From patchwork Mon Jul 4 09:33:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 587115 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:1ec:0:0:0:0 with SMTP id 12csp648814map; Mon, 4 Jul 2022 02:42:30 -0700 (PDT) X-Google-Smtp-Source: AGRyM1u24BMK3yvZ2kXn8dISKpttO6QmQdVBoUkk9xbEThClTZGVcRoRYPCIIwS96hgeu6Kk97AX X-Received: by 2002:a25:3c41:0:b0:66d:fb11:5548 with SMTP id j62-20020a253c41000000b0066dfb115548mr16624997yba.64.1656927750143; Mon, 04 Jul 2022 02:42:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656927750; cv=none; d=google.com; s=arc-20160816; b=xf1lweagg3Diix9i/S3onauLAePitxh52R0lv1qkCBjqsXu3DnBBWbLKI7kaj2sx6V LmFTJ7NDs00ANKLyp3aUFX/RM81s5DSWFqhIZOEdc3ntyY2/cmQqLPahCJ93F+KW5gyX 1ynjsKmQMdWutJdvUTKd8t0qUsLz3wON9lcl7AkqJ4zhvw3Uap4VPUkWEUZpEjHpxrpb xrkpfOssRGzRpOlNvep/Ku2ANx1e/F9sFE7bfC9sT+r5HiOEGCnBPDi+40PLEOnFbZ8B oMcfWBOpivWOwu/nWesiahwelpHNwrOiIxuaLHIaS+CVhPffe13qHjjDMrBy8EYPXCx2 RHHA== 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=tDCg0wQiELK4JIf1r2pke5TirqnXzxgU9AqZStODHTbj/cqX25QRG6h/iG22OUAwYm O2r1tCm3c1MlZBq4fUhiTfX0sKk+k4PyhtaVOhCvGxs36QrNA03p3zuOG64q8T3CmkTV NOuT6GR4yixm/9UWGm2jeJfdF7t1PaGPKQRpNvs8QDkJh7+YkSl61Kax+YOCvpiA4y+m osBZTgATtSsQjhCJz6O69N7l/zn/cVGm23EPnHQqWkC+xlcCMTE3zugDgePWJXvA0+fG ZjLDqRO2kJ+f4L/LVuxuYyAuyBwf/w811yHpaKjrhkQM7xZfa6diWiUH5CMLwPg0N8un zqdQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JkbPHVE2; 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 r7-20020a254407000000b0066e4ef5b518si1669267yba.78.2022.07.04.02.42.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 04 Jul 2022 02:42:30 -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=JkbPHVE2; 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]:44950 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o8Ib7-0003YE-KF for patch@linaro.org; Mon, 04 Jul 2022 05:42:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42920) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o8ITN-0000Le-0o for qemu-devel@nongnu.org; Mon, 04 Jul 2022 05:34:30 -0400 Received: from mail-pf1-x436.google.com ([2607:f8b0:4864:20::436]:38615) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o8ITL-0004wq-HZ for qemu-devel@nongnu.org; Mon, 04 Jul 2022 05:34:28 -0400 Received: by mail-pf1-x436.google.com with SMTP id k9so8457623pfg.5 for ; Mon, 04 Jul 2022 02:34:27 -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=JkbPHVE26B6Uuawwrbljc5T/BHUuBry4VSmAQTSUp5OzR644PWjI/D1rilq/9ugw+5 G2aGbF+tsJgH4a5gMgecYJoeWEvodJTullDsZRLYi/avRuLoREJjQXZk8cqX81KPDHvU qbk4dgBNmIJlKOiBWkRhddD+FkzaGarIemQqRXGDgwjw3GOIY8C/mNHnM01lZLDpcNRL CCe/FU0qLxyE7rYbEMwCFsS89GGUD6s1xUOjkmLB91w2S9uxYKLLZhdq/trJBj9XQjTt fKaP/zLl0lXdGgMeHe5Yv1RmVDT3O7FgyDXwmUPXRmc6qXF3/JxsgjiFOgln02QmSbWz LjHw== 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=HphdnyK2ZiyNOkEjjVfhGASQqcmk5eDSulUqJBvDk2fr9Z/QryTpXZ6hR4tYeT0AGz gH7sYMToL3iVqydskfSlKbMO2UJ5wwGV9SbBZwwXDsrpF+wigDhgJ3eKpBnX5YS4ldoe NLC6E7qPlzAWfuIyEBjSb2rz4VkUnPJugB/Mr8xZS4NyMZW61EnKQ+HYWLUeiemCqMRH hFiOlrgD2hFtmuSaNbCOsihHcw04WQfMiMrgUtYpFWgwf2T6SFFvnzAB+DSxhk8k8N7S zC93EsQmoyXQFHhA7JKPedGDoiRLuw7YmTdjMVItyWP1oAWMRegynLGS7OfOSEU9wvu0 snqA== X-Gm-Message-State: AJIora8/aOd9fwL6YmfxzSJAxEtcs2iBuNNkKv3xeYpdMHx6hav7OdFB R0gBVaYGTzGlmpMFaQPreS4rByzo49JFPQyS X-Received: by 2002:a63:6c42:0:b0:3fe:465:7a71 with SMTP id h63-20020a636c42000000b003fe04657a71mr24153697pgc.101.1656927266792; Mon, 04 Jul 2022 02:34:26 -0700 (PDT) Received: from stoup.. ([122.255.60.245]) by smtp.gmail.com with ESMTPSA id z5-20020aa79e45000000b00525b7f3e906sm15353355pfq.27.2022.07.04.02.34.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Jul 2022 02:34:26 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Song Gao , Xiaojuan Yang Subject: [PULL 08/23] target/loongarch: Fix missing update CSR_BADV Date: Mon, 4 Jul 2022 15:03:42 +0530 Message-Id: <20220704093357.983255-9-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220704093357.983255-1-richard.henderson@linaro.org> References: <20220704093357.983255-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::436; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x436.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: