[POWERPC] Prepare for spu disassembly in xmon
In order to do disassembly of spu binaries in xmon, we need to abstract the disassembly function from ppc_inst_dump. We do this by making the actual disassembly function a function pointer that we pass to ppc_inst_dump(). To save updating all the callers, we turn ppc_inst_dump() into generic_inst_dump() and make ppc_inst_dump() a wrapper which always uses print_insn_powerpc(). Currently we pass the dialect into print_insn_powerpc(), but we always pass 0 - so just make it a local. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Signed-off-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
This commit is contained in:

committed by
Paul Mackerras

parent
24a24c85d3
commit
4c4c872368
@@ -154,7 +154,7 @@ static int do_spu_cmd(void);
|
||||
|
||||
int xmon_no_auto_backtrace;
|
||||
|
||||
extern int print_insn_powerpc(unsigned long, unsigned long, int);
|
||||
extern int print_insn_powerpc(unsigned long insn, unsigned long memaddr);
|
||||
|
||||
extern void xmon_enter(void);
|
||||
extern void xmon_leave(void);
|
||||
@@ -2068,8 +2068,11 @@ prdump(unsigned long adrs, long ndump)
|
||||
}
|
||||
}
|
||||
|
||||
typedef int (*instruction_dump_func)(unsigned long inst, unsigned long addr);
|
||||
|
||||
int
|
||||
ppc_inst_dump(unsigned long adr, long count, int praddr)
|
||||
generic_inst_dump(unsigned long adr, long count, int praddr,
|
||||
instruction_dump_func dump_func)
|
||||
{
|
||||
int nr, dotted;
|
||||
unsigned long first_adr;
|
||||
@@ -2099,12 +2102,18 @@ ppc_inst_dump(unsigned long adr, long count, int praddr)
|
||||
if (praddr)
|
||||
printf(REG" %.8x", adr, inst);
|
||||
printf("\t");
|
||||
print_insn_powerpc(inst, adr, 0); /* always returns 4 */
|
||||
dump_func(inst, adr);
|
||||
printf("\n");
|
||||
}
|
||||
return adr - first_adr;
|
||||
}
|
||||
|
||||
int
|
||||
ppc_inst_dump(unsigned long adr, long count, int praddr)
|
||||
{
|
||||
return generic_inst_dump(adr, count, praddr, print_insn_powerpc);
|
||||
}
|
||||
|
||||
void
|
||||
print_address(unsigned long addr)
|
||||
{
|
||||
|
Reference in New Issue
Block a user