From patchwork Fri Jul 7 02:21:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9829403 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 55D20604D9 for ; Fri, 7 Jul 2017 02:33:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 43C9328449 for ; Fri, 7 Jul 2017 02:33:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 33D0228506; Fri, 7 Jul 2017 02:33:18 +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 CE25B28455 for ; Fri, 7 Jul 2017 02:33:17 +0000 (UTC) Received: from localhost ([::1]:54149 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dTJ52-0001QT-W4 for patchwork-qemu-devel@patchwork.kernel.org; Thu, 06 Jul 2017 22:33:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35318) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dTIxF-0003p4-Sa for qemu-devel@nongnu.org; Thu, 06 Jul 2017 22:25:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dTIxC-0001P9-Nb for qemu-devel@nongnu.org; Thu, 06 Jul 2017 22:25:13 -0400 Received: from mail-qk0-x241.google.com ([2607:f8b0:400d:c09::241]:35958) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dTIxC-0001OZ-K0 for qemu-devel@nongnu.org; Thu, 06 Jul 2017 22:25:10 -0400 Received: by mail-qk0-x241.google.com with SMTP id v143so2748930qkb.3 for ; Thu, 06 Jul 2017 19:25:10 -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=NHW906zzHgKlCw+eErolbDw8DDizfeYMM0S+Sxd8lhc=; b=NJ58xiq721icxW5st4DRahZtGDutxKdecbbOsMZpDIRtdzIFVn4snGlc1OzGas/yP5 ttC1lIjP7Q4+klaDkmccJwnHv4Ok62SKdB13t0+hRZg1yEITCbB2Y0/h9R60pZ+qB3l/ IZpAwjOfTTxpl5iifweb6HwV/nbYl6L5ajq1W0aO0S6YilpEM+Tvg/TqkgH4WNtLu3L7 yFDqT7750tVyX/wczmOd9GDIthAr35HWyx4I1xIv9jBI5mLCKIKmrhh5g2bRAJ6qgs+S Jmb7FEUXLvf8CoYlvj0K7xfhuxnibECxNI6NrJaea/fjd7dzBvlzE0zbVjL3mXlhXM2K F3tg== 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=NHW906zzHgKlCw+eErolbDw8DDizfeYMM0S+Sxd8lhc=; b=Fb3rzyYabci2w1iR+SQ6FcCsggRqTlEv4YXKohMwXGzql56deT/k69rjLdm2ESbmfB x61abmhsLQAxYbZ/3yJ9/YwlNJ87LKi2U5i43x/9tX4vuyj12H7Gm0BN+mdRa36vyv6F Q3dShMI5aptcuwSxTkBEpyEDpmVSOod+Zdj8uEYa84s8odubIkZEMcgRaOlL3794T7qu KWn7FJDyx9X7mOLEJEvqNGHnKLU46x2FWpd9mOT4/rqtG7XsL8r3BpJVA+PyygNPfZis wFERLZrbE+yAvj7AhspcdiI2abnYRmRB0CQ9Go9IG85r2Xju8jiO2aG6kItHpGnWPcMK vKvQ== X-Gm-Message-State: AKS2vOy4eBvVInhpqFV08LFo/T9fJIHQj5W2ivrSsk59QBv54+gFKLih yokwLH/2C8nEKuRN8aE= X-Received: by 10.55.40.89 with SMTP id o86mr63894570qkh.116.1499394309945; Thu, 06 Jul 2017 19:25:09 -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.24.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Jul 2017 19:25:09 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 6 Jul 2017 16:21:06 -1000 Message-Id: <20170707022111.21836-23-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:c09::241 Subject: [Qemu-devel] [PATCH v2 22/27] 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: 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 | 57 +++++++++++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 26 deletions(-) diff --git a/target/sh4/translate.c b/target/sh4/translate.c index 06cf649..3d8ac59 100644 --- a/target/sh4/translate.c +++ b/target/sh4/translate.c @@ -391,6 +391,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 @@ -1140,16 +1150,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) { @@ -1750,16 +1755,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 { @@ -1780,10 +1783,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); @@ -1792,10 +1795,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;