Changeset 98029 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Jan 9, 2023 10:58:23 AM (2 years ago)

Author:

vboxsync

Message:

VMM/DBGF: Adjust DR6 for instruction breakpoints on AMD, only enabled BPs are flagged. bugref:9898

File:

• trunk/src/VBox/VMM/VMMAll/DBGFAll.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMAll/DBGFAll.cpp

@@ -254 +254 @@
             CPUM_IMPORT_EXTRN_RET(pVCpu, CPUMCTX_EXTRN_DR6);
             pVCpu->cpum.GstCtx.dr[6] &= ~X86_DR6_B_MASK;
-            pVCpu->cpum.GstCtx.dr[6] |= fMatched;    /* All matched  */
+            if (pVM->cpum.ro.GuestFeatures.enmCpuVendor != CPUMCPUVENDOR_INTEL)
+                pVCpu->cpum.GstCtx.dr[6] |= fMatched & fEnabled;
+            else
+                pVCpu->cpum.GstCtx.dr[6] |= fMatched;    /* Intel: All matched, regardless of whether they're enabled or not  */
             pVCpu->cpum.GstCtx.dr[7] &= ~X86_DR7_GD;
             LogFlow(("DBGFBpCheckInstruction: hit hw breakpoints %#x at %04x:%RGv (%RGv)\n",