sh4 disasm fixes

Add the sh4 target to the monitor disassembly function,
and remove a duplicate "0x" printout from the sh4 dis-
assembly code.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

diff --git a/disas.c b/disas.c
index ce342bc8ee4dd9f1509473a5bb46e05a9e0b41a4..f7bcce748ce57d2470c99bbaf026cd66485d2e39 100644 (file)
--- a/disas.c
+++ b/disas.c
@@ -393,6 +393,9 @@ void monitor_disas(Monitor *mon, CPUState *env,
 #else
     print_insn = print_insn_little_mips;
 #endif
+#elif defined(TARGET_SH4)
+    disasm_info.mach = bfd_mach_sh4;
+    print_insn = print_insn_sh;
 #else
     monitor_printf(mon, "0x" TARGET_FMT_lx
                    ": Asm output not supported on this arch\n", pc);

diff --git a/sh4-dis.c b/sh4-dis.c
index a502a618834eff15ff7c978fbc6d5c13c143ee1f..41fd8667b8fe6fd5c9957ad2e10bfeb970d9b034 100644 (file)
--- a/sh4-dis.c
+++ b/sh4-dis.c
@@ -2065,7 +2065,7 @@ print_insn_sh (bfd_vma memaddr, struct disassemble_info *info)
                }
              if ((*info->symbol_at_address_func) (val, info))
                {
-                 fprintf_fn (stream, "\t! 0x");
+                 fprintf_fn (stream, "\t! ");
                  (*info->print_address_func) (val, info);
                }
              else