From nobody Tue Feb 10 00:59:28 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1530728688876717.1243254505363; Wed, 4 Jul 2018 11:24:48 -0700 (PDT) Received: from localhost ([::1]:48731 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1famSO-0002Ry-6i for importer@patchew.org; Wed, 04 Jul 2018 14:24:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40508) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1famLL-0005p2-HB for qemu-devel@nongnu.org; Wed, 04 Jul 2018 14:17:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1famLI-0001Nx-SP for qemu-devel@nongnu.org; Wed, 04 Jul 2018 14:17:31 -0400 Received: from mx2.rt-rk.com ([89.216.37.149]:35350 helo=mail.rt-rk.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1famLI-0001Mk-GI for qemu-devel@nongnu.org; Wed, 04 Jul 2018 14:17:28 -0400 Received: from localhost (localhost [127.0.0.1]) by mail.rt-rk.com (Postfix) with ESMTP id BE78D1A2173; Wed, 4 Jul 2018 20:17:25 +0200 (CEST) Received: from rtrkw774-lin.mipstec.com (unknown [82.117.201.26]) by mail.rt-rk.com (Postfix) with ESMTPSA id 8DAD81A2187; Wed, 4 Jul 2018 20:17:25 +0200 (CEST) X-Virus-Scanned: amavisd-new at rt-rk.com From: Aleksandar Markovic To: qemu-devel@nongnu.org Date: Wed, 4 Jul 2018 20:17:17 +0200 Message-Id: <1530728238-5608-8-git-send-email-aleksandar.markovic@rt-rk.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1530728238-5608-1-git-send-email-aleksandar.markovic@rt-rk.com> References: <1530728238-5608-1-git-send-email-aleksandar.markovic@rt-rk.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 89.216.37.149 Subject: [Qemu-devel] [PATCH v2 7/8] target/mips: Don't update BadVAddr register in Debug Mode X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pburton@wavecomp.com, smarkovic@wavecomp.com, philippe.mathieu.daude@gmail.com, amarkovic@wavecomp.com, pjovanovic@wavecomp.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" From: Yongbok Kim BadVAddr should not be updated if (env->hflags & MIPS_HFLAG_DM) is set. Signed-off-by: Yongbok Kim Signed-off-by: Aleksandar Markovic Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- target/mips/helper.c | 4 +++- target/mips/op_helper.c | 12 +++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/target/mips/helper.c b/target/mips/helper.c index 8cf91ce..e215af9 100644 --- a/target/mips/helper.c +++ b/target/mips/helper.c @@ -502,7 +502,9 @@ static void raise_mmu_exception(CPUMIPSState *env, targ= et_ulong address, break; } /* Raise exception */ - env->CP0_BadVAddr =3D address; + if (!(env->hflags & MIPS_HFLAG_DM)) { + env->CP0_BadVAddr =3D address; + } env->CP0_Context =3D (env->CP0_Context & ~0x007fffff) | ((address >> 9) & 0x007ffff0); env->CP0_EntryHi =3D (env->CP0_EntryHi & env->CP0_EntryHi_ASID_mask) | diff --git a/target/mips/op_helper.c b/target/mips/op_helper.c index 0b8ec7d..a6a57bd 100644 --- a/target/mips/op_helper.c +++ b/target/mips/op_helper.c @@ -271,7 +271,9 @@ static inline hwaddr do_translate_address(CPUMIPSState = *env, target_ulong helper_##name(CPUMIPSState *env, target_ulong arg, int mem_id= x) \ { = \ if (arg & almask) { = \ - env->CP0_BadVAddr =3D arg; = \ + if (!(env->hflags & MIPS_HFLAG_DM)) { = \ + env->CP0_BadVAddr =3D arg; = \ + } = \ do_raise_exception(env, EXCP_AdEL, GETPC()); = \ } = \ env->lladdr =3D do_translate_address(env, arg, 0, GETPC()); = \ @@ -291,7 +293,9 @@ target_ulong helper_##name(CPUMIPSState *env, target_ul= ong arg1, \ target_long tmp; = \ = \ if (arg2 & almask) { = \ - env->CP0_BadVAddr =3D arg2; = \ + if (!(env->hflags & MIPS_HFLAG_DM)) { = \ + env->CP0_BadVAddr =3D arg2; = \ + } = \ do_raise_exception(env, EXCP_AdES, GETPC()); = \ } = \ if (do_translate_address(env, arg2, 1, GETPC()) =3D=3D env->lladdr) { = \ @@ -2456,7 +2460,9 @@ void mips_cpu_do_unaligned_access(CPUState *cs, vaddr= addr, int error_code =3D 0; int excp; =20 - env->CP0_BadVAddr =3D addr; + if (!(env->hflags & MIPS_HFLAG_DM)) { + env->CP0_BadVAddr =3D addr; + } =20 if (access_type =3D=3D MMU_DATA_STORE) { excp =3D EXCP_AdES; --=20 2.7.4