Changeset 22112 in vbox for trunk/src/recompiler

Timestamp:

Aug 9, 2009 8:14:32 PM (15 years ago)

Author:

vboxsync

Message:

DBGF,REM,Diggers: Converted more of the code dealing with debug symbol to use the DBGFR3As API. Not prefect yet, but we're slowly getting there.

Location:

trunk/src/recompiler

Files:

• VBoxREMWrapper.cpp (modified) (5 diffs)
• VBoxRecompiler.c (modified) (1 diff)

trunk/src/recompiler/VBoxREMWrapper.cpp

@@ -577 +577 @@
     { REMPARMDESC_FLAGS_INT,        sizeof(PCDBGFINFOHLP), NULL }
 };
-static const REMPARMDESC g_aArgsDBGFR3SymbolByAddr[] =
-{
-    { REMPARMDESC_FLAGS_INT,        sizeof(PVM), NULL },
-    { REMPARMDESC_FLAGS_GCPTR,      sizeof(RTGCUINTPTR), NULL },
-    { REMPARMDESC_FLAGS_GCPTR,      sizeof(RTGCINTPTR), NULL },
-    { REMPARMDESC_FLAGS_INT,        sizeof(PDBGFSYMBOL), NULL }
+static const REMPARMDESC g_aArgsDBGFR3AsSymbolByAddr[] =
+{
+    { REMPARMDESC_FLAGS_INT,        sizeof(PVM), NULL },
+    { REMPARMDESC_FLAGS_INT,        sizeof(RTDBGAS), NULL },
+    { REMPARMDESC_FLAGS_INT,        sizeof(PCDBGFADDRESS), NULL },
+    { REMPARMDESC_FLAGS_GCPTR,      sizeof(PRTGCINTPTR), NULL },
+    { REMPARMDESC_FLAGS_INT,        sizeof(PRTDBGSYMBOL), NULL },
+    { REMPARMDESC_FLAGS_INT,        sizeof(PRTDBGMOD), NULL }
 };
 static const REMPARMDESC g_aArgsDISInstr[] =
@@ -714 +716 @@
     { REMPARMDESC_FLAGS_INT,        sizeof(uint8_t), NULL }
 };
-static const REMPARMDESC g_aArgsPDMR3CritSectInit[] = 
+static const REMPARMDESC g_aArgsPDMR3CritSectInit[] =
 {
     { REMPARMDESC_FLAGS_INT,        sizeof(PVM), NULL },
@@ -720 +722 @@
     { REMPARMDESC_FLAGS_INT,        sizeof(char *), NULL }
 };
-static const REMPARMDESC g_aArgsPDMCritSectEnter[] = 
+static const REMPARMDESC g_aArgsPDMCritSectEnter[] =
 {
     { REMPARMDESC_FLAGS_INT,        sizeof(PPDMCRITSECT), NULL },
@@ -1114 +1116 @@
     { "DBGFR3Info",                             (void *)(uintptr_t)&DBGFR3Info,                     &g_aArgsDBGFR3Info[0],                      RT_ELEMENTS(g_aArgsDBGFR3Info),                        REMFNDESC_FLAGS_RET_INT,    sizeof(int),        NULL },
     { "DBGFR3InfoLogRelHlp",                    (void *)(uintptr_t)&DBGFR3InfoLogRelHlp,            NULL,                                       0,                                                     REMFNDESC_FLAGS_RET_INT,    sizeof(void *),     NULL },
-    { "DBGFR3SymbolByAddr",                     (void *)(uintptr_t)&DBGFR3SymbolByAddr,             &g_aArgsDBGFR3SymbolByAddr[0],              RT_ELEMENTS(g_aArgsDBGFR3SymbolByAddr),                REMFNDESC_FLAGS_RET_INT,    sizeof(int),        NULL },
+    { "DBGFR3AsSymbolByAddr",                   (void *)(uintptr_t)&DBGFR3AsSymbolByAddr,           &g_aArgsDBGFR3AsSymbolByAddr[0],            RT_ELEMENTS(g_aArgsDBGFR3AsSymbolByAddr),              REMFNDESC_FLAGS_RET_INT,    sizeof(int),        NULL },
     { "DISInstr",                               (void *)(uintptr_t)&DISInstr,                       &g_aArgsDISInstr[0],                        RT_ELEMENTS(g_aArgsDISInstr),                          REMFNDESC_FLAGS_RET_INT,    sizeof(bool),       NULL },
     { "EMR3FatalError",                         (void *)(uintptr_t)&EMR3FatalError,                 &g_aArgsEMR3FatalError[0],                  RT_ELEMENTS(g_aArgsEMR3FatalError),                    REMFNDESC_FLAGS_RET_VOID,   0,                  NULL },
@@ -1145 +1147 @@
     { "PDMCritSectEnter",                       (void *)(uintptr_t)&PDMCritSectEnter,               &g_aArgsPDMCritSectEnter[0],                RT_ELEMENTS(g_aArgsPDMCritSectEnter),                  REMFNDESC_FLAGS_RET_INT,    sizeof(int),        NULL },
     { "PDMCritSectLeave",                       (void *)(uintptr_t)&PDMCritSectLeave,               &g_aArgsPTR[0],                             RT_ELEMENTS(g_aArgsPTR),                               REMFNDESC_FLAGS_RET_VOID,   0,                  NULL },
-    
+
     { "PDMGetInterrupt",                        (void *)(uintptr_t)&PDMGetInterrupt,                &g_aArgsPDMGetInterrupt[0],                 RT_ELEMENTS(g_aArgsPDMGetInterrupt),                   REMFNDESC_FLAGS_RET_INT,    sizeof(int),        NULL },
     { "PDMIsaSetIrq",                           (void *)(uintptr_t)&PDMIsaSetIrq,                   &g_aArgsPDMIsaSetIrq[0],                    RT_ELEMENTS(g_aArgsPDMIsaSetIrq),                      REMFNDESC_FLAGS_RET_INT,    sizeof(int),        NULL },

trunk/src/recompiler/VBoxRecompiler.c

@@ -3846 +3846 @@
 const char *lookup_symbol(target_ulong orig_addr)
 {
-    RTGCINTPTR off = 0;
-    DBGFSYMBOL Sym;
-    PVM pVM = cpu_single_env->pVM;
-    int rc = DBGFR3SymbolByAddr(pVM, orig_addr, &off, &Sym);
+    PVM         pVM = cpu_single_env->pVM;
+    RTGCINTPTR  off = 0;
+    RTDBGSYMBOL Sym;
+    DBGFADDRESS Addr;
+
+    int rc = DBGFR3AsSymbolByAddr(pVM, DBGF_AS_GLOBAL, DBGFR3AddrFromFlat(pVM, &Addr, orig_addr), &off, &Sym, NULL /*phMod*/);
     if (RT_SUCCESS(rc))
     {