From patchwork Fri Jul 7 02:21:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9829409 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 85113602F0 for ; Fri, 7 Jul 2017 02:35:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 75B93284B2 for ; Fri, 7 Jul 2017 02:35:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6983928506; Fri, 7 Jul 2017 02:35:59 +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 B4A10284B2 for ; Fri, 7 Jul 2017 02:35:58 +0000 (UTC) Received: from localhost ([::1]:54157 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dTJ7d-0003lz-UX for patchwork-qemu-devel@patchwork.kernel.org; Thu, 06 Jul 2017 22:35:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35411) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dTIxS-00040t-6C for qemu-devel@nongnu.org; Thu, 06 Jul 2017 22:25:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dTIxP-0001X0-1v for qemu-devel@nongnu.org; Thu, 06 Jul 2017 22:25:26 -0400 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:35387) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dTIxO-0001Wj-Sr for qemu-devel@nongnu.org; Thu, 06 Jul 2017 22:25:22 -0400 Received: by mail-qt0-x243.google.com with SMTP id w12so2714688qta.2 for ; Thu, 06 Jul 2017 19:25:22 -0700 (PDT) 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; bh=N8HU/YSd55JM5bNeAwURG7jHmANEdVnfH5HfFu/mY5Q=; b=kILtxK4suixdqfn1kSk5goMPJzTTugLap4f0+oIAHPqGe3LW99exUP7EQO8QJ9pmE2 jbxIwy3+dztQTe2f+vUSM/6v9dT/OPj6YZsHy5bAT0RkrgCHVjW71duw5h0iUJatjxzU gPFaGN6DsEtSnurQHDcSUmQseWUKpmUVXGFbVGmZrR1eQ7bDL35XySFzeOgP2cR6vG9+ rV6T1TR+JEn1/17tzGEzE2B65/7skbcGFDsjT1qvegOMWYzjB8QneGXmBe+f5tgNgq6e TdYwXYDYDq+dzuOSgEFbMovr6v1giC0Vzo5m3HXJbvLfjUQdGeS//n0gnB6jF/urSMdx yXAA== 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; bh=N8HU/YSd55JM5bNeAwURG7jHmANEdVnfH5HfFu/mY5Q=; b=EZkb4VJBs8s5KfRgKKHqKQo8JfyiKSUfVbrczQnrntfY59C/RwA7863XnVqHwJzkzd 637FCCGRlhmXb3KoqDqBhgCQqYDBd2eirQPHzhtTwDsDBbM2q4kv3tJykUGejvRBThCM 9bP94T7rywt/6XmjJg/yAU4NdF96O98a50KRulKJu4KlnoEYIANpKfY0Y59/MbtlUI/c +VdEj+zPE3S8lSs2v9g753TbVUf5mP0Ew9R9H99EHkkjlAEYZWoqNfClXTKK8tun1Xrn Kj+M2VslQSCDfqbySkgbKPtQl5h2kRsfok3I+d1gnLLSqs4pAHGpHwsRC41Yyupl0/wI 7fOA== X-Gm-Message-State: AKS2vOyg+znWlVD6lLc02o/S5Z+qQDSEiwO+34p09EXFZgYqZpFKM8zo rvkcBMxPBljvKWVKi2s= X-Received: by 10.237.55.129 with SMTP id j1mr61640193qtb.152.1499394322230; Thu, 06 Jul 2017 19:25:22 -0700 (PDT) Received: from bigtime.twiddle.net.com (rrcs-66-91-136-156.west.biz.rr.com. [66.91.136.156]) by smtp.gmail.com with ESMTPSA id i85sm1407176qke.66.2017.07.06.19.25.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Jul 2017 19:25:21 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 6 Jul 2017 16:21:07 -1000 Message-Id: <20170707022111.21836-24-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170707022111.21836-1-rth@twiddle.net> References: <20170707022111.21836-1-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::243 Subject: [Qemu-devel] [PATCH v2 23/27] target/sh4: Introduce CHECK_SH4A 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: bruno@clisp.org, laurent@vivier.eu, aurelien@aurel32.net, glaubitz@debian.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Richard Henderson Reviewed-by: Aurelien Jarno --- target/sh4/translate.c | 64 +++++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/target/sh4/translate.c b/target/sh4/translate.c index 3d8ac59..d164e62 100644 --- a/target/sh4/translate.c +++ b/target/sh4/translate.c @@ -401,6 +401,11 @@ static inline void gen_store_fpr64(DisasContext *ctx, TCGv_i64 t, int reg) goto do_illegal; \ } +#define CHECK_SH4A \ + if (!(ctx->features & SH_FEATURE_SH4A)) { \ + goto do_illegal; \ + } + static void _decode_opc(DisasContext * ctx) { /* This code tries to make movcal emulation sufficiently @@ -1478,7 +1483,7 @@ static void _decode_opc(DisasContext * ctx) LDST(ssr, 0x403e, 0x4037, 0x0032, 0x4033, CHECK_PRIVILEGED) LDST(spc, 0x404e, 0x4047, 0x0042, 0x4043, CHECK_PRIVILEGED) ST(sgr, 0x003a, 0x4032, CHECK_PRIVILEGED) - LD(sgr, 0x403a, 0x4036, CHECK_PRIVILEGED if (!(ctx->features & SH_FEATURE_SH4A)) break;) + LD(sgr, 0x403a, 0x4036, CHECK_PRIVILEGED CHECK_SH4A) LDST(dbr, 0x40fa, 0x40f6, 0x00fa, 0x40f2, CHECK_PRIVILEGED) LDST(mach, 0x400a, 0x4006, 0x000a, 0x4002, {}) LDST(macl, 0x401a, 0x4016, 0x001a, 0x4012, {}) @@ -1528,21 +1533,19 @@ static void _decode_opc(DisasContext * ctx) ctx->has_movcal = 1; return; case 0x40a9: /* movua.l @Rm,R0 */ + CHECK_SH4A /* Load non-boundary-aligned data */ - if (ctx->features & SH_FEATURE_SH4A) { - tcg_gen_qemu_ld_i32(REG(0), REG(B11_8), ctx->memidx, - MO_TEUL | MO_UNALN); - return; - } + tcg_gen_qemu_ld_i32(REG(0), REG(B11_8), ctx->memidx, + MO_TEUL | MO_UNALN); + return; break; case 0x40e9: /* movua.l @Rm+,R0 */ + CHECK_SH4A /* Load non-boundary-aligned data */ - if (ctx->features & SH_FEATURE_SH4A) { - tcg_gen_qemu_ld_i32(REG(0), REG(B11_8), ctx->memidx, - MO_TEUL | MO_UNALN); - tcg_gen_addi_i32(REG(B11_8), REG(B11_8), 4); - return; - } + tcg_gen_qemu_ld_i32(REG(0), REG(B11_8), ctx->memidx, + MO_TEUL | MO_UNALN); + tcg_gen_addi_i32(REG(B11_8), REG(B11_8), 4); + return; break; case 0x0029: /* movt Rn */ tcg_gen_mov_i32(REG(B11_8), cpu_sr_t); @@ -1553,7 +1556,8 @@ static void _decode_opc(DisasContext * ctx) If (T == 1) R0 -> (Rn) 0 -> LDST */ - if (ctx->features & SH_FEATURE_SH4A) { + CHECK_SH4A + { TCGLabel *fail = gen_new_label(); TCGLabel *done = gen_new_label(); TCGv tmp; @@ -1572,8 +1576,6 @@ static void _decode_opc(DisasContext * ctx) gen_set_label(done); return; - } else { - break; } case 0x0063: /* MOVLI.L @Rm,R0 @@ -1582,14 +1584,11 @@ static void _decode_opc(DisasContext * ctx) When interrupt/exception occurred 0 -> LDST */ - if (ctx->features & SH_FEATURE_SH4A) { - tcg_gen_qemu_ld_i32(REG(0), REG(B11_8), ctx->memidx, MO_TESL); - tcg_gen_mov_i32(cpu_lock_addr, REG(B11_8)); - tcg_gen_mov_i32(cpu_lock_value, REG(0)); - return; - } else { - break; - } + CHECK_SH4A + tcg_gen_qemu_ld_i32(REG(0), REG(B11_8), ctx->memidx, MO_TESL); + tcg_gen_mov_i32(cpu_lock_addr, REG(B11_8)); + tcg_gen_mov_i32(cpu_lock_value, REG(0)); + return; case 0x0093: /* ocbi @Rn */ { gen_helper_ocbi(cpu_env, REG(B11_8)); @@ -1604,20 +1603,15 @@ static void _decode_opc(DisasContext * ctx) case 0x0083: /* pref @Rn */ return; case 0x00d3: /* prefi @Rn */ - if (ctx->features & SH_FEATURE_SH4A) - return; - else - break; + CHECK_SH4A + return; case 0x00e3: /* icbi @Rn */ - if (ctx->features & SH_FEATURE_SH4A) - return; - else - break; + CHECK_SH4A + return; case 0x00ab: /* synco */ - if (ctx->features & SH_FEATURE_SH4A) { - tcg_gen_mb(TCG_MO_ALL | TCG_BAR_SC); - return; - } + CHECK_SH4A + tcg_gen_mb(TCG_MO_ALL | TCG_BAR_SC); + return; break; case 0x4024: /* rotcl Rn */ {