From patchwork Wed Mar 1 02:56:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 657758 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3269603wrb; Tue, 28 Feb 2023 18:59:18 -0800 (PST) X-Google-Smtp-Source: AK7set/3kASVvYsEyO8LPUh4BE5DK2+W1QkEUbAiDZZ7i/tfrNIdgo7yk1W2v4a6qfvqp5mPZAW/ X-Received: by 2002:a05:6214:d8d:b0:56e:a7d9:b132 with SMTP id e13-20020a0562140d8d00b0056ea7d9b132mr8615683qve.22.1677639558703; Tue, 28 Feb 2023 18:59:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677639558; cv=none; d=google.com; s=arc-20160816; b=07n/MZCV+BmhLmPSpSRyrokEDL46TI85ims9B0WKn9FE1x6IhfqKwRZTYw/7gRZDuW iA/HkdkDrJf1VmLu5wyK+FdjLcwNtdIttCtXpHLnsTZuuytVdBT5cg4kvt2iDn7nB8gM +Ar6hvtjInh7tIdoOfXHWtxhNOYXn34tB6z3QoOYQ4HQkltjypFVKoZwgP7EkH3mflTH buZ2oLOHy7QNt0wgfwmFdozmN6yeTWAKRmpFh14fYFlCW8KBZV4GnfipsxKJJ0gGjMUH PzZ3kUr6ao2FWHFWUFxinUXUorYsa1Hvg1irCFT/JSUsBu1tAWvTYchBJeIhDL260w7i rVnQ== 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=pev3HlA4TjnFMH1XzD5ACqNnlxKIz9B0EG7wVEpD4Xg=; b=dY+uM11A0ioUsX5npfT/rfCRCrVUm83U9YxEbB9u9erjVfmzd5iDKhJhJAmBMcicWK V3QVDqUJOTCInAZRvczvgyZPRihS95rvIcRBmbxboGALXM7zrUgtxU5yoTfG7DHoY0eA MBoGP9g3hZScvN6jkXPUANLB5qXV1UZTW5KCJ3EW4AYyLEUExnF+/STHTRUTDzdquC50 oXYkXkoHUsnWfebj2zsRnYEQlsSj0F0go6IqpOftVc6YRf4xrzUhqsTjKsAhEFP7Amd9 H7NUNf9XEFhL3k0ttKrbutV+aPyTkyc5eQYTu+1ykvFRK2mRosAyRDVe6vyGGArbayIH e0rw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RuGcI1VW; 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 k2-20020a0c9702000000b0056e97f3d1b0si9525569qvd.59.2023.02.28.18.59.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 Feb 2023 18:59:18 -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=RuGcI1VW; 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 1pXCf2-0001R1-Sn; Tue, 28 Feb 2023 21:57:44 -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 1pXCen-0000ym-WD for qemu-devel@nongnu.org; Tue, 28 Feb 2023 21:57:30 -0500 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pXCem-00033e-Bu for qemu-devel@nongnu.org; Tue, 28 Feb 2023 21:57:29 -0500 Received: by mail-pl1-x636.google.com with SMTP id u5so9163592plq.7 for ; Tue, 28 Feb 2023 18:57:27 -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=pev3HlA4TjnFMH1XzD5ACqNnlxKIz9B0EG7wVEpD4Xg=; b=RuGcI1VW2D62HeMww7WpZ3D/lCP7CaFk+PhadupZU94LRiQz87XAZF2Coa8BBAYKRo nLocnCmlGm1rw5r9pS72rr1j4bb1hbF5aP2t+Li+6za99jnEmI49/gnSkhbvIZIfJD2g 5UHPT4tVHpX/5OQ+NdejXhlNrXALC75i71CwWHP2G6u0MczB+nr7jAcPy0ebQlVoiVTZ 5eMqClrRizX7iLR4d88Qhn4txpm6t4xJR+p9WYZbUMwymhx3ojIhzcLxNuPlmfn9Wi0v b04RWstMXQHV6E8Tpu1jD1eKm6qHTsB4OIs+kVGorwmLZmhN72YY7kaRza1AQV/WPnQy 6fiw== 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=pev3HlA4TjnFMH1XzD5ACqNnlxKIz9B0EG7wVEpD4Xg=; b=ETjniHMsrWwDvn2gRDey3wfTTRg8pFu7AKPlm1fgkIR1UxGrf+9qWclNPvwW/HlUpQ 82oKenKMtTzitu9x9k6Q+Mt/W7aIhchlj4wGtUrNZFDp/Ou36u2LjFC3Kg0wSn50O0Wp WHjP/a22miKgPhvsLsuM0FsDy2d9hpOF8sw3+24szVC9xOoqCct/+MfowPdBNhzCXz3d lnIgyof5KmgKtSjR7ej+8G138y8sSPhWKB72BIhS9Nli+2yW9c/zDSF8XtIdRDLv8nxt hRnTjVE+Jq+wpoMBVN5iRjszQbTWRUe3rqTMaczPXOYKUzjxOeChXqDc8+QClxEQLAt9 eyfQ== X-Gm-Message-State: AO0yUKU8xpmfRWV6aa6IEJSzqRgOeU1jL56XCkS7EEr3UlRqlnlpbX+6 a9Nz3CXF3Xf2lbCIPf2aGxGE5zlqbMaqED6XitE= X-Received: by 2002:a17:902:d507:b0:19a:96ea:3850 with SMTP id b7-20020a170902d50700b0019a96ea3850mr5864320plg.17.1677639447599; Tue, 28 Feb 2023 18:57:27 -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.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Feb 2023 18:57:27 -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 24/62] target/microblaze: Replace `tb_pc()` with `tb->pc` Date: Tue, 28 Feb 2023 16:56:05 -1000 Message-Id: <20230301025643.1227244-25-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::636; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x636.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-21-anjo@rev.ng> Signed-off-by: Richard Henderson --- target/microblaze/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/microblaze/cpu.c b/target/microblaze/cpu.c index a2d2f5c340..03c2c4db1f 100644 --- a/target/microblaze/cpu.c +++ b/target/microblaze/cpu.c @@ -30,6 +30,7 @@ #include "exec/exec-all.h" #include "exec/gdbstub.h" #include "fpu/softfloat-helpers.h" +#include "tcg/tcg.h" static const struct { const char *name; @@ -97,7 +98,8 @@ static void mb_cpu_synchronize_from_tb(CPUState *cs, { MicroBlazeCPU *cpu = MICROBLAZE_CPU(cs); - cpu->env.pc = tb_pc(tb); + tcg_debug_assert(!(cs->tcg_cflags & CF_PCREL)); + cpu->env.pc = tb->pc; cpu->env.iflags = tb->flags & IFLAGS_TB_MASK; }