Changeset 19015 in vbox for trunk/src/recompiler_new

Timestamp:

Apr 20, 2009 7:54:29 AM (16 years ago)

Author:

vboxsync

Message:

Split up TRPM. (guest SMP)

Location:

trunk/src/recompiler_new

Files:

• VBoxREMWrapper.cpp (modified) (3 diffs)
• VBoxRecompiler.c (modified) (4 diffs)

trunk/src/recompiler_new/VBoxREMWrapper.cpp

@@ -910 +910 @@
 static const REMPARMDESC g_aArgsTRPMAssertTrap[] =
 {
-    { REMPARMDESC_FLAGS_INT,        sizeof(PVM), NULL },
+    { REMPARMDESC_FLAGS_INT,        sizeof(PVMCPU), NULL },
     { REMPARMDESC_FLAGS_INT,        sizeof(uint8_t), NULL },
     { REMPARMDESC_FLAGS_INT,        sizeof(TRPMEVENT), NULL }
@@ -916 +916 @@
 static const REMPARMDESC g_aArgsTRPMQueryTrap[] =
 {
-    { REMPARMDESC_FLAGS_INT,        sizeof(PVM), NULL },
+    { REMPARMDESC_FLAGS_INT,        sizeof(PVMCPU), NULL },
     { REMPARMDESC_FLAGS_INT,        sizeof(uint8_t *), NULL },
     { REMPARMDESC_FLAGS_INT,        sizeof(TRPMEVENT *), NULL }
@@ -922 +922 @@
 static const REMPARMDESC g_aArgsTRPMSetErrorCode[] =
 {
-    { REMPARMDESC_FLAGS_INT,        sizeof(PVM), NULL },
+    { REMPARMDESC_FLAGS_INT,        sizeof(PVMCPU), NULL },
     { REMPARMDESC_FLAGS_GCPTR,      sizeof(RTGCUINT), NULL }
 };
 static const REMPARMDESC g_aArgsTRPMSetFaultAddress[] =
 {
-    { REMPARMDESC_FLAGS_INT,        sizeof(PVM), NULL },
+    { REMPARMDESC_FLAGS_INT,        sizeof(PVMCPU), NULL },
     { REMPARMDESC_FLAGS_GCPTR,      sizeof(RTGCUINT), NULL }
 };

trunk/src/recompiler_new/VBoxRecompiler.c

@@ -2115 +2115 @@
      */
     pVM->rem.s.Env.exception_index = -1; /** @todo this won't work :/ */
-    rc = TRPMQueryTrap(pVM, &u8TrapNo, &enmType);
+    rc = TRPMQueryTrap(pVCpu, &u8TrapNo, &enmType);
     if (RT_SUCCESS(rc))
     {
@@ -2159 +2159 @@
         {
             case 0x0e:
-                pVM->rem.s.Env.cr[2] = TRPMGetFaultAddress(pVM);
+                pVM->rem.s.Env.cr[2] = TRPMGetFaultAddress(pVCpu);
                 /* fallthru */
             case 0x0a: case 0x0b: case 0x0c: case 0x0d:
-                pVM->rem.s.Env.error_code = TRPMGetErrorCode(pVM);
+                pVM->rem.s.Env.error_code = TRPMGetErrorCode(pVCpu);
                 break;
 
@@ -2174 +2174 @@
          * We can now reset the active trap since the recompiler is gonna have a go at it.
          */
-        rc = TRPMResetTrap(pVM);
+        rc = TRPMResetTrap(pVCpu);
         AssertRC(rc);
         Log2(("REMR3State: trap=%02x errcd=%RGv cr2=%RGv nexteip=%RGv%s\n", pVM->rem.s.Env.exception_index, (RTGCPTR)pVM->rem.s.Env.error_code,
@@ -2425 +2425 @@
 
         Log(("REMR3StateBack: Pending trap %x %d\n", pVM->rem.s.Env.exception_index, pVM->rem.s.Env.exception_is_int));
-        rc = TRPMAssertTrap(pVM, pVM->rem.s.Env.exception_index, (pVM->rem.s.Env.exception_is_int) ? TRPM_SOFTWARE_INT : TRPM_HARDWARE_INT);
+        rc = TRPMAssertTrap(pVCpu, pVM->rem.s.Env.exception_index, (pVM->rem.s.Env.exception_is_int) ? TRPM_SOFTWARE_INT : TRPM_HARDWARE_INT);
         AssertRC(rc);
         switch (pVM->rem.s.Env.exception_index)
         {
             case 0x0e:
-                TRPMSetFaultAddress(pVM, pCtx->cr2);
+                TRPMSetFaultAddress(pVCpu, pCtx->cr2);
                 /* fallthru */
             case 0x0a: case 0x0b: case 0x0c: case 0x0d:
             case 0x11: case 0x08: /* 0 */
-                TRPMSetErrorCode(pVM, pVM->rem.s.Env.error_code);
+                TRPMSetErrorCode(pVCpu, pVM->rem.s.Env.error_code);
                 break;
         }