Changeset 41831 in vbox

Timestamp:

Jun 19, 2012 3:07:16 PM (12 years ago)

Author:

vboxsync

Message:

IEM hacking.

Location:

trunk/src/VBox/VMM

Files:

• Makefile.kmk (modified) (2 diffs)
• VMMAll/IEMAll.cpp (modified) (11 diffs)

trunk/src/VBox/VMM/Makefile.kmk

@@ -432 +432 @@
   VMMRC_SOURCES += $(VMMRCImp_0_OUTDIR)/VMMRC.def
  endif
-
+ ifdef VBOX_WITH_IEM
+  VMMRC_SOURCES += \
+        VMMAll/IEMAll.cpp \
+        VMMAll/IEMAllAImpl.asm \
+        VMMAll/IEMAllAImplC.cpp
+ endif
 
  # the very last one.
@@ -532 +537 @@
         VMMR0/VMMR0TripleFaultHackA.asm
  endif
+ ifdef VBOX_WITH_IEM
+  VMMR0_SOURCES += \
+        VMMAll/IEMAll.cpp \
+        VMMAll/IEMAllAImpl.asm \
+        VMMAll/IEMAllAImplC.cpp
+ endif
  VMMR0_SOURCES.amd64 = \
         VMMR0/VMMR0JmpA-amd64.asm

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

@@ -78 +78 @@
 #include <VBox/vmm/iem.h>
 #include <VBox/vmm/pgm.h>
+#include <internal/pgm.h>
 #include <VBox/vmm/iom.h>
 #include <VBox/vmm/em.h>
@@ -683 +684 @@
     {
         uint32_t GCPtrPC32 = pCtx->eip;
-        Assert(!(GCPtrPC32 & ~(uint32_t)UINT16_MAX) || pIemCpu->enmCpuMode == IEMMODE_32BIT);
+        AssertMsg(!(GCPtrPC32 & ~(uint32_t)UINT16_MAX) || pIemCpu->enmCpuMode == IEMMODE_32BIT, ("%04x:%RX64\n", pCtx->cs, pCtx->rip));
         if (GCPtrPC32 > pCtx->csHid.u32Limit)
             return iemRaiseSelectorBounds(pIemCpu, X86_SREG_CS, IEM_ACCESS_INSTRUCTION);
@@ -2159 +2160 @@
      * Extensive logging.
      */
-#ifdef LOG_ENABLED
+#if defined(LOG_ENABLED) && defined(IN_RING3)
     if (LogIs3Enabled())
     {
@@ -2530 +2531 @@
  *
  */
-#include <iprt/mem.h>
+//#include <iprt/mem.h>
 
 /**
@@ -2538 +2539 @@
 static void iemOpStubMsg2(PIEMCPU pIemCpu)
 {
+#if defined(LOG_ENABLED) && defined(IN_RING3)
     PVM     pVM   = IEMCPU_TO_VM(pIemCpu);
     PVMCPU  pVCpu = IEMCPU_TO_VMCPU(pIemCpu);
@@ -2574 +2576 @@
 
     RTAssertMsg2Weak("%s%s\n", szRegs, szInstr);
+#else
+    RTAssertMsg2Weak("cs:rip=%04x:%RX64\n", pIemCpu->CTX_SUFF(pCtx)->cs, pIemCpu->CTX_SUFF(pCtx)->rip);
+#endif
 }
 
@@ -3295 +3300 @@
     NOREF(pIemCpu);
 #else
-# error "Implement me"
+/** @todo RZ: FIXME */
+//# error "Implement me"
 #endif
 }
@@ -4409 +4415 @@
      */
     /** @todo need some better API. */
+#ifdef IN_RING3
     return PGMR3PhysTlbGCPhys2Ptr(IEMCPU_TO_VM(pIemCpu),
                                   GCPhysMem,
                                   RT_BOOL(fAccess & IEM_ACCESS_TYPE_WRITE),
                                   ppvMem);
+#else
+//# error "Implement me"
+    if (fAccess & IEM_ACCESS_TYPE_WRITE)
+        return PGMPhysGCPhys2CCPtr(IEMCPU_TO_VM(pIemCpu),
+                                   GCPhysMem,
+                                   ppvMem,
+                                   /** @todo pLock */ NULL);
+    return PGMPhysGCPhys2CCPtrReadOnly(IEMCPU_TO_VM(pIemCpu),
+                                       GCPhysMem,
+                                       (void const **)ppvMem,
+                                       /** @todo pLock */ NULL);
+#endif
 }
 
@@ -7835 +7854 @@
 #ifdef LOG_ENABLED
     PCPUMCTX pCtx = pIemCpu->CTX_SUFF(pCtx);
+# ifdef IN_RING3
     if (LogIs2Enabled())
     {
@@ -7861 +7881 @@
     }
     else
+# endif
         LogFlow(("IEMExecOne: cs:rip=%04x:%08RX64 ss:rsp=%04x:%08RX64 EFL=%06x\n",
                  pCtx->cs, pCtx->rip, pCtx->ss, pCtx->rsp, pCtx->eflags.u));
@@ -7916 +7937 @@
 
     VBOXSTRICTRC rcStrict;
-    if (cbOpcodeBytes)
+    if (   cbOpcodeBytes
+        && pCtx->rip == OpcodeBytesPC)
     {
         iemInitDecoder(pIemCpu);