From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1N8swP-0001DP-Km
	for qemu-devel@nongnu.org; Fri, 13 Nov 2009 04:59:41 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1N8swL-0001Bo-4J
	for qemu-devel@nongnu.org; Fri, 13 Nov 2009 04:59:41 -0500
Received: from [199.232.76.173] (port=50557 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1N8swL-0001Bi-1I
	for qemu-devel@nongnu.org; Fri, 13 Nov 2009 04:59:37 -0500
Received: from mail-yw0-f176.google.com ([209.85.211.176]:46880)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <magnus.damm@gmail.com>) id 1N8swK-0006Ju-LW
	for qemu-devel@nongnu.org; Fri, 13 Nov 2009 04:59:36 -0500
Received: by ywh6 with SMTP id 6so2729650ywh.4
	for <qemu-devel@nongnu.org>; Fri, 13 Nov 2009 01:59:35 -0800 (PST)
From: Magnus Damm <magnus.damm@gmail.com>
Date: Fri, 13 Nov 2009 18:54:22 +0900
Message-Id: <20091113095422.29749.77404.sendpatchset@rxone.opensource.se>
Subject: [Qemu-devel] [PATCH] sh4 disasm fixes
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

From: Magnus Damm <damm@opensource.se>

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>
---

 disas.c   |    4 ++++
 sh4-dis.c |    2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

--- 0001/disas.c
+++ work/disas.c	2009-11-13 15:32:17.000000000 +0900
@@ -393,6 +393,10 @@ void monitor_disas(Monitor *mon, CPUStat
 #else
     print_insn = print_insn_little_mips;
 #endif
+#elif
+#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);
--- 0001/sh4-dis.c
+++ work/sh4-dis.c	2009-11-13 15:31:13.000000000 +0900
@@ -2065,7 +2065,7 @@ print_insn_sh (bfd_vma memaddr, struct d
 		}
 	      if ((*info->symbol_at_address_func) (val, info))
 		{
-		  fprintf_fn (stream, "\t! 0x");
+		  fprintf_fn (stream, "\t! ");
 		  (*info->print_address_func) (val, info);
 		}
 	      else