Changeset 1792 in vbox

Timestamp:

Mar 29, 2007 11:47:32 AM (18 years ago)

Author:

vboxsync

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

19970

Message:

Proper interrupt redirection bitmap sync

Location:

trunk/src/VBox/VMM

Files:

• PATM/PATM.cpp (modified) (1 diff)
• PATM/PATMA.asm (modified) (1 diff)
• PATM/VMMGC/PATMGC.cpp (modified) (3 diffs)
• SELM.cpp (modified) (1 diff)
• TRPM.cpp (modified) (2 diffs)
• VMMAll/PGMAllHandler.cpp (modified) (1 diff)
• VMMR0/HWVMXR0.cpp (modified) (2 diffs)
• VMMR0/VMMR0.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/PATM/PATM.cpp

@@ -4480 +4480 @@
             /* Increase by instruction size. */
             uint32_t size = patmGetInstrSize(pVM, pPatch, pPatchPage->pHighestAddrGC);
-            Assert(size);
+////            Assert(size);
             pPatchPage->pHighestAddrGC += size;
         }

trunk/src/VBox/VMM/PATM/PATMA.asm

@@ -41 +41 @@
 ; Noisy, but useful for debugging certain problems
 ;;;%define PATM_LOG_PATCHINSTR
-;;%define PATM_LOG_PATCHIRET
+%define PATM_LOG_PATCHIRET
 %endif
 

trunk/src/VBox/VMM/PATM/VMMGC/PATMGC.cpp

@@ -107 +107 @@
 #ifdef LOG_ENABLED
     if (pPatchPage)
-        Log(("PATMIsWriteToPatchPage: Found page %VGv for write to %VGv %d bytes\n", pPatchPage->Core.Key, GCPtr, cbWrite));
+        Log2(("PATMIsWriteToPatchPage: Found page %VGv for write to %VGv %d bytes\n", pPatchPage->Core.Key, GCPtr, cbWrite));
 #endif
 
@@ -296 +296 @@
                     /* We are no longer executing PATM code; set PIF again. */
                     pVM->patm.s.CTXSUFF(pGCState)->fPIF = 1;
+
+#ifndef VBOX_RAW_V86
+                    return VINF_EM_RESCHEDULE;
+#else
                     CPUMGCCallV86Code(pRegFrame);
+#endif
                     /* does not return */
                 }
@@ -407 +412 @@
                                 Log(("PATMGC: GATE->VM stack frame: DS=%04X ES=%04X FS=%04X GS=%04X\n", selDS, selES, selFS, selGS));
                             }
+if (eip == 0x690) 
+{
+   pRegFrame->eip += PATM_ILLEGAL_INSTR_SIZE;
+   return VINF_EM_RESCHEDULE;
+}
                         }
                         else

trunk/src/VBox/VMM/SELM.cpp

@@ -1520 +1520 @@
                     
                     /** @todo not sure how the partial case is handled; probably not allowed */
-                    if (offRedirBitmap + sizeof(tss.IntRedirBitmap) <= cbTss)
+                    if (offRedirBitmap + sizeof(tss.IntRedirBitmap) <= pVM->selm.s.cbGuestTss)
                     {
                         rc = PGMPhysReadGCPtr(pVM, &pVM->selm.s.Tss.IntRedirBitmap, GCPtrTss + offRedirBitmap, sizeof(tss.IntRedirBitmap));
                         AssertRC(rc);
-                        Log2(("Redirection bitmap:\n"));
-                        Log2(("%.*Vhxd\n", sizeof(tss.IntRedirBitmap), &pVM->selm.s.Tss.IntRedirBitmap));
+                        Log(("Redirection bitmap:\n"));
+                        Log(("%.*Vhxd\n", sizeof(tss.IntRedirBitmap), &pVM->selm.s.Tss.IntRedirBitmap));
                     }
                 }

trunk/src/VBox/VMM/TRPM.cpp

@@ -1178 +1178 @@
                 pVM->trpm.s.aGuestTrapHandler[iTrap] = pHandler;
 
-                Log(("Setting trap handler %x to %08X (direct)\n", iTrap, pHandler));
+                Log(("Setting trap handler %d to %08X\n", iTrap, pHandler));
                 return VINF_SUCCESS;
             }
@@ -1193 +1193 @@
          * Save handler which can be used for a trampoline call inside the GC
          */
-        Log(("Setting trap handler %x to %08X\n", iTrap, pHandler));
+        Log(("Setting trap handler %d to %08X\n", iTrap, pHandler));
         pVM->trpm.s.aGuestTrapHandler[iTrap] = pHandler;
         return VINF_SUCCESS;

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

@@ -255 +255 @@
 #else
             int rc2 = CTXALLMID(VMM, CallHost)(pVM, VMMCALLHOST_PGM_RAM_GROW_RANGE, GCPhys);
+AssertRC(rc2);
 #endif
             if (rc2 != VINF_SUCCESS)

trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp

@@ -1324 +1324 @@
 
 #ifdef VBOX_STRICT
+            case X86_XCPT_UD:   /* Unknown opcode exception. */
             case X86_XCPT_GP:   /* General protection failure exception.*/
-            case X86_XCPT_UD:   /* Unknown opcode exception. */
             case X86_XCPT_DE:   /* Debug exception. */
             case X86_XCPT_SS:   /* Stack segment exception. */
@@ -1349 +1349 @@
                 }
 
-                Log(("Trap %x at %VGv\n", vector, pCtx->eip));
+                Log(("Trap %x at %04x:%VGv\n", vector, pCtx->cs, pCtx->eip));
                 rc = VMXR0InjectEvent(pVM, pCtx, VMX_VMCS_CTRL_ENTRY_IRQ_INFO_FROM_EXIT_INT_INFO(intInfo), cbInstr, errCode);
                 AssertRC(rc);

trunk/src/VBox/VMM/VMMR0/VMMR0.cpp

@@ -61 +61 @@
 
 
-//#define DEBUG_NO_RING0_ASSERTIONS
+#define DEBUG_NO_RING0_ASSERTIONS
 #ifdef DEBUG_NO_RING0_ASSERTIONS
 static PVM g_pVMAssert = 0;
@@ -171 +171 @@
         LogCom(("VMMR0Init: after %p dereg2\n", RTLogDefaultInstance()));
 
-        RTLogLoggerEx(&pR0Logger->Logger, 0, ~0U, "hello ring-0 logger (RTLogLoggerEx)\n");
         LogCom(("VMMR0Init: RTLogLoggerEx returned fine offScratch=%d\n", pR0Logger->Logger.offScratch));
 #endif