From patchwork Tue Jul 18 20:02:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9849467 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 8282560392 for ; Tue, 18 Jul 2017 20:17:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5E1B7285CC for ; Tue, 18 Jul 2017 20:17:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 530D0285E3; Tue, 18 Jul 2017 20:17:30 +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 CBC5C285CC for ; Tue, 18 Jul 2017 20:17:29 +0000 (UTC) Received: from localhost ([::1]:58408 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dXYvx-00023l-2p for patchwork-qemu-devel@patchwork.kernel.org; Tue, 18 Jul 2017 16:17:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49927) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dXYjL-0006jT-1R 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 1dXYjI-0004vh-P6 for qemu-devel@nongnu.org; Tue, 18 Jul 2017 16:04:27 -0400 Received: from mail-qk0-x242.google.com ([2607:f8b0:400d:c09::242]:35055) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dXYjI-0004ui-L9 for qemu-devel@nongnu.org; Tue, 18 Jul 2017 16:04:24 -0400 Received: by mail-qk0-x242.google.com with SMTP id t186so2153924qkf.2 for ; Tue, 18 Jul 2017 13:04:24 -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 :mime-version:content-transfer-encoding; bh=0AkIM6cm1t+mT773Mhzpb8uhfiia4uenqNP6SQQc7Zk=; b=kQOvQkgOYxENiYaxKK5wj+0o6Gncl26Ypmx+/LPayTO6Qyes/8ChvVfGn1nRENG+IQ +D/J0n6HVq6FhjUHZzIW2uKzoYif3E/uKI0I7DZr87cS6YdMmHrKIrIoxUp7D+VvjXLU N8l680Kw90+JVg6zu5+0LQf/9Dwkb8KRAHzHi3x5bKUyKW65UAQ9m64oWUwLznCKT37h esYFSM6K15wD1A1Vkt0BFqfxrIz/uTu2x8qmxFlj6zXv3o6SDjIu2qnN/gjigf2bqCS8 LC4TrOmMmkjYjeCAkw6jeNmGn9OV6PqwNix9jyQjdObhq1TnGs0La7+iGAlirpAxcluq Fa/w== 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:mime-version:content-transfer-encoding; bh=0AkIM6cm1t+mT773Mhzpb8uhfiia4uenqNP6SQQc7Zk=; b=bFi88h0TRaZ44zDnisC/6Xq2jCYvlaS+9x0ule/1L4oNtWWjsuhbE7gJDPoiWaEyPl oxRHrYZRuPwOrluWdAfZwj2s1fJdqzA4FiRICq9mNUOihMKOA/qbrYRfi24yhcd9ZUWl /fqcTYG23Zmz7InSJC5hV8o+U/hHW0NGNoPr5b5YDbYcLX8indRbEFP2p+v9GrbDR6cI b6ffes7HHMg7Io5nZsDsJVPWxY4Edq/RcmmGbBwW3kntgkXOUbb8OgtbaGThuO79LeJc rIQ+CWHdf6hhEbBw3bVQBuukiNN5imhBRSOD67ftymnfWB88ZRPvQXEooeXjvgc1wLov p/RA== X-Gm-Message-State: AIVw111nXzW8/JpXICwcO2DnrcLC0NUWU9jQB5tQ3RHfQukipc1B00Fr cXKhb7LEunNWoam/4YE= X-Received: by 10.55.19.13 with SMTP id d13mr4090190qkh.214.1500408263523; Tue, 18 Jul 2017 13:04:23 -0700 (PDT) Received: from bigtime.com ([101.165.234.197]) by smtp.gmail.com with ESMTPSA id b201sm2339817qkg.5.2017.07.18.13.04.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Jul 2017 13:04:22 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 18 Jul 2017 10:02:46 -1000 Message-Id: <20170718200255.31647-22-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> MIME-Version: 1.0 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 21/30] target/sh4: Tidy misc illegal insn checks 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 Now that we have a do_illegal label, use goto in order to self-document the forcing of the exception. Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Aurelien Jarno Signed-off-by: Richard Henderson --- target/sh4/translate.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/target/sh4/translate.c b/target/sh4/translate.c index 4c32248..09e4ace 100644 --- a/target/sh4/translate.c +++ b/target/sh4/translate.c @@ -1074,8 +1074,9 @@ static void _decode_opc(DisasContext * ctx) if (ctx->tbflags & FPSCR_PR) { TCGv_i64 fp0, fp1; - if (ctx->opcode & 0x0110) - break; /* illegal instruction */ + if (ctx->opcode & 0x0110) { + goto do_illegal; + } fp0 = tcg_temp_new_i64(); fp1 = tcg_temp_new_i64(); gen_load_fpr64(ctx, fp0, B11_8); @@ -1137,7 +1138,7 @@ static void _decode_opc(DisasContext * ctx) { CHECK_FPU_ENABLED if (ctx->tbflags & FPSCR_PR) { - break; /* illegal instruction */ + goto do_illegal; } else { gen_helper_fmac_FT(FREG(B11_8), cpu_env, FREG(0), FREG(B7_4), FREG(B11_8)); @@ -1681,8 +1682,9 @@ static void _decode_opc(DisasContext * ctx) CHECK_FPU_ENABLED if (ctx->tbflags & FPSCR_PR) { TCGv_i64 fp; - if (ctx->opcode & 0x0100) - break; /* illegal instruction */ + if (ctx->opcode & 0x0100) { + goto do_illegal; + } fp = tcg_temp_new_i64(); gen_helper_float_DT(fp, cpu_env, cpu_fpul); gen_store_fpr64(ctx, fp, B11_8); @@ -1696,8 +1698,9 @@ static void _decode_opc(DisasContext * ctx) CHECK_FPU_ENABLED if (ctx->tbflags & FPSCR_PR) { TCGv_i64 fp; - if (ctx->opcode & 0x0100) - break; /* illegal instruction */ + if (ctx->opcode & 0x0100) { + goto do_illegal; + } fp = tcg_temp_new_i64(); gen_load_fpr64(ctx, fp, B11_8); gen_helper_ftrc_DT(cpu_fpul, cpu_env, fp); @@ -1718,8 +1721,9 @@ static void _decode_opc(DisasContext * ctx) case 0xf06d: /* fsqrt FRn */ CHECK_FPU_ENABLED if (ctx->tbflags & FPSCR_PR) { - if (ctx->opcode & 0x0100) - break; /* illegal instruction */ + if (ctx->opcode & 0x0100) { + goto do_illegal; + } TCGv_i64 fp = tcg_temp_new_i64(); gen_load_fpr64(ctx, fp, B11_8); gen_helper_fsqrt_DT(fp, cpu_env, fp);