Changeset 1981 in vbox for trunk

Timestamp:

Apr 6, 2007 9:20:43 PM (18 years ago)

Author:

vboxsync

Message:

Arg. Forgot that EMInterpretInstructionCPU doesn't accept cpl != 0.

File:

• trunk/src/VBox/VMM/VMMGC/TRPMGCHandlers.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMGC/TRPMGCHandlers.cpp

@@ -678 +678 @@
         /*
          * Handle virtualized TSC reads.
+         * (EMInterpretInstructionCPU isn't usable here because it rejects cpl != 0.)
          */
         case OP_RDTSC:
         {
-            uint32_t cbIgnored;
-            rc = EMInterpretInstructionCPU(pVM, pCpu, pRegFrame, PC, &cbIgnored);
-            if (VBOX_SUCCESS(rc))
+            /** @todo statistics */
+            if (CPUMGetGuestCR4(pVM) & X86_CR4_TSD)
+                rc = VINF_EM_RAW_EMULATE_INSTR;
+            else
+            {
+                uint64_t Tsc = TMCpuTickGet(pVM);
+                pRegFrame->eax = Tsc;
+                pRegFrame->edx = Tsc >> 32;
                 pRegFrame->eip += pCpu->opsize;
-            else if (rc != VERR_EM_INTERPRETER)
-                AssertReleaseMsgFailed(("rc=%Vrc\n", rc));    /* Can't happen with RDTSC. */
+                rc = VINF_SUCCESS;
+            }
             return trpmGCExitTrap(pVM, rc, pRegFrame);
         }