From patchwork Wed Mar 1 02:55:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 657743 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3269366wrb; Tue, 28 Feb 2023 18:58:27 -0800 (PST) X-Google-Smtp-Source: AK7set8XXO7XcJI9YAz8MP6O8dC3vAElWadff6fcCCREHOt6ybGqaz2ORearWEt99gZ11WBnPn4H X-Received: by 2002:a05:6214:21e7:b0:56f:6f5:502d with SMTP id p7-20020a05621421e700b0056f06f5502dmr9673422qvj.17.1677639507218; Tue, 28 Feb 2023 18:58:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677639507; cv=none; d=google.com; s=arc-20160816; b=01DtKLDiOu7UOw3eQXMcaIGrIh41YqVEBl83XwEmEpDEHYq9V/SPG1GatwJ4qFxoPJ b0Y0gs8X520Teawi4Fcciw1ErNLduiTvPQmDs0rGlqmxCHQ8Ua+p4/TCXpBEGFUJ9F8X v0gpvmbRqysdBKPvzDjWNcOI+h9k9CyTFXv3M8q+NKDEh9WVbhJ1IGnAZVPGjCvcSYQU 6QdCHwp1v6vVes9e5ZhE8vblAtBo1U0R1SAUBhm/v+XL1jUB7kizhJZL5GcwHjbzXrJT 0SpLt7JHdp29rNFDDw657xQJkksZFioi9/7jZz1FylXr7eMmefHEwatPy2zBC9pKJS54 1yeg== 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=mOi2dZWOde9c7ZDVnk7YacZ1zzYK1AJKpJYah+w7IsA=; b=b8b9vUd/pXck1FkgiJ0dK+vy2cvzQ4hjxNtFAmMW0Gyw6S6d7NGnCMq7XGGOADiLTF qTsBRboN7jXfLP3H6GAsFngIVjO5ERvs2ZmKDRWFZqyvJAQNsjQcbmF/7vV3y/dIPqKg ovm4qktd57ceBwxMKZEhBeuida3X71OxN0zmE6eJaW6XQqvllz+or6ELjOd2LfVMJwTo a8P0HYVipqGuzyDYrzoo7XhZSwOWIDIpazp1szoOpN38X/S2RLaSAToe7vY+xAvfkLw0 k6CUovpJjDqZubf8R2uetoeznfuf09KYTntwTnpecKOveMwVkcOcRHFeMgGiD68DhadJ +WQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qHPpHxMt; 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 w24-20020a05620a0e9800b00720ae1605efsi9656466qkm.68.2023.02.28.18.58.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 Feb 2023 18:58:27 -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=qHPpHxMt; 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 1pXCek-0000hC-GW; Tue, 28 Feb 2023 21:57:26 -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 1pXCed-0008Vy-TK for qemu-devel@nongnu.org; Tue, 28 Feb 2023 21:57:20 -0500 Received: from mail-pj1-x102d.google.com ([2607:f8b0:4864:20::102d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pXCeb-00031u-Ii for qemu-devel@nongnu.org; Tue, 28 Feb 2023 21:57:19 -0500 Received: by mail-pj1-x102d.google.com with SMTP id y2so11898323pjg.3 for ; Tue, 28 Feb 2023 18:57:17 -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=mOi2dZWOde9c7ZDVnk7YacZ1zzYK1AJKpJYah+w7IsA=; b=qHPpHxMtt0DNyTW2DRoD+Owia7RqeQpqo5MTXdzZqdA2pR8Q8OQ5gVHK1766Al6MJK SW6gKsglS30ep/IQ4GhTNWWYy4TC1tqu65Bs7ZP6rvBi/kiR62d5QNGKQ4glCP8t2piS RfHCKFan5sq745fkvwBaGkww0yd1bvmIbwpRvAX9VKvb/iJM8xUTEAlMNJinyKjsGDAV q/blhdF6qNtlKzS/7m5rICBJbXYCEahBhE18tugnaivirMylNprZgSpP7rgIAlrB5tOf hnZX67jon44Fa1NB/q0htj3mJCtqZ7OTWil7TmdLNic9gmE+lhDzlHOt+HVHWElVHo/1 Mffw== 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=mOi2dZWOde9c7ZDVnk7YacZ1zzYK1AJKpJYah+w7IsA=; b=X31m7p9ASEc7uSPEWEvYIlsjLRpL1Ls0RD4t51wVUtgKhJ34qe/n6kKh72b3fk5Z1W QVobEjM6lnrks/5mUqVo4sj/h3Z5DvG3M2Xrw5rWB2WyAzYSgBCAlsXcoliQQKk19Frd 0XKO2xa9n41wISyxEcFukBLVUdCc48D8o7oS58iBBvDAbW/UYO3CUeZck1d22pf4SWXM ZzgHc3NhHo7wGZ0q77hWUcKjst35Hq+JL5Afl5hasgwg7vRlcBqdGmwHEapqAbUSPHTJ 6/+ItOCOFqPW0BBVvxDGHHDhAFR7zoydZYiRlaXCB5WYTawjF3Cr5nFh+dYngZIYaSSs otIw== X-Gm-Message-State: AO0yUKXtLSVtMwansvpWDzAkabjpqgmGMiNljSONHHUN80iuUUwiwr5M QBmEWZWYUR/FcTNVGsSYmvMBWnIG9TFYGNINGko= X-Received: by 2002:a17:902:e883:b0:19c:a9b8:58eb with SMTP id w3-20020a170902e88300b0019ca9b858ebmr6091022plg.12.1677639436726; Tue, 28 Feb 2023 18:57:16 -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.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Feb 2023 18:57:16 -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 18/62] target/sparc: Replace `tb_pc()` with `tb->pc` Date: Tue, 28 Feb 2023 16:55:59 -1000 Message-Id: <20230301025643.1227244-19-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::102d; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102d.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-15-anjo@rev.ng> Signed-off-by: Richard Henderson --- target/sparc/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c index 1734ef8dc6..e329a7aece 100644 --- a/target/sparc/cpu.c +++ b/target/sparc/cpu.c @@ -25,6 +25,7 @@ #include "exec/exec-all.h" #include "hw/qdev-properties.h" #include "qapi/visitor.h" +#include "tcg/tcg.h" //#define DEBUG_FEATURES @@ -707,7 +708,8 @@ static void sparc_cpu_synchronize_from_tb(CPUState *cs, { SPARCCPU *cpu = SPARC_CPU(cs); - cpu->env.pc = tb_pc(tb); + tcg_debug_assert(!(cs->tcg_cflags & CF_PCREL)); + cpu->env.pc = tb->pc; cpu->env.npc = tb->cs_base; }