From nobody Mon Feb 9 20:10:32 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1487021944395287.1434077023098; Mon, 13 Feb 2017 13:39:04 -0800 (PST) Received: from localhost ([::1]:59666 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cdOKt-0008Ai-2V for importer@patchew.org; Mon, 13 Feb 2017 16:39:03 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45206) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cdO8T-0004eU-AW for qemu-devel@nongnu.org; Mon, 13 Feb 2017 16:26:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cdO8S-0001J2-07 for qemu-devel@nongnu.org; Mon, 13 Feb 2017 16:26:13 -0500 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:36389) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cdO8R-0001Im-S3 for qemu-devel@nongnu.org; Mon, 13 Feb 2017 16:26:11 -0500 Received: by mail-qt0-x243.google.com with SMTP id h53so15005593qth.3 for ; Mon, 13 Feb 2017 13:26:11 -0800 (PST) Received: from bigtime.twiddle.net.com ([1.129.9.91]) by smtp.gmail.com with ESMTPSA id h40sm8311480qtb.6.2017.02.13.13.26.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Feb 2017 13:26:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=O0DXI33fYA9Sgbn2t9fDrLf/9gyHSWpzAbxNiwHAaVo=; b=pZZcVxm2nQ1QCWrnKN+0iL0VxHeuCio3gjmMN9+TlSCEtiZ2dhJp53yevOlf88/i4h Tbkv+Lq6JBrSWRptGog1wlYxdKM/ujyG4C0cB7xdUoPq8GOK86WMSjrp1fIUQYqy/brC 9hf7OLxf+N8Jb4TEFwhZRZm0ttBfZu9UcHeKWVUDXB66eOMvui/zqK/8Km22HcWqEdkx XJV06ToY0tiD25lZ2kXwcmlKwrm8ucYLFniejLMVn6fjwiTO9gSxgdN7ca9SymxI1Xyo YyU97tjZaOogPTY5MmZD+LZqRvpSZupHKwy4I6b/WBDjYGId5Emy8AqLDK4WItTjPMyN sNEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=O0DXI33fYA9Sgbn2t9fDrLf/9gyHSWpzAbxNiwHAaVo=; b=IoDftqIlrKIpc7PwdTNTLbPEJwzmr1WfgzqYCyGoi9+fJbjeOrDW2NfyMGLWVSOtRf n46a1cfR/V9vUusdJkabgtWBH8CW9urbm1XDLg7ooijwotwugyWfeTIx8pOCLolc49Hk HjNU0P675IXDOnPVF1mvGDUwOcBmQHK8cvNX0EgWvXUGnFYShPciAloa0KqyMg47IizG NHzG1TSQGII3srtGuJ6v0MDLxHlxHqClk5sNSTzo2FZgNSqARXu3fG1HOZKsIb7lwubk T9FHULIuqyVdNzryr/25Lr3i9no8a1G/FroUlHLBoKnC9wIaHnBouWi1AbEPIp/EzA0f 1u1A== X-Gm-Message-State: AMke39kek1BD/9YgcGG7XFdlggMAtMPmBd+dUul/uqHx38jEcbCzL2I0woZVz/f9gdGBWg== X-Received: by 10.200.49.41 with SMTP id g38mr22755993qtb.175.1487021171266; Mon, 13 Feb 2017 13:26:11 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 14 Feb 2017 08:25:19 +1100 Message-Id: <20170213212536.31871-8-rth@twiddle.net> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170213212536.31871-1-rth@twiddle.net> References: <20170213212536.31871-1-rth@twiddle.net> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400d:c0d::243 Subject: [Qemu-devel] [PULL 07/24] target/openrisc: Tidy insn dumping X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Avoids warnings from unused variables etc. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Bastian Koppelmann Signed-off-by: Richard Henderson --- target/openrisc/translate.c | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/target/openrisc/translate.c b/target/openrisc/translate.c index c207875..ac0c409 100644 --- a/target/openrisc/translate.c +++ b/target/openrisc/translate.c @@ -34,14 +34,8 @@ #include "trace-tcg.h" #include "exec/log.h" =20 - -#define OPENRISC_DISAS - -#ifdef OPENRISC_DISAS -# define LOG_DIS(...) qemu_log_mask(CPU_LOG_TB_IN_ASM, ## __VA_ARGS__) -#else -# define LOG_DIS(...) do { } while (0) -#endif +#define LOG_DIS(str, ...) \ + qemu_log_mask(CPU_LOG_TB_IN_ASM, "%08x: " str, dc->pc, ## __VA_ARGS__) =20 typedef struct DisasContext { TranslationBlock *tb; @@ -766,9 +760,7 @@ static void dec_misc(DisasContext *dc, uint32_t insn) { uint32_t op0, op1; uint32_t ra, rb, rd; -#ifdef OPENRISC_DISAS uint32_t L6, K5; -#endif uint32_t I16, I5, I11, N26, tmp; TCGMemOp mop; =20 @@ -777,10 +769,8 @@ static void dec_misc(DisasContext *dc, uint32_t insn) ra =3D extract32(insn, 16, 5); rb =3D extract32(insn, 11, 5); rd =3D extract32(insn, 21, 5); -#ifdef OPENRISC_DISAS L6 =3D extract32(insn, 5, 6); K5 =3D extract32(insn, 0, 5); -#endif I16 =3D extract32(insn, 0, 16); I5 =3D extract32(insn, 21, 5); I11 =3D extract32(insn, 0, 11); @@ -1387,13 +1377,10 @@ static void dec_compi(DisasContext *dc, uint32_t in= sn) static void dec_sys(DisasContext *dc, uint32_t insn) { uint32_t op0; -#ifdef OPENRISC_DISAS uint32_t K16; -#endif + op0 =3D extract32(insn, 16, 10); -#ifdef OPENRISC_DISAS K16 =3D extract32(insn, 0, 16); -#endif =20 switch (op0) { case 0x000: /* l.sys */ @@ -1723,6 +1710,13 @@ void gen_intermediate_code(CPUOpenRISCState *env, st= ruct TranslationBlock *tb) max_insns =3D TCG_MAX_INSNS; } =20 + if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM) + && qemu_log_in_addr_range(pc_start)) { + qemu_log_lock(); + qemu_log("----------------\n"); + qemu_log("IN: %s\n", lookup_symbol(pc_start)); + } + gen_tb_start(tb); =20 do { @@ -1807,18 +1801,12 @@ void gen_intermediate_code(CPUOpenRISCState *env, s= truct TranslationBlock *tb) tb->size =3D dc->pc - pc_start; tb->icount =3D num_insns; =20 -#ifdef DEBUG_DISAS if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM) && qemu_log_in_addr_range(pc_start)) { - qemu_log_lock(); - qemu_log("----------------\n"); - qemu_log("IN: %s\n", lookup_symbol(pc_start)); - log_target_disas(cs, pc_start, dc->pc - pc_start, 0); - qemu_log("\nisize=3D%d osize=3D%d\n", - dc->pc - pc_start, tcg_op_buf_count()); + log_target_disas(cs, pc_start, tb->size, 0); + qemu_log("\n"); qemu_log_unlock(); } -#endif } =20 void openrisc_cpu_dump_state(CPUState *cs, FILE *f, --=20 2.9.3