vbox的更動 44399 路徑 trunk/src/VBox/VMM/VMMR3/EMRaw.cpp

時間撮記:

2013-1-27 下午09:12:53 (12 年 以前)

作者:

vboxsync

訊息:

DBGF,DBGC,++: PVM -> PUVM. Some refactoring and cleanup as well.

檔案:

• trunk/src/VBox/VMM/VMMR3/EMRaw.cpp (修改) (9 筆差異)

trunk/src/VBox/VMM/VMMR3/EMRaw.cpp

@@ -237 +237 @@
     {
         DBGFR3PrgStep(pVCpu);
-        DBGFR3DisasInstrCurrentLog(pVCpu, "RSS: ");
+        DBGFR3_DISAS_INSTR_CUR_LOG(pVCpu, "RSS: ");
         rc = emR3RawStep(pVM, pVCpu);
         if (rc != VINF_SUCCESS)
@@ -285 +285 @@
     if (pszPrefix)
     {
-        DBGFR3InfoLog(pVM, "cpumguest", pszPrefix);
-        DBGFR3DisasInstrCurrentLog(pVCpu, pszPrefix);
+        DBGFR3_INFO_LOG(pVM, "cpumguest", pszPrefix);
+        DBGFR3_DISAS_INSTR_CUR_LOG(pVCpu, pszPrefix);
     }
 #endif /* LOG_ENABLED */
@@ -634 +634 @@
 
 #ifdef LOG_ENABLED
-    DBGFR3InfoLog(pVM, "cpumguest", "Guest trap");
-    DBGFR3DisasInstrCurrentLog(pVCpu, "Guest trap");
+    DBGFR3_INFO_LOG(pVM, "cpumguest", "Guest trap");
+    DBGFR3_DISAS_INSTR_CUR_LOG(pVCpu, "Guest trap");
 
     /* Get guest page information. */
@@ -687 +687 @@
                 if (RT_SUCCESS(rc))
                 {
-                    DBGFR3DisasInstrCurrentLog(pVCpu, "Patched sysenter instruction");
+                    DBGFR3_DISAS_INSTR_CUR_LOG(pVCpu, "Patched sysenter instruction");
                     return VINF_EM_RESCHEDULE_RAW;
                 }
@@ -770 +770 @@
     {
 #ifdef LOG_ENABLED
-        DBGFR3InfoLog(pVM, "cpumguest", "Trap in patch code");
-        DBGFR3DisasInstrCurrentLog(pVCpu, "Patch code");
+        DBGFR3_INFO_LOG(pVM, "cpumguest", "Trap in patch code");
+        DBGFR3_DISAS_INSTR_CUR_LOG(pVCpu, "Patch code");
 
         DISCPUSTATE Cpu;
@@ -924 +924 @@
         {
 #ifdef LOG_ENABLED
-            DBGFR3InfoLog(pVM, "cpumguest", "PRIV");
+            DBGFR3_INFO_LOG(pVM, "cpumguest", "PRIV");
 #endif
             AssertMsgFailed(("FATAL ERROR: executing random instruction inside generated patch jump %08x\n", pCtx->eip));
@@ -938 +938 @@
             {
 #ifdef LOG_ENABLED
-                DBGFR3InfoLog(pVM, "cpumguest", "PRIV");
+                DBGFR3_INFO_LOG(pVM, "cpumguest", "PRIV");
 #endif
-                DBGFR3DisasInstrCurrentLog(pVCpu, "Patched privileged instruction");
+                DBGFR3_DISAS_INSTR_CUR_LOG(pVCpu, "Patched privileged instruction");
                 return VINF_SUCCESS;
             }
@@ -949 +949 @@
     if (!PATMIsPatchGCAddr(pVM, pCtx->eip))
     {
-        DBGFR3InfoLog(pVM, "cpumguest", "PRIV");
-        DBGFR3DisasInstrCurrentLog(pVCpu, "Privileged instr: ");
+        DBGFR3_INFO_LOG(pVM, "cpumguest", "PRIV");
+        DBGFR3_DISAS_INSTR_CUR_LOG(pVCpu, "Privileged instr: ");
     }
 #endif
@@ -1089 +1089 @@
                     if (PATMIsPatchGCAddr(pVM, pCtx->eip))
                     {
-                        DBGFR3InfoLog(pVM, "cpumguest", "PRIV");
-                        DBGFR3DisasInstrCurrentLog(pVCpu, "Privileged instr: ");
+                        DBGFR3_INFO_LOG(pVM, "cpumguest", "PRIV");
+                        DBGFR3_DISAS_INSTR_CUR_LOG(pVCpu, "Privileged instr: ");
                     }
 #endif