From patchwork Thu Oct 27 10:02:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 619181 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp176186pvb; Thu, 27 Oct 2022 03:07:22 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6IBROZcVUjTuSM+l9Jj5TpGwqYMO1j3ghadHzIADFeiyz2HK/I7ehLNxuT96kdY+fh6PVF X-Received: by 2002:a0c:f84b:0:b0:4bb:92b0:3860 with SMTP id g11-20020a0cf84b000000b004bb92b03860mr7843543qvo.61.1666865242008; Thu, 27 Oct 2022 03:07:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666865242; cv=none; d=google.com; s=arc-20160816; b=rD3gE8PMTI/eH9yQVzq8PSAbgw6bVQiNCzx5yAz9gh/m8OdtWTOK1Sm4bIXG61hM7w cLXYwN6Zz9matZQ+rj9qJHaRyvODo2QNv+OA7dDO05bbk4gPLTMmUbMrHnt2oONdEaOL ixhKKLZvJxydDVE2WGUupogw8d9j04SWYcwd/fPA07c1gIHm/v3CGnS4+uELOh3TQYUO hDdu83jyiDXDNXfpy1vvYeLrj/T+dqABW/jPESAxYCsP0rpgNMLpnYAjL8qAs7WwY4Ow 5i0qtF+tbY7E4F3XnOxz7IIpei5UVB4ECUUbJLgV3Inu4slAT0VWsWWFdF1PLbqATYV+ gKKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=27tU7q4skqyWhNaj53PDReLhseNs0R74OdN+/vV4qx0=; b=EsHuPLbfF2br2JLfnTu2bGycI5nk+ujWFkP3k1VNDV7W92UT1Vv6rLQ6PMx9XffZ6l qP9dG+i3B7is5uedwwwPbZNaLbWBY9foyNzR4MKnf+LiiVSXap1rwnNhbUpQ2PA2Xtdt dyaXTrAzZQo1vOPrWF/kjyQqoqn+Bav0FmYjYtVzwboiiVZliaVAfSP+++C98+gR39Nr lA4ETNIsNr0XFsS2379TBHirbz9QFwTvMf8gy4UNU1llDW2ldjPZcaLiM42dwZ6N0aJm R15YwjT7YDFuJ3Mh73Ft5h9Iv3fJqKfpt9OZ/toz6jMsu/2s6sp77+T7411fvatRMbRs p0Mg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=afTJeOoX; 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 ff25-20020a05622a4d9900b0039a592d2409si594873qtb.269.2022.10.27.03.07.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 27 Oct 2022 03:07:22 -0700 (PDT) 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=afTJeOoX; 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 1onzjb-0007mq-N9; Thu, 27 Oct 2022 06:03:35 -0400 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 1onzjK-00074D-Kq for qemu-devel@nongnu.org; Thu, 27 Oct 2022 06:03:22 -0400 Received: from mail-pf1-x42d.google.com ([2607:f8b0:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1onzjI-0004Fk-Gw for qemu-devel@nongnu.org; Thu, 27 Oct 2022 06:03:17 -0400 Received: by mail-pf1-x42d.google.com with SMTP id e4so1008024pfl.2 for ; Thu, 27 Oct 2022 03:03:15 -0700 (PDT) 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=27tU7q4skqyWhNaj53PDReLhseNs0R74OdN+/vV4qx0=; b=afTJeOoXkkYIDOk3H7ZGJ4lUWq+jJsPbsXfvwL7lcFznokxqDDe5f+kb0vW0606uog qvAjy1sPR1cchr2Uuz5njE5uo+fNmTuvhnApbG268B2Xh++pCMgUq6EQkUL6m18jGoJi AR2eA+2h74BqNOEk/rjHetd/KaqJks8XNPzpuq7msvTfksi7W7GM1QdO4q+MyIDrEE6/ 7hE0+936iSnC15K1AEwhGsMR0hrDY2aRqrkHdgaPjkwiySaHsC0U1D/THlfLMX6GRtTJ 1IPdLV+8UI5iIuICgwFmiIvFOr80Wzh4QAWp21ZXCKDM+P4VTs4L2tDyIsRo53rJ91eL C+gg== 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=27tU7q4skqyWhNaj53PDReLhseNs0R74OdN+/vV4qx0=; b=SF1lXl5M7gxT1/LxFs2gVGjM6cXNB94CmtBNoKskCYINVnOfbcrk1nwdHG8B2IlSTM Ac78wvSyZJND5detPjd4Mb3X19X/ELzo147XOAWbKhMyzeqBQe0ifm2Oc4gNQO79E5Kn xhdQkhUuuA6QV30uxDX5JbAK3a2VQqVjHjkVvV8SQOTtN175VuTfHSC4zIieZMxVkois CLprw58C5EwsL+iUrEWq963pF6Idinxx8eggrwA/P3NSfL218K9dmj9w1bYu71MIHRoA UIlyygS5kxF9dVQUvCQ9hQLpk1jgEHBhlEXN+RelfBzAfPfVnXeGDjU6PfFa6pxAWOHa 6iUQ== X-Gm-Message-State: ACrzQf3tW2MN5w/4/6D+qa+fNO2RtLKxiYImJRl3KDODWymmUK28cEZr bibMus/uTbfK9VfyKoDO0W5rRGsC9jRTbG5E X-Received: by 2002:a65:6041:0:b0:449:8b9c:8d29 with SMTP id a1-20020a656041000000b004498b9c8d29mr40411698pgp.335.1666864994205; Thu, 27 Oct 2022 03:03:14 -0700 (PDT) Received: from localhost.localdomain ([2001:8003:501a:d301:3a91:9408:3918:55a]) by smtp.gmail.com with ESMTPSA id n13-20020a17090a2bcd00b0020a825fc912sm2354631pje.45.2022.10.27.03.03.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Oct 2022 03:03:12 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: cfontana@suse.de Subject: [PATCH v2 3/6] target/openrisc: Always exit after mtspr npc Date: Thu, 27 Oct 2022 21:02:51 +1100 Message-Id: <20221027100254.215253-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221027100254.215253-1-richard.henderson@linaro.org> References: <20221027100254.215253-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42d; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42d.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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org We have called cpu_restore_state asserting will_exit. Do not go back on that promise. This affects icount. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé --- target/openrisc/sys_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/openrisc/sys_helper.c b/target/openrisc/sys_helper.c index 09b3c97d7c..a3508e421d 100644 --- a/target/openrisc/sys_helper.c +++ b/target/openrisc/sys_helper.c @@ -51,8 +51,8 @@ void HELPER(mtspr)(CPUOpenRISCState *env, target_ulong spr, target_ulong rb) if (env->pc != rb) { env->pc = rb; env->dflag = 0; - cpu_loop_exit(cs); } + cpu_loop_exit(cs); break; case TO_SPR(0, 17): /* SR */