Changeset 29333 in vbox

Timestamp:

May 11, 2010 10:28:57 AM (15 years ago)

Author:

vboxsync

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

61438

Message:

removed VBOX_WITH_VMI

Location:

trunk/src/recompiler

Files:

• Makefile-old.kmk (modified) (1 diff)
• Makefile.kmk (modified) (1 diff)
• VBoxREMWrapper.cpp (modified) (3 diffs)
• VBoxRecompiler.c (modified) (1 diff)
• target-i386/op_helper.c (modified) (2 diffs)

trunk/src/recompiler/Makefile-old.kmk

@@ -202 +202 @@
 VBoxREMWrapper_TEMPLATE    = VBOXR3
 VBoxREMWrapper_NAME        = VBoxREM
-VBoxREMWrapper_DEFS        = IN_REM_R3 $(if $(VBOX_WITH_VMI),VBOX_WITH_VMI,)
+VBoxREMWrapper_DEFS        = IN_REM_R3
  ifdef VBOX_USE_REM64
 VBoxREMWrapper_DEFS       += VBOX_USE_BITNESS_SELECTOR

trunk/src/recompiler/Makefile.kmk

@@ -178 +178 @@
  VBoxREMWrapper_TEMPLATE   = VBOXR3
  VBoxREMWrapper_NAME       = VBoxREM
- VBoxREMWrapper_DEFS       = IN_REM_R3 $(if $(VBOX_WITH_VMI),VBOX_WITH_VMI,)
+ VBoxREMWrapper_DEFS       = IN_REM_R3
  if "$(KBUILD_TARGET_ARCH)" == "x86" && defined(VBOX_WITH_64_BITS_GUESTS)
   VBoxREMWrapper_DEFS     += VBOX_USE_BITNESS_SELECTOR

trunk/src/recompiler/VBoxREMWrapper.cpp

@@ -207 +207 @@
 #include <VBox/hwaccm.h>
 #include <VBox/patm.h>
-#ifdef VBOX_WITH_VMI
-# include <VBox/parav.h>
-#endif
 #include <VBox/pdm.h>
 #include <VBox/pdmcritsect.h>
@@ -698 +695 @@
     { REMPARMDESC_FLAGS_INT,        sizeof(uint32_t *),         NULL }
 };
-#  ifdef VBOX_WITH_VMI
-static const REMPARMDESC g_aArgsPARAVIsBiosCall[] =
-{
-    { REMPARMDESC_FLAGS_INT,        sizeof(PVM),                NULL },
-    { REMPARMDESC_FLAGS_GCPTR,      sizeof(RTGCPTR),            NULL },
-    { REMPARMDESC_FLAGS_INT,        sizeof(uint32_t),           NULL }
-};
-#  endif
 static const REMPARMDESC g_aArgsPDMApicGetBase[] =
 {
@@ -1229 +1218 @@
     { "PATMR3QueryPatchMemGC",                  VMM_FN(PATMR3QueryPatchMemGC),          &g_aArgsPATMR3QueryPatchMem[0],             RT_ELEMENTS(g_aArgsPATMR3QueryPatchMem),               REMFNDESC_FLAGS_RET_INT,    sizeof(RTGCPTR),    NULL },
     { "PATMR3QueryPatchMemHC",                  VMM_FN(PATMR3QueryPatchMemHC),          &g_aArgsPATMR3QueryPatchMem[0],             RT_ELEMENTS(g_aArgsPATMR3QueryPatchMem),               REMFNDESC_FLAGS_RET_INT,    sizeof(void *),     NULL },
-#  ifdef VBOX_WITH_VMI
-    { "PARAVIsBiosCall",                        VMM_FN(PARAVIsBiosCall),                &g_aArgsPARAVIsBiosCall[0],                 RT_ELEMENTS(g_aArgsPARAVIsBiosCall),                   REMFNDESC_FLAGS_RET_INT,    sizeof(bool),       NULL },
-#  endif
     { "PDMApicGetBase",                         VMM_FN(PDMApicGetBase),                 &g_aArgsPDMApicGetBase[0],                  RT_ELEMENTS(g_aArgsPDMApicGetBase),                    REMFNDESC_FLAGS_RET_INT,    sizeof(int),        NULL },
     { "PDMApicGetTPR",                          VMM_FN(PDMApicGetTPR),                  &g_aArgsPDMApicGetTPR[0],                   RT_ELEMENTS(g_aArgsPDMApicGetTPR),                     REMFNDESC_FLAGS_RET_INT,    sizeof(int),        NULL },

trunk/src/recompiler/VBoxRecompiler.c

@@ -1169 +1169 @@
             break;
 
-        /** @todo missing VBOX_WITH_VMI/EXECP_PARAV_CALL   */
         /*
          * An EM RC was raised (VMR3Reset/Suspend/PowerOff/some-fatal-error).

trunk/src/recompiler/target-i386/op_helper.c

@@ -32 +32 @@
 
 #ifdef VBOX
-# ifdef VBOX_WITH_VMI
-#  include <VBox/parav.h>
-# endif
 #include "qemu-common.h"
 #include <math.h>
@@ -822 +819 @@
 #ifdef VBOX
     ss = ss_e1 = ss_e2 = 0;
-# ifdef VBOX_WITH_VMI
-    if (   intno == 6
-        && PARAVIsBiosCall(env->pVM, (RTRCPTR)next_eip, env->regs[R_EAX]))
-    {
-        env->exception_index = EXCP_PARAV_CALL;
-        cpu_loop_exit();
-    }
-# endif
     if (remR3NotifyTrap(env, intno, error_code, next_eip) != VINF_SUCCESS)
         cpu_loop_exit();