* Add BoolAlignment to TargetData, default is 1 byte, size 1 byte
* Convert tabs to spaces
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@15120 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Target/TargetData.cpp b/lib/Target/TargetData.cpp
index e5f391b..8aea154 100644
--- a/lib/Target/TargetData.cpp
+++ b/lib/Target/TargetData.cpp
@@ -30,7 +30,7 @@
}
static inline void getTypeInfo(const Type *Ty, const TargetData *TD,
- uint64_t &Size, unsigned char &Alignment);
+ uint64_t &Size, unsigned char &Alignment);
//===----------------------------------------------------------------------===//
// Support for StructLayout
@@ -42,7 +42,7 @@
// Loop over each of the elements, placing them in memory...
for (StructType::element_iterator TI = ST->element_begin(),
- TE = ST->element_end(); TI != TE; ++TI) {
+ TE = ST->element_end(); TI != TE; ++TI) {
const Type *Ty = *TI;
unsigned char A;
unsigned TyAlign;
@@ -79,7 +79,7 @@
unsigned char PtrAl, unsigned char DoubleAl,
unsigned char FloatAl, unsigned char LongAl,
unsigned char IntAl, unsigned char ShortAl,
- unsigned char ByteAl) {
+ unsigned char ByteAl, unsigned char BoolAl) {
// If this assert triggers, a pass "required" TargetData information, but the
// top level tool did not provide one for it. We do not want to default
@@ -97,6 +97,7 @@
IntAlignment = IntAl;
ShortAlignment = ShortAl;
ByteAlignment = ByteAl;
+ BoolAlignment = BoolAl;
}
TargetData::TargetData(const std::string &ToolName, const Module *M) {
@@ -109,6 +110,7 @@
IntAlignment = 4;
ShortAlignment = 2;
ByteAlignment = 1;
+ BoolAlignment = 1;
}
static std::map<std::pair<const TargetData*,const StructType*>,
@@ -146,11 +148,11 @@
}
static inline void getTypeInfo(const Type *Ty, const TargetData *TD,
- uint64_t &Size, unsigned char &Alignment) {
+ uint64_t &Size, unsigned char &Alignment) {
assert(Ty->isSized() && "Cannot getTypeInfo() on a type that is unsized!");
switch (Ty->getTypeID()) {
+ case Type::BoolTyID: Size = 1; Alignment = TD->getBoolAlignment(); return;
case Type::VoidTyID:
- case Type::BoolTyID:
case Type::UByteTyID:
case Type::SByteTyID: Size = 1; Alignment = TD->getByteAlignment(); return;
case Type::UShortTyID:
@@ -212,7 +214,7 @@
uint64_t TargetData::getIndexedOffset(const Type *ptrTy,
- const std::vector<Value*> &Idx) const {
+ const std::vector<Value*> &Idx) const {
const Type *Ty = ptrTy;
assert(isa<PointerType>(Ty) && "Illegal argument for getIndexedOffset()");
uint64_t Result = 0;
diff --git a/lib/Target/TargetMachine.cpp b/lib/Target/TargetMachine.cpp
index d71bd3f..3022b52 100644
--- a/lib/Target/TargetMachine.cpp
+++ b/lib/Target/TargetMachine.cpp
@@ -45,10 +45,11 @@
unsigned char PtrSize, unsigned char PtrAl,
unsigned char DoubleAl, unsigned char FloatAl,
unsigned char LongAl, unsigned char IntAl,
- unsigned char ShortAl, unsigned char ByteAl)
+ unsigned char ShortAl, unsigned char ByteAl,
+ unsigned char BoolAl)
: Name(name), DataLayout(name, LittleEndian,
PtrSize, PtrAl, DoubleAl, FloatAl, LongAl,
- IntAl, ShortAl, ByteAl) {
+ IntAl, ShortAl, ByteAl, BoolAl) {
IL = il ? il : new DefaultIntrinsicLowering();
}
TargetMachine::TargetMachine(const std::string &name, IntrinsicLowering *il,