Changeset 44399 in vbox for trunk/src/recompiler/VBoxRecompiler.c

Timestamp:

Jan 27, 2013 9:12:53 PM (12 years ago)

Author:

vboxsync

Message:

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

File:

• trunk/src/recompiler/VBoxRecompiler.c (modified) (9 diffs)

trunk/src/recompiler/VBoxRecompiler.c

@@ -45 +45 @@
 #include "REMInternal.h"
 #include <VBox/vmm/vm.h>
+#include <VBox/vmm/uvm.h>
 #include <VBox/param.h>
 #include <VBox/err.h>
@@ -193 +194 @@
  * Debugger commands.
  */
-static DECLCALLBACK(int) remR3CmdDisasEnableStepping(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs);
+static FNDBGCCMD remR3CmdDisasEnableStepping;;
 
 /** '.remstep' arguments. */
@@ -1121 +1122 @@
          */
         remR3StateUpdate(pVM, pVCpu);
-        DBGFR3Info(pVM, "cpumguest", NULL, NULL);
+        DBGFR3Info(pVM->pUVM, "cpumguest", NULL, NULL);
         szBuf[0] = '\0';
-        rc = DBGFR3DisasInstrEx(pVM,
+        rc = DBGFR3DisasInstrEx(pVM->pUVM,
                                 pVCpu->idCpu,
                                 0, /* Sel */
@@ -3490 +3491 @@
             "*** handlers\n",
             (RTGCPTR)pTLBEntry->addr_code, (RTGCPHYS)pTLBEntry->addend, (RTGCPTR)addr, pVM->rem.s.iHandlerMemType, pVM->rem.s.iMMIOMemType, (RTGCPHYS)ioTLBEntry));
-    DBGFR3Info(pVM, "handlers", NULL, DBGFR3InfoLogRelHlp());
+    DBGFR3Info(pVM->pUVM, "handlers", NULL, DBGFR3InfoLogRelHlp());
     LogRel(("*** mmio\n"));
-    DBGFR3Info(pVM, "mmio", NULL, DBGFR3InfoLogRelHlp());
+    DBGFR3Info(pVM->pUVM, "mmio", NULL, DBGFR3InfoLogRelHlp());
     LogRel(("*** phys\n"));
-    DBGFR3Info(pVM, "phys", NULL, DBGFR3InfoLogRelHlp());
+    DBGFR3Info(pVM->pUVM, "phys", NULL, DBGFR3InfoLogRelHlp());
     cpu_abort(env, "Trying to execute code with memory type addr_code=%RGv addend=%RGp at %RGv. (iHandlerMemType=%#x iMMIOMemType=%#x)\n",
               (RTGCPTR)pTLBEntry->addr_code, (RTGCPHYS)pTLBEntry->addend, (RTGCPTR)addr, pVM->rem.s.iHandlerMemType, pVM->rem.s.iMMIOMemType);
@@ -3923 +3924 @@
  * External Debugger Command: .remstep [on|off|1|0]
  */
-static DECLCALLBACK(int) remR3CmdDisasEnableStepping(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs)
+static DECLCALLBACK(int) remR3CmdDisasEnableStepping(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PUVM pUVM, PCDBGCVAR paArgs, unsigned cArgs)
 {
     int rc;
+    PVM pVM = pUVM->pVM;
 
     if (cArgs == 0)
@@ -3988 +3990 @@
      */
     if (fLog2)
-        DBGFR3InfoLog(pVM, "cpumguest", pszPrefix);
+        DBGFR3_INFO_LOG(pVM, "cpumguest", pszPrefix);
 
     /*
@@ -3998 +4000 @@
         char    szBuf[256];
         szBuf[0] = '\0';
-        int rc = DBGFR3DisasInstrEx(pVCpu->pVMR3,
+        int rc = DBGFR3DisasInstrEx(pVCpu->pVMR3->pUVM,
                                     pVCpu->idCpu,
                                     0, /* Sel */
@@ -4092 +4094 @@
             char        szBuf[256];
             uint32_t    cbInstr;
-            int rc = DBGFR3DisasInstrEx(pVM,
+            int rc = DBGFR3DisasInstrEx(pVM->pUVM,
                                         pVCpu->idCpu,
                                         cs,
@@ -4131 +4133 @@
     DBGFADDRESS Addr;
 
-    int rc = DBGFR3AsSymbolByAddr(pVM, DBGF_AS_GLOBAL, DBGFR3AddrFromFlat(pVM, &Addr, orig_addr), &off, &Sym, NULL /*phMod*/);
+    int rc = DBGFR3AsSymbolByAddr(pVM->pUVM, DBGF_AS_GLOBAL, DBGFR3AddrFromFlat(pVM->pUVM, &Addr, orig_addr),
+                                  &off, &Sym, NULL /*phMod*/);
     if (RT_SUCCESS(rc))
     {