From patchwork Wed Mar 1 02:56:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 657747 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3269478wrb; Tue, 28 Feb 2023 18:58:49 -0800 (PST) X-Google-Smtp-Source: AK7set+7SWIENf0p9ETmF/YUU9CZMmbkswVRbE8lOrFsHMFSF8+ljGQV3UVTcQKNfidnEGcGdxxo X-Received: by 2002:a05:6214:629:b0:56b:ec1f:db0d with SMTP id a9-20020a056214062900b0056bec1fdb0dmr9383416qvx.34.1677639529372; Tue, 28 Feb 2023 18:58:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677639529; cv=none; d=google.com; s=arc-20160816; b=ibohRk+ERkjFYSbX32MIjveeBgKRjNDnDq6IK7mesn/PdbiBByRM89yk93Bu2mDwIy qsCVc0XEWEpCfywxmiZExSHquhp+yXtTt/SPJv/PX3AGq5r95CYl406oht6Ky47BU6xq ni5EfbVjQakOLby4e+pzrU4U7X7S9GQYN0Ljrwx7KMblR4b67jWIm5ahfy3uuVVBStYm AQkHUcjVkzhedRL/cZ3+xMsS01g68/QpFVLlyFBM3BYuvXBE1NTs3w27WdX7chAMwYkF mXps3IcrITbLAYvBD9CzqGJn2XvFEYLel3Rn4rQZuFZshIQD1IILXN+v9nRqPYqEH5gT Cmhw== 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:dkim-signature; bh=U5BXGBlt74DJJyoNslsOhSd2HGdWDnB0E5Y2PhUEbn4=; b=NPEB8iMqGlRqQ4cczNuXxI8zUf6nT41bjskqXV2xnBmCVB2ow+OWEerAl1O757bIe7 myZ09xf4kHo4HTxjGTNXMbZkBMr0bRQaz7rn9lSBn1sgh1xS0ieYPQ137RafM+d9KOS9 2eujNGHYGDXYPDFWZCl58QGpr63yg1RUIGa5YDb1RmlcPtGLXPoOSIsf3rmKXU8M7B98 BKjWVSMtVazvOWNV3XWP31DRiUOGbAzHtRAfRae8KK8nM6OaGeNZaSI+kvaA3n5zLQQ7 RrX0AGpTb55lhh8euVQhDhXmfEHhvpcjR7SZigAn7QCrFNt/s6IYTmFkyLLsyxa7p+G7 /YNg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=KOa1mY2j; 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 o14-20020a0cf4ce000000b005376f90927asi10244942qvm.440.2023.02.28.18.58.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 Feb 2023 18:58:49 -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; dkim=pass header.i=@linaro.org header.s=google header.b=KOa1mY2j; 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 1pXCfA-0002j9-2i; Tue, 28 Feb 2023 21:57:52 -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 1pXCes-00015F-FS for qemu-devel@nongnu.org; Tue, 28 Feb 2023 21:57:37 -0500 Received: from mail-pj1-x102e.google.com ([2607:f8b0:4864:20::102e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pXCeq-0003GF-IO for qemu-devel@nongnu.org; Tue, 28 Feb 2023 21:57:34 -0500 Received: by mail-pj1-x102e.google.com with SMTP id oj5so7940465pjb.5 for ; Tue, 28 Feb 2023 18:57:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=U5BXGBlt74DJJyoNslsOhSd2HGdWDnB0E5Y2PhUEbn4=; b=KOa1mY2jhcmQOyc7AdQjXdH8QE2LyRuTkJQ1iswaEkpMphxsEqd+ZAatGWOFCxXR4w Kk2gCQUF20d6fTGjojqLFnwrUXlHS+ihSjv99i09CwE6Kkqxujp106G4QteE4kseTopy WeqexNA/iquun2dc2WtiNxkHYCs0GzJbUamNY1EZabAJZOAJeCZOPGkIGPkFcNqsiWmK LukxCPefsHw/i2Drcuup3KkALF521hx6Y6hrhq0pPCh7z486oqsSXfDLPRZQ/VnouSSu v2RFMh2WYWz6y72QKRSkVg+PkulxBX1XxYNHnYlT/qg7vcbi8X9QP/wN6Hbs/5HalHUB le0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=U5BXGBlt74DJJyoNslsOhSd2HGdWDnB0E5Y2PhUEbn4=; b=gUiKdWNe+StvVhxXJbNybsqwHOiRvwiMsJPOWzwlRUWejRydjpp7qoqP8ynbIBpDBy 9HQoQx69zBD9kgZZ633j1Y8qFEGkK1fKStUzNmrigrV1X62njysljGe6pGoYA7+UD3Xg YfTqdHkxP+MEfemyxOgKVYa+LXcMQcYwB+4x/SBfdECyFdMZ2wIBCB9qo4S8aDnf951d Iz5nA+wj5tMcaRO5LfOKF7y9DwdWB0eW+YP9c2ZFwSH1mhNyK3LXyGgkXqTcxozFSC0O Auw6S02u25Z+mD7BhbMTxGsqOOuGHgKdFTTs2f/CkS6+v/KVSmBIi4HEWB3YKeNqpNTH I7GA== X-Gm-Message-State: AO0yUKUO+BGf502FZw6PUXTfy2wVraY/pNa7XmacIF15x0I1g/02HDHH c2P+RBc3iY8g39t0t6fmr6NgBdaBTegVdZ/yt0Y= X-Received: by 2002:a17:902:700b:b0:19a:e96a:58b3 with SMTP id y11-20020a170902700b00b0019ae96a58b3mr4350136plk.22.1677639451006; Tue, 28 Feb 2023 18:57:31 -0800 (PST) Received: from stoup.. (rrcs-173-198-77-218.west.biz.rr.com. [173.198.77.218]) by smtp.gmail.com with ESMTPSA id jg15-20020a17090326cf00b0019adbef6a63sm7210120plb.235.2023.02.28.18.57.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Feb 2023 18:57:30 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Anton Johansson , =?utf-8?q?Phili?= =?utf-8?q?ppe_Mathieu-Daud=C3=A9?= Subject: [PULL 26/62] target/i386: Replace `tb_pc()` with `tb->pc` Date: Tue, 28 Feb 2023 16:56:07 -1000 Message-Id: <20230301025643.1227244-27-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230301025643.1227244-1-richard.henderson@linaro.org> References: <20230301025643.1227244-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102e; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102e.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 From: Anton Johansson via Signed-off-by: Anton Johansson Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20230227135202.9710-23-anjo@rev.ng> Signed-off-by: Richard Henderson --- target/i386/tcg/tcg-cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/i386/tcg/tcg-cpu.c b/target/i386/tcg/tcg-cpu.c index c090ce152b..b942c306d6 100644 --- a/target/i386/tcg/tcg-cpu.c +++ b/target/i386/tcg/tcg-cpu.c @@ -52,7 +52,7 @@ static void x86_cpu_synchronize_from_tb(CPUState *cs, /* The instruction pointer is always up to date with CF_PCREL. */ if (!(tb_cflags(tb) & CF_PCREL)) { CPUX86State *env = cs->env_ptr; - env->eip = tb_pc(tb) - tb->cs_base; + env->eip = tb->pc - tb->cs_base; } }