From patchwork Fri Mar 29 22:20:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 784085 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e01:0:b0:33e:7753:30bd with SMTP id p1csp3426542wrt; Fri, 29 Mar 2024 15:22:07 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXOv06d1AAeCHmn+52QNbT59VRNkojioJW/DJJr6auWuuzeTHYeOzDEISH2ePPAsmbrHme/eUwu132ynQko+pnk X-Google-Smtp-Source: AGHT+IHHZmYob+yKZv9eze+GMyyn3B2X/nAGpdt+iWxEu6OVBmrYAGmC1sfoezEs7Kh8iIcQPPDf X-Received: by 2002:a05:6808:3309:b0:3c3:e61f:dc03 with SMTP id ca9-20020a056808330900b003c3e61fdc03mr4327043oib.33.1711750927501; Fri, 29 Mar 2024 15:22:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711750927; cv=none; d=google.com; s=arc-20160816; b=XK94JIKoLkRv1xx6kPJhPHkXy4B5i6JJnQDadmMS4+V5TyUdOVN9o4vmCzAmUyhAcR PxtIznlnOVK+sV+8FYZbcW4B2M6LVeL+GELQb/ZgRfknKjTDbOpCY/AKCx6vUc7GYsFN zvg9qVkwywyQDu1RwZxfPd4ssPmVeptZDvP/lysFEqx40qzofdaW1g0PAPzdvAVu2BEd 3Dnisf+Im9C1lXg2ryo3GDKT6vqkmonhyOcdtZrRTLBtrI20l8eFsvByrLX+QVDJ4jth Jg8L2qw/dND/2EROeqt78VZ39PeWbuz/r8+Zn9GYyyP9oOLqkS3LPTkyaY/xGzfQneMX hMlQ== 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:to:from :dkim-signature; bh=aXBZFu2s4VI4gx6Rv0AU3SgCaeiACnYHqJQpFd1hK8k=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=xQALx4O6k7kWTIZE78mwacst/djMFdjrvcSxWhxrjl+pi1X7ljTa9FVhdWkkseyuud 7PXH45LYOhY0jmvECLJ2HOYu5bl5NT1AxU59HUYJyt8SG9cppfY0gzeDsZ/kxSCJ9HZu 6GiiZf+m1C/9IJxG0MUQKoAQak7Nsh9PAWYiF+P3R+3WVOc2pUxzbl+x86ZcLSWjJGtR 8AIMQiAHJho03gZre9uU+ySVmwGSfNwBnNHx0c48RSyqZW4oNWZmhgIF/l2F0YmLG5DW +I6yhomipd/6cwDU3ls1fqd5hYv62IZ/I8TD9Ok+uxiYdGSfQFe36Iy09+KmyUKldqSA gPeQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CoDIdmAR; 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 v14-20020ac8578e000000b00432b953060fsi3839448qta.651.2024.03.29.15.22.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Mar 2024 15:22:07 -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=CoDIdmAR; 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 1rqKan-00059G-8u; Fri, 29 Mar 2024 18:20:57 -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 1rqKak-000588-Gg for qemu-devel@nongnu.org; Fri, 29 Mar 2024 18:20:54 -0400 Received: from mail-pf1-x432.google.com ([2607:f8b0:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rqKai-0001qU-CW for qemu-devel@nongnu.org; Fri, 29 Mar 2024 18:20:53 -0400 Received: by mail-pf1-x432.google.com with SMTP id d2e1a72fcca58-6e704078860so2085719b3a.0 for ; Fri, 29 Mar 2024 15:20:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1711750851; x=1712355651; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=aXBZFu2s4VI4gx6Rv0AU3SgCaeiACnYHqJQpFd1hK8k=; b=CoDIdmARNX9vqrG7PCuHKbASUQSfwM8lwRwiE/l49KUiSqt3+NTdLTBCUxsQpEOMXX 8U6fLY/qdG3vG1LJeyHEVb51MPFVmcYO6SOXWXPv743Em3DgAcZ70WbAc9aYiHGqRaKH 0F6uFQ+5RkjZkiWEzsCEDeSQJX6RHtnxy++BQ1gqHT3tdFP1EcUFVE1w3dbiANTMm526 W2duqXeBG5vpOPAIZOGV+hIPa+62zVx+LFPqBQnOW+UK9lDfs3Ndmu5W+62KMj4e3xgG n+CI1cn01JPMUH+uR9yh32hDHXzI8JlO4gC0gKH+Nukv64bLGOzUoXaIgaUWw2tVs2p7 xcJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711750851; x=1712355651; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=aXBZFu2s4VI4gx6Rv0AU3SgCaeiACnYHqJQpFd1hK8k=; b=HTgm1ud5c0FeRA74Qwwdjg9hqo2I6gqAGPwBYbbynG3pP2cLhWOK+LYkF/zK3F0qeV aVVpTmLZTUqXfaY5ekPDHMekvqglAMq2RVHA4sJ1phvYUX0DfjmYxcPXB4ARmqPLjKoz BFEdJe2YEuCH0i7v3zCNJMwE5+F2bY75J9Yzi1Srs1iiK/YD+CcVSjGWdkaahVLo1enf h5lyHIUP5Z+yqbwy46qZFUtlzguDWvgzo+OuA44cESXCeCDZI2AGWHetNaWsjyukir9r bIVkj0LN052c3C/xnuHul46t3rjTTNPDzYPyOm6DKZf6+3OoZYCd/l1lrvJyR7YMhm7h lQ9g== X-Gm-Message-State: AOJu0YwEysyjLq5WDotDLGMyVwmhXaJNjjGe/XTSMbiP/JElyZf5zQKQ k6x78ood7d4djLiylvK33Z5VbPOT2Vn9Ip4cDsEFdDyI1qaDL/FYxaLQ0f5beuFDnYS7W6v3eIb / X-Received: by 2002:a05:6a00:4f82:b0:6e6:970f:a809 with SMTP id ld2-20020a056a004f8200b006e6970fa809mr4312957pfb.20.1711750850944; Fri, 29 Mar 2024 15:20:50 -0700 (PDT) Received: from stoup.. (098-147-007-212.res.spectrum.com. [98.147.7.212]) by smtp.gmail.com with ESMTPSA id lc24-20020a056a004f5800b006eaacc63435sm3579811pfb.173.2024.03.29.15.20.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Mar 2024 15:20:50 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 7/7] accel/tcg: Use CPUState.get_pc in cpu_io_recompile Date: Fri, 29 Mar 2024 12:20:37 -1000 Message-Id: <20240329222037.1735350-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240329222037.1735350-1-richard.henderson@linaro.org> References: <20240329222037.1735350-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::432; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x432.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);