From patchwork Thu Mar 28 03:39:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 783583 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e01:0:b0:33e:7753:30bd with SMTP id p1csp2520227wrt; Wed, 27 Mar 2024 20:40:40 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU1GR3gALvx0hIbz3taCgRxURnlwvwtnwGOnd5xddNeDcUOHUMWtNPJVZglBv43slSEYK7YMqvwa843+CoRJHTh X-Google-Smtp-Source: AGHT+IHvC5zyBrH8929tzTYwC3FLNsLzs19fUMdS+QSiv+BzmKYgcIECD57ACR3Y9IpfE84oHIr7 X-Received: by 2002:a05:620a:22d:b0:78a:5eb3:8e3d with SMTP id u13-20020a05620a022d00b0078a5eb38e3dmr1455697qkm.8.1711597240222; Wed, 27 Mar 2024 20:40:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711597240; cv=none; d=google.com; s=arc-20160816; b=ny4ARqyHuJ4wfVjV8WhE3XVD/fDWsGF8bGIZyRnoBFKP88a2dUXI3dk38i8x+1b90p gG+zLuxDjs9qYuYOP2t1TuFSnVvowsGseGCg4vqW3HoL9J9m+i7Kuht00f1hyZlMyNUC rALbwHiIdXwKcqK4I3qNtiZyejem8gpWGk9i0ow4o9U1B+UugdborFiIvmOHMhCRQxGT XNTmjLl/45PcWeV4ZYgi+YPAV8uB9DjjjO3adxL9omZ8jGaFgexZ9ySQoJe/riU/mKyM dkWgKcxW9fjeBYKh2PbcWJMpMTaskaOl7NbiYAZbSxJmsTQQDU2m+42bcFJ124qXkY6N 47VQ== 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:message-id:date:subject:to:from:dkim-signature; bh=aXBZFu2s4VI4gx6Rv0AU3SgCaeiACnYHqJQpFd1hK8k=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=TsE+rQk6halauaq0JldAORCGTliQywOyK0LIbjSlFIgPWLm4bs0FcLjKBqXaZd2cut v3loWtbKux4GAXu3M35GuhntMTE8+cGaitYVRDi4xWAOVoa0bTKbKkyNU5YAlUqzV/uI 2k3Qq3hkjG2tXJJTzGnM+5/qFTPCGiRRibm8V9Q1Iv7In3eb4Lq8/yz1qQqyjOzDXub4 neV08rEG7U7/Z8XhbvtI1FK1P586mNfbuOy4USY0PdaWuYualiDTLuit9OQ5heL3f/eN CDYbptvcVxzcUdBmQdxPzsz34rmnQzP9V0e6oD5JlNrUpI+sNHH9huZZWUsHXb1QGbre KDMA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="Puc2x/Di"; 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 a28-20020a05620a103c00b00789fe94aefcsi607210qkk.689.2024.03.27.20.40.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 27 Mar 2024 20:40:40 -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="Puc2x/Di"; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rpgcN-0005qA-Gs; Wed, 27 Mar 2024 23:39:55 -0400 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 1rpgcM-0005pf-1H for qemu-devel@nongnu.org; Wed, 27 Mar 2024 23:39:54 -0400 Received: from mail-pg1-x52b.google.com ([2607:f8b0:4864:20::52b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rpgcK-0004Sf-FX for qemu-devel@nongnu.org; Wed, 27 Mar 2024 23:39:53 -0400 Received: by mail-pg1-x52b.google.com with SMTP id 41be03b00d2f7-5d8b70b39efso402790a12.0 for ; Wed, 27 Mar 2024 20:39:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1711597190; x=1712201990; darn=nongnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=aXBZFu2s4VI4gx6Rv0AU3SgCaeiACnYHqJQpFd1hK8k=; b=Puc2x/DiavTgzB74yD8iMTOjGdeXKg+ApuGIWnzqV44c2Kprkn20zxHJf32Y4zCbiT kuFYZEQhxt8z2dYEzFbK6ycO7IO55B7Rjz9rzUP5YCY0D/SolVeKMOBu8obfg8+qfcsC pCK9wAe8Vg24xfbVJLjCbOG/1oUFXBftrHLW8Dk189p098ntX1krXFgcSt/8Q37VvEj9 0uZvE0mSfEVpA4WEC2b1yyvFzu9XZwheNnAm9sHNDcw+ozBfvKQPCEq1Ljsr0MFkEosG 3wgv32YnErVcIS31GZ4XnHEAqz3YzRUiR7rrwRmSEgAa7VMgZq1zvObPXjqZbf0if97N 4VpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711597190; x=1712201990; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=aXBZFu2s4VI4gx6Rv0AU3SgCaeiACnYHqJQpFd1hK8k=; b=Clg5Jd4qFA9au9Oj6FcEkfw1uqK8dEtcJVNcd25lEPH5tfdMiid3/JAi9z3W9w3HZS rUjiu6v1sZ1hKee97CJcQqMytM4lJFScWIIHWwChSc16RXU8qF5VppCWBR3qUch42WBe jU/0ROmOrlQu1ZhzIvGtLv8isCFdFYmoBZiWNBIz88+oAjtAcDCt594lTKsVBwklteOu ix82YgNoqDN/Z8qGVEU6Rq2E3uL9dWI0iXje5IjqqGOkXXyBUl6Z16+kHdDFIbbDMEnB wCgGTQkxRrUxCOiUepxRJjNXX2IFQmZ41PDq7QRDVmSSyYC+fsK9iM9SRvpTewQXZ9zJ 0tZA== X-Gm-Message-State: AOJu0Yw+v1B/MfjdKIj1sxlMP06AC1jxO2YypMqZ6EIMX5mTo99jbr6t f5ovtYCbw5grGDS3Y4pk6oKhLgK6dw8IAYJuzMvxBDXI7bnrxyazG4YzR3eM9zyFREyHwOYpT6I v X-Received: by 2002:a05:6a21:9990:b0:1a3:c4ba:2bb3 with SMTP id ve16-20020a056a21999000b001a3c4ba2bb3mr2254378pzb.9.1711597190526; Wed, 27 Mar 2024 20:39:50 -0700 (PDT) Received: from stoup.. (098-147-007-212.res.spectrum.com. [98.147.7.212]) by smtp.gmail.com with ESMTPSA id z8-20020a17090a014800b002a04f430937sm392622pje.43.2024.03.27.20.39.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Mar 2024 20:39:50 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH for-9.0?] accel/tcg: Use CPUState.get_pc in cpu_io_recompile Date: Wed, 27 Mar 2024 17:39:47 -1000 Message-Id: <20240328033947.1268943-1-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::52b; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x52b.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 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 Using log_pc produces the pc at the beginning of TB, not the actual pc installed by cpu_restore_state_from_tb, which could be any of the guest instructions within TB. Signed-off-by: Richard Henderson --- accel/tcg/translate-all.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index c1f57e894a..83cc14fbde 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -634,7 +634,7 @@ void cpu_io_recompile(CPUState *cpu, uintptr_t retaddr) cpu->cflags_next_tb = curr_cflags(cpu) | CF_MEMI_ONLY | n; if (qemu_loglevel_mask(CPU_LOG_EXEC)) { - vaddr pc = log_pc(cpu, tb); + vaddr pc = cpu->cc->get_pc(cpu); if (qemu_log_in_addr_range(pc)) { qemu_log("cpu_io_recompile: rewound execution of TB to %016" VADDR_PRIx "\n", pc);