From patchwork Wed Mar 16 05:58:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 551823 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:6713:0:0:0:0 with SMTP id u19csp3109mag; Tue, 15 Mar 2022 23:02:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwfIJyBeS0Yrp6HhOQUA7MT8YJ2mJKKuEQ/I9pV0xjlyQMEBP1cSvXfbVtoETC/EPv0/IJK X-Received: by 2002:ac8:5a83:0:b0:2e1:bbda:3b17 with SMTP id c3-20020ac85a83000000b002e1bbda3b17mr18602538qtc.236.1647410578742; Tue, 15 Mar 2022 23:02:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647410578; cv=none; d=google.com; s=arc-20160816; b=eYj0h94X5FBWYnhSe5mzoeDnIQnbK6MHRqkoX452AYzvD6pWc01UAYfoBlbNYIUnZ3 dWJpRcrunlUcvB45zHbPjy/kmOGHGpAvxy3UjYXg2y+czPKC70ERgaVKra6GgJTAcwX3 EYteEzPajl4EkM3b7N2h/f6pqK4ESORPbCsvLB7vGcSNTrJpUFDJoBB1HpuhAl7CuoDj flJsn6Ks3rdwEsUPii0Z4hlKozmV30E+r/QDjA3//3ygSlmt1/9ryA+MER29stxlVNd1 QLsHwjE4A8Q/53cyFlLeODuRs1+rHENdC9I0K85KUuxj6kqB6imIbN5R90xrX4WR+xKk pejA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=46ufPNCBtrD2443ESlCBM/IFeVZu2U1LqCPdzBzWRlc=; b=KOH3zw39twnvh712BHe31XE4laRaGsvnMnljmfW2PuwFZYd1Kdj8XW8h9N+TEvuzfI 8ZRboDwLQNseonW3C6gqhXDHOQnTBG9B2VIg/tYvqmoRbwPK148wnUF3XL3pk2luG9kK 2n2w7Mf8Q+YWOXw9bJJVh4UNmMEaFE34i3RbBJojr7/4apQfrOPKWu/0ChkJaqpnLCHe cgAedgAIdJCn1bqiCw5PY5DxjCziU5EpGjvhdVCs5YpDrFJcn3bJp1D9vuXrZiBAccGT dL8MtgMMVMWjUmY5YT4i8k++5asdmqcJ67ME9AI7cScykd+PPjN6ZcM6IpfVHKL0Uo5l N8NQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vZnFHq+I; 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"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id fq11-20020a056214258b00b0043d58dd8375si275827qvb.426.2022.03.15.23.02.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 15 Mar 2022 23:02:58 -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; dkim=pass header.i=@linaro.org header.s=google header.b=vZnFHq+I; 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"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:56682 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nUMkM-00081z-9c for patch@linaro.org; Wed, 16 Mar 2022 02:02:58 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58740) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nUMgL-0002GC-Sa for qemu-devel@nongnu.org; Wed, 16 Mar 2022 01:58:50 -0400 Received: from [2607:f8b0:4864:20::636] (port=39568 helo=mail-pl1-x636.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nUMgK-0006Rz-B5 for qemu-devel@nongnu.org; Wed, 16 Mar 2022 01:58:49 -0400 Received: by mail-pl1-x636.google.com with SMTP id d18so965382plr.6 for ; Tue, 15 Mar 2022 22:58:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=46ufPNCBtrD2443ESlCBM/IFeVZu2U1LqCPdzBzWRlc=; b=vZnFHq+IIbqItDylP6+lvjrFO+2baeqXweVOScytmDv16FOkZSfLv7bHxKMlP+r4BJ TrYRDpHqsMN3l66PP6ChU+EcB8Fv1+3vI9mcXCnyvlc+p4QOIYmZ72QXpbIWlReDMAf/ sqXG5hUbNtoIyCYUSHFw0oxTp2p5iHlSXjL6VNFZt+gpDN44HxMsQrM3DBEGVx3BjUf9 FZwCNZdNtJ1tXNArHxmS0HX4SLKB84Vp10Vpv7dVfLsvACLs480YnK0+RjJoL9bOVG7z trRHiAXNtWzg/4JGEGKZlzrgRUJDKem+G0UOZhbyRSxzjMXTpFhyUIUTWBv4JFXB+2wQ 451g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=46ufPNCBtrD2443ESlCBM/IFeVZu2U1LqCPdzBzWRlc=; b=Z4HTxxNNM/64+NvksgCBrWp8MxkN/Zj3ElQJqikn+uGJ6THvg7Ke6seW2aCdMPB+Bc SQvLF+xqoll+YFMzapBDmihsezyAO9uG/TpeSVQFO3oKKMgfjvKqGVMmUiaUCzzkzXJi Vl23s4MxP/RUkHdkktQM3AU8lRAe9mAAWJ1NIHczILxSG5EPYsvGbkWBO03GBSPkXLsT jC072hDniaHZG6FWpPsw30t0nldQabE1EEVUsy252CNrtMXGhwwm5axjmV8Ly9OGMdC6 uhteR8s9dFOMhmQfU8onKrIkSFVR+ne3/PayBHwtgsW6ofDlUeklPlIer9xJ0DuNgKmK nBaQ== X-Gm-Message-State: AOAM530jCVPsyNxycx9Zjb74OMIhNb/Ux6LihAaZbSdiXf2lgxpbwZEI bZBgVhvqAeePUBfCT3Up9mBElEJht6BZDw== X-Received: by 2002:a17:902:7296:b0:151:62b1:e2b0 with SMTP id d22-20020a170902729600b0015162b1e2b0mr31721514pll.165.1647410326781; Tue, 15 Mar 2022 22:58:46 -0700 (PDT) Received: from localhost.localdomain (174-21-142-130.tukw.qwest.net. [174.21.142.130]) by smtp.gmail.com with ESMTPSA id i24-20020a056a00225800b004f6edabc9f4sm1236290pfu.72.2022.03.15.22.58.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Mar 2022 22:58:46 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 05/17] target/m68k: Remove retaddr in m68k_interrupt_all Date: Tue, 15 Mar 2022 22:58:28 -0700 Message-Id: <20220316055840.727571-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220316055840.727571-1-richard.henderson@linaro.org> References: <20220316055840.727571-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::636 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::636; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x636.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: laurent@vivier.eu, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The only value this variable holds is now env->pc. Reviewed-by: Laurent Vivier Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- target/m68k/op_helper.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/target/m68k/op_helper.c b/target/m68k/op_helper.c index 0f41c2dce3..777869790b 100644 --- a/target/m68k/op_helper.c +++ b/target/m68k/op_helper.c @@ -287,12 +287,9 @@ static void m68k_interrupt_all(CPUM68KState *env, int is_hw) { CPUState *cs = env_cpu(env); uint32_t sp; - uint32_t retaddr; uint32_t vector; uint16_t sr, oldsr; - retaddr = env->pc; - if (!is_hw) { switch (cs->exception_index) { case EXCP_RTE: @@ -385,7 +382,7 @@ static void m68k_interrupt_all(CPUM68KState *env, int is_hw) sp -= 4; cpu_stl_mmuidx_ra(env, sp, env->mmu.ar, MMU_KERNEL_IDX, 0); - do_stack_frame(env, &sp, 7, oldsr, 0, retaddr); + do_stack_frame(env, &sp, 7, oldsr, 0, env->pc); env->mmu.fault = false; if (qemu_loglevel_mask(CPU_LOG_INT)) { qemu_log(" " @@ -395,7 +392,7 @@ static void m68k_interrupt_all(CPUM68KState *env, int is_hw) break; case EXCP_ADDRESS: - do_stack_frame(env, &sp, 2, oldsr, 0, retaddr); + do_stack_frame(env, &sp, 2, oldsr, 0, env->pc); break; case EXCP_ILLEGAL: @@ -404,12 +401,12 @@ static void m68k_interrupt_all(CPUM68KState *env, int is_hw) case EXCP_TRAPCC: case EXCP_TRACE: /* FIXME: addr is not only env->pc */ - do_stack_frame(env, &sp, 2, oldsr, env->pc, retaddr); + do_stack_frame(env, &sp, 2, oldsr, env->pc, env->pc); break; case EXCP_SPURIOUS ... EXCP_INT_LEVEL_7: if (is_hw && (oldsr & SR_M)) { - do_stack_frame(env, &sp, 0, oldsr, 0, retaddr); + do_stack_frame(env, &sp, 0, oldsr, 0, env->pc); oldsr = sr; env->aregs[7] = sp; cpu_m68k_set_sr(env, sr & ~SR_M); @@ -417,13 +414,13 @@ static void m68k_interrupt_all(CPUM68KState *env, int is_hw) if (!m68k_feature(env, M68K_FEATURE_UNALIGNED_DATA)) { sp &= ~1; } - do_stack_frame(env, &sp, 1, oldsr, 0, retaddr); + do_stack_frame(env, &sp, 1, oldsr, 0, env->pc); break; } /* fall through */ default: - do_stack_frame(env, &sp, 0, oldsr, 0, retaddr); + do_stack_frame(env, &sp, 0, oldsr, 0, env->pc); break; }