Changeset 41321 in vbox for trunk/src/VBox/VMM

Timestamp:

May 15, 2012 8:11:21 PM (13 years ago)

Author:

vboxsync

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

77991

Message:

repaired tstMicro

Location:

trunk/src/VBox/VMM/testcase

Files:

• tstMicro.cpp (modified) (3 diffs)
• tstMicroRCA.asm (modified) (5 diffs)

trunk/src/VBox/VMM/testcase/tstMicro.cpp

@@ -322 +322 @@
     RTPrintf("\n");
     PrintHeaderTraps();
+    /* don't disable rdtsc in R1/R2/R3! */
+    CPUMR3SetCR4Feature(pVM, 0, ~X86_CR4_TSD);
     for (i = TSTMICROTEST_TRAP_FIRST; i < TSTMICROTEST_MAX; i++)
     {
@@ -358 +360 @@
          * Cleanup.
          */
+        rc = VMR3PowerOff(pVM);
+        if (!RT_SUCCESS(rc))
+        {
+            RTPrintf(TESTCASE ": error: failed to power off vm! rc=%Rrc\n", rc);
+            rcRet++;
+        }
         rc = VMR3Destroy(pVM);
         if (!RT_SUCCESS(rc))
         {
-            RTPrintf(TESTCASE ": error: failed to destroy vm! rc=%d\n", rc);
+            RTPrintf(TESTCASE ": error: failed to destroy vm! rc=%Rrc\n", rc);
             rcRet++;
         }
@@ -367 +375 @@
     else
     {
-        RTPrintf(TESTCASE ": fatal error: failed to create vm! rc=%d\n", rc);
+        RTPrintf(TESTCASE ": fatal error: failed to create vm! rc=%Rrc\n", rc);
         rcRet++;
     }

trunk/src/VBox/VMM/testcase/tstMicroRCA.asm

@@ -295 +295 @@
 
     ; Setup iret to execute r1 code.
-    mov     eax, 02069h                 ; load ds and es with r3 selectors.
+    mov     eax, 02069h                 ; load ds and es with R1 selectors.
     mov     es, eax
     mov     ds, eax
@@ -309 +309 @@
     iret
 
-    ; R3 code
+    ; R1 code
 tstPTR1_R1:
     RDTSC_ECX_EBP                       ; ebp:ecx - Rx enter time (0:0).
@@ -335 +335 @@
 
     ; Setup iret to execute r2 code.
-    mov     eax, 0206ah                 ; load ds and es with r3 selectors.
+    mov     eax, 0206ah                 ; load ds and es with R2 selectors.
     mov     es, eax
     mov     ds, eax
@@ -349 +349 @@
     iret
 
-    ; R3 code
+    ; R2 code
 tstPTR2_R2:
     RDTSC_ECX_EBP                       ; ebp:ecx - Rx enter time (0:0).
@@ -375 +375 @@
 
     ; Setup iret to execute r3 code.
-    mov     eax, 0306bh                 ; load ds and es with r3 selectors.
+    mov     eax, 0306bh                 ; load ds and es with R3 selectors.
     mov     es, eax
     mov     ds, eax