From patchwork Sun Jul 3 08:59:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 586863 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:5036:0:0:0:0 with SMTP id e22csp2945423mab; Sun, 3 Jul 2022 02:40:13 -0700 (PDT) X-Google-Smtp-Source: AGRyM1v+fTqwUqAGAYsgG+qvJr73jtLz5DENlubOMq1qjlVoMvShVGgESYoxL6kXccF/BBx701+g X-Received: by 2002:a05:6902:124e:b0:668:222c:e8da with SMTP id t14-20020a056902124e00b00668222ce8damr25158183ybu.383.1656841213529; Sun, 03 Jul 2022 02:40:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656841213; cv=none; d=google.com; s=arc-20160816; b=dZVzlpyqi+X2AU84C50MBv3RQ+eF+DbjGd6cQ4GigB1v4KxmNzc/tK7IFt5UdwnejA RGAi+u0VdBM6vKYeVFUi0mUaOCor7XqehtcnsJeCViKpsC5KRsHDh47pJXQMHkBGev12 OHtLWWAefonGlpbgzpnbgi071AsYe6yWG/0UsWdm9LW2+LuVFuXLLKM1c5mEJfvva/WZ 2psRqO+uuyumt4K7ln8/sdI9Yj8l4o2FiRaNtpDu12edJkkcDZqBBRYfGjmEjr1aUmy7 A7juxIuVPanKJXQoMpB2bp+MGk2/Oc91S9MuPbqPYPBvPgG+CZUIszyYxZeehVa4cgfB pOHw== 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=KtmNbu9yExeJxvfDUNJQ5c1VHDhvr7IbviTyJY19R0g=; b=P55DSvGi0XgwEp/l61BahxA1B2a/tkbvFw3dnk347wr7NO4IqwUtf7XLLIC2NSAhp2 7mrbCbAJXV+dmnVl60Hva+hH+Oh8WQgRI3QjQcRDYvPiY+vJoICytz2skwpxpra+kTGd IlxrmNOLvfUPqnGNOG2j3RXDNFbk9Gv5/zILO0M5IevTBDCYzqoxVFKRn7ISC++xbVoC CqVMs3vj3E9C0VBcgi7OmrFnURBmn9zUo2jbDJYYJ/cFG2Un60hnzpaQpu0jWciXlFv7 Rw3IwJZfBc6TRLptFMG5i36cM1QhUTk4DedvZEND/Hg+kfikzsrkvaAaPxWtBnPWTS5X QUfQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GdnBGArj; 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 e75-20020a811e4e000000b0031b771944f2si31232747ywe.253.2022.07.03.02.40.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 03 Jul 2022 02:40:13 -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=GdnBGArj; 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]:41964 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o7w5M-0005Hf-MV for patch@linaro.org; Sun, 03 Jul 2022 05:40:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58718) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o7vSG-0004uc-6X for qemu-devel@nongnu.org; Sun, 03 Jul 2022 04:59:48 -0400 Received: from mail-pj1-x102a.google.com ([2607:f8b0:4864:20::102a]:51076) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o7vSE-0004BH-Ob for qemu-devel@nongnu.org; Sun, 03 Jul 2022 04:59:47 -0400 Received: by mail-pj1-x102a.google.com with SMTP id go6so6662513pjb.0 for ; Sun, 03 Jul 2022 01:59:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KtmNbu9yExeJxvfDUNJQ5c1VHDhvr7IbviTyJY19R0g=; b=GdnBGArj2cGdcl4t5v62Ds5t+DfkYD1SbHtHrlog4Fzk4v/F0ugRwxwUnuSW4EHY5O 1VFALVbUXK1UIM8dtj2ru99FSuDGnSov31SnBhfNEQAQ+xwTAgM2RBmtbJwOmXbY4rjN eA/TFm7HVX43JW4KI+83MLGYJR/X02lLYfwnjaVfaNUM+9Vjv+0IWGU9ZxBoxMao6X15 EF8MqMUIqumZzyfxRUzC3fI5KB9smEx/lwzbw2RRZdVUBGPfd9fUyYZ7ij2nmSCRwysU ZYw/AARz5QpF366AMib03s+LhYUpZShouCdWzPrmaQI+e9jOVDGpDIyPPZmT9q89U6tz b1Mw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KtmNbu9yExeJxvfDUNJQ5c1VHDhvr7IbviTyJY19R0g=; b=hZLewKQA7RcPvuhA3FP99QyRZp75EMhbJt8zo/XViiSR95Qy6r5ZlIZq368rC+4r4c iO964FX7qGeNPJmUQ7hvbW0mznjKTsK4CEY/PDk0K78X9lWuL8xK7xM8NxxdG58d9MtD 5x8MmWQDTbnL9SDjLacWgXiDCn93moKyltK81mg46NfTe2jN+PLbkcgwfqx3AwTg40ps BrvPctyiH7KeQ/qZsonSjrfn3pt7D9l6eYR8gjAffXFYFAlj3+i/P44vYOQIkZrefag7 NT6KFYdWJxjjAYljUN6wtDJADOpGhhOCqPBpi3tpF4q5dnRSqG/8YESUYy7WteTunJna ZJQg== X-Gm-Message-State: AJIora9mk7ib+RL1XQpeh8uPyOolLCL+Mqg0br1tIESNgsdwxiaGmJJp 8Xl9UKZvVCDmAAZ9MhvmXVibLxt2360keSSQ X-Received: by 2002:a17:90b:4cc8:b0:1ee:d3a3:4e6 with SMTP id nd8-20020a17090b4cc800b001eed3a304e6mr29811244pjb.54.1656838785213; Sun, 03 Jul 2022 01:59:45 -0700 (PDT) Received: from stoup.. ([122.255.60.245]) by smtp.gmail.com with ESMTPSA id cq16-20020a056a00331000b00518764d09cdsm18777593pfb.164.2022.07.03.01.59.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jul 2022 01:59:44 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: laurent@vivier.eu, Song Gao , Xiaojuan Yang Subject: [PATCH v21 08/13] target/loongarch: Fix missing update CSR_BADV Date: Sun, 3 Jul 2022 14:29:08 +0530 Message-Id: <20220703085913.772936-9-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220703085913.772936-1-richard.henderson@linaro.org> References: <20220703085913.772936-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102a; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102a.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, T_SCC_BODY_TEXT_LINE=-0.01 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" From: Song Gao loongarch_cpu_do_interrupt() should update CSR_BADV for some EXCCODE. Signed-off-by: Song Gao Signed-off-by: Xiaojuan Yang Reviewed-by: Richard Henderson Message-Id: <20220624031049.1716097-9-gaosong@loongson.cn> Signed-off-by: Richard Henderson --- target/loongarch/cpu.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c index 4c8f96bc3a..e32d4cc269 100644 --- a/target/loongarch/cpu.c +++ b/target/loongarch/cpu.c @@ -171,18 +171,20 @@ static void loongarch_cpu_do_interrupt(CPUState *cs) cause = cs->exception_index; update_badinstr = 0; break; - case EXCCODE_ADEM: case EXCCODE_SYS: case EXCCODE_BRK: + case EXCCODE_INE: + case EXCCODE_IPE: + case EXCCODE_FPE: + env->CSR_BADV = env->pc; + QEMU_FALLTHROUGH; + case EXCCODE_ADEM: case EXCCODE_PIL: case EXCCODE_PIS: case EXCCODE_PME: case EXCCODE_PNR: case EXCCODE_PNX: case EXCCODE_PPI: - case EXCCODE_INE: - case EXCCODE_IPE: - case EXCCODE_FPE: cause = cs->exception_index; break; default: