Changeset 2064 in vbox for trunk

Timestamp:

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

Author:

vboxsync

Message:

Accept ring 3 rdtsc for emulation.

File:

• trunk/src/VBox/VMM/VMMAll/EMAll.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/VMMAll/EMAll.cpp

@@ -1648 +1648 @@
 
 
-#ifdef IN_GC
 /**
  * RDTSC Emulation.
@@ -1666 +1665 @@
     return VINF_SUCCESS;
 }
-#endif
 
 /**
@@ -1730 +1728 @@
     /* Get the current privilege level. */
     uint32_t cpl = CPUMGetGuestCPL(pVM, pRegFrame);
-    if (cpl != 0)
+    if (    cpl != 0
+        &&  pCpu->pCurInstr->opcode != OP_RDTSC)    /* rdtsc requires emulation in ring 3 as well */
     {
         Log(("WARNING: refusing instruction emulation for user-mode code!!\n"));
@@ -1803 +1802 @@
         INTERPRET_CASE_EX_PARAM2(OP_BTS,Bts, BitTest, EMEmulateBts);
         INTERPRET_CASE_EX_PARAM2(OP_BTC,Btc, BitTest, EMEmulateBtc);
-#ifdef IN_GC
         INTERPRET_CASE(OP_RDTSC,Rdtsc);
+#ifdef IN_GC
         INTERPRET_CASE(OP_STI,Sti);
         INTERPRET_CASE(OP_CMPXCHG, CmpXchg);