Changeset 1977 in vbox for trunk/src/VBox

Timestamp:

Apr 6, 2007 6:19:08 PM (18 years ago)

Author:

vboxsync

Message:

Need to emulate RDTSC for ring-3 as well.

File:

• trunk/src/VBox/VMM/VMMGC/TRPMGCHandlers.cpp (modified) (8 diffs)

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

@@ -312 +312 @@
      * Both PATM are using INT3s, let them have a go first.
      */
-    if (    (pRegFrame->ss & X86_SEL_RPL) == 1 
+    if (    (pRegFrame->ss & X86_SEL_RPL) == 1
         &&  !pRegFrame->eflags.Bits.u1VM)
     {
@@ -379 +379 @@
         Assert(rc == VINF_EM_RAW_GUEST_TRAP);
     }
-    else 
+    else
         /* Never generate a raw trap here; it might be a monitor instruction, that requires emulation. */
         rc = VINF_EM_RAW_EMULATE_INSTR;
@@ -513 +513 @@
  * @param   pRegFrame   Pointer to the register frame for the trap.
  * @param   pCpu        The opcode info.
- * @param   PC          Program counter.
+ * @param   PC          The program counter corresponding to cs:eip in pRegFrame.
  */
 static int trpmGCTrap0dHandlerRing0(PVM pVM, PCPUMCTXCORE pRegFrame, PDISCPUSTATE pCpu, RTGCPTR PC)
@@ -611 +611 @@
  * @param   pRegFrame   Pointer to the register frame for the trap.
  * @param   pCpu        The opcode info.
- */
-static int trpmGCTrap0dHandlerRing3(PVM pVM, PCPUMCTXCORE pRegFrame, PDISCPUSTATE pCpu)
+ * @param   PC          The program counter corresponding to cs:eip in pRegFrame.
+ */
+static int trpmGCTrap0dHandlerRing3(PVM pVM, PCPUMCTXCORE pRegFrame, PDISCPUSTATE pCpu, RTGCPTR PC)
 {
     int rc;
@@ -674 +675 @@
             pVM->trpm.s.uActiveVector = ~0;
             return trpmGCExitTrap(pVM, VINF_EM_RAW_RING_SWITCH, pRegFrame);
+
+        /*
+         * Read TSC
+         */
+        case OP_RDTSC:
+        {
+            uint32_t cbIgnored;
+            rc = EMInterpretInstructionCPU(pVM, pCpu, pRegFrame, PC, &cbIgnored);
+            if (VBOX_SUCCESS(rc))
+                pRegFrame->eip += pCpu->opsize;
+            else if (rc != VERR_EM_INTERPRETER)
+                AssertReleaseMsgFailed(("rc=%Vrc\n", rc));    /* Can't happen with RDTSC. */
+            return trpmGCExitTrap(pVM, rc, pRegFrame);
+        }
     }
 
@@ -758 +773 @@
      */
     if (!pRegFrame->eflags.Bits.u1VM)
-        return trpmGCTrap0dHandlerRing3(pVM, pRegFrame, &Cpu);
-    
-    /* 
+        return trpmGCTrap0dHandlerRing3(pVM, pRegFrame, &Cpu, PC);
+
+    /*
      * Deal with v86 code.
      */
@@ -1017 +1032 @@
     {
         /*
-         * Check that there is still some stack left, if not we'll flag 
+         * Check that there is still some stack left, if not we'll flag
          * a guru meditation (the alternative is a triple fault).
          */
@@ -1029 +1044 @@
         /*
          * Just zero the register containing the selector in question.
-         * We'll deal with the actual stale or troublesome selector value in 
+         * We'll deal with the actual stale or troublesome selector value in
          * the outermost trap frame.
          */