Changeset 1223 in vbox for trunk

Timestamp:

Mar 5, 2007 3:28:59 PM (18 years ago)

Author:

vboxsync

Message:

Compile fix

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HWACCMR0A.asm (modified) (2 diffs)
• HWSVMR0.cpp (modified) (4 diffs)
• VMMR0.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/VMMR0/HWACCMR0A.asm

@@ -624 +624 @@
     MYPUSHAD
 
-    ; /* Clear fs and gs as a safety precaution. Maybe not necessary. */
-    push    fs
-    push    gs
-    xor     eax, eax
-    mov     fs, eax
-    mov     gs, eax
-
     ;/* Save the Guest CPU context pointer. */
     mov     xSI, [xBP + xS*2 + RTHCPHYS_CB*2]   ; pCtx
@@ -687 +680 @@
     mov     [ss:xAX + CPUMCTX.ebp], ebp
 
-    ; Restore fs & gs
-    pop     gs
-    pop     fs
-
     ; Restore general purpose registers
     MYPOPAD

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

@@ -804 +804 @@
         VM_FF_CLEAR(pVM, VM_FF_INHIBIT_INTERRUPTS);
 
-    Log2(("exitCode = %x\n", exitCode));
+    Log(("exitCode = %x\n", exitCode));
 
     /* Check if an injected event was interrupted prematurely. */
@@ -1248 +1248 @@
             if (IoExitInfo.n.u1Type == 0)
             {
-                Log2(("IOMIOPortWrite %VGv %x %x size=%d\n", pCtx->eip, IoExitInfo.n.u16Port, pCtx->eax & uAndVal, uIOSize));
+                Log(("IOMIOPortWrite %VGv %x %x size=%d\n", pCtx->eip, IoExitInfo.n.u16Port, pCtx->eax & uAndVal, uIOSize));
                 STAM_COUNTER_INC(&pVM->hwaccm.s.StatExitIOWrite);
                 rc = IOMIOPortWrite(pVM, IoExitInfo.n.u16Port, pCtx->eax & uAndVal, uIOSize);
@@ -1262 +1262 @@
                     /* Write back to the EAX register. */
                     pCtx->eax = (pCtx->eax & ~uAndVal) | (u32Val & uAndVal);
-                    Log2(("IOMIOPortRead %VGv %x %x size=%d\n", pCtx->eip, IoExitInfo.n.u16Port, u32Val & uAndVal, uIOSize));
+                    Log(("IOMIOPortRead %VGv %x %x size=%d\n", pCtx->eip, IoExitInfo.n.u16Port, u32Val & uAndVal, uIOSize));
                 }
             }
@@ -1277 +1277 @@
         else
             rc = VINF_IOM_HC_IOPORT_READWRITE;
+
+        Log(("Failed IO at %VGv %x size %d\n", pCtx->eip, IoExitInfo.n.u16Port, uIOSize));
 
         break;

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;
@@ -708 +708 @@
 }
 
+void R0LogFlush()
+{
+    vmmR0LoggerFlush(RTLogDefaultInstance());
+}
+
 #ifdef DEBUG_NO_RING0_ASSERTIONS
 /**
@@ -735 +740 @@
 DECLEXPORT(void) RTCALL AssertMsg1(const char *pszExpr, unsigned uLine, const char *pszFile, const char *pszFunction)
 {
-    Log(("\n!!Assertion Failed!!\n"
+    Log(("\n!!R0-Assertion Failed!!\n"
          "Expression: %s\n"
          "Location  : %s(%d) %s\n",
@@ -746 +751 @@
     if (pLog)
     {
+        va_list args;
+
         va_start(args, pszFormat);
         RTLogRelPrintfV(pszFormat, args);