Changeset 13375

Timestamp:

10/17/08 16:18:29 (3 months ago)

Author:

vboxsync

Message:

some (disabled) VMI bits

Files:

• trunk/include/VBox/em.h (modified) (1 diff)
• trunk/include/VBox/err.h (modified) (2 diffs)
• trunk/include/VBox/mm.h (modified) (1 diff)
• trunk/include/VBox/vm.h (modified) (2 diffs)
• trunk/src/VBox/Devices/Makefile.kmk (modified) (1 diff)
• trunk/src/VBox/VMM/EM.cpp (modified) (5 diffs)
• trunk/src/VBox/VMM/MMHeap.cpp (modified) (1 diff)
• trunk/src/VBox/VMM/Makefile.kmk (modified) (2 diffs)
• trunk/src/VBox/VMM/VM.cpp (modified) (2 diffs)
• trunk/src/VBox/VMM/testcase/Makefile.kmk (modified) (1 diff)
• trunk/src/VBox/VMM/testcase/tstVMStructSize.cpp (modified) (1 diff)
• trunk/src/recompiler/Makefile.kmk (modified) (1 diff)
• trunk/src/recompiler/VBoxREMWrapper.cpp (modified) (2 diffs)
• trunk/src/recompiler/VBoxRecompiler.c (modified) (1 diff)
• trunk/src/recompiler/cpu-defs.h (modified) (1 diff)
• trunk/src/recompiler/target-i386/helper.c (modified) (2 diffs)

trunk/include/VBox/em.h

@@ -56 +56 @@
-    /** Hardware accelerated raw-mode execution. */
-    EMSTATE_HWACC,
+    /** PARAV function. */
+    EMSTATE_PARAV,
-    /** Recompiled mode execution. */
-    EMSTATE_REM,

trunk/include/VBox/err.h

@@ -154 +154 @@
- * interrupts having changed the EIP. */
-#define VINF_EM_RESCHEDULE                  1117
+/** PARAV call */
+#define VINF_EM_RESCHEDULE_PARAV            1118
-/** Last scheduling related status code. (inclusive) */
-7
+8
-
-/** Reason for leaving GC: Guest trap which couldn't be handled in GC.
@@ -1274 +1276 @@
-/** @} */
-
+
+/** @name VBox PARAV Status Codes
+ * @{
+ */
+/** Switch back to host */
+#define VINF_PARAV_SWITCH_TO_HOST                     4400
+
+/** @} */
+
-/* SED-END */
-

trunk/include/VBox/mm.h

@@ -162 +162 @@
-    MM_TAG_MM_LOOKUP_VIRT,
-    MM_TAG_MM_PAGE,
+
+    MM_TAG_PARAV,
-
-    MM_TAG_PATM,

trunk/include/VBox/vm.h

@@ -487 +487 @@
-     * This is placed here for performance reasons. */
-    bool                fHWACCMEnabled;
+
+    /** PARAV enabled flag. */
+    bool                fPARAVEnabled;
-    /** @} */
-
@@ -632 +635 @@
-    } csam;
-
+    /** PARAV part. */
+    union
+    {
+#ifdef ___PARAVInternal_h
+        struct PARAV s;
+#endif
+        char        padding[128];
+    } parav;
+
-    /** EM part. */
-    union

trunk/src/VBox/Devices/Makefile.kmk

@@ -197 +197 @@
-#
-VBoxDD2_TEMPLATE        = VBOXR3
-
+
+
-VBoxDD2_INCS           := \
-        $(PATH_SUB_CURRENT)

trunk/src/VBox/VMM/EM.cpp

@@ -42 +42 @@
-#include <VBox/em.h>
-#include <VBox/vmm.h>
+#ifdef VBOX_WITH_VMI
+#include <VBox/parav.h>
+#endif
-#include <VBox/patm.h>
-#include <VBox/csam.h>
@@ -531 +534 @@
-        case EMSTATE_HWACC:             return "EMSTATE_HWACC";
-        case EMSTATE_REM:               return "EMSTATE_REM";
+#ifdef VBOX_WITH_VMI
+        case EMSTATE_PARAV:             return "EMSTATE_PARAV";
+#endif
-        case EMSTATE_HALTED:            return "EMSTATE_HALTED";
-        case EMSTATE_SUSPENDED:         return "EMSTATE_SUSPENDED";
@@ -2155 +2161 @@
-            AssertReleaseMsgFailed(("%Vrc handling is not yet implemented\n", rc));
-            break;
+
+#ifdef VBOX_WITH_VMI
+        /*
+         * PARAV function.
+         */
+        case VINF_EM_RESCHEDULE_PARAV:
+            rc = PARAVCallFunction(pVM);
+            break;
+#endif
-
-        /*
@@ -3316 +3331 @@
-                    break;
-
+#ifdef VBOX_WITH_VMI
+                /*
+                 * Reschedule - parav call.
+                 */
+                case VINF_EM_RESCHEDULE_PARAV:
+                    Log2(("EMR3ExecuteVM: VINF_EM_RESCHEDULE_PARAV: %d -> %d (EMSTATE_PARAV)\n", pVM->em.s.enmState, EMSTATE_PARAV));
+                    pVM->em.s.enmState = EMSTATE_PARAV;
+                    break;
+#endif
+
-                /*
-                 * Resume.
@@ -3467 +3492 @@
-                    break;
-
+#ifdef VBOX_WITH_VMI
+                /*
+                 * Execute PARAV function.
+                 */
+                case EMSTATE_PARAV:
+                    rc = PARAVCallFunction(pVM);
+                    pVM->em.s.enmState = EMSTATE_REM;
+                    break;
+#endif
+
-                /*
-                 * hlt - execution halted until interrupt.

trunk/src/VBox/VMM/MMHeap.cpp

@@ -753 +753 @@
-        TAG2STR(MM_PAGE);
-
+        TAG2STR(PARAV);
+
-        TAG2STR(PATM);
-        TAG2STR(PATM_PATCH);

trunk/src/VBox/VMM/Makefile.kmk

@@ -138 +138 @@
-        VMMSwitcher/AMD64ToPAE.asm
-
+ifdef VBOX_WITH_VMI
+VMMR3_DEFS += \
+        VBOX_WITH_VMI
+VMMR3_INCS += \
+        PARAV
+VMMR3_SOURCES += \
+        PARAV/PARAV.cpp \
+        PARAV/PARAVAll.cpp
+endif
+
-ifdef VBOX_WITH_USB
-VMMR3_DEFS += VBOX_WITH_USB
@@ -338 +348 @@
-endif
-
+ifdef VBOX_WITH_VMI
+VMMGC_DEFS += \
+        VBOX_WITH_VMI
+VMMGC_SOURCES += \
+        PARAV/PARAV.cpp \
+        PARAV/PARAVAll.cpp
+endif
+
-# the very last one.
-VMMGC_SOURCES += VMMGC/VMMGC99.asm

trunk/src/VBox/VMM/VM.cpp

@@ -41 +41 @@
-#include <VBox/stam.h>
-#include <VBox/patm.h>
+#ifdef VBOX_WITH_VMI
+#include <VBox/parav.h>
+#endif
-#include <VBox/csam.h>
-#include <VBox/iom.h>
@@ -613 +616 @@
-                                            if (VBOX_SUCCESS(rc))
-                                            {
-
+
+
-                                                if (VBOX_SUCCESS(rc))
-                                                {
-
+
+
-                                                    if (VBOX_SUCCESS(rc))
-                                                    {
-DBGF
+EM
-                                                        if (VBOX_SUCCESS(rc))
-                                                        {
-PDM
+DBGF
-                                                            if (VBOX_SUCCESS(rc))
-                                                            {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-                                                                if (VBOX_SUCCESS(rc))
-                                                                {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                                                }
-PDM
+DBGF
-                                                                AssertRC(rc2);
-                                                            }
-DBGF
+EM
-                                                            AssertRC(rc2);
-                                                        }
-E
+IO
-                                                        AssertRC(rc2);
-                                                    }
-
+
+
-                                                    AssertRC(rc2);
-                                                }
+#endif
-                                                int rc2 = PATMR3Term(pVM);
-                                                AssertRC(rc2);

trunk/src/VBox/VMM/testcase/Makefile.kmk

@@ -94 +94 @@
-tstVMStructSize_TEMPLATE= VBOXR3AUTOTST
-tstVMStructSize_DEFS    = IN_VMM_R3 IN_DIS
-ifdef VBOX_WITH_IDT_PATCHING
-tstVMStructSize_DEFS   += VBOX_WITH_IDT_PATCHING
-endif
-tstVMStructSize_INCS    = $(VBOX_PATH_VMM_SRC) $(VBOX_PATH_VMM_SRC)/PATM $(VBOX_VMM_TESTCASE_OUT_DIR)
-tstVMStructSize_SOURCES = tstVMStructSize.cpp
-tstVMStructSize.cpp_DEPS= $(VBOX_VMM_TESTCASE_OUT_DIR)/tstVMStructGC.h
+ifdef VBOX_WITH_IDT_PATCHING
+tstVMStructSize_DEFS   += VBOX_WITH_IDT_PATCHING
+endif
+ifdef VBOX_WITH_VMI
+tstVMStructSize_DEFS   += VBOX_WITH_VMI
+tstVMStructSize_INCS   += $(VBOX_PATH_VMM_SRC)/PARAV
+endif
-
-tstAsmStructs_TEMPLATE  = VBOXR3AUTOTST

trunk/src/VBox/VMM/testcase/tstVMStructSize.cpp

@@ -47 +47 @@
-#include "HWACCMInternal.h"
-#include "PATMInternal.h"
+#ifdef VBOX_WITH_VMI
+#include "PARAVInternal.h"
+#endif
-#include "VMMInternal.h"
-#include "DBGFInternal.h"

trunk/src/recompiler/Makefile.kmk

@@ -104 +104 @@
-# The VBoxREM.[dll|so|..] or VBoxREM2.rel.
-#
-
-
+
+
+
+
-#$(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();