maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

MC: Switch MCFillFragment to storing total fill size instead of a count. This allows using ValueSize==0 to represent a virtual fill. 

llvm-svn: 103662
This commit is contained in:
Daniel Dunbar 2010-05-12 22:51:32 +00:00
parent 51402b79e4
commit 597eb48168
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -293,17 +293,21 @@ class MCFillFragment : public MCFragment {
/// Value - Value to use for filling bytes.
int64_t Value;
/// ValueSize - The size (in bytes) of \arg Value to use when filling.
/// ValueSize - The size (in bytes) of \arg Value to use when filling, or 0 if
/// this is a virtual fill fragment.
unsigned ValueSize;
/// Count - The number of copies of \arg Value to insert.
uint64_t Count;
/// Size - The number of bytes to insert.
uint64_t Size;
public:
MCFillFragment(int64_t _Value, unsigned _ValueSize, uint64_t _Count,
MCFillFragment(int64_t _Value, unsigned _ValueSize, uint64_t _Size,
MCSectionData *SD = 0)
: MCFragment(FT_Fill, SD),
Value(_Value), ValueSize(_ValueSize), Count(_Count) {}
Value(_Value), ValueSize(_ValueSize), Size(_Size) {
assert((!ValueSize || (Size % ValueSize) == 0) &&
"Fill size must be a multiple of the value size!");
}
/// @name Accessors
/// @{
@ -312,7 +316,7 @@ public:
unsigned getValueSize() const { return ValueSize; }
uint64_t getCount() const { return Count; }
uint64_t getSize() const { return Size; }
/// @}

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

@ -395,7 +395,7 @@ void MCAssembler::LayoutFragment(MCAsmLayout &Layout, MCFragment &F) {
case MCFragment::FT_Fill: {
MCFillFragment &FF = cast<MCFillFragment>(F);
EffectiveSize = FF.getValueSize() * FF.getCount();
EffectiveSize = FF.getSize();
break;
}
@ -534,7 +534,7 @@ static void WriteFragmentData(const MCAssembler &Asm, const MCAsmLayout &Layout,
case MCFragment::FT_Fill: {
MCFillFragment &FF = cast<MCFillFragment>(F);
for (uint64_t i = 0, e = FF.getCount(); i != e; ++i) {
for (uint64_t i = 0, e = FF.getSize() / FF.getValueSize(); i != e; ++i) {
switch (FF.getValueSize()) {
default:
assert(0 && "Invalid size!");
@ -876,7 +876,7 @@ void MCFillFragment::dump() {
this->MCFragment::dump();
OS << "\n ";
OS << " Value:" << getValue() << " ValueSize:" << getValueSize()
<< " Count:" << getCount() << ">";
<< " Size:" << getSize() << ">";
}
void MCInstFragment::dump() {