From patchwork Tue Jul 18 20:02:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9849461 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 CFDC760392 for ; Tue, 18 Jul 2017 20:17:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AAD6A285CC for ; Tue, 18 Jul 2017 20:17:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9F8AC285E3; Tue, 18 Jul 2017 20:17:17 +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 1347B285CC for ; Tue, 18 Jul 2017 20:17:16 +0000 (UTC) Received: from localhost ([::1]:58404 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dXYvj-0001ur-So for patchwork-qemu-devel@patchwork.kernel.org; Tue, 18 Jul 2017 16:17:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49995) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dXYjO-0006mI-3n for qemu-devel@nongnu.org; Tue, 18 Jul 2017 16:04:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dXYjN-00050k-0R for qemu-devel@nongnu.org; Tue, 18 Jul 2017 16:04:30 -0400 Received: from mail-qk0-x242.google.com ([2607:f8b0:400d:c09::242]:33008) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dXYjM-00050b-Rw for qemu-devel@nongnu.org; Tue, 18 Jul 2017 16:04:28 -0400 Received: by mail-qk0-x242.google.com with SMTP id u126so2857282qka.0 for ; Tue, 18 Jul 2017 13:04:28 -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=GOIOhYCogD/VBwRcNOLtOYgYcMyyxHPopYw+Qb1dQNQ=; b=JkB8SdZJgL7RZoeangIYgF5RNJGUwNTEkoZT8zDXMnCFYaRnRHql2hE/4/iNG2Qe0N Ram4shfYDiTOMxT1csvlEAp4qseCuCGlkPBD6yF6r5uwGjpX/83zCJFn5TCvNeB4HL+c k1Ckl1MrHq/vB16jDKC2/NdS3OdElwmgk461KUR6waKNg1RHfSNa0iw5GpJZunm7glpR ugsUxUrReGax3geYc9PxPjfERv68gqWRPrdVntNjAsiw6YIpQng/rWtGkQSOHFk9Scok 9nm81OEthNONqbgj7nlQTq9bhR9awYuKGGyHPOQo6k7abnPotLbq3dZWbk6j4a7DmIBL AVPQ== 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=GOIOhYCogD/VBwRcNOLtOYgYcMyyxHPopYw+Qb1dQNQ=; b=n9DD+L8NRhP+Omj9rQ9tptSQGBkTTXucUXf19R4FDRW0QdZyBlfc8lLKd6mziI8k6w fcAvefcC0Q+JwzjdS9xGOZ2vVn+A+sa76e3TIODVj9v7BI24NlOoYDCXQ+l8w8UYE1/+ rnmPj3LnM6v4Sg7mvWBPPDHNLpMUR6l3rgqvfMRL/ga0fZ2enqS5j2LlIX+jb2kHY7lZ vWgOrkjMOvkDgfrofnQhLo2S9GTUy+3VoD8Wcqzzbpaf2LsLTeTyfy/xg9DeCRgaauTC TZo4jRliaMyF7MDYwZvNnldgMWvzh5On6QugacZCha69Lwoj+zhYBASUwLrSYY+Q7WE8 1LJw== X-Gm-Message-State: AIVw111cho2q8FhWa7gUfPFggkww1Wdd+IkInlLrjRZUJ+hjIFIb77T0 JQH4GRI0TOvVpNIqUdM= X-Received: by 10.55.108.68 with SMTP id h65mr4169480qkc.141.1500408268086; Tue, 18 Jul 2017 13:04:28 -0700 (PDT) Received: from bigtime.com ([101.165.234.197]) by smtp.gmail.com with ESMTPSA id b201sm2339817qkg.5.2017.07.18.13.04.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Jul 2017 13:04:27 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 18 Jul 2017 10:02:48 -1000 Message-Id: <20170718200255.31647-24-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170718200255.31647-1-rth@twiddle.net> References: <20170718200255.31647-1-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::242 Subject: [Qemu-devel] [PATCH v3 23/30] 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: aurelien@aurel32.net Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Reviewed-by: Aurelien Jarno Signed-off-by: Richard Henderson --- target/sh4/translate.c | 66 +++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 36 deletions(-) diff --git a/target/sh4/translate.c b/target/sh4/translate.c index 346f672..239a0d9 100644 --- a/target/sh4/translate.c +++ b/target/sh4/translate.c @@ -394,6 +394,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 @@ -1473,7 +1478,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, {}) @@ -1523,21 +1528,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); @@ -1546,7 +1549,8 @@ static void _decode_opc(DisasContext * ctx) /* MOVCO.L: if (lock still held) R0 -> (Rn), T=1; else T=0. Approximate "lock still held" with a comparison of address from the MOVLI insn and a cmpxchg with the value read. */ - if (ctx->features & SH_FEATURE_SH4A) { + CHECK_SH4A + { TCGLabel *fail = gen_new_label(); TCGLabel *done = gen_new_label(); @@ -1564,20 +1568,15 @@ static void _decode_opc(DisasContext * ctx) gen_set_label(done); tcg_gen_movi_i32(cpu_lock_addr, -1); return; - } else { - break; } case 0x0063: /* MOVLI.L @Rm -> R0, and remember the address and value loaded. */ - if (ctx->features & SH_FEATURE_SH4A) { - tcg_gen_qemu_ld_i32(cpu_lock_value, REG(B11_8), - ctx->memidx, MO_TESL); - tcg_gen_mov_i32(cpu_lock_addr, REG(B11_8)); - tcg_gen_mov_i32(REG(0), cpu_lock_value); - return; - } else { - break; - } + CHECK_SH4A + tcg_gen_qemu_ld_i32(cpu_lock_value, REG(B11_8), + ctx->memidx, MO_TESL); + tcg_gen_mov_i32(cpu_lock_addr, REG(B11_8)); + tcg_gen_mov_i32(REG(0), cpu_lock_value); + return; case 0x0093: /* ocbi @Rn */ { gen_helper_ocbi(cpu_env, REG(B11_8)); @@ -1592,20 +1591,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 */ {