6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-01-31 10:34:17 +00:00
Code Issues Projects Releases Wiki Activity

Change getStringRepresentation to skip defaults.

Browse Source 
I have a pending change for clang to use getStringRepresentation to check
that its DataLayout is in sync with llvm's.

getStringRepresentation is not called from llvm itself, so far it is mostly
a debugging aid, so the shorter strings are an independent improvement.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@197740 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola 2013-12-19 23:03:03 +00:00
parent a25701bc42
commit b9df9e68e7
1 changed files with 45 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
lib/IR/DataLayout.cpp
View File

@ -18,6 +18,7 @@
#include "llvm/IR/DataLayout.h" #include "llvm/IR/DataLayout.h"
#include "llvm/ADT/DenseMap.h" #include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/STLExtras.h"
#include "llvm/IR/Constants.h" #include "llvm/IR/Constants.h"
#include "llvm/IR/DerivedTypes.h" #include "llvm/IR/DerivedTypes.h"
#include "llvm/IR/Module.h" #include "llvm/IR/Module.h"
@ -151,6 +152,21 @@ DataLayout::InvalidPointerElem = { 0U, 0U, 0U, ~0U };
// DataLayout Class Implementation // DataLayout Class Implementation
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
static LayoutAlignElem DefaultAlignments[] = {
{ INTEGER_ALIGN, 1, 1, 1 }, // i1
{ INTEGER_ALIGN, 8, 1, 1 }, // i8
{ INTEGER_ALIGN, 16, 2, 2 }, // i16
{ INTEGER_ALIGN, 32, 4, 4 }, // i32
{ INTEGER_ALIGN, 64, 4, 8 }, // i64
{ FLOAT_ALIGN, 16, 2, 2 }, // half
{ FLOAT_ALIGN, 32, 4, 4 }, // float
{ FLOAT_ALIGN, 64, 8, 8 }, // double
{ FLOAT_ALIGN, 128, 16, 16 }, // ppcf128, quad, ...
{ VECTOR_ALIGN, 64, 8, 8 }, // v2i32, v1i64, ...
{ VECTOR_ALIGN, 128, 16, 16 }, // v16i8, v8i16, v4i32, ...
{ AGGREGATE_ALIGN, 0, 0, 8 } // struct
};
void DataLayout::init(StringRef Desc) { void DataLayout::init(StringRef Desc) {
initializeDataLayoutPass(*PassRegistry::getPassRegistry()); initializeDataLayoutPass(*PassRegistry::getPassRegistry());
@ -159,18 +175,11 @@ void DataLayout::init(StringRef Desc) {
StackNaturalAlign = 0; StackNaturalAlign = 0;
// Default alignments // Default alignments
setAlignment(INTEGER_ALIGN, 1, 1, 1); // i1 for (int I = 0, N = array_lengthof(DefaultAlignments); I < N; ++I) {
setAlignment(INTEGER_ALIGN, 1, 1, 8); // i8 LayoutAlignElem &E = DefaultAlignments[I];
setAlignment(INTEGER_ALIGN, 2, 2, 16); // i16 setAlignment((AlignTypeEnum)E.AlignType, E.ABIAlign, E.PrefAlign,
setAlignment(INTEGER_ALIGN, 4, 4, 32); // i32 E.TypeBitWidth);
setAlignment(INTEGER_ALIGN, 4, 8, 64); // i64 }
setAlignment(FLOAT_ALIGN, 2, 2, 16); // half
setAlignment(FLOAT_ALIGN, 4, 4, 32); // float
setAlignment(FLOAT_ALIGN, 8, 8, 64); // double
setAlignment(FLOAT_ALIGN, 16, 16, 128); // ppcf128, quad, ...
setAlignment(VECTOR_ALIGN, 8, 8, 64); // v2i32, v1i64, ...
setAlignment(VECTOR_ALIGN, 16, 16, 128); // v16i8, v8i16, v4i32, ...
setAlignment(AGGREGATE_ALIGN, 0, 8, 0); // struct
setPointerAlignment(0, 8, 8, 8); setPointerAlignment(0, 8, 8, 8);
parseSpecifier(Desc); parseSpecifier(Desc);
@ -483,19 +492,34 @@ std::string DataLayout::getStringRepresentation() const {
for (SmallVectorImpl<unsigned>::iterator asb = addrSpaces.begin(), for (SmallVectorImpl<unsigned>::iterator asb = addrSpaces.begin(),
ase = addrSpaces.end(); asb != ase; ++asb) { ase = addrSpaces.end(); asb != ase; ++asb) {
const PointerAlignElem &PI = Pointers.find(*asb)->second; const PointerAlignElem &PI = Pointers.find(*asb)->second;
// Skip default.
if (PI.AddressSpace == 0 && PI.ABIAlign == 8 && PI.PrefAlign == 8 &&
PI.TypeByteWidth == 8)
continue;
OS << "-p"; OS << "-p";
if (PI.AddressSpace) { if (PI.AddressSpace) {
OS << PI.AddressSpace; OS << PI.AddressSpace;
} }
OS << ":" << PI.TypeByteWidth*8 << ':' << PI.ABIAlign*8 OS << ":" << PI.TypeByteWidth*8 << ':' << PI.ABIAlign*8;
<< ':' << PI.PrefAlign*8; if (PI.PrefAlign != PI.ABIAlign)
OS << ':' << PI.PrefAlign*8;
} }
OS << "-S" << StackNaturalAlign*8;
LayoutAlignElem *DefaultStart = DefaultAlignments;
LayoutAlignElem *DefaultEnd =
DefaultStart + array_lengthof(DefaultAlignments);
for (unsigned i = 0, e = Alignments.size(); i != e; ++i) { for (unsigned i = 0, e = Alignments.size(); i != e; ++i) {
const LayoutAlignElem &AI = Alignments[i]; const LayoutAlignElem &AI = Alignments[i];
OS << '-' << (char)AI.AlignType << AI.TypeBitWidth << ':' if (std::find(DefaultStart, DefaultEnd, AI) != DefaultEnd)
<< AI.ABIAlign*8 << ':' << AI.PrefAlign*8; continue;
OS << '-' << (char)AI.AlignType;
if (AI.TypeBitWidth)
OS << AI.TypeBitWidth;
OS << ':' << AI.ABIAlign*8;
if (AI.ABIAlign != AI.PrefAlign)
OS << ':' << AI.PrefAlign*8;
} }
if (!LegalIntWidths.empty()) { if (!LegalIntWidths.empty()) {
@ -504,6 +528,10 @@ std::string DataLayout::getStringRepresentation() const {
for (unsigned i = 1, e = LegalIntWidths.size(); i != e; ++i) for (unsigned i = 1, e = LegalIntWidths.size(); i != e; ++i)
OS << ':' << (unsigned)LegalIntWidths[i]; OS << ':' << (unsigned)LegalIntWidths[i];
} }
if (StackNaturalAlign)
OS << "-S" << StackNaturalAlign*8;
return OS.str(); return OS.str();
} }