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

ARM: Get rid of the binary dumping function in utility.hh.

Browse source
This commit is contained in:
Gabe Black 2010-06-02 12:58:17 -05:00
parent f8d2ed708b
commit b6c2548a27
4 changed files with 6 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/arch/arm/faults.cc
View file

@ -161,13 +161,11 @@ UndefinedInstruction::invoke(ThreadContext *tc)
{
assert(unknown || mnemonic != NULL);
if (unknown) {
panic("Attempted to execute unknown instruction "
"(inst 0x%08x, opcode 0x%x, binary:%s)",
machInst, machInst.opcode, inst2string(machInst));
panic("Attempted to execute unknown instruction (inst 0x%08x)",
machInst);
} else {
panic("Attempted to execute unimplemented instruction '%s' "
"(inst 0x%08x, opcode 0x%x, binary:%s)",
mnemonic, machInst, machInst.opcode, inst2string(machInst));
panic("Attempted to execute unimplemented instruction "
"'%s' (inst 0x%08x)", mnemonic, machInst);
}
}

4
src/arch/arm/insts/misc.cc
View file

@ -265,7 +265,5 @@ RegImmRegShiftOp::generateDisassembly(Addr pc, const SymbolTable *symtab) const
std::string
UnknownOp::generateDisassembly(Addr pc, const SymbolTable *symtab) const
{
return csprintf("%-10s (inst 0x%x, opcode 0x%x, binary:%s)",
"unknown", machInst, machInst.opcode,
inst2string(machInst));
return csprintf("%-10s (inst %#08x)", "unknown", machInst);
}

3
src/arch/arm/isa/formats/breakpoint.isa
View file

@ -74,8 +74,7 @@ output decoder {{
std::string
Breakpoint::generateDisassembly(Addr pc, const SymbolTable *symtab) const
{
return csprintf("%-10s (inst 0x%x, opcode 0x%x, binary:%s)",
"Breakpoint", machInst, OPCODE, inst2string(machInst));
return csprintf("%-10s (inst 0x%x)", "Breakpoint", machInst);
}
}};

14
src/arch/arm/utility.hh
View file

@ -147,20 +147,6 @@ namespace ArmISA {
return (tc->readMiscRegNoEffect(MISCREG_CPSR) & 0x1f) == MODE_USER;
}
static inline std::string
inst2string(MachInst machInst)
{
std::string str = "";
uint32_t mask = (1 << 31);
while (mask) {
str += ((machInst & mask) ? "1" : "0");
mask = mask >> 1;
}
return str;
}
uint64_t getArgument(ThreadContext *tc, int number, bool fp);
Fault setCp15Register(uint32_t &Rd, int CRn, int opc1, int CRm, int opc2);