From patchwork Thu Nov 9 13:42:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 742569 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:110f:b0:32d:baff:b0ca with SMTP id z15csp844229wrw; Thu, 9 Nov 2023 05:46:16 -0800 (PST) X-Google-Smtp-Source: AGHT+IF6R0DXwg+ycReQp4IPFRv2sO74P3S6+qJD6BOytGruq9rjTifol9REU8IiCd0ObPlGyVtL X-Received: by 2002:a05:620a:240a:b0:76f:1eac:e726 with SMTP id d10-20020a05620a240a00b0076f1eace726mr5273959qkn.15.1699537575834; Thu, 09 Nov 2023 05:46:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699537575; cv=none; d=google.com; s=arc-20160816; b=qmKElNoQe4wyadPImOt8o99W7MlPOULdYIPbZ6fCL3SaHeVcsmMd6YK4FWhdlqMPFC ClYZ00SVIfrKOcTlJ/mslOgYeQ0D5SL74gFowV8oeFD/o5+9xUj7djMn3LN32lHIuj6v mSwrO7ZP54xa8Jxfl9KJYdGMJI/nhru1EE0RiSSUG/sI0xc/lAMiE6Ipz50qMFuf3cWW oSe15uishsQblSayC1vRtog7GrTjyKGee1fF1ZaXI7eBmmr9T+Tk4FBPq7aJJTfdgUdi L6NrI38rcI9qp3JKPzcCZQyQqOn7f0z8QRlept2dJHYtZjaZENc/2RVL5nhIkja/Hd0v GmoA== 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=GpHfy5JuyZHC5XWIVJ/F4YLlC/gayqYlZN1I5ydAmmM=; fh=Hz+vO67F8PFDrY9UzplP5vp0zJFRafxlSjmXbk0LEmc=; b=ndFfy7BgAaYaMgFXZ9cJM/TFMdJIPLrANiKVG5Vlbiy7TyIljSc2X1SgFuTGWLINfe cdpTr8JRM0vlL7da2WC+x6wuD7DTcmesMiSj6C1N34TFpK0hHLVyix7Y/cvgp1GjLvRR O68tYPFfzNcd7PRdNR4wJWdXRep2g0eHHpOu4eIJ7flb55TCh4weWK8xUhH4vdKuVDg6 8wfxSr9cBT6H2cXQDMcW62erQBSoN4KuJRfSAO4jb9mRsoMXvwxiosKUejhp69Jtx2Rg bS1GKu2ZMexPzXzChHi9S1AyjQ2XdndXKLigxni5ung8ZAYTGA9ZV4SY1MsWwUegOWb3 4tCw== 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 g3-20020a05620a108300b0076dcf1b910bsi2808146qkk.748.2023.11.09.05.46.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 09 Nov 2023 05:46:15 -0800 (PST) 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r15LP-0002hb-Kg; Thu, 09 Nov 2023 08:45:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r15L5-0002Xa-QR; Thu, 09 Nov 2023 08:44:59 -0500 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r15L4-0001I6-1j; Thu, 09 Nov 2023 08:44:55 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 5C55531B09; Thu, 9 Nov 2023 16:43:12 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 6C955344B0; Thu, 9 Nov 2023 16:43:04 +0300 (MSK) Received: (nullmailer pid 1461815 invoked by uid 1000); Thu, 09 Nov 2023 13:43:02 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Richard Henderson , Mark Cave-Ayland , Michael Tokarev Subject: [Stable-8.1.3 18/55] target/sparc: Clear may_lookup for npc == DYNAMIC_PC Date: Thu, 9 Nov 2023 16:42:22 +0300 Message-Id: <20231109134300.1461632-18-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Richard Henderson With pairs of jmp+rett, pc == DYNAMIC_PC_LOOKUP and npc == DYNAMIC_PC. Make sure that we exit for interrupts. Cc: qemu-stable@nongnu.org Fixes: 633c42834c7 ("target/sparc: Introduce DYNAMIC_PC_LOOKUP") Tested-by: Mark Cave-Ayland Acked-by: Mark Cave-Ayland Signed-off-by: Richard Henderson (cherry picked from commit 930f1865cc654b637ffe1207fa5b44bf0a156279) Signed-off-by: Michael Tokarev diff --git a/target/sparc/translate.c b/target/sparc/translate.c index bd877a5e4a..9074a90818 100644 --- a/target/sparc/translate.c +++ b/target/sparc/translate.c @@ -5664,10 +5664,10 @@ static void sparc_tr_tb_stop(DisasContextBase *dcbase, CPUState *cs) break; } + may_lookup = true; if (dc->pc & 3) { switch (dc->pc) { case DYNAMIC_PC_LOOKUP: - may_lookup = true; break; case DYNAMIC_PC: may_lookup = false; @@ -5677,10 +5677,24 @@ static void sparc_tr_tb_stop(DisasContextBase *dcbase, CPUState *cs) } } else { tcg_gen_movi_tl(cpu_pc, dc->pc); - may_lookup = true; } - save_npc(dc); + if (dc->npc & 3) { + switch (dc->npc) { + case JUMP_PC: + gen_generic_branch(dc); + break; + case DYNAMIC_PC: + may_lookup = false; + break; + case DYNAMIC_PC_LOOKUP: + break; + default: + g_assert_not_reached(); + } + } else { + tcg_gen_movi_tl(cpu_npc, dc->npc); + } if (may_lookup) { tcg_gen_lookup_and_goto_ptr(); } else {