sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ARM: Improve memory instruction disassembly.

Browse source
This commit is contained in:
Gabe Black 2009-07-08 23:02:19 -07:00
parent 2fb8d481ab
commit 4eb18cc07a
3 changed files with 78 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/arch/arm/insts/mem.cc
View file

@ -37,14 +37,17 @@ Memory::generateDisassembly(Addr pc, const SymbolTable *symtab) const
{ {
std::stringstream ss; std::stringstream ss;
printMnemonic(ss); printMnemonic(ss);
return ss.str(); printReg(ss, machInst.rd);
} ss << ", [";
printReg(ss, machInst.rn);
std::string ss << ", ";
MemoryNoDisp::generateDisassembly(Addr pc, const SymbolTable *symtab) const if (machInst.puswl.prepost == 1)
{ printOffset(ss);
std::stringstream ss; ss << "]";
printMnemonic(ss); if (machInst.puswl.prepost == 0)
printOffset(ss);
else if (machInst.puswl.writeback)
ss << "!";
return ss.str(); return ss.str();
} }
} }

68
src/arch/arm/insts/mem.hh
View file

@ -65,23 +65,75 @@ class Memory : public PredOp
std::string std::string
generateDisassembly(Addr pc, const SymbolTable *symtab) const; generateDisassembly(Addr pc, const SymbolTable *symtab) const;
virtual void
printOffset(std::ostream &os) const
{}
}; };
/** class MemoryDisp : public Memory
* Base class for a few miscellaneous memory-format insts
* that don't interpret the disp field
*/
class MemoryNoDisp : public Memory
{ {
protected: protected:
/// Constructor /// Constructor
MemoryNoDisp(const char *mnem, ExtMachInst _machInst, OpClass __opClass) MemoryDisp(const char *mnem, ExtMachInst _machInst, OpClass __opClass)
: Memory(mnem, _machInst, __opClass) : Memory(mnem, _machInst, __opClass)
{ {
} }
std::string void
generateDisassembly(Addr pc, const SymbolTable *symtab) const; printOffset(std::ostream &os) const
{
ccprintf(os, "#%#x", (machInst.puswl.up ? disp : -disp));
}
};
class MemoryHilo : public Memory
{
protected:
/// Constructor
MemoryHilo(const char *mnem, ExtMachInst _machInst, OpClass __opClass)
: Memory(mnem, _machInst, __opClass)
{
}
void
printOffset(std::ostream &os) const
{
ccprintf(os, "#%#x", (machInst.puswl.up ? hilo : -hilo));
}
};
class MemoryShift : public Memory
{
protected:
/// Constructor
MemoryShift(const char *mnem, ExtMachInst _machInst, OpClass __opClass)
: Memory(mnem, _machInst, __opClass)
{
}
void
printOffset(std::ostream &os) const
{
printShiftOperand(os);
}
};
class MemoryReg : public Memory
{
protected:
/// Constructor
MemoryReg(const char *mnem, ExtMachInst _machInst, OpClass __opClass)
: Memory(mnem, _machInst, __opClass)
{
}
void
printOffset(std::ostream &os) const
{
os << (machInst.puswl.up ? "+ " : "- ");
printReg(os, machInst.rm);
}
}; };
} }

11
src/arch/arm/isa/formats/mem.isa
View file

@ -276,11 +276,12 @@ let {{
# Here's where we'll tack on a flag to make this a usermode access. # Here's where we'll tack on a flag to make this a usermode access.
mnem += "t" mnem += "t"
type = ("Store", "Load")[l] type = ("Store", "Load")[l]
suffix = "_%s_P%dU%dB%dW%d" % (suffix, p, u, b, w) newSuffix = "_%s_P%dU%dB%dW%d" % (suffix, p, u, b, w)
if b == 1: if b == 1:
mnem += "b" mnem += "b"
return LoadStoreBase(mnem, mnem.capitalize() + suffix, return LoadStoreBase(mnem, mnem.capitalize() + newSuffix,
ea_code, code, mem_flags = [], inst_flags = [], ea_code, code, mem_flags = [], inst_flags = [],
base_class = 'Memory' + suffix,
exec_template_base = type.capitalize()) exec_template_base = type.capitalize())
def buildMode3Inst(p, u, i, w, type, code, mnem): def buildMode3Inst(p, u, i, w, type, code, mnem):
@ -289,9 +290,11 @@ let {{
ea_code = "EA = Rn %s;" % ("", offset)[p] ea_code = "EA = Rn %s;" % ("", offset)[p]
if p == 0 or w == 1: if p == 0 or w == 1:
code += "Rn = Rn %s;" % offset code += "Rn = Rn %s;" % offset
suffix = "_P%dU%dI%dW%d" % (p, u, i, w) newSuffix = "_P%dU%dI%dW%d" % (p, u, i, w)
return LoadStoreBase(mnem, mnem.capitalize() + suffix, suffix = ("Reg", "Hilo")[i]
return LoadStoreBase(mnem, mnem.capitalize() + newSuffix,
ea_code, code, mem_flags = [], inst_flags = [], ea_code, code, mem_flags = [], inst_flags = [],
base_class = 'Memory' + suffix,
exec_template_base = type.capitalize()) exec_template_base = type.capitalize())
}}; }};