Changeset 9349 in vbox for trunk/src

Timestamp:

Jun 3, 2008 11:56:19 AM (17 years ago)

Author:

vboxsync

Message:

More type fixes for GC execution.

File:

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

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

@@ -55 +55 @@
 typedef DECLCALLBACK(uint32_t) PFN_EMULATE_PARAM2(uint32_t *pu32Param1, size_t val2);
 typedef DECLCALLBACK(uint32_t) PFN_EMULATE_PARAM3(uint32_t *pu32Param1, uint32_t val2, size_t val3);
-typedef DECLCALLBACK(int)      FNEMULATELOCKPARAM2(RTGCPTR GCPtrParam1, RTGCUINTREG Val2, RTGCUINTREG32 *pf);
+typedef DECLCALLBACK(int)      FNEMULATELOCKPARAM2(RTRCPTR GCPtrParam1, RTGCUINTREG32 Val2, RTGCUINTREG32 *pf);
 typedef FNEMULATELOCKPARAM2 *PFNEMULATELOCKPARAM2;
-typedef DECLCALLBACK(int)      FNEMULATELOCKPARAM3(RTGCPTR GCPtrParam1, RTGCUINTREG Val2, size_t cb, RTGCUINTREG32 *pf);
+typedef DECLCALLBACK(int)      FNEMULATELOCKPARAM3(RTRCPTR GCPtrParam1, RTGCUINTREG32 Val2, size_t cb, RTGCUINTREG32 *pf);
 typedef FNEMULATELOCKPARAM3 *PFNEMULATELOCKPARAM3;
 
@@ -367 +367 @@
     switch (pCpu->pCurInstr->opcode)
     {
-        case OP_XOR:        return "Xor";
+        case OP_XCHG:       return "Xchg";
+        case OP_DEC:        return "Dec";
+        case OP_INC:        return "Inc";
+        case OP_POP:        return "Pop";
         case OP_OR:         return "Or";
         case OP_AND:        return "And";
+        case OP_MOV:        return "Mov";
+        case OP_INVLPG:     return "InvlPg";
+        case OP_CPUID:      return "CpuId";
+        case OP_MOV_CR:     return "MovCRx";
+        case OP_MOV_DR:     return "MovDRx";
+        case OP_LLDT:       return "LLdt";
+        case OP_CLTS:       return "Clts";
+        case OP_MONITOR:    return "Monitor";
+        case OP_MWAIT:      return "MWait";
+        case OP_RDMSR:      return "Rdmsr";
+        case OP_WRMSR:      return "Wrmsr";
+        case OP_ADC:        return "Adc";
+        case OP_BTC:        return "Btc";
+        case OP_RDTSC:      return "Rdtsc";
+        case OP_STI:        return "Sti";
+        case OP_XADD:       return "XAdd";
+        case OP_HLT:        return "Hlt";
+        case OP_IRET:       return "Iret";
+        case OP_CMPXCHG:    return "CmpXchg";
+        case OP_CMPXCHG8B:  return "CmpXchg8b";
+        case OP_MOVNTPS:    return "MovNTPS";
+        case OP_STOSWD:     return "StosWD";
+        case OP_WBINVD:     return "WbInvd";
+        case OP_XOR:        return "Xor";
         case OP_BTR:        return "Btr";
         case OP_BTS:        return "Bts";
         default:
-            AssertMsgFailed(("%d\n", pCpu->pCurInstr->opcode));
+            Log(("Unknown opcode %d\n", pCpu->pCurInstr->opcode));
             return "???";
     }
@@ -813 +840 @@
     /* Register and immediate data == PARMTYPE_IMMEDIATE */
     AssertReturn(param2.type == PARMTYPE_IMMEDIATE, VERR_EM_INTERPRETER);
-    RTGCUINTREG ValPar2 = param2.val.val32;
+    RTGCUINTREG32 ValPar2 = param2.val.val32;
 
     /* Try emulate it with a one-shot #PF handler in place. */
@@ -820 +847 @@
     RTGCUINTREG32 eflags = 0;
     MMGCRamRegisterTrapHandler(pVM);
-    rc = pfnEmulate(GCPtrPar1, ValPar2, pCpu->param2.size, &eflags);
+    rc = pfnEmulate((RTRCPTR)GCPtrPar1, ValPar2, pCpu->param2.size, &eflags);
     MMGCRamDeregisterTrapHandler(pVM);
 
@@ -1059 +1086 @@
                                   uint32_t *pcbSize, PFNEMULATELOCKPARAM2 pfnEmulate)
 {
+        return VERR_EM_INTERPRETER;
     OP_PARAMVAL param1, param2;
     int rc = DISQueryParamVal(pRegFrame, pCpu, &pCpu->param1, &param1, PARAM_DEST);
@@ -1077 +1105 @@
     /* Register and immediate data == PARMTYPE_IMMEDIATE */
     AssertReturn(param2.type == PARMTYPE_IMMEDIATE, VERR_EM_INTERPRETER);
-    RTGCUINTREG ValPar2 = param2.val.val32;
+    RTGCUINTREG32 ValPar2 = param2.val.val32;
 
     Log2(("emInterpretLockBitTest %s: pvFault=%VGv GCPtrPar1=%RGv imm=%RGr\n", emGetMnemonic(pCpu), pvFault, GCPtrPar1, ValPar2));
@@ -1094 +1122 @@
     RTGCUINTREG32 eflags = 0;
     MMGCRamRegisterTrapHandler(pVM);
-    rc = pfnEmulate(GCPtrPar1, ValPar2, &eflags);
+    rc = pfnEmulate((RTRCPTR)GCPtrPar1, ValPar2, &eflags);
     MMGCRamDeregisterTrapHandler(pVM);
 
@@ -2289 +2317 @@
 
     int rc;
+#if defined(IN_GC) && (defined(VBOX_STRICT) || defined(LOG_ENABLED))
+    LogFlow(("emInterpretInstructionCPU %s\n", emGetMnemonic(pCpu)));
+#endif
     switch (pCpu->pCurInstr->opcode)
     {