vbox的更動 17426 路徑 trunk/src/recompiler_new

時間撮記:

2009-3-6 上午01:55:51 (16 年 以前)

作者:

vboxsync

訊息:

REM: Don't use PGMPhysGCPtr2R3PtrByGstCR3 - removed remR3DisasBlock and switched remR3DisasInstr to the DBGF disassembler.

位置:

trunk/src/recompiler_new

檔案:

• VBoxREMWrapper.cpp (修改) (2 筆差異)
• VBoxRecompiler.c (修改) (3 筆差異)

trunk/src/recompiler_new/VBoxREMWrapper.cpp

@@ -725 +725 @@
     { REMPARMDESC_FLAGS_INT,        sizeof(void *), NULL }
 };
-static const REMPARMDESC g_aArgsPGMPhysGCPtr2R3PtrByGstCR3[] =
-{
-    { REMPARMDESC_FLAGS_INT,        sizeof(PVM), NULL },
-    { REMPARMDESC_FLAGS_GCPHYS,     sizeof(RTGCPHYS), NULL },
-    { REMPARMDESC_FLAGS_INT,        sizeof(uint64_t), NULL },
-    { REMPARMDESC_FLAGS_INT,        sizeof(unsigned), NULL },
-    { REMPARMDESC_FLAGS_INT,        sizeof(PRTR3PTR), NULL }
-};
 static const REMPARMDESC g_aArgsPGM3PhysGrowRange[] =
 {
@@ -1131 +1123 @@
     { "PGMInvalidatePage",                      (void *)(uintptr_t)&PGMInvalidatePage,              &g_aArgsPGMInvalidatePage[0],               RT_ELEMENTS(g_aArgsPGMInvalidatePage),                 REMFNDESC_FLAGS_RET_INT,    sizeof(int),        NULL },
     { "PGMPhysGCPhys2R3Ptr",                    (void *)(uintptr_t)&PGMPhysGCPhys2R3Ptr,            &g_aArgsPGMPhysGCPhys2R3Ptr[0],             RT_ELEMENTS(g_aArgsPGMPhysGCPhys2R3Ptr),               REMFNDESC_FLAGS_RET_INT,    sizeof(int),        NULL },
-    { "PGMPhysGCPtr2R3PtrByGstCR3",             (void *)(uintptr_t)&PGMPhysGCPtr2R3PtrByGstCR3,     &g_aArgsPGMPhysGCPtr2R3PtrByGstCR3[0],      RT_ELEMENTS(g_aArgsPGMPhysGCPtr2R3PtrByGstCR3),        REMFNDESC_FLAGS_RET_INT,    sizeof(int),        NULL },
 #ifndef VBOX_WITH_NEW_PHYS_CODE
     { "PGM3PhysGrowRange",                      (void *)(uintptr_t)&PGM3PhysGrowRange,              &g_aArgsPGM3PhysGrowRange[0],               RT_ELEMENTS(g_aArgsPGM3PhysGrowRange),                 REMFNDESC_FLAGS_RET_INT,    sizeof(int),        NULL },

trunk/src/recompiler_new/VBoxRecompiler.c

@@ -3465 +3465 @@
 
 /**
- * Disassembles n instructions and prints them to the log.
- *
- * @returns Success indicator.
- * @param   env         Pointer to the recompiler CPU structure.
- * @param   f32BitCode  Indicates that whether or not the code should
- *                      be disassembled as 16 or 32 bit. If -1 the CS
- *                      selector will be inspected.
- * @param   nrInstructions  Nr of instructions to disassemble
- * @param   pszPrefix
- * @remark  not currently used for anything but ad-hoc debugging.
- */
-bool remR3DisasBlock(CPUState *env, int f32BitCode, int nrInstructions, char *pszPrefix)
-{
-    int           i, rc;
-    RTGCPTR       GCPtrPC;
-    uint8_t       *pvPC;
-    RTINTPTR      off;
-    DISCPUSTATE   Cpu;
-
-    /*
-     * Determin 16/32 bit mode.
-     */
-    if (f32BitCode == -1)
-        f32BitCode = !!(env->segs[R_CS].flags & X86_DESC_DB); /** @todo is this right?!!?!?!?!? */
-
-    /*
-     * Convert cs:eip to host context address.
-     * We don't care to much about cross page correctness presently.
-     */
-    GCPtrPC = env->segs[R_CS].base + env->eip;
-    if (f32BitCode && (env->cr[0] & (X86_CR0_PE | X86_CR0_PG)) == (X86_CR0_PE | X86_CR0_PG))
-    {
-        Assert(PGMGetGuestMode(env->pVM) < PGMMODE_AMD64);
-
-        /* convert eip to physical address. */
-        rc = PGMPhysGCPtr2R3PtrByGstCR3(env->pVM,
-                                        GCPtrPC,
-                                        env->cr[3],
-                                        env->cr[4] & (X86_CR4_PSE | X86_CR4_PAE), /** @todo add longmode flag */
-                                        (void**)&pvPC);
-        if (RT_FAILURE(rc))
-        {
-            if (!PATMIsPatchGCAddr(env->pVM, GCPtrPC))
-                return false;
-            pvPC = (uint8_t *)PATMR3QueryPatchMemHC(env->pVM, NULL)
-                + (GCPtrPC - PATMR3QueryPatchMemGC(env->pVM, NULL));
-        }
-    }
-    else
-    {
-        /* physical address */
-        rc = PGMPhysGCPhys2R3Ptr(env->pVM, (RTGCPHYS)GCPtrPC, nrInstructions * 16,
-                                 (void**)&pvPC);
-        if (RT_FAILURE(rc))
-            return false;
-    }
-
-    /*
-     * Disassemble.
-     */
-    off = env->eip - (RTGCUINTPTR)(uintptr_t)pvPC;
-    Cpu.mode = f32BitCode ? CPUMODE_32BIT : CPUMODE_16BIT;
-    Cpu.pfnReadBytes = NULL;            /** @todo make cs:eip reader for the disassembler. */
-    //Cpu.dwUserData[0] = (uintptr_t)pVM;
-    //Cpu.dwUserData[1] = (uintptr_t)pvPC;
-    //Cpu.dwUserData[2] = GCPtrPC;
-
-    for (i=0;i<nrInstructions;i++)
-    {
-        char szOutput[256];
-        uint32_t    cbOp;
-        if (RT_FAILURE(DISInstr(&Cpu, (uintptr_t)pvPC, off, &cbOp, &szOutput[0])))
-            return false;
-        if (pszPrefix)
-            Log(("%s: %s", pszPrefix, szOutput));
-        else
-            Log(("%s", szOutput));
-
-        pvPC += cbOp;
-    }
-    return true;
-}
-
-
-/** @todo need to test the new code, using the old code in the mean while. */
-#define USE_OLD_DUMP_AND_DISASSEMBLY
-
-/**
  * Disassembles one instruction and prints it to the log.
  *
@@ -3564 +3476 @@
 bool remR3DisasInstr(CPUState *env, int f32BitCode, char *pszPrefix)
 {
-#ifdef USE_OLD_DUMP_AND_DISASSEMBLY
-    PVM         pVM =   env->pVM;
-    RTGCPTR     GCPtrPC;
-    uint8_t     *pvPC;
-    char        szOutput[256];
-    uint32_t    cbOp;
-    RTINTPTR    off;
-    DISCPUSTATE Cpu;
-
-
-    /* Doesn't work in long mode. */
-    if (env->hflags & HF_LMA_MASK)
-        return false;
-
-    /*
-     * Determin 16/32 bit mode.
-     */
-    if (f32BitCode == -1)
-        f32BitCode = !!(env->segs[R_CS].flags & X86_DESC_DB); /** @todo is this right?!!?!?!?!? */
-
-    /*
-     * Log registers
-     */
-    if (LogIs2Enabled())
-    {
-        remR3StateUpdate(pVM);
-        DBGFR3InfoLog(pVM, "cpumguest", pszPrefix);
-    }
-
-    /*
-     * Convert cs:eip to host context address.
-     * We don't care to much about cross page correctness presently.
-     */
-    GCPtrPC = env->segs[R_CS].base + env->eip;
-    if ((env->cr[0] & (X86_CR0_PE | X86_CR0_PG)) == (X86_CR0_PE | X86_CR0_PG))
-    {
-        /* convert eip to physical address. */
-        int rc = PGMPhysGCPtr2R3PtrByGstCR3(pVM,
-                                            GCPtrPC,
-                                            env->cr[3],
-                                            env->cr[4] & (X86_CR4_PSE | X86_CR4_PAE),
-                                            (void**)&pvPC);
-        if (RT_FAILURE(rc))
-        {
-            if (!PATMIsPatchGCAddr(pVM, GCPtrPC))
-                return false;
-            pvPC = (uint8_t *)PATMR3QueryPatchMemHC(pVM, NULL)
-                + (GCPtrPC - PATMR3QueryPatchMemGC(pVM, NULL));
-        }
-    }
-    else
-    {
-
-        /* physical address */
-        int rc = PGMPhysGCPhys2R3Ptr(pVM, (RTGCPHYS)GCPtrPC, 16, (void**)&pvPC);
-        if (RT_FAILURE(rc))
-            return false;
-    }
-
-    /*
-     * Disassemble.
-     */
-    off = env->eip - (RTGCUINTPTR)(uintptr_t)pvPC;
-    Cpu.mode = f32BitCode ? CPUMODE_32BIT : CPUMODE_16BIT;
-    Cpu.pfnReadBytes = NULL;            /** @todo make cs:eip reader for the disassembler. */
-    //Cpu.dwUserData[0] = (uintptr_t)pVM;
-    //Cpu.dwUserData[1] = (uintptr_t)pvPC;
-    //Cpu.dwUserData[2] = GCPtrPC;
-    if (RT_FAILURE(DISInstr(&Cpu, (uintptr_t)pvPC, off, &cbOp, &szOutput[0])))
-        return false;
-
-    if (!f32BitCode)
-    {
-        if (pszPrefix)
-            Log(("%s: %04X:%s", pszPrefix, env->segs[R_CS].selector, szOutput));
-        else
-            Log(("%04X:%s", env->segs[R_CS].selector, szOutput));
-    }
-    else
-    {
-        if (pszPrefix)
-            Log(("%s: %s", pszPrefix, szOutput));
-        else
-            Log(("%s", szOutput));
-    }
-    return true;
-
-#else /* !USE_OLD_DUMP_AND_DISASSEMBLY */
     PVM pVM = env->pVM;
     const bool fLog = LogIsEnabled();
@@ -3681 +3505 @@
 
     return RT_SUCCESS(rc);
-#endif
 }