6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-11-01 15:11:24 +00:00
Code Issues Projects Releases Wiki Activity

MC: Eliminate MCFragment::getMaxFileSize.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@99203 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Daniel Dunbar 2010-03-22 20:35:43 +00:00
parent 8d39eb47d6
commit 2a6e3f5be2
2 changed files with 8 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -99,12 +99,6 @@ public:
MCSectionData *getParent() const { return Parent; } MCSectionData *getParent() const { return Parent; }
void setParent(MCSectionData *Value) { Parent = Value; } void setParent(MCSectionData *Value) { Parent = Value; }
// FIXME: This should be abstract, fix sentinel.
virtual uint64_t getMaxFileSize() const {
assert(0 && "Invalid getMaxFileSize call!");
return 0;
}
/// @name Assembler Backend Support /// @name Assembler Backend Support
/// @{ /// @{
// //
@ -116,10 +110,7 @@ public:
assert(FileSize != ~UINT64_C(0) && "File size not set!"); assert(FileSize != ~UINT64_C(0) && "File size not set!");
return FileSize; return FileSize;
} }
void setFileSize(uint64_t Value) { void setFileSize(uint64_t Value) { FileSize = Value; }
assert(Value <= getMaxFileSize() && "Invalid file size!");
FileSize = Value;
}
uint64_t getOffset() const { uint64_t getOffset() const {
assert(Offset != ~UINT64_C(0) && "File offset not set!"); assert(Offset != ~UINT64_C(0) && "File offset not set!");
@ -150,10 +141,6 @@ public:
/// @name Accessors /// @name Accessors
/// @{ /// @{
uint64_t getMaxFileSize() const {
return Contents.size();
}
SmallString<32> &getContents() { return Contents; } SmallString<32> &getContents() { return Contents; }
const SmallString<32> &getContents() const { return Contents; } const SmallString<32> &getContents() const { return Contents; }
@ -219,10 +206,6 @@ public:
/// @name Accessors /// @name Accessors
/// @{ /// @{
uint64_t getMaxFileSize() const {
return std::max(Alignment - 1, MaxBytesToEmit);
}
unsigned getAlignment() const { return Alignment; } unsigned getAlignment() const { return Alignment; }
int64_t getValue() const { return Value; } int64_t getValue() const { return Value; }
@ -262,10 +245,6 @@ public:
/// @name Accessors /// @name Accessors
/// @{ /// @{
uint64_t getMaxFileSize() const {
return ValueSize * Count;
}
int64_t getValue() const { return Value; } int64_t getValue() const { return Value; }
unsigned getValueSize() const { return ValueSize; } unsigned getValueSize() const { return ValueSize; }
@ -297,11 +276,6 @@ public:
/// @name Accessors /// @name Accessors
/// @{ /// @{
uint64_t getMaxFileSize() const {
// FIXME: This doesn't make much sense.
return ~UINT64_C(0);
}
const MCExpr &getOffset() const { return *Offset; } const MCExpr &getOffset() const { return *Offset; }
uint8_t getValue() const { return Value; } uint8_t getValue() const { return Value; }
@ -333,11 +307,6 @@ public:
/// @name Accessors /// @name Accessors
/// @{ /// @{
uint64_t getMaxFileSize() const {
// FIXME: This also doesn't make much sense, this method is misnamed.
return ~UINT64_C(0);
}
uint64_t getSize() const { return Size; } uint64_t getSize() const { return Size; }
unsigned getAlignment() const { return Alignment; } unsigned getAlignment() const { return Alignment; }

9
lib/MC/MCAssembler.cpp
View File

@ -320,10 +320,15 @@ void MCAssembler::LayoutSection(MCSectionData &SD,
} }
case MCFragment::FT_Data: case MCFragment::FT_Data:
case MCFragment::FT_Fill: F.setFileSize(cast<MCDataFragment>(F).getContents().size());
F.setFileSize(F.getMaxFileSize());
break; break;
case MCFragment::FT_Fill: {
MCFillFragment &FF = cast<MCFillFragment>(F);
F.setFileSize(FF.getValueSize() * FF.getCount());
break;
}
case MCFragment::FT_Org: { case MCFragment::FT_Org: {
MCOrgFragment &OF = cast<MCOrgFragment>(F); MCOrgFragment &OF = cast<MCOrgFragment>(F);