Changeset 13375 in vbox for trunk/src/recompiler

Timestamp:

Oct 17, 2008 2:18:29 PM (16 years ago)

Author:

vboxsync

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

38101

Message:

some (disabled) VMI bits

Location:

trunk/src/recompiler

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxREMWrapper.cpp (modified) (2 diffs)
• VBoxRecompiler.c (modified) (1 diff)
• cpu-defs.h (modified) (1 diff)
• target-i386/helper.c (modified) (2 diffs)

trunk/src/recompiler/Makefile.kmk

@@ -104 +104 @@
 # The VBoxREM.[dll|so|..] or VBoxREM2.rel.
 #
-$(REM_MOD)_DEFS             = IN_REM_R3 REM_INCLUDE_CPU_H
-$(REM_MOD)_DEFS            += REM_PHYS_ADDR_IN_TLB
+$(REM_MOD)_DEFS             = \
+        IN_REM_R3 REM_INCLUDE_CPU_H REM_PHYS_ADDR_IN_TLB \
+        $(if $(VBOX_WITH_VMI),VBOX_WITH_VMI,)
+
 #$(REM_MOD)_DEFS          += DEBUG_ALL_LOGGING DEBUG_DISAS DEBUG_PCALL DEBUG_EXEC DEBUG_FLUSH DEBUG_IOPORT DEBUG_SIGNAL DEBUG_TLB_CHECK DEBUG_TB_INVALIDATE DEBUG_TLB  # Enables huge amounts of debug logging.
 

trunk/src/recompiler/VBoxREMWrapper.cpp

@@ -624 +624 @@
     { 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[] =
 {
@@ -1075 +1083 @@
     { "PATMR3QueryPatchMemGC",                  (void *)(uintptr_t)&PATMR3QueryPatchMemGC,          &g_aArgsPATMR3QueryPatchMem[0],             RT_ELEMENTS(g_aArgsPATMR3QueryPatchMem),               REMFNDESC_FLAGS_RET_INT,    sizeof(RTGCPTR),    NULL },
     { "PATMR3QueryPatchMemHC",                  (void *)(uintptr_t)&PATMR3QueryPatchMemHC,          &g_aArgsPATMR3QueryPatchMem[0],             RT_ELEMENTS(g_aArgsPATMR3QueryPatchMem),               REMFNDESC_FLAGS_RET_INT,    sizeof(void *),     NULL },
+#ifdef VBOX_WITH_VMI
+    { "PARAVIsBiosCall",                        (void *)(uintptr_t)&PARAVIsBiosCall,                &g_aArgsPARAVIsBiosCall[0],                 RT_ELEMENTS(g_aArgsPARAVIsBiosCall),                   REMFNDESC_FLAGS_RET_INT,    sizeof(bool),       NULL },
+#endif
     { "PDMApicGetBase",                         (void *)(uintptr_t)&PDMApicGetBase,                 &g_aArgsPDMApicGetBase[0],                  RT_ELEMENTS(g_aArgsPDMApicGetBase),                    REMFNDESC_FLAGS_RET_INT,    sizeof(int),        NULL },
     { "PDMApicGetTPR",                          (void *)(uintptr_t)&PDMApicGetTPR,                  &g_aArgsPDMApicGetTPR[0],                   RT_ELEMENTS(g_aArgsPDMApicGetTPR),                     REMFNDESC_FLAGS_RET_INT,    sizeof(int),        NULL },

trunk/src/recompiler/VBoxRecompiler.c

@@ -1070 +1070 @@
             rc = VINF_EM_RESCHEDULE_HWACC;
             break;
+
+#ifdef VBOX_WITH_VMI
+        /*
+         *
+         */
+        case EXCP_PARAV_CALL:
+            Log2(("REMR3Run: cpu_exec -> EXCP_PARAV_CALL\n"));
+            rc = VINF_EM_RESCHEDULE_PARAV;
+            break;
+#endif
 
         /*

trunk/src/recompiler/cpu-defs.h

@@ -90 +90 @@
 #define EXCP_SINGLE_INSTR   0x11026 /* executed single instruction. */
 #define EXCP_RC             0x11027 /* a EM rc was raised (VMR3Reset/Suspend/PowerOff). */
+#ifdef VBOX
+#define EXCP_PARAV_CALL     0x11028 /* VMI BIOS call */
+#endif
 #endif /* VBOX */
 #define MAX_BREAKPOINTS 32

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

@@ -29 +29 @@
 #ifdef VBOX
 # include <VBox/err.h>
+# include <VBox/parav.h>
 #endif
 #include "exec.h"
@@ -625 +626 @@
 
 #ifdef VBOX
+# 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();