replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Pointer sizes are stored in Bytes. Fix variables names to say so. 

Also update for the current naming style.

llvm-svn: 197283
This commit is contained in:
Rafael Espindola 2013-12-13 23:15:20 +00:00
parent 651898c19f
commit f39136c39f
2 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
llvm/include/llvm/IR/DataLayout.h
View File

@ -78,12 +78,12 @@ struct LayoutAlignElem {
struct PointerAlignElem {
unsigned ABIAlign; ///< ABI alignment for this type/bitw
unsigned PrefAlign; ///< Pref. alignment for this type/bitw
uint32_t TypeBitWidth; ///< Type bit width
uint32_t TypeByteWidth; ///< Type byte width
uint32_t AddressSpace; ///< Address space for the pointer type
/// Initializer
static PointerAlignElem get(uint32_t addr_space, unsigned abi_align,
unsigned pref_align, uint32_t bit_width);
static PointerAlignElem get(uint32_t AddressSpace, unsigned ABIAlign,
unsigned PrefAlign, uint32_t TypeByteWidth);
/// Equality predicate
bool operator==(const PointerAlignElem &rhs) const;
};
@ -129,8 +129,8 @@ private:
bool ABIAlign, Type *Ty) const;
//! Set/initialize pointer alignments
void setPointerAlignment(uint32_t addr_space, unsigned abi_align,
unsigned pref_align, uint32_t bit_width);
void setPointerAlignment(uint32_t AddrSpace, unsigned ABIAlign,
unsigned PrefAlign, uint32_t TypeByteWidth);
//! Internal helper method that returns requested alignment for type.
unsigned getAlignment(Type *Ty, bool abi_or_pref) const;
@ -263,7 +263,7 @@ public:
if (val == Pointers.end()) {
val = Pointers.find(0);
}
return val->second.TypeBitWidth;
return val->second.TypeByteWidth;
}
/// Layout pointer size, in bits
/// FIXME: The defaults need to be removed once all of

38
llvm/lib/IR/DataLayout.cpp
View File

@ -125,14 +125,14 @@ DataLayout::InvalidAlignmentElem = { INVALID_ALIGN, 0, 0, 0 };
//===----------------------------------------------------------------------===//
PointerAlignElem
PointerAlignElem::get(uint32_t addr_space, unsigned abi_align,
unsigned pref_align, uint32_t bit_width) {
assert(abi_align <= pref_align && "Preferred alignment worse than ABI!");
PointerAlignElem::get(uint32_t AddressSpace, unsigned ABIAlign,
unsigned PrefAlign, uint32_t TypeByteWidth) {
assert(ABIAlign <= PrefAlign && "Preferred alignment worse than ABI!");
PointerAlignElem retval;
retval.AddressSpace = addr_space;
retval.ABIAlign = abi_align;
retval.PrefAlign = pref_align;
retval.TypeBitWidth = bit_width;
retval.AddressSpace = AddressSpace;
retval.ABIAlign = ABIAlign;
retval.PrefAlign = PrefAlign;
retval.TypeByteWidth = TypeByteWidth;
return retval;
}
@ -141,7 +141,7 @@ PointerAlignElem::operator==(const PointerAlignElem &rhs) const {
return (ABIAlign == rhs.ABIAlign
&& AddressSpace == rhs.AddressSpace
&& PrefAlign == rhs.PrefAlign
&& TypeBitWidth == rhs.TypeBitWidth);
&& TypeByteWidth == rhs.TypeByteWidth);
}
const PointerAlignElem
@ -335,18 +335,18 @@ DataLayout::setAlignment(AlignTypeEnum align_type, unsigned abi_align,
pref_align, bit_width));
}
void
DataLayout::setPointerAlignment(uint32_t addr_space, unsigned abi_align,
unsigned pref_align, uint32_t bit_width) {
assert(abi_align <= pref_align && "Preferred alignment worse than ABI!");
DenseMap<unsigned,PointerAlignElem>::iterator val = Pointers.find(addr_space);
void DataLayout::setPointerAlignment(uint32_t AddrSpace, unsigned ABIAlign,
unsigned PrefAlign,
uint32_t TypeByteWidth) {
assert(ABIAlign <= PrefAlign && "Preferred alignment worse than ABI!");
DenseMap<unsigned,PointerAlignElem>::iterator val = Pointers.find(AddrSpace);
if (val == Pointers.end()) {
Pointers[addr_space] = PointerAlignElem::get(addr_space,
abi_align, pref_align, bit_width);
Pointers[AddrSpace] =
PointerAlignElem::get(AddrSpace, ABIAlign, PrefAlign, TypeByteWidth);
} else {
val->second.ABIAlign = abi_align;
val->second.PrefAlign = pref_align;
val->second.TypeBitWidth = bit_width;
val->second.ABIAlign = ABIAlign;
val->second.PrefAlign = PrefAlign;
val->second.TypeByteWidth = TypeByteWidth;
}
}
@ -487,7 +487,7 @@ std::string DataLayout::getStringRepresentation() const {
if (PI.AddressSpace) {
OS << PI.AddressSpace;
}
OS << ":" << PI.TypeBitWidth*8 << ':' << PI.ABIAlign*8
OS << ":" << PI.TypeByteWidth*8 << ':' << PI.ABIAlign*8
<< ':' << PI.PrefAlign*8;
}
OS << "-S" << StackNaturalAlign*8;