From patchwork Mon Jun 13 23:58:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9174713 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D1D1160573 for ; Mon, 13 Jun 2016 23:59:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C2BF52015F for ; Mon, 13 Jun 2016 23:59:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B78D627D07; Mon, 13 Jun 2016 23:59:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D5BED2015F for ; Mon, 13 Jun 2016 23:59:38 +0000 (UTC) Received: from localhost ([::1]:59986 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCblZ-0002DU-Ob for patchwork-qemu-devel@patchwork.kernel.org; Mon, 13 Jun 2016 19:59:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38633) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCbl2-00029V-1p for qemu-devel@nongnu.org; Mon, 13 Jun 2016 19:59:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bCbkw-0004Q8-7W for qemu-devel@nongnu.org; Mon, 13 Jun 2016 19:59:03 -0400 Received: from mail-qg0-x241.google.com ([2607:f8b0:400d:c04::241]:36738) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCbkw-0004Q2-2s for qemu-devel@nongnu.org; Mon, 13 Jun 2016 19:58:58 -0400 Received: by mail-qg0-x241.google.com with SMTP id 78so3295155qgt.3 for ; Mon, 13 Jun 2016 16:58:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=bxC8j2xbLkA4TPhxU9JP440N7qvPG8zICp4ontwJb/c=; b=eVZsloIGk6O22LCFIu7mJFU4JoIabIuFHY1awV6PaFDYT0kUA1MdJfgDXK/819JPgP g2CkOALfHI4C+vydnSZ/8hRJHPHbG56cmaVDIFuDVc/QiCNRQlpQXg0nSwHMY+d6Tv+i wRXEyHl57Ov6+XyRlQyusI1lBPFBlE1BPDy1YCKfG86w4sVZRA1AewHJp5IbVPLVfBB4 PeMGV1sXpRoM6gSAljMyUa+kqFOUgA2Bf4GNRk9qR3qWIAOtVWrEKBle9S/JtU2jxMUy smk/pU5PmP3NONQz2gDWl6l5kzj9yixFW80u1s/zL7z8SKoh1Leewy2XZwPf1l2SbY+q smAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=bxC8j2xbLkA4TPhxU9JP440N7qvPG8zICp4ontwJb/c=; b=LNax6pG3/ziAVZe+8ydwfgHT/78n3NSfWiyEaf2EWa7FZoMgvtVGB1qNP0FZ7k1OTD iGcpmWNMAQMvGtAsj2CbDMznELrSXWiPsy9leD1/0oW4Mf+26+4ajxlBv3hv2vm+AMk7 6++QPsT8sgJ/fqvx8iYXqcIrSugCeREwnevqPkJgQXIyz44DFf29LF/PTqIxoOAxypi4 l3r8PrxR9jm52Amis1e2HbK+u9qYsGVPXVXfx25eNxbaynVKH9/cpSoY6RFK/V4PRDtV QUCkgEc2zYFIjONMwOvdHLG45wTkwAelsoH/W8UrSaTC7itcsrByUQt+Pv5mHPj3gXlJ /dvw== X-Gm-Message-State: ALyK8tKlgHMaVeCvBkMnlVvHr+iHsdqFz1IBY3TfsnFNUZNTeTR20eBW6R6l3oI7uwE1mg== X-Received: by 10.140.242.150 with SMTP id n144mr17949907qhc.2.1465862337543; Mon, 13 Jun 2016 16:58:57 -0700 (PDT) Received: from bigtime.com (71-37-54-227.tukw.qwest.net. [71.37.54.227]) by smtp.gmail.com with ESMTPSA id q200sm7547234qke.31.2016.06.13.16.58.56 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Jun 2016 16:58:57 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 13 Jun 2016 16:58:01 -0700 Message-Id: <1465862305-14090-2-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1465862305-14090-1-git-send-email-rth@twiddle.net> References: <1465862305-14090-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400d:c04::241 Subject: [Qemu-devel] [PATCH 01/25] target-openrisc: Always enable OPENRISC_DISAS 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: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Avoids warnings from unused variables etc. Reviewed-by: Bastian Koppelmann Signed-off-by: Richard Henderson --- target-openrisc/translate.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/target-openrisc/translate.c b/target-openrisc/translate.c index c08876b..97e8665 100644 --- a/target-openrisc/translate.c +++ b/target-openrisc/translate.c @@ -34,14 +34,9 @@ #include "trace-tcg.h" #include "exec/log.h" - -#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 +/* Set to 0 to completely disable. */ +#define OPENRISC_DISAS CPU_LOG_TB_IN_ASM +#define LOG_DIS(...) qemu_log_mask(OPENRISC_DISAS, ## __VA_ARGS__) typedef struct DisasContext { TranslationBlock *tb; @@ -715,9 +710,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; @@ -726,10 +719,8 @@ static void dec_misc(DisasContext *dc, uint32_t insn) ra = extract32(insn, 16, 5); rb = extract32(insn, 11, 5); rd = extract32(insn, 21, 5); -#ifdef OPENRISC_DISAS L6 = extract32(insn, 5, 6); K5 = extract32(insn, 0, 5); -#endif I16 = extract32(insn, 0, 16); I5 = extract32(insn, 21, 5); I11 = extract32(insn, 0, 11); @@ -1326,13 +1317,10 @@ static void dec_compi(DisasContext *dc, uint32_t insn) static void dec_sys(DisasContext *dc, uint32_t insn) { uint32_t op0; -#ifdef OPENRISC_DISAS uint32_t K16; -#endif + op0 = extract32(insn, 16, 10); -#ifdef OPENRISC_DISAS K16 = extract32(insn, 0, 16); -#endif switch (op0) { case 0x000: /* l.sys */