Changeset 2065 in vbox for trunk

Timestamp:

Apr 13, 2007 8:46:06 AM (18 years ago)

Author:

vboxsync

Message:

Use EMInterpretInstructionCPU for rdtsc

File:

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

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

@@ -687 +687 @@
         /*
          * Handle virtualized TSC reads.
-         * (EMInterpretInstructionCPU isn't usable here because it rejects cpl != 0.)
          */
         case OP_RDTSC:
         {
-            /** @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;
+            uint32_t cbIgnored;
+            rc = EMInterpretInstructionCPU(pVM, pCpu, pRegFrame, PC, &cbIgnored);
+            if (VBOX_SUCCESS(rc))
                 pRegFrame->eip += pCpu->opsize;
-                rc = VINF_SUCCESS;
-            }
+            else if (rc == VERR_EM_INTERPRETER)
+                rc = VINF_EM_RAW_EXCEPTION_PRIVILEGED;
             return trpmGCExitTrap(pVM, rc, pRegFrame);
         }