From patchwork Tue Jul 18 20:02:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9849465 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 1E98260392 for ; Tue, 18 Jul 2017 20:17:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EE2E9285CC for ; Tue, 18 Jul 2017 20:17:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E2D7F285E3; Tue, 18 Jul 2017 20:17:27 +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 84245285CC for ; Tue, 18 Jul 2017 20:17:27 +0000 (UTC) Received: from localhost ([::1]:58406 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dXYvu-000236-Nh for patchwork-qemu-devel@patchwork.kernel.org; Tue, 18 Jul 2017 16:17:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49862) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dXYjB-0006ay-Ul for qemu-devel@nongnu.org; Tue, 18 Jul 2017 16:04:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dXYjB-0004oA-3O for qemu-devel@nongnu.org; Tue, 18 Jul 2017 16:04:17 -0400 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:34332) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dXYjB-0004nh-01 for qemu-devel@nongnu.org; Tue, 18 Jul 2017 16:04:17 -0400 Received: by mail-qt0-x244.google.com with SMTP id 19so3682001qty.1 for ; Tue, 18 Jul 2017 13:04:16 -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=PhZfG5sKlLOpIbUJ0FIBMUpHp/x//nCkVl1EawYMqeU=; b=raphxhJMJjK5pY3HtJIgaAIcyaPG29gMh0PCkA+8GR0p0JwsGeHheaDbFItwMk9EVZ 6aBxTFh/73hEH3r0UV14LC2C0Hp4PdBfwmhLiUWivEiiwvJ9TfwXRbTlDelEtgDJfaCs TC/CcyyGIy6HK3YZ/TRxkwXCkNu7d74MJwfs2IiKBsIip0nEdVVEjBQDhZqeAvDXPh53 cLCZg1XFz6HZ9V/8qCoZnPq2TaXNhemThuxYWzw7HUbegofPXN99AtdXsAx8fJqBZTT5 fHOIrmvUQDv813z9LnXcWZH/mglXDW6G3nmas7j6dHNscEjkgIJhAPQdzrCbZTATvdP4 jgnQ== 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=PhZfG5sKlLOpIbUJ0FIBMUpHp/x//nCkVl1EawYMqeU=; b=hxJvYwGvfo/+2/f1Sj2oLSnDz1ITpPMYP9raN6jbA3+KA4EkbsDxtf+Ohgb8fuJ4Wc LDysyedITs6V7WwujlNvW34BthMcPYc5E5QDXRgU+P7YdXfSMZ9tgVPk4e+aJrLT8WoF d0994PagJCKt8n1cvO7fmNmlBmuaOXSP4OpGVdVRBK2UITRjY0I1F31TrG86dNsUuvMt kCWNl5ePkjfswGoJ63P28/k9Q2jDtTsHyxR95BfMFJnKbTXD+cdaqbazo1kr01rXcxFj mZ/wdRw/6hORKi8Ms0eQG+YGHsTyXxTWelVHHn1DTQVBPjxtWbKY1S6Ggn+ng5kQfGqR wAGg== X-Gm-Message-State: AIVw111IbvVB0LDT0RSP6EwxNNbJW37/nbg5JgdVPt9uGYxdF20fI5bt KKFQSEheXT5AsYzF7kw= X-Received: by 10.200.3.72 with SMTP id w8mr4132159qtg.203.1500408256232; Tue, 18 Jul 2017 13:04:16 -0700 (PDT) Received: from bigtime.com ([101.165.234.197]) by smtp.gmail.com with ESMTPSA id b201sm2339817qkg.5.2017.07.18.13.04.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Jul 2017 13:04:15 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 18 Jul 2017 10:02:43 -1000 Message-Id: <20170718200255.31647-19-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:c0d::244 Subject: [Qemu-devel] [PATCH v3 18/30] target/sh4: Unify code for CHECK_NOT_DELAY_SLOT 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 We do not need to emit N copies of raising an exception. Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Aurelien Jarno Signed-off-by: Richard Henderson --- target/sh4/translate.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/target/sh4/translate.c b/target/sh4/translate.c index 1164f73..b0a3d79 100644 --- a/target/sh4/translate.c +++ b/target/sh4/translate.c @@ -370,11 +370,8 @@ static inline void gen_store_fpr64(DisasContext *ctx, TCGv_i64 t, int reg) #define XHACK(x) ((((x) & 1 ) << 4) | ((x) & 0xe)) #define CHECK_NOT_DELAY_SLOT \ - if (ctx->envflags & DELAY_SLOT_MASK) { \ - gen_save_cpu_state(ctx, true); \ - gen_helper_raise_slot_illegal_instruction(cpu_env); \ - ctx->bstate = BS_EXCP; \ - return; \ + if (ctx->envflags & DELAY_SLOT_MASK) { \ + goto do_illegal_slot; \ } #define CHECK_PRIVILEGED \ @@ -1808,10 +1805,12 @@ static void _decode_opc(DisasContext * ctx) ctx->opcode, ctx->pc); fflush(stderr); #endif - gen_save_cpu_state(ctx, true); if (ctx->envflags & DELAY_SLOT_MASK) { + do_illegal_slot: + gen_save_cpu_state(ctx, true); gen_helper_raise_slot_illegal_instruction(cpu_env); } else { + gen_save_cpu_state(ctx, true); gen_helper_raise_illegal_instruction(cpu_env); } ctx->bstate = BS_EXCP;