Changeset 39998 in vbox

Timestamp:

Feb 4, 2012 4:06:05 PM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

76109

Message:

tstX86-1: Display CR2.

Location:

trunk/src/VBox/VMM/testcase

Files:

• tstX86-1.cpp (modified) (8 diffs)
• tstX86-1A.asm (modified) (1 diff)

trunk/src/VBox/VMM/testcase/tstX86-1.cpp

@@ -25 +25 @@
 #include <iprt/err.h>
 #include <iprt/assert.h>
+#include <iprt/x86.h>
 
 #ifdef RT_OS_WINDOWS
@@ -98 +99 @@
     uintptr_t   uTrapNo = pCtx->uc_mcontext->__es.__trapno;
     uintptr_t   uErr    = pCtx->uc_mcontext->__es.__err;
+    uintptr_t   uCr2    = pCtx->uc_mcontext->__es.__faultvaddr;
 
 # elif defined(RT_ARCH_AMD64) && defined(RT_OS_FREEBSD)
@@ -104 +106 @@
     uintptr_t   uTrapNo = ~(uintptr_t)0;
     uintptr_t   uErr    = ~(uintptr_t)0;
+    uintptr_t   uCr2    = ~(uintptr_t)0;
 
 # elif defined(RT_ARCH_AMD64)
@@ -110 +113 @@
     uintptr_t   uTrapNo = pCtx->uc_mcontext.gregs[REG_TRAPNO];
     uintptr_t   uErr    = pCtx->uc_mcontext.gregs[REG_ERR];
+    uintptr_t   uCr2    = pCtx->uc_mcontext.gregs[REG_CR2];
 
 # elif defined(RT_ARCH_X86) && defined(RT_OS_DARWIN)
@@ -116 +120 @@
     uintptr_t   uTrapNo = pCtx->uc_mcontext->__es.__trapno;
     uintptr_t   uErr    = pCtx->uc_mcontext->__es.__err;
+    uintptr_t   uCr2    = pCtx->uc_mcontext->__es.__faultvaddr;
 
 # elif defined(RT_ARCH_X86) && defined(RT_OS_FREEBSD)
@@ -122 +127 @@
     uintptr_t   uTrapNo = ~(uintptr_t)0;
     uintptr_t   uErr    = ~(uintptr_t)0;
+    uintptr_t   uCr2    = ~(uintptr_t)0;
 
 # elif defined(RT_ARCH_X86)
@@ -128 +134 @@
     uintptr_t   uTrapNo = pCtx->uc_mcontext.gregs[REG_TRAPNO];
     uintptr_t   uErr    = pCtx->uc_mcontext.gregs[REG_ERR];
+    uintptr_t   uCr2    = pCtx->uc_mcontext.gregs[REG_CR2];
 
 # else
@@ -134 +141 @@
     uintptr_t   uTrapNo = ~(uintptr_t)0;
     uintptr_t   uErr    = ~(uintptr_t)0;
+    uintptr_t   uCr2    = ~(uintptr_t)0;
 # endif
-    RTAssertMsg2("tstX86-1: Trap #%#04x err=%#06x at %p\n", uTrapNo, uErr, *puPC);
+    if (uTrapNo == X86_XCPT_PF)
+        RTAssertMsg2("tstX86-1: Trap #%#04x err=%#06x at %p / %p\n", uTrapNo, uErr, *puPC, uCr2);
+    else
+        RTAssertMsg2("tstX86-1: Trap #%#04x err=%#06x at %p\n", uTrapNo, uErr, *puPC);
 
     PCTRAPINFO pTrapInfo = findTrapInfo(*puPC, *puSP);

trunk/src/VBox/VMM/testcase/tstX86-1A.asm

@@ -1208 +1208 @@
         add     ebx, 16
         cmp     ebx, 512
-        jb      .fxrstor_pf_effect_loop
+        jbe     .fxrstor_pf_effect_loop
 
 .success: