RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-02-01 05:01:59 +01:00
Code Issues Projects Releases Wiki Activity

MC: Lift MCSymbolData::Index up to MCSymbol::Index, NFC

Browse Source 
Lift `MCSymbolData::Index` up a level to `MCSymbol`, as preparation for
packing it into the bitfield in `MCSymbol`.

llvm-svn: 238001
This commit is contained in:
Duncan P. N. Exon Smith 2015-05-22 05:54:01 +00:00
parent c374234f23
commit b907b3f6f2
4 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
include/llvm/MC/MCSymbol.h
View File

@ -56,9 +56,6 @@ class MCSymbolData {
/// additional per symbol information which is not easily classified.
uint32_t Flags = 0;
/// Index - Index field, for use by the object file implementation.
uint64_t Index = 0;
public:
MCSymbolData() { Offset = 0; }
@ -128,12 +125,6 @@ public:
Flags = (Flags & ~Mask) | Value;
}
/// getIndex - Get the (implementation defined) index.
uint64_t getIndex() const { return Index; }
/// setIndex - Set the (implementation defined) index.
void setIndex(uint64_t Value) { Index = Value; }
/// @}
void dump() const;
@ -178,6 +169,9 @@ class MCSymbol {
mutable bool HasData : 1;
mutable MCSymbolData Data;
/// Index field, for use by the object file implementation.
mutable uint64_t Index = 0;
private: // MCContext creates and uniques these.
friend class MCExpr;
friend class MCContext;
@ -287,6 +281,18 @@ public:
/// @}
/// Get the (implementation defined) index.
uint64_t getIndex() const {
assert(HasData && "Uninitialized symbol data");
return Index;
}
/// Set the (implementation defined) index.
void setIndex(uint64_t Value) const {
assert(HasData && "Uninitialized symbol data");
Index = Value;
}
/// print - Print the value to the stream \p OS.
void print(raw_ostream &OS) const;

10
lib/MC/ELFObjectWriter.cpp
View File

@ -858,8 +858,8 @@ void ELFObjectWriter::RecordRelocation(MCAssembler &Asm,
uint64_t
ELFObjectWriter::getSymbolIndexInSymbolTable(const MCAssembler &Asm,
const MCSymbol *S) {
const MCSymbolData &SD = Asm.getSymbolData(*S);
return SD.getIndex();
assert(S->hasData());
return S->getIndex();
}
bool ELFObjectWriter::isInSymtab(const MCAsmLayout &Layout,
@ -1049,12 +1049,12 @@ void ELFObjectWriter::computeSymbolTable(
// symbols with non-local bindings.
unsigned Index = FileSymbolData.size() + 1;
for (unsigned i = 0, e = LocalSymbolData.size(); i != e; ++i)
LocalSymbolData[i].Symbol->getData().setIndex(Index++);
LocalSymbolData[i].Symbol->setIndex(Index++);
for (unsigned i = 0, e = ExternalSymbolData.size(); i != e; ++i)
ExternalSymbolData[i].Symbol->getData().setIndex(Index++);
ExternalSymbolData[i].Symbol->setIndex(Index++);
for (unsigned i = 0, e = UndefinedSymbolData.size(); i != e; ++i)
UndefinedSymbolData[i].Symbol->getData().setIndex(Index++);
UndefinedSymbolData[i].Symbol->setIndex(Index++);
}
MCSectionELF *

4
lib/MC/MCAssembler.cpp
View File

@ -1268,7 +1268,7 @@ void MCSymbolData::dump() const {
<< " Fragment:" << getFragment();
if (!isCommon())
OS << " Offset:" << getOffset();
OS << " Flags:" << getFlags() << " Index:" << getIndex();
OS << " Flags:" << getFlags();
if (isCommon())
OS << " (common, size:" << getCommonSize()
<< " align: " << getCommonAlignment() << ")";
@ -1295,7 +1295,7 @@ void MCAssembler::dump() {
if (it != symbol_begin()) OS << ",\n ";
OS << "(";
it->dump();
OS << ",";
OS << ", Index:" << it->getIndex() << ", ";
it->getData().dump();
OS << ")";
}

10
lib/MC/MachObjectWriter.cpp
View File

@ -616,11 +616,11 @@ void MachObjectWriter::ComputeSymbolTable(
// Set the symbol indices.
Index = 0;
for (unsigned i = 0, e = LocalSymbolData.size(); i != e; ++i)
LocalSymbolData[i].Symbol->getData().setIndex(Index++);
LocalSymbolData[i].Symbol->setIndex(Index++);
for (unsigned i = 0, e = ExternalSymbolData.size(); i != e; ++i)
ExternalSymbolData[i].Symbol->getData().setIndex(Index++);
ExternalSymbolData[i].Symbol->setIndex(Index++);
for (unsigned i = 0, e = UndefinedSymbolData.size(); i != e; ++i)
UndefinedSymbolData[i].Symbol->getData().setIndex(Index++);
UndefinedSymbolData[i].Symbol->setIndex(Index++);
for (const MCSectionData &SD : Asm) {
std::vector<RelAndSymbol> &Relocs = Relocations[&SD];
@ -629,7 +629,7 @@ void MachObjectWriter::ComputeSymbolTable(
continue;
// Set the Index and the IsExtern bit.
unsigned Index = Rel.Sym->getData().getIndex();
unsigned Index = Rel.Sym->getIndex();
assert(isInt<24>(Index));
if (IsLittleEndian)
Rel.MRE.r_word1 = (Rel.MRE.r_word1 & (~0U << 24)) | Index | (1 << 27);
@ -982,7 +982,7 @@ void MachObjectWriter::WriteObject(MCAssembler &Asm,
}
}
Write32(Asm.getSymbolData(*it->Symbol).getIndex());
Write32(it->Symbol->getIndex());
}
// FIXME: Check that offsets match computed ones.