From patchwork Fri Nov 13 09:54:22 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 38352 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 11995B7093 for ; Fri, 13 Nov 2009 21:00:30 +1100 (EST) Received: from localhost ([127.0.0.1]:39524 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N8sx9-0001J6-5o for incoming@patchwork.ozlabs.org; Fri, 13 Nov 2009 05:00:27 -0500 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 ) 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 ; Fri, 13 Nov 2009 01:59:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:date:message-id :subject; bh=K6eC24Jo+1ZF+FyhXUoTnc37ZqNug+BmGdhw8x92Q74=; b=rn+I/D5udk3NlP1LaD9bIP/9DBm0V6v79919vDUqZrrKXFSfTrZxuqld35HQvZZ1d7 QgPFIn0FdYge6YUTN3q5faNVD5Hc8jCi5YZme3mtkPVBj6IVF3ymGvWF884d13Y0AG4Q onG9Lv2b428a0tlGz+bOlbqYcc6dCCUupRWBk= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:date:message-id:subject; b=QHGQABn4CShP6srhtlJFFI7yroecnoPj9qNJHyBDSXjXU4tgdz4dwVUgo3uzY8FhJ0 VZ/RHLVcr3ozONvQKlxgBkTUuphQebWfMBaBpsbzI5130GgY0TwF46TubvEgDTcG1syj FNnk6TLQCzrRb/N0bDW+mIGidhHT17pzlWOPc= Received: by 10.101.4.9 with SMTP id g9mr367751ani.61.1258106371928; Fri, 13 Nov 2009 01:59:31 -0800 (PST) Received: from rxone.opensource.se (49.14.32.202.bf.2iij.net [202.32.14.49]) by mx.google.com with ESMTPS id 8sm406822yxb.43.2009.11.13.01.59.30 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 13 Nov 2009 01:59:31 -0800 (PST) From: Magnus Damm To: qemu-devel@nongnu.org Date: Fri, 13 Nov 2009 18:54:22 +0900 Message-Id: <20091113095422.29749.77404.sendpatchset@rxone.opensource.se> X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: Subject: [Qemu-devel] [PATCH] sh4 disasm fixes X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Magnus Damm 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 --- 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