From patchwork Wed Mar 1 02:56:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 657762 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3269643wrb; Tue, 28 Feb 2023 18:59:28 -0800 (PST) X-Google-Smtp-Source: AK7set+lDsxznA0KCkZDcf1ukcB3F/DRzqFW10YR20cCb2TO2zFIfwuLEMlGS7B08JuqcDL/n0JI X-Received: by 2002:ac8:59c9:0:b0:3bd:156f:6666 with SMTP id f9-20020ac859c9000000b003bd156f6666mr8896828qtf.26.1677639568336; Tue, 28 Feb 2023 18:59:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677639568; cv=none; d=google.com; s=arc-20160816; b=m8N+a6c63AVjzMRjYpJIxeGZ9RVI0hZb0oS1PWZ9fIOJdE2wlmKaN7NfPOkZqL0xlD HDlx3Z2j/aPXh00yZF/nh5/6j8GyHFX4+5Mi9nXX1+HXYLcVrGIbKYT5LkLhNtEklYa4 gaKcNIQUTpG0LhNaYwkbDuuVo+PZOf5/ezLpvCD2AFNS+dWm4l2Tl4D2wcqNcYW49nk+ 0XgeiJGnWEImocS9gRatrUFoJsEedgXIAoRMyQkQwkgfBG4M73GCU+a7qwfcfgrYZ9lm AVl1B290CHd2Mqc95GgVN3HfsoS4aWLHdDvKWzLXIp0vOCQMKl5zLsKlaeLMLjgalVfb IU4Q== 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=6gdCFmDPKfs8EJLeaCLXwTHbx4v/g6J2Bq4Q6QAK+Es=; b=TOJr/PT4CqZVuIkDzELWrvpgvfa2eqDIJElR+oHeqbSXi0jXgKYEmpyfn6sq+qP75L W3UGvOs9TEJQbtjzJL1xhg7e+hRmzNukWW1Ec7f+hJidpTQCPn57ylZBI4rzNmtSvF29 I9DWpUfc9Pmv1nHyqULGMjqMzlhltVpfQA1NlPxXGT8pLmtEXfTT4wIB/LLdrZgttmKN UDwjaTN9UsmHumXOGqVJyYcyvFxH0/XhWeWVa6CoQR4fuYxF7/w3w5cybRK52EWti3LZ EYDadXgtpvFFIKKiHkBOenAhOKpmEkSHO+X8Q+UDIE+lyD5AA70c/zgvKFz851z7O9T3 Yo7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ShtPk+bW; 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 m13-20020a05620a24cd00b0071f7ccd8119si10914373qkn.461.2023.02.28.18.59.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 Feb 2023 18:59:28 -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=ShtPk+bW; 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 1pXCex-000183-0s; Tue, 28 Feb 2023 21:57:39 -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 1pXCek-0000ii-Mw for qemu-devel@nongnu.org; Tue, 28 Feb 2023 21:57:26 -0500 Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pXCej-00036T-2o for qemu-devel@nongnu.org; Tue, 28 Feb 2023 21:57:26 -0500 Received: by mail-pl1-x632.google.com with SMTP id ky4so12589671plb.3 for ; Tue, 28 Feb 2023 18:57:24 -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=6gdCFmDPKfs8EJLeaCLXwTHbx4v/g6J2Bq4Q6QAK+Es=; b=ShtPk+bWJdK5FdNSNGSZ9tynJsOf+KmMugFPkVEieWoKSaOhwhquTz977LoRASptK5 58aWdMlLvZxVAmz9hXgXODZZxncStHRwkvqMuz5nxTnvFN/lOKJ7rLcUUoMBJvjjykHR /oY8k5lRCUtBCmuInZT8DVZ2Qlw6+fWdE9jH/c+MrQzMhGSlGBpvzJRyP8XFJ+NWFYK7 zjSmyh8c0uIxBDBXsHU9iJDYF8aQiQnMnnms5rFsuL+aCS+jB0vn+yrZKuixiUhlGe4T z6+pY8ijYl2diCrZCRg5kIqm0nNunxP/xvvZlrbFq9opNnELmyrwDrSL7bRd5WhAaAh2 QImQ== 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=6gdCFmDPKfs8EJLeaCLXwTHbx4v/g6J2Bq4Q6QAK+Es=; b=b37o2+KVjRII+5o6gBWh0+9AZCpDd1gmMiKNmgR1uYwRIf9rql280DyYmE/GQyW+Ok aJ8USCRIWSs068FkHEGcn3Kwe9QlyUj6Edyo/YvmTRimGV52O7tgFXRxIXtPhdT9ZAzt F+/j8xQtJkbCtymCbzuNNllDrI+ELg/7pbFEp3m4/m3hq5ti9n82NLsYoNpx9xWLsMCw /msHkpjnmJVBIdjbe5IXW0TeRK5M67UbZDAb3jy+f3GWZsynEmon4VT+UeG2M7PUpOJ+ U/RMqBDC/aSWbXOtIWvnwPoWd3xrPpMzsxOfQaBQSJ776Vxy+8HTnlXZXbD7UA8A+uNn V8dg== X-Gm-Message-State: AO0yUKXRMxY7anh1a6lu3ElLnH/v5QZaI34lzzY1qr2HcNrohG81HlZu RbJ6gYo90r+zzZUw/CKp/KnSI6YjU8OpbJNoNsQ= X-Received: by 2002:a17:903:2804:b0:19d:f63:3df4 with SMTP id kp4-20020a170903280400b0019d0f633df4mr4274080plb.13.1677639444316; Tue, 28 Feb 2023 18:57:24 -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.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Feb 2023 18:57:23 -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 22/62] target/openrisc: Replace `tb_pc()` with `tb->pc` Date: Tue, 28 Feb 2023 16:56:03 -1000 Message-Id: <20230301025643.1227244-23-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::632; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x632.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-19-anjo@rev.ng> Signed-off-by: Richard Henderson --- target/openrisc/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/openrisc/cpu.c b/target/openrisc/cpu.c index 4c11a1f7ad..0ce4f796fa 100644 --- a/target/openrisc/cpu.c +++ b/target/openrisc/cpu.c @@ -22,6 +22,7 @@ #include "qemu/qemu-print.h" #include "cpu.h" #include "exec/exec-all.h" +#include "tcg/tcg.h" static void openrisc_cpu_set_pc(CPUState *cs, vaddr value) { @@ -43,7 +44,8 @@ static void openrisc_cpu_synchronize_from_tb(CPUState *cs, { OpenRISCCPU *cpu = OPENRISC_CPU(cs); - cpu->env.pc = tb_pc(tb); + tcg_debug_assert(!(cs->tcg_cflags & CF_PCREL)); + cpu->env.pc = tb->pc; } static void openrisc_restore_state_to_opc(CPUState *cs,