From patchwork Wed Mar 1 02:56:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 657770 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3270482wrb; Tue, 28 Feb 2023 19:01:39 -0800 (PST) X-Google-Smtp-Source: AK7set8ZqWvYwb3xmWwDQ5AFpia1KcXFad3fg3pMMixG0AYy6HDvEB8qkDDmL3o8b0yp5q5Gi81/ X-Received: by 2002:a05:622a:14f:b0:3b8:6aff:9b58 with SMTP id v15-20020a05622a014f00b003b86aff9b58mr8470146qtw.35.1677639699119; Tue, 28 Feb 2023 19:01:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677639699; cv=none; d=google.com; s=arc-20160816; b=zqmr70Yw+aaepD3MwiwYoutViZEAfnFFl6FNJ3PaikuDvw3egYOWBshXryjK3HxoUg hxVMDR+TVwwZhHpSnAke66NiOmZWdXYxgsGyVi+LqWHRcKHw1pskHxYjjskAIM06rruV zoSiZ7QDyW2W4w6MjqywWrZI0Zek3Dn/UiKC/W00ZJ0M8HVVZJ3QM/x0ws/MRSujD4jI OXjVkb/IN1EJVpowSgdnS+l+2naUS6s5EW9tKpwG+sQLhVgUdqlRm3F/gIhPMPs/5lZ0 jrZU6yw6ngYYGOZglBRyLSUDDpZLZcaJVjbN2uIC8ilwau9Y8jniGNuvOqBrGw4yo/Y+ gyhA== 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=p9Zl/72jqCv6b0jcueBEHeUBqu1bzp9c+AmvOSIfBwY=; b=wOwMl1agJlQOdYa8Xb7Ozk1uur5bN4H9cqmBW4P2LG9Cd5338Xfic8uPyOARU7/7Bh dI3huO0sj7GCQJb4xuR/e9+9N3fTwavujobf3h7iYMUkjKNdeNZm6looKdhYOJqG4QuG QPyoKeskr6n2WZ1BGfztd/Tq1Az/uvvHbOX4Xbtix0el6qptSevEUhJsAtpVNvdxiyhB 2Cm5A9YPeaOuvL1t4+2t62bxJZD6VFGJ+mMfxZyXuDUvfUDNUryI8Jr/j0ZZYND6AaCH HusmLPg0Jz6w3whsL/d2XmLdBHY0b0LXvdKxkgj473qCq22j2wpdhpHwkp4ZF/Fpbira RhVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="IbT3lmf/"; 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 u14-20020a05620a454e00b007426edae8d9si10567946qkp.595.2023.02.28.19.01.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 Feb 2023 19:01:39 -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="IbT3lmf/"; 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-00019r-7t; 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 1pXCen-0000sf-8c for qemu-devel@nongnu.org; Tue, 28 Feb 2023 21:57:29 -0500 Received: from mail-pl1-x62c.google.com ([2607:f8b0:4864:20::62c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pXCel-0003Ez-Kd for qemu-devel@nongnu.org; Tue, 28 Feb 2023 21:57:29 -0500 Received: by mail-pl1-x62c.google.com with SMTP id i10so12543876plr.9 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=p9Zl/72jqCv6b0jcueBEHeUBqu1bzp9c+AmvOSIfBwY=; b=IbT3lmf/wW2/PcQGpqdZboGaMczkKuvNgA5QMZKS8CPxYB858sukbywVLvNQlInMgV AyAFL3wmAW3xHo83tNVuPIlC1OKMMsakqvh0OCFJcpPtZvEDjgqZlpxgNx0usgd0lved rpFVftqLlDnmzN3Vw41oZn0Q12+AIYz+B32R4UDJdBIA95gg6ccnUTj1t+trKCOiPK+j fAC4OKxETdlDUGyarSqZaVQfN8p32/clvGqrw6WrllclXHGaTkv2X+bPwx6BU11mhkQ6 o98W+tQ2H8mxxlyFIB0QQ/0IslB46OVYnLLiSKZ9/4aUKDhDiNfnOpW4Nu5NJXe7ej0E t1qA== 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=p9Zl/72jqCv6b0jcueBEHeUBqu1bzp9c+AmvOSIfBwY=; b=7DDdGBw2EUVe+IMQIVFhDwdCW5ca7JTHJ79r/okFdps+hYswbHjNEuAflpMm0/g/Lz 7xPhdcPv/XJpz5HoTTlBSjc9o1/OIGf7/NCHJ9ub68zD2IB9hxPnqWg530Dvx/w7nrTx yZHtusrYm9h0CXN5+0/pndKuYBnD1dbKva/yoby0zQxCfw9FGjSy3HqO3zG5LBRqvGwc HG7Tg0tPfUSHrzoIzcGaXPPgfSEl7rjGpcX6B7Ke5Ya1RgWQnCOVgWcXNnoF4UhNa8dM VpVIab1aHGzKYW1wvspxyKNfcy2zK5weGICiWckxIz3O/sJwhe9+3sUJhTo26so4WxiW vj4A== X-Gm-Message-State: AO0yUKWgZ5wO4WFZHwviopEJgLOlblg2N1vSLtqGJemuGJzUB4jhya/G 77RlXU8iHCcVk9le1Yk4vxkQYe/b/dOfQkQTGnQ= X-Received: by 2002:a17:903:24d:b0:19c:fd73:5586 with SMTP id j13-20020a170903024d00b0019cfd735586mr5645858plh.38.1677639446090; Tue, 28 Feb 2023 18:57:26 -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.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Feb 2023 18:57:25 -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 23/62] target/mips: Replace `tb_pc()` with `tb->pc` Date: Tue, 28 Feb 2023 16:56:04 -1000 Message-Id: <20230301025643.1227244-24-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::62c; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62c.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-20-anjo@rev.ng> Signed-off-by: Richard Henderson --- target/mips/tcg/exception.c | 3 ++- target/mips/tcg/sysemu/special_helper.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/target/mips/tcg/exception.c b/target/mips/tcg/exception.c index 96e61170e6..da49a93912 100644 --- a/target/mips/tcg/exception.c +++ b/target/mips/tcg/exception.c @@ -82,7 +82,8 @@ void mips_cpu_synchronize_from_tb(CPUState *cs, const TranslationBlock *tb) MIPSCPU *cpu = MIPS_CPU(cs); CPUMIPSState *env = &cpu->env; - env->active_tc.PC = tb_pc(tb); + tcg_debug_assert(!(cs->tcg_cflags & CF_PCREL)); + env->active_tc.PC = tb->pc; env->hflags &= ~MIPS_HFLAG_BMASK; env->hflags |= tb->flags & MIPS_HFLAG_BMASK; } diff --git a/target/mips/tcg/sysemu/special_helper.c b/target/mips/tcg/sysemu/special_helper.c index 3c5f35c759..93276f789d 100644 --- a/target/mips/tcg/sysemu/special_helper.c +++ b/target/mips/tcg/sysemu/special_helper.c @@ -94,7 +94,7 @@ bool mips_io_recompile_replay_branch(CPUState *cs, const TranslationBlock *tb) CPUMIPSState *env = &cpu->env; if ((env->hflags & MIPS_HFLAG_BMASK) != 0 - && env->active_tc.PC != tb_pc(tb)) { + && !(cs->tcg_cflags & CF_PCREL) && env->active_tc.PC != tb->pc) { env->active_tc.PC -= (env->hflags & MIPS_HFLAG_B16 ? 2 : 4); env->hflags &= ~MIPS_HFLAG_BMASK; return true;