From patchwork Tue Jul 18 20:02:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9849475 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 370B060392 for ; Tue, 18 Jul 2017 20:20:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 17077201A4 for ; Tue, 18 Jul 2017 20:20:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0BFAA285EC; Tue, 18 Jul 2017 20:20:08 +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 18E4B201A4 for ; Tue, 18 Jul 2017 20:20:07 +0000 (UTC) Received: from localhost ([::1]:58416 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dXYyU-0004Mo-8D for patchwork-qemu-devel@patchwork.kernel.org; Tue, 18 Jul 2017 16:20:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49944) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dXYjL-0006k2-M7 for qemu-devel@nongnu.org; Tue, 18 Jul 2017 16:04:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dXYjK-0004yU-LS for qemu-devel@nongnu.org; Tue, 18 Jul 2017 16:04:27 -0400 Received: from mail-qk0-x241.google.com ([2607:f8b0:400d:c09::241]:36779) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dXYjK-0004y8-IF for qemu-devel@nongnu.org; Tue, 18 Jul 2017 16:04:26 -0400 Received: by mail-qk0-x241.google.com with SMTP id d136so3746991qkg.3 for ; Tue, 18 Jul 2017 13:04:26 -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=wgRM1DsIUge6ZJA9BHLdgk/6+Mdfsfwxl1OerineuFA=; b=fCBzVIjNCjooh9nvYftdOnsnZz5wUirAwPo7AM/d7IIdEh3D5yf3ohTd8pghPHa6v+ DFbOXe1zGAUAMVy/grBKqC9Csl53MCurff+EO5KKVkM2Qs1lasAdRczvv8URGcU0mMtL tPMGa0EWdf1j/t6wrVX7QzS6X3RKnUbuyezhA+MekPKB4kZyuXaIesW33lq33Jt+YXly JoB/Zx/GatywW1VCAuTUVgphzPSWH6mAP6CrDYHC+tkfm6HxMuiVz8xYW5iQDlgztCW7 s956iF3EEvRa5fvqsPXwJo4JmOPoizAFYmLyvJklHhPkOELS4GPNHDusjVCYMfEAfQyp krSg== 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=wgRM1DsIUge6ZJA9BHLdgk/6+Mdfsfwxl1OerineuFA=; b=fpHGL5LaHYefQMKruMkF/uhGQn5/OJXgkQM/WKV/LKgO3/81+te43H7wdb4SnUHkya HVZcWZZXuisIGTffibQgvgdTpq/KTBTuPqx2L7vf4Gq17B4olNujas05Xvne+55wBijL HTsA4HiBo887YzvVX5q1Kh2OAlLymXhsBjh8e36hN8cd8QRWgosnpvsFqDJvNp8/jOVz RiTRRxatnaIYUP7/NG7kakAbAzfBToXlKCLGlJY5quPhQgCdyWxij0hIZXk8x0y2U6As VmPO2SnQzu/IWJ0D7dQdsiDV1ZvyYjlzrUwQxkKUpW5ypfb5fQhfLQzgbGzxPmHue8uq Pbbg== X-Gm-Message-State: AIVw110/L4Ye2kPp+4I+fOFX1Cqz6bW+pActfx6ea0bQhZ+zwYjNCbc4 VoYIz2973DfVEuoM4+A= X-Received: by 10.55.144.130 with SMTP id s124mr4229737qkd.136.1500408265846; Tue, 18 Jul 2017 13:04:25 -0700 (PDT) Received: from bigtime.com ([101.165.234.197]) by smtp.gmail.com with ESMTPSA id b201sm2339817qkg.5.2017.07.18.13.04.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Jul 2017 13:04:25 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 18 Jul 2017 10:02:47 -1000 Message-Id: <20170718200255.31647-23-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::241 Subject: [Qemu-devel] [PATCH v3 22/30] target/sh4: Introduce CHECK_FPSCR_PR_* 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 | 57 +++++++++++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 26 deletions(-) diff --git a/target/sh4/translate.c b/target/sh4/translate.c index 09e4ace..346f672 100644 --- a/target/sh4/translate.c +++ b/target/sh4/translate.c @@ -384,6 +384,16 @@ static inline void gen_store_fpr64(DisasContext *ctx, TCGv_i64 t, int reg) goto do_fpu_disabled; \ } +#define CHECK_FPSCR_PR_0 \ + if (ctx->tbflags & FPSCR_PR) { \ + goto do_illegal; \ + } + +#define CHECK_FPSCR_PR_1 \ + if (!(ctx->tbflags & FPSCR_PR)) { \ + goto do_illegal; \ + } + static void _decode_opc(DisasContext * ctx) { /* This code tries to make movcal emulation sufficiently @@ -1135,16 +1145,11 @@ static void _decode_opc(DisasContext * ctx) } return; case 0xf00e: /* fmac FR0,RM,Rn */ - { - CHECK_FPU_ENABLED - if (ctx->tbflags & FPSCR_PR) { - goto do_illegal; - } else { - gen_helper_fmac_FT(FREG(B11_8), cpu_env, - FREG(0), FREG(B7_4), FREG(B11_8)); - return; - } - } + CHECK_FPU_ENABLED + CHECK_FPSCR_PR_0 + gen_helper_fmac_FT(FREG(B11_8), cpu_env, + FREG(0), FREG(B7_4), FREG(B11_8)); + return; } switch (ctx->opcode & 0xff00) { @@ -1738,16 +1743,14 @@ static void _decode_opc(DisasContext * ctx) break; case 0xf08d: /* fldi0 FRn - FPSCR: R[PR] */ CHECK_FPU_ENABLED - if (!(ctx->tbflags & FPSCR_PR)) { - tcg_gen_movi_i32(FREG(B11_8), 0); - } - return; + CHECK_FPSCR_PR_0 + tcg_gen_movi_i32(FREG(B11_8), 0); + return; case 0xf09d: /* fldi1 FRn - FPSCR: R[PR] */ CHECK_FPU_ENABLED - if (!(ctx->tbflags & FPSCR_PR)) { - tcg_gen_movi_i32(FREG(B11_8), 0x3f800000); - } - return; + CHECK_FPSCR_PR_0 + tcg_gen_movi_i32(FREG(B11_8), 0x3f800000); + return; case 0xf0ad: /* fcnvsd FPUL,DRn */ CHECK_FPU_ENABLED { @@ -1768,10 +1771,10 @@ static void _decode_opc(DisasContext * ctx) return; case 0xf0ed: /* fipr FVm,FVn */ CHECK_FPU_ENABLED - if ((ctx->tbflags & FPSCR_PR) == 0) { - TCGv m, n; - m = tcg_const_i32((ctx->opcode >> 8) & 3); - n = tcg_const_i32((ctx->opcode >> 10) & 3); + CHECK_FPSCR_PR_1 + { + TCGv m = tcg_const_i32((ctx->opcode >> 8) & 3); + TCGv n = tcg_const_i32((ctx->opcode >> 10) & 3); gen_helper_fipr(cpu_env, m, n); tcg_temp_free(m); tcg_temp_free(n); @@ -1780,10 +1783,12 @@ static void _decode_opc(DisasContext * ctx) break; case 0xf0fd: /* ftrv XMTRX,FVn */ CHECK_FPU_ENABLED - if ((ctx->opcode & 0x0300) == 0x0100 && - (ctx->tbflags & FPSCR_PR) == 0) { - TCGv n; - n = tcg_const_i32((ctx->opcode >> 10) & 3); + CHECK_FPSCR_PR_1 + { + if ((ctx->opcode & 0x0300) != 0x0100) { + goto do_illegal; + } + TCGv n = tcg_const_i32((ctx->opcode >> 10) & 3); gen_helper_ftrv(cpu_env, n); tcg_temp_free(n); return;