Changeset 12664 in vbox for trunk/src

Timestamp:

Sep 23, 2008 10:33:35 AM (16 years ago)

Author:

vboxsync

Message:

IO breakpoint length implies an io range.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HWSVMR0.cpp (modified) (2 diffs)
• HWVMXR0.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMR0/HWSVMR0.cpp

@@ -47 +47 @@
 
 static int SVMR0InterpretInvpg(PVM pVM, PCPUMCTXCORE pRegFrame, uint32_t uASID);
+
+/* IO operation lookup arrays. */
+static uint32_t aIOSize[4]  = {1, 2, 0, 4};
 
 /**
@@ -1861 +1864 @@
                     for (unsigned i=0;i<4;i++)
                     {
-                        if (    pCtx->dr[i] == IoExitInfo.n.u16Port
+                        unsigned uBPLen = aIOSize[X86_DR7_GET_LEN(pCtx->dr[7], i)];
+
+                        if (    (IoExitInfo.n.u16Port >= pCtx->dr[i] && IoExitInfo.n.u16Port <= pCtx->dr[i] + uBPLen)
                             &&  (pCtx->dr[7] & (X86_DR7_L(i) | X86_DR7_G(i)))
                             &&  (pCtx->dr[7] & X86_DR7_RW(i, X86_DR7_RW_IO)) == X86_DR7_RW(i, X86_DR7_RW_IO))

trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp

@@ -2174 +2174 @@
                     for (unsigned i=0;i<4;i++)
                     {
-                        if (    pCtx->dr[i] == uPort
+                        unsigned uBPLen = aIOSize[X86_DR7_GET_LEN(pCtx->dr[7], i)];
+
+                        if (    (uPort >= pCtx->dr[i] && uPort <= pCtx->dr[i] + uBPLen)
                             &&  (pCtx->dr[7] & (X86_DR7_L(i) | X86_DR7_G(i)))
                             &&  (pCtx->dr[7] & X86_DR7_RW(i, X86_DR7_RW_IO)) == X86_DR7_RW(i, X86_DR7_RW_IO))