Changeset 17695 in vbox

Timestamp:

Mar 11, 2009 1:48:09 PM (16 years ago)

Author:

vboxsync

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

44197

Message:

Minor emulation changes for VT-x.

File:

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

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

@@ -409 +409 @@
         case OP_RDTSC:      return "Rdtsc";
         case OP_STI:        return "Sti";
+        case OP_CLI:        return "Cli";
         case OP_XADD:       return "XAdd";
         case OP_HLT:        return "Hlt";
@@ -2434 +2435 @@
     }
 
+#ifdef IN_RING0
+    /* Only for the VT-x real-mode emulation case. */
+    AssertReturn(CPUMIsGuestInRealMode(pVM), VERR_EM_INTERPRETER);
+    CPUMSetGuestLDTR(pVM, sel);
+    return VINF_SUCCESS;
+#else
     if (sel == 0)
     {
@@ -2444 +2451 @@
     //still feeling lazy
     return VERR_EM_INTERPRETER;
+#endif
 }
 
@@ -2459 +2467 @@
 
     /* Only for the VT-x real-mode emulation case. */
-    if (!CPUMIsGuestInRealMode(pVM))
-        return VERR_EM_INTERPRETER;
+    AssertReturn(CPUMIsGuestInRealMode(pVM), VERR_EM_INTERPRETER);
 
     int rc = DISQueryParamVal(pRegFrame, pCpu, &pCpu->param1, &param1, PARAM_SOURCE);
@@ -3182 +3189 @@
         INTERPRET_CASE(OP_MOV_CR,MovCRx);
         INTERPRET_CASE(OP_MOV_DR,MovDRx);
-        INTERPRET_CASE(OP_LLDT,LLdt);
 #ifdef IN_RING0
         INTERPRET_CASE_EX_DUAL_PARAM2(OP_LIDT, LIdt, LIGdt);
         INTERPRET_CASE_EX_DUAL_PARAM2(OP_LGDT, LGdt, LIGdt);
 #endif
+        INTERPRET_CASE(OP_LLDT,LLdt);
         INTERPRET_CASE(OP_LMSW,Lmsw);
 #ifdef EM_EMULATE_SMSW