From nobody Tue Feb 10 11:32:51 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1654133829; cv=none; d=zohomail.com; s=zohoarc; b=PtbulS/E7JTu5kWL7giTf8/g+MI4uU7dgS6p9fyVkKJxLcz2S4a5NxYTxe4Qe6IzIXML/2M26AzZyNOcAtOXNhp7MQyCxzoWR554OeXqi8odnQ4uTRIyvqL0MqQSSbXaeDdLG+GPxl7mGqtBjXZMjTCO4/qO6n8ZmkdKA1KJ4SQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1654133829; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=v6GsMd9l2dAfQx+Uj+qJ1gCQp2pHPy4DQInBPdc5TCM=; b=YZ2qi1EM58wvXqau/ovdOuQSoEhEpeMO5I2+UKd0IyG6HP6cgcVPwDfZwkHwkaLxO5hoXq28ehEW+1GPT5yWBNsmbRR9AQ1k7rj42QBkDVJqH59ISBkbE36Fs7+XgM9RTtJX6x2i8tVydc4l/H3rhcZ8qbRZjmobKyQcAUG/ig0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1654133829110206.5499730508792; Wed, 1 Jun 2022 18:37:09 -0700 (PDT) Received: from localhost ([::1]:53122 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nwZlr-0005F7-Fu for importer@patchew.org; Wed, 01 Jun 2022 21:37:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43424) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwZix-0002KI-17 for qemu-devel@nongnu.org; Wed, 01 Jun 2022 21:34:07 -0400 Received: from mail-pj1-x102a.google.com ([2607:f8b0:4864:20::102a]:40670) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nwZiv-0005E2-BY for qemu-devel@nongnu.org; Wed, 01 Jun 2022 21:34:06 -0400 Received: by mail-pj1-x102a.google.com with SMTP id n13-20020a17090a394d00b001e30a60f82dso7944900pjf.5 for ; Wed, 01 Jun 2022 18:34:04 -0700 (PDT) Received: from stoup.. ([2602:ae:1547:e101:1eca:8ee3:9269:e00c]) by smtp.gmail.com with ESMTPSA id l191-20020a6391c8000000b003fc5b1db26fsm1962875pge.52.2022.06.01.18.34.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 18:34:03 -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=v6GsMd9l2dAfQx+Uj+qJ1gCQp2pHPy4DQInBPdc5TCM=; b=Qg8/PLu8Zu5+LZyYhCNcSfO3eQLy/+KrGp2UPo57WrKp2FNzJv6/R5JugOmcoBd8g8 Q6+48+Yth8+d7bNyLXzOKiHvU40oquMdEBZ7+Is4jewIOFdlrcs0Fzwv5umgZnJHWNl1 ipFYFg2KnroRZRt3u4VFI+t01EGLvMR86d82kHFQG4ElGyyJH/X1xTjjmPXVR8PobeST neBFoHW7+p0MTDqFDDc8mvHZiKol8iKBKGlufC1ng1sUUUBQDaypO4EWmyflTxJnFCBa IbCFVQbNTL2dR2xI5sZ+4GqSUDboG5v0uWI2n8iYg5NWkKfuQWDxIejOC8xA0rwdKxAl tfKA== 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=v6GsMd9l2dAfQx+Uj+qJ1gCQp2pHPy4DQInBPdc5TCM=; b=vYTHk3IGWj//PLAjkj6VOtGaL9wQE4P8Ia2XILUFZNhnznDK8x+iF9iGyAmn8g/X6S IYkVENqwIMtNo3HuBT5gpPF2I6w1qOLL0MdcUowir2Myd54FxGJIqE32xXFSrv0VvjbH tmdugfWGpwZfX2CnLdK1W07t4BzWKqDdgnMSXGGVt0V7a2BpLLW2/sp6GGFT+BnnFOoI eGvNAqK8+GqQl4kf68isFag4ozDuuW0oT0i711Qv5hdFvAdMFRusaaf3H/9BN0K0TrG6 uc+EO7j2Vl0MuAm/1N/3Ml199mCgmHevlgoLZT+vD+B5xwpPjsuXkQWq6Di4Yo+eGavd nvGA== X-Gm-Message-State: AOAM532GdbQdbC0xGdpYv/gfqU+LB78YmgAdP1qNxjNkTdLp4gnQbp1W Pel5cixpy66XAmfL2Kn4SNSslCI6eVniDw== X-Google-Smtp-Source: ABdhPJzg7elFncZg10kOPHp7phsyH9uC5DzWBNnb64ptOxce8i9VkPmjFxcfuiIxEQe4pBotaSGeeg== X-Received: by 2002:a17:902:a9ca:b0:161:54a6:af3f with SMTP id b10-20020a170902a9ca00b0016154a6af3fmr2358404plr.48.1654133644052; Wed, 01 Jun 2022 18:34:04 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: laurent@vivier.eu Subject: [PATCH v6 01/17] target/m68k: Raise the TRAPn exception with the correct pc Date: Wed, 1 Jun 2022 18:33:45 -0700 Message-Id: <20220602013401.303699-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220602013401.303699-1-richard.henderson@linaro.org> References: <20220602013401.303699-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::102a; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1654133830314100001 Content-Type: text/plain; charset="utf-8" Rather than adjust the PC in all of the consumers, raise the exception with the correct PC in the first place. Reviewed-by: Laurent Vivier Signed-off-by: Richard Henderson --- linux-user/m68k/cpu_loop.c | 1 - target/m68k/op_helper.c | 9 --------- target/m68k/translate.c | 2 +- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/linux-user/m68k/cpu_loop.c b/linux-user/m68k/cpu_loop.c index d1bf8548b7..56417f7401 100644 --- a/linux-user/m68k/cpu_loop.c +++ b/linux-user/m68k/cpu_loop.c @@ -56,7 +56,6 @@ void cpu_loop(CPUM68KState *env) { abi_long ret; n =3D env->dregs[0]; - env->pc +=3D 2; ret =3D do_syscall(env, n, env->dregs[1], diff --git a/target/m68k/op_helper.c b/target/m68k/op_helper.c index 8decc61240..d30f988ae0 100644 --- a/target/m68k/op_helper.c +++ b/target/m68k/op_helper.c @@ -217,11 +217,6 @@ static void cf_interrupt_all(CPUM68KState *env, int is= _hw) cpu_loop_exit(cs); return; } - if (cs->exception_index >=3D EXCP_TRAP0 - && cs->exception_index <=3D EXCP_TRAP15) { - /* Move the PC after the trap instruction. */ - retaddr +=3D 2; - } } =20 vector =3D cs->exception_index << 2; @@ -304,10 +299,6 @@ static void m68k_interrupt_all(CPUM68KState *env, int = is_hw) /* Return from an exception. */ m68k_rte(env); return; - case EXCP_TRAP0 ... EXCP_TRAP15: - /* Move the PC after the trap instruction. */ - retaddr +=3D 2; - break; } } =20 diff --git a/target/m68k/translate.c b/target/m68k/translate.c index 4026572ed8..6d6d026e3c 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -4860,7 +4860,7 @@ DISAS_INSN(wdebug) =20 DISAS_INSN(trap) { - gen_exception(s, s->base.pc_next, EXCP_TRAP0 + (insn & 0xf)); + gen_exception(s, s->pc, EXCP_TRAP0 + (insn & 0xf)); } =20 static void gen_load_fcr(DisasContext *s, TCGv res, int reg) --=20 2.34.1