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

MC: Eliminate MC{Fragment,{Section,Symbol}Data}::getAddress. 

llvm-svn: 99467
This commit is contained in:
Daniel Dunbar 2010-03-25 01:03:24 +00:00
parent 5caf2ff561
commit 5d98824615
2 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
llvm/include/llvm/MC/MCAssembler.h
View File

@ -57,6 +57,8 @@ public:
};
class MCFragment : public ilist_node<MCFragment> {
friend class MCAsmLayout;
MCFragment(const MCFragment&); // DO NOT IMPLEMENT
void operator=(const MCFragment&); // DO NOT IMPLEMENT
@ -108,8 +110,6 @@ public:
//
// FIXME: This could all be kept private to the assembler implementation.
uint64_t getAddress() const;
uint64_t getFileSize() const {
assert(FileSize != ~UINT64_C(0) && "File size not set!");
return FileSize;
@ -390,6 +390,8 @@ public:
// we anticipate the fast path being through an MCAssembler, the only reason to
// keep it out is for API abstraction.
class MCSectionData : public ilist_node<MCSectionData> {
friend class MCAsmLayout;
MCSectionData(const MCSectionData&); // DO NOT IMPLEMENT
void operator=(const MCSectionData&); // DO NOT IMPLEMENT
@ -469,12 +471,6 @@ public:
//
// FIXME: This could all be kept private to the assembler implementation.
uint64_t getAddress() const {
assert(Address != ~UINT64_C(0) && "Address not set!");
return Address;
}
void setAddress(uint64_t Value) { Address = Value; }
uint64_t getSize() const {
assert(Size != ~UINT64_C(0) && "File size not set!");
return Size;
@ -549,11 +545,6 @@ public:
uint64_t getOffset() const { return Offset; }
void setOffset(uint64_t Value) { Offset = Value; }
uint64_t getAddress() const {
assert(getFragment() && "Invalid getAddress() on undefined symbol!");
return getFragment()->getAddress() + getOffset();
}
/// @}
/// @name Symbol Attributes
/// @{

16
llvm/lib/MC/MCAssembler.cpp
View File

@ -46,19 +46,22 @@ STATISTIC(ObjectBytes, "Number of emitted object file bytes");
/* *** */
uint64_t MCAsmLayout::getFragmentAddress(const MCFragment *F) const {
return F->getAddress();
assert(F->getParent() && "Missing section()!");
return getSectionAddress(F->getParent()) + F->getOffset();
}
uint64_t MCAsmLayout::getSymbolAddress(const MCSymbolData *SD) const {
return SD->getAddress();
assert(SD->getFragment() && "Invalid getAddress() on undefined symbol!");
return getFragmentAddress(SD->getFragment()) + SD->getOffset();
}
uint64_t MCAsmLayout::getSectionAddress(const MCSectionData *SD) const {
return SD->getAddress();
assert(SD->Address != ~UINT64_C(0) && "Address not set!");
return SD->Address;
}
void MCAsmLayout::setSectionAddress(MCSectionData *SD, uint64_t Value) {
SD->setAddress(Value);
SD->Address = Value;
}
/* *** */
@ -78,11 +81,6 @@ MCFragment::MCFragment(FragmentType _Kind, MCSectionData *_Parent)
MCFragment::~MCFragment() {
}
uint64_t MCFragment::getAddress() const {
assert(getParent() && "Missing Section!");
return getParent()->getAddress() + Offset;
}
/* *** */
MCSectionData::MCSectionData() : Section(0) {}