From patchwork Thu Jun 2 11:58:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 578096 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:5806:0:0:0:0 with SMTP id j6csp476732max; Thu, 2 Jun 2022 05:09:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzX6dacqjsyYvseS3LoSnEM73nH72w7gYjoWp7i8aJTVGbdWL/5QbE0ro8Ake/ZHma2tuLO X-Received: by 2002:a05:622a:295:b0:304:b4fc:cae2 with SMTP id z21-20020a05622a029500b00304b4fccae2mr3232858qtw.217.1654171750221; Thu, 02 Jun 2022 05:09:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654171750; cv=none; d=google.com; s=arc-20160816; b=1CSNEfg5U540kTzyVaGrCWsuFITAGGQ/THD5TwJMKF6voISFcfj9Nm+6YsUULCz9Nm cP4GlaqCUL2jQqf9ygSRygqZia2YPJWOMr6vhVkARndEEIzLzwQRbclYGWzVcQ8uJ8Yr rRpvPpcyXYndpEVFFYuVGnmiOPMh2WauBBcmY00PbczTh20qDuSt1IUt/kkTYofCJ2vQ f4K+P6trkQoD2ClgmEImxrgrXhtJjmCMHiSwotm+LR4uq/RBinabEhms8R4EQP4LwwmG nCyT9kheH8OfVsfczHBXiiQjKp/Bt51AV90yO3qcDkkNv2cZo5hgiOtHBqqEipw6efun b7rA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from; bh=YJ0n6D789b5cacS4dNnJ4EKPaMm9LqP30YshHniopLo=; b=qzTllV5zGmPm4AmlTsekPMmXxP3Y+VHziDu1K7i4LWgzri7Gf/s8ej6V6leZp4hyw1 kflrZwxUQaXkeZNJl6X2iCd4cp+J9htQnAU3x4wABSVSLrgVGAMIl8c6NndI8FMj52ex vp6b3daiirsWtx+IssU9o4/1qYhimV0aXSRuhW6/FTEaJnfzvcBK3gRBy9PdO3+wiTp8 KSBNafYNl2RjPxySxXClc3qkvI+FeoZQyhgPTuq8Sx6XLOUWU7Xid5GLjivQ1fwcDV0j PW3SB2ToqIMD/mlsafR87XAdVJ5diGk/wc83vYjUJlmY/ef6l7w8ReKBu5RevX/Mn4wW sIIQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id k18-20020a05620a415200b0069eab0cc228si2242552qko.763.2022.06.02.05.09.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 02 Jun 2022 05:09:10 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1]:37754 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nwjdV-0006mi-Qr for patch@linaro.org; Thu, 02 Jun 2022 08:09:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46916) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwjTT-0000Yf-EZ for qemu-devel@nongnu.org; Thu, 02 Jun 2022 07:58:47 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:44991) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwjTR-0001Dy-OX for qemu-devel@nongnu.org; Thu, 02 Jun 2022 07:58:47 -0400 Received: from quad ([82.142.8.70]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.183]) with ESMTPSA (Nemesis) id 1Mk0BK-1nTyDx0Jgm-00kMAq; Thu, 02 Jun 2022 13:58:41 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: Laurent Vivier , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Subject: [PULL 04/19] target/m68k: Switch over exception type in m68k_interrupt_all Date: Thu, 2 Jun 2022 13:58:22 +0200 Message-Id: <20220602115837.2013918-5-laurent@vivier.eu> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220602115837.2013918-1-laurent@vivier.eu> References: <20220602115837.2013918-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:3yy/6cRXLahJTt3MX413aSaYxSs4uxAnqC7280jofzISyv8LfxY JkJzon5lj5U7e21UtFV6Iv7NsQcJcQZBDOZcMCA0NRWaxZOeTyz4bpUOZw4zXPIn5KVmlXu vEmlj8TOa5HbGyEyOZZITK+zcJm8XqEK4o2JUBCJVb9Ek4NzjIOsr2lwS20anu14NNGWtKl vSzDfccZw+JPQGlhYtpcA== X-UI-Out-Filterresults: notjunk:1;V03:K0:tnIFgJhjMcw=:enrsHJTck8WR1NsvOqhQDV AL8QzDXCpPiWPZQhAYWLR70bjBXKfogyMRt6+KUqAYhI9JS+4lp45BLhe7ybLFU3FMOp057Xk pCr2xK1SHmYOQXvUYe0Uxkxf7j7a4rzF8iXACpPSrK0svtDiWOXVMW6Dt/Q99EQunGNurGCVz AqC8XyMT1KU6KzYRuRrv6lPCG/wbO/OrDLZtWZvL09p31OUTyN3ndUIOePvY7w9f13AMuNWqb /swPXCzndP+PrX3gwLUQp8lMfJbFI0d+GqzEgtka87Ga1WM3wfPzlyoKduCq+sMTk7VKVK1cR 2iJku8ETamL5L1K0t3SCJ8h/ZuXrgloemd93fKWCSJsOJAZV5ISTJUmWKOCoc9rE0BC7hDYBn drtyaTEPtGIUaTqK6mvIK0NkDWqwiN3zQkk5cVfybO1Sd96xNN1kh5qfVxHNPWCbheuGFd57U pPgqcG8UmNJNKqJOTtytHda2Aw7UC4qrv+zNtCNHn+Q+m1A0d76tJHFpH67sdjaVTX4SLAIPg w6ntxmIEez2bbDLY7aB5+CdFjPI1P492JD+c4lHKfmsP/zIahFUuCkO51eok8gN7prh6B35ST o47DI91Y4vygzRoRHxz58KPJx9/nra7xwSu55GaLMemI3rCqf1/LavsqQOrpYK1CnqVx/T8zh aqHW8HllYYAi4JP49hWYTtTqHqpju4JS1V4Gj7BvgwQJ4AjdBFBLYlSfXnO/D0/3gcMnvkMwE 9ZgFPojmwi8xYzmSFhldDlrnyNcpEgkp9XAypA== Received-SPF: none client-ip=217.72.192.73; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson Replace an if ladder with a switch for clarity. Reviewed-by: Laurent Vivier Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson Message-Id: <20220602013401.303699-3-richard.henderson@linaro.org> Signed-off-by: Laurent Vivier --- target/m68k/op_helper.c | 49 +++++++++++++++++++++++++---------------- 1 file changed, 30 insertions(+), 19 deletions(-) diff --git a/target/m68k/op_helper.c b/target/m68k/op_helper.c index d30f988ae089..2b94a6ec84de 100644 --- a/target/m68k/op_helper.c +++ b/target/m68k/op_helper.c @@ -333,7 +333,8 @@ static void m68k_interrupt_all(CPUM68KState *env, int is_hw) sp &= ~1; } - if (cs->exception_index == EXCP_ACCESS) { + switch (cs->exception_index) { + case EXCP_ACCESS: if (env->mmu.fault) { cpu_abort(cs, "DOUBLE MMU FAULT\n"); } @@ -391,29 +392,39 @@ static void m68k_interrupt_all(CPUM68KState *env, int is_hw) "ssw: %08x ea: %08x sfc: %d dfc: %d\n", env->mmu.ssw, env->mmu.ar, env->sfc, env->dfc); } - } else if (cs->exception_index == EXCP_ADDRESS) { + break; + + case EXCP_ADDRESS: do_stack_frame(env, &sp, 2, oldsr, 0, retaddr); - } else if (cs->exception_index == EXCP_ILLEGAL || - cs->exception_index == EXCP_DIV0 || - cs->exception_index == EXCP_CHK || - cs->exception_index == EXCP_TRAPCC || - cs->exception_index == EXCP_TRACE) { + break; + + case EXCP_ILLEGAL: + case EXCP_DIV0: + case EXCP_CHK: + case EXCP_TRAPCC: + case EXCP_TRACE: /* FIXME: addr is not only env->pc */ do_stack_frame(env, &sp, 2, oldsr, env->pc, retaddr); - } else if (is_hw && oldsr & SR_M && - cs->exception_index >= EXCP_SPURIOUS && - cs->exception_index <= EXCP_INT_LEVEL_7) { - do_stack_frame(env, &sp, 0, oldsr, 0, retaddr); - oldsr = sr; - env->aregs[7] = sp; - cpu_m68k_set_sr(env, sr &= ~SR_M); - sp = env->aregs[7]; - if (!m68k_feature(env, M68K_FEATURE_UNALIGNED_DATA)) { - sp &= ~1; + break; + + case EXCP_SPURIOUS ... EXCP_INT_LEVEL_7: + if (is_hw && oldsr & SR_M) { + do_stack_frame(env, &sp, 0, oldsr, 0, retaddr); + oldsr = sr; + env->aregs[7] = sp; + cpu_m68k_set_sr(env, sr &= ~SR_M); + sp = env->aregs[7]; + if (!m68k_feature(env, M68K_FEATURE_UNALIGNED_DATA)) { + sp &= ~1; + } + do_stack_frame(env, &sp, 1, oldsr, 0, retaddr); + break; } - do_stack_frame(env, &sp, 1, oldsr, 0, retaddr); - } else { + /* fall through */ + + default: do_stack_frame(env, &sp, 0, oldsr, 0, retaddr); + break; } env->aregs[7] = sp;