mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-07-25 13:24:46 +00:00
reapply the patches reverted in r149470 that reenable ConstantDataArray,
but with a critical fix to the SelectionDAG code that optimizes copies from strings into immediate stores: the previous code was stopping reading string data at the first nul. Address this by adding a new argument to llvm::getConstantStringInfo, preserving the behavior before the patch. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@149800 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@@ -1684,31 +1684,18 @@ static void EmitGlobalConstantDataSequential(const ConstantDataSequential *CDS,
|
||||
|
||||
static void EmitGlobalConstantArray(const ConstantArray *CA, unsigned AddrSpace,
|
||||
AsmPrinter &AP) {
|
||||
if (AddrSpace != 0 || !CA->isString()) {
|
||||
// Not a string. Print the values in successive locations.
|
||||
// See if we can aggregate some values. Make sure it can be
|
||||
// represented as a series of bytes of the constant value.
|
||||
int Value = isRepeatedByteSequence(CA, AP.TM);
|
||||
|
||||
// See if we can aggregate some values. Make sure it can be
|
||||
// represented as a series of bytes of the constant value.
|
||||
int Value = isRepeatedByteSequence(CA, AP.TM);
|
||||
|
||||
if (Value != -1) {
|
||||
uint64_t Bytes = AP.TM.getTargetData()->getTypeAllocSize(CA->getType());
|
||||
AP.OutStreamer.EmitFill(Bytes, Value, AddrSpace);
|
||||
}
|
||||
else {
|
||||
for (unsigned i = 0, e = CA->getNumOperands(); i != e; ++i)
|
||||
EmitGlobalConstantImpl(CA->getOperand(i), AddrSpace, AP);
|
||||
}
|
||||
return;
|
||||
if (Value != -1) {
|
||||
uint64_t Bytes = AP.TM.getTargetData()->getTypeAllocSize(CA->getType());
|
||||
AP.OutStreamer.EmitFill(Bytes, Value, AddrSpace);
|
||||
}
|
||||
else {
|
||||
for (unsigned i = 0, e = CA->getNumOperands(); i != e; ++i)
|
||||
EmitGlobalConstantImpl(CA->getOperand(i), AddrSpace, AP);
|
||||
}
|
||||
|
||||
// Otherwise, it can be emitted as .ascii.
|
||||
SmallVector<char, 128> TmpVec;
|
||||
TmpVec.reserve(CA->getNumOperands());
|
||||
for (unsigned i = 0, e = CA->getNumOperands(); i != e; ++i)
|
||||
TmpVec.push_back(cast<ConstantInt>(CA->getOperand(i))->getZExtValue());
|
||||
|
||||
AP.OutStreamer.EmitBytes(StringRef(TmpVec.data(), TmpVec.size()), AddrSpace);
|
||||
}
|
||||
|
||||
static void EmitGlobalConstantVector(const ConstantVector *CV,
|
||||
|
Reference in New Issue
Block a user