From patchwork Thu May 3 09:19:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 10377513 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 4636F603B4 for ; Thu, 3 May 2018 09:41:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 42B082907B for ; Thu, 3 May 2018 09:41:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3767229082; Thu, 3 May 2018 09:41:34 +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=-3.9 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, FSL_HELO_FAKE, MAILING_LIST_MULTI, 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 9FF1029081 for ; Thu, 3 May 2018 09:41:33 +0000 (UTC) Received: from localhost ([::1]:54960 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fEAk0-0002m5-Pm for patchwork-qemu-devel@patchwork.kernel.org; Thu, 03 May 2018 05:41:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55211) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fEAP6-00011m-6Y for qemu-devel@nongnu.org; Thu, 03 May 2018 05:20:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fEAP5-00057l-DY for qemu-devel@nongnu.org; Thu, 03 May 2018 05:19:56 -0400 Received: from mail-lf0-x243.google.com ([2a00:1450:4010:c07::243]:37525) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fEAP5-000577-55 for qemu-devel@nongnu.org; Thu, 03 May 2018 05:19:55 -0400 Received: by mail-lf0-x243.google.com with SMTP id b23-v6so24915147lfg.4 for ; Thu, 03 May 2018 02:19:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Yav0hAuGWvRo6noys/i351x/MGASZqws/AX5IAsZSIw=; b=moC8zqzwb70UEyK6vFaU/M6xgCzRT7P5W9U4S6vPX148aV+GeiUKmFc5egxDmlNRR3 eFKEqc0XsgGgh1uHI3C4u6/Diq449lNdp2EqlnyBEUkDa7ENgzE1vnYc7QJ8zHH/onTJ wDqTSXzdRf8sWweo5yiFe5Hff59OLWR1ENwYAJJqAcdyX8iFkARuEMIdUxoL0ZB1vHpt pmBEA6mRQYO9cYooK/Lmb8ZEtMNF67R8BtmjN3f7laRis/84Qx0tlWQeYU6nbMjpEtyD hweXkHM0hIE0MBNEyEZvW7JtBPYYvml5ugR1I7KtW1NI9cuJEgpGy6dixFeILdxO3R5t 2SGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Yav0hAuGWvRo6noys/i351x/MGASZqws/AX5IAsZSIw=; b=LVlmQfcq5n7Gg0xo7pLoyv52RHheiA3i6xT5RWWpH4mVIfO1asnvRbZIOB1sMKPbPO 1VyaQJjk7I8A812pl9c9XHltBtUKX/cBru/vEUcC1x1U1Qm6UWSsyE2eXAh/Ig+E5EuB sOyXuFr+oyhtJDA6uN606AcCP8PrALNTWcPYp0Hbi4eux8bHghyLIUKcMXHVpkJUSaGf YPWMZix9rFoXCRGCtuw6JuDc7mTjjJ5a5kj8211Bpgn1zglDhZSn/z9eWH+74i84xSHy 1Ebsok1/pUHukfn0nNHibSN2tNfSe8ObttIDDVM2eeoDHMGGOvVgerdQ+0/XZnNMNPrU apKQ== X-Gm-Message-State: ALQs6tDW+qJ863VZJ9b3GHe5NKrN87RGPQ6JFgC4LuLgP9MlMIM865oU LKbQedmb6BC7BCXUahgglC9m2Q== X-Google-Smtp-Source: AB8JxZrfgvXZX//7Y67s7oJKUlEfzr0gorwcz0PiY0qqgLI2QVq16fPD8KCYuYM0qiW48B2Rg5k7cg== X-Received: by 2002:a2e:1082:: with SMTP id 2-v6mr15320329ljq.9.1525339193682; Thu, 03 May 2018 02:19:53 -0700 (PDT) Received: from gmail.com (81-231-232-130-no39.tbcn.telia.com. [81.231.232.130]) by smtp.gmail.com with ESMTPSA id h2-v6sm1193090ljk.60.2018.05.03.02.19.52 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 May 2018 02:19:52 -0700 (PDT) From: "Edgar E. Iglesias" To: qemu-devel@nongnu.org Date: Thu, 3 May 2018 11:19:11 +0200 Message-Id: <20180503091922.28733-19-edgar.iglesias@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180503091922.28733-1-edgar.iglesias@gmail.com> References: <20180503091922.28733-1-edgar.iglesias@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4010:c07::243 Subject: [Qemu-devel] [PATCH v1 18/29] target-microblaze: dec_msr: Reuse more code when reg-decoding 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: edgar.iglesias@xilinx.com, peter.maydell@linaro.org, sai.pavan.boddu@xilinx.com, frasse.iglesias@gmail.com, alistair@alistair23.me, richard.henderson@linaro.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: "Edgar E. Iglesias" Reuse more code when decoding register numbers. No functional changes. Signed-off-by: Edgar E. Iglesias Reviewed-by: Richard Henderson Reviewed-by: Alistair Francis --- target/microblaze/translate.c | 38 +++++++++----------------------------- 1 file changed, 9 insertions(+), 29 deletions(-) diff --git a/target/microblaze/translate.c b/target/microblaze/translate.c index d2788451fe..05449fb941 100644 --- a/target/microblaze/translate.c +++ b/target/microblaze/translate.c @@ -531,11 +531,9 @@ static void dec_msr(DisasContext *dc) case 1: msr_write(dc, cpu_R[dc->ra]); break; - case 0x3: - tcg_gen_mov_i32(cpu_SR[SR_EAR], cpu_R[dc->ra]); - break; - case 0x5: - tcg_gen_mov_i32(cpu_SR[SR_ESR], cpu_R[dc->ra]); + case SR_EAR: + case SR_ESR: + tcg_gen_mov_i32(cpu_SR[sr], cpu_R[dc->ra]); break; case 0x7: tcg_gen_andi_i32(cpu_SR[SR_FSR], cpu_R[dc->ra], 31); @@ -562,17 +560,11 @@ static void dec_msr(DisasContext *dc) case 1: msr_read(dc, cpu_R[dc->rd]); break; - case 0x3: - tcg_gen_mov_i32(cpu_R[dc->rd], cpu_SR[SR_EAR]); - break; - case 0x5: - tcg_gen_mov_i32(cpu_R[dc->rd], cpu_SR[SR_ESR]); - break; - case 0x7: - tcg_gen_mov_i32(cpu_R[dc->rd], cpu_SR[SR_FSR]); - break; - case 0xb: - tcg_gen_mov_i32(cpu_R[dc->rd], cpu_SR[SR_BTR]); + case SR_EAR: + case SR_ESR: + case SR_FSR: + case SR_BTR: + tcg_gen_mov_i32(cpu_R[dc->rd], cpu_SR[sr]); break; case 0x800: tcg_gen_ld_i32(cpu_R[dc->rd], @@ -582,19 +574,7 @@ static void dec_msr(DisasContext *dc) tcg_gen_ld_i32(cpu_R[dc->rd], cpu_env, offsetof(CPUMBState, shr)); break; - case 0x2000: - case 0x2001: - case 0x2002: - case 0x2003: - case 0x2004: - case 0x2005: - case 0x2006: - case 0x2007: - case 0x2008: - case 0x2009: - case 0x200a: - case 0x200b: - case 0x200c: + case 0x2000 ... 0x200c: rn = sr & 0xf; tcg_gen_ld_i32(cpu_R[dc->rd], cpu_env, offsetof(CPUMBState, pvr.regs[rn]));