From patchwork Wed Mar 1 02:56:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 657741 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3269314wrb; Tue, 28 Feb 2023 18:58:12 -0800 (PST) X-Google-Smtp-Source: AK7set81hYyrgAKgDU2Ps93R0AkWGOOvk76XH/vZNLiXqMd0Zj+vIMBKYCyzR75DUomjJcxySM3e X-Received: by 2002:a05:6214:2aac:b0:56f:8a99:1a64 with SMTP id js12-20020a0562142aac00b0056f8a991a64mr9764869qvb.4.1677639492489; Tue, 28 Feb 2023 18:58:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677639492; cv=none; d=google.com; s=arc-20160816; b=ArMPK0KWdvQwuFGlEQW/G5Yfzl4nMGLevkMsx6kyifz4/MtVRXLtdwhaOGLUkZP/4p G5pOjngvdg8PndxQ+m2oD4tdsdfyTUmhxEdhANwz4vp0NErxKPIG/Mnb3lHVs5dR1zH9 QqBYBAmIWgbbGONqypRo60HmkFMyratP7j6STOBOzy/jofVXxG5XVIhXl6X+YEvDMLlI i32jytrEY6A1kQRy3QJ5yIqo3C7yCxFm65g8alt/XVX+kh+b2RnFmaPdRLZQ0hXZOP8R M7KaYtYFqVHvmSQNkQ+yczB8DIxMprXsS9MiZ2jCIuTV06djW9Ym65xRjFd3XbrwkShK J/+w== 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=/m8reQ6d63n5J7x5SOdeVqARyO51vY+vuD9/Ai3rS/U=; b=WTtfxcZHPmBOLZwe0fCzODmEipLETSq1/ETb+aaaiUbX76Xubx5RL7IlLS9OQgCJUt OwaPq0pM2DfrrTZkQC9NAyip9nKRIcrsKLrS1aBhjsWeGCKHHMDS1l2c2VhHkd+GfSn9 kYV9pk3H7k+W4YhDVi28oKljX31NmoH9h++OI46hcbYbcW8KxcZqjFI5Iqsf/xi638O6 PYimRQ4ZS2wFA8epf7rFoCscjYKkUZ+4V0q6RhfCL37JCTYoSCJuKJC8hPK0to43+Iz2 5cTNCwK92ry25ZpwvoMUIQqAaK023Cbt3BYY8qdSqk6WmThoPOD1MMgtuxsSIDFGU5bh 5t0A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UJ9bP594; 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 r4-20020a0ce284000000b0056ebe4b500esi10369755qvl.48.2023.02.28.18.58.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 Feb 2023 18:58:12 -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=UJ9bP594; 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 1pXCeo-0000uh-6T; Tue, 28 Feb 2023 21:57:31 -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 1pXCei-0000TW-RI for qemu-devel@nongnu.org; Tue, 28 Feb 2023 21:57:24 -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 1pXCeh-000353-7V for qemu-devel@nongnu.org; Tue, 28 Feb 2023 21:57:24 -0500 Received: by mail-pj1-x102d.google.com with SMTP id x34so11955147pjj.0 for ; Tue, 28 Feb 2023 18:57:22 -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=/m8reQ6d63n5J7x5SOdeVqARyO51vY+vuD9/Ai3rS/U=; b=UJ9bP594F+R6ihm63aQEqwakT24khgxs9zjuKjnl2UVdHwY0/mirCuu5Xb4T0O0spl AjfeAw3Ov2JeaDzrc4rCFNaRJB1NNndyqhunvcK1+pr2SGSIG4ZRpHvQt+jbfRdMKfb5 U7sS2zkuqOY201wxnjRLgvgV6gYeDIUuQpux4JiSSDc7wk8fsSugSsW300Aa010RKUkO CsPfc9PQHxxufYUany4PzKLyvOQatsOWZdwUY5vexjyJudSIWiN7uuHgFeAnuv6y32bg R/rfkDAYrwA8z3mzjVOiquXP+VKm8ZHNIC/pWYIuDHXAXE9+pYJ5+XKoXKube3Cserqc CWLg== 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=/m8reQ6d63n5J7x5SOdeVqARyO51vY+vuD9/Ai3rS/U=; b=1KTVf4C8Jlkd6IAXHn4xzg5OakwYHZM0yqdbcSt9XQWbcifpDwARqNILXho8W8UA/F Fd4iSvcOoeJZZp6SdpifCfqCyZwGkGn6YPq6hz4nXEZMgDn5cIxH/ZfifwbtG6MnBwMP n5T1WQjpgWcDEuJovkc8rGZaW3vKvLd+JhZhvY26ynOzFbjstyjYMLE/BVFJkI3qccSB wgSH7FNSi2tiBg8xjFFkHXnH5IHmMT6WcIkcrLvZhRwMzL17h4Atnq7BPT/IQ3g9bmup KVbMKSe4YFQOjZwimrTmFffo8KNC7cXbo2VgqSmc0j8nP50kqtBFHr5kzkCxPR6QgcQS jnYA== X-Gm-Message-State: AO0yUKVeCQ8ZTVTzcAoBbmVuV5/emQZAsfiezN7aaemZzs6fKtVsfC5S DRh9UQgY5qqXGW4qYRyOBLA+k2K9r3nZsIz0pjw= X-Received: by 2002:a17:90a:1a48:b0:239:ea16:5b13 with SMTP id 8-20020a17090a1a4800b00239ea165b13mr3951428pjl.14.1677639442473; Tue, 28 Feb 2023 18:57:22 -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.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Feb 2023 18:57:21 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Anton Johansson , Palmer Dabbelt , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 21/62] target/riscv: Replace `tb_pc()` with `tb->pc` Date: Tue, 28 Feb 2023 16:56:02 -1000 Message-Id: <20230301025643.1227244-22-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: Palmer Dabbelt Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20230227135202.9710-18-anjo@rev.ng> Signed-off-by: Richard Henderson --- target/riscv/cpu.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 93b52b826c..9eb748a283 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -34,6 +34,7 @@ #include "fpu/softfloat-helpers.h" #include "sysemu/kvm.h" #include "kvm_riscv.h" +#include "tcg/tcg.h" /* RISC-V CPU definitions */ @@ -533,10 +534,12 @@ static void riscv_cpu_synchronize_from_tb(CPUState *cs, CPURISCVState *env = &cpu->env; RISCVMXL xl = FIELD_EX32(tb->flags, TB_FLAGS, XL); + tcg_debug_assert(!(cs->tcg_cflags & CF_PCREL)); + if (xl == MXL_RV32) { - env->pc = (int32_t)tb_pc(tb); + env->pc = (int32_t) tb->pc; } else { - env->pc = tb_pc(tb); + env->pc = tb->pc; } }