MachineConstantPoolEntry CPE = CP[i];
const Type *Ty = CPE.getType();
if (TAI->getFourByteConstantSection() &&
- TM.getTargetData()->getTypeSize(Ty) == 4)
+ TM.getTargetData()->getABITypeSize(Ty) == 4)
FourByteCPs.push_back(std::make_pair(CPE, i));
else if (TAI->getEightByteConstantSection() &&
- TM.getTargetData()->getTypeSize(Ty) == 8)
+ TM.getTargetData()->getABITypeSize(Ty) == 8)
EightByteCPs.push_back(std::make_pair(CPE, i));
else if (TAI->getSixteenByteConstantSection() &&
- TM.getTargetData()->getTypeSize(Ty) == 16)
+ TM.getTargetData()->getABITypeSize(Ty) == 16)
SixteenByteCPs.push_back(std::make_pair(CPE, i));
else
OtherCPs.push_back(std::make_pair(CPE, i));
if (i != e-1) {
const Type *Ty = CP[i].first.getType();
unsigned EntSize =
- TM.getTargetData()->getTypeSize(Ty);
+ TM.getTargetData()->getABITypeSize(Ty);
unsigned ValEnd = CP[i].first.getOffset() + EntSize;
// Emit inter-object padding for alignment.
EmitZeros(CP[i+1].first.getOffset()-ValEnd);
// We can emit the pointer value into this slot if the slot is an
// integer slot greater or equal to the size of the pointer.
if (Ty->isInteger() &&
- TD->getTypeSize(Ty) >= TD->getTypeSize(Op->getType()))
+ TD->getABITypeSize(Ty) >= TD->getABITypeSize(Op->getType()))
return EmitConstantValueOnly(Op);
assert(0 && "FIXME: Don't yet support this kind of constant cast expr");
}
/// EmitGlobalConstant - Print a general LLVM constant to the .s file.
-///
-void AsmPrinter::EmitGlobalConstant(const Constant *CV) {
+/// If Packed is false, pad to the ABI size.
+void AsmPrinter::EmitGlobalConstant(const Constant *CV, bool Packed) {
const TargetData *TD = TM.getTargetData();
+ unsigned Size = Packed ?
+ TD->getTypeStoreSize(CV->getType()) : TD->getABITypeSize(CV->getType());
if (CV->isNullValue() || isa<UndefValue>(CV)) {
- EmitZeros(TD->getTypeSize(CV->getType()));
+ EmitZeros(Size);
return;
} else if (const ConstantArray *CVA = dyn_cast<ConstantArray>(CV)) {
if (CVA->isString()) {
EmitString(CVA);
} else { // Not a string. Print the values in successive locations
for (unsigned i = 0, e = CVA->getNumOperands(); i != e; ++i)
- EmitGlobalConstant(CVA->getOperand(i));
+ EmitGlobalConstant(CVA->getOperand(i), false);
}
return;
} else if (const ConstantStruct *CVS = dyn_cast<ConstantStruct>(CV)) {
const Constant* field = CVS->getOperand(i);
// Check if padding is needed and insert one or more 0s.
- uint64_t fieldSize = TD->getTypeSize(field->getType());
- uint64_t padSize = ((i == e-1? cvsLayout->getSizeInBytes()
- : cvsLayout->getElementOffset(i+1))
+ uint64_t fieldSize = TD->getTypeStoreSize(field->getType());
+ uint64_t padSize = ((i == e-1 ? Size : cvsLayout->getElementOffset(i+1))
- cvsLayout->getElementOffset(i)) - fieldSize;
sizeSoFar += fieldSize + padSize;
- // Now print the actual field value
- EmitGlobalConstant(field);
+ // Now print the actual field value without ABI size padding.
+ EmitGlobalConstant(field, true);
- // Insert the field padding unless it's zero bytes...
+ // Insert padding - this may include padding to increase the size of the
+ // current field up to the ABI size (if the struct is not packed) as well
+ // as padding to ensure that the next field starts at the right offset.
EmitZeros(padSize);
}
assert(sizeSoFar == cvsLayout->getSizeInBytes() &&
<< "\t" << TAI->getCommentString()
<< " long double most significant halfword\n";
}
+ EmitZeros(Size - TD->getTypeStoreSize(Type::X86_FP80Ty));
+ return;
+ } else if (CFP->getType() == Type::PPC_FP128Ty) {
+ // all long double variants are printed as hex
+ // api needed to prevent premature destruction
+ APInt api = CFP->getValueAPF().convertToAPInt();
+ const uint64_t *p = api.getRawData();
+ if (TD->isBigEndian()) {
+ O << TAI->getData32bitsDirective() << uint32_t(p[0] >> 32)
+ << "\t" << TAI->getCommentString()
+ << " long double most significant word\n";
+ O << TAI->getData32bitsDirective() << uint32_t(p[0])
+ << "\t" << TAI->getCommentString()
+ << " long double next word\n";
+ O << TAI->getData32bitsDirective() << uint32_t(p[1] >> 32)
+ << "\t" << TAI->getCommentString()
+ << " long double next word\n";
+ O << TAI->getData32bitsDirective() << uint32_t(p[1])
+ << "\t" << TAI->getCommentString()
+ << " long double least significant word\n";
+ } else {
+ O << TAI->getData32bitsDirective() << uint32_t(p[1])
+ << "\t" << TAI->getCommentString()
+ << " long double least significant word\n";
+ O << TAI->getData32bitsDirective() << uint32_t(p[1] >> 32)
+ << "\t" << TAI->getCommentString()
+ << " long double next word\n";
+ O << TAI->getData32bitsDirective() << uint32_t(p[0])
+ << "\t" << TAI->getCommentString()
+ << " long double next word\n";
+ O << TAI->getData32bitsDirective() << uint32_t(p[0] >> 32)
+ << "\t" << TAI->getCommentString()
+ << " long double most significant word\n";
+ }
return;
} else assert(0 && "Floating point constant type not handled");
} else if (CV->getType() == Type::Int64Ty) {
const VectorType *PTy = CP->getType();
for (unsigned I = 0, E = PTy->getNumElements(); I < E; ++I)
- EmitGlobalConstant(CP->getOperand(I));
+ EmitGlobalConstant(CP->getOperand(I), false);
return;
}
unsigned OpFlags = MI->getOperand(OpNo).getImmedValue();
++OpNo; // Skip over the ID number.
- AsmPrinter *AP = const_cast<AsmPrinter*>(this);
- if ((OpFlags & 7) == 4 /*ADDR MODE*/) {
- Error = AP->PrintAsmMemoryOperand(MI, OpNo, AsmPrinterVariant,
- Modifier[0] ? Modifier : 0);
- } else {
- Error = AP->PrintAsmOperand(MI, OpNo, AsmPrinterVariant,
- Modifier[0] ? Modifier : 0);
+ if (Modifier[0]=='l') // labels are target independent
+ printBasicBlockLabel(MI->getOperand(OpNo).getMachineBasicBlock(),
+ false, false);
+ else {
+ AsmPrinter *AP = const_cast<AsmPrinter*>(this);
+ if ((OpFlags & 7) == 4 /*ADDR MODE*/) {
+ Error = AP->PrintAsmMemoryOperand(MI, OpNo, AsmPrinterVariant,
+ Modifier[0] ? Modifier : 0);
+ } else {
+ Error = AP->PrintAsmOperand(MI, OpNo, AsmPrinterVariant,
+ Modifier[0] ? Modifier : 0);
+ }
}
}
if (Error) {
void AsmPrinter::printBasicBlockLabel(const MachineBasicBlock *MBB,
bool printColon,
bool printComment) const {
- O << TAI->getPrivateGlobalPrefix() << "BB" << FunctionNumber << "_"
+ O << TAI->getPrivateGlobalPrefix() << "BB" << getFunctionNumber() << "_"
<< MBB->getNumber();
if (printColon)
O << ':';
}
break;
case Type::FloatTyID: case Type::DoubleTyID:
+ case Type::X86_FP80TyID: case Type::FP128TyID: case Type::PPC_FP128TyID:
assert (0 && "Should have already output floating point constant.");
default:
assert (0 && "Can't handle printing this type of thing");