Changeset 13839

Timestamp:

11/05/08 04:27:47 (2 months ago)

Author:

vboxsync

Message:

And yet more %V* -> %R* changes...

Files:

• trunk/src/VBox/Additions/common/VBoxGuestLib/SysHlp.cpp (modified) (3 diffs)
• trunk/src/VBox/Disassembler/DisasmReg.cpp (modified) (1 diff)
• trunk/src/VBox/HostDrivers/Support/SUPDrv.c (modified) (1 diff)
• trunk/src/VBox/HostDrivers/Support/testcase/tstPin.cpp (modified) (1 diff)
• trunk/src/VBox/HostServices/SharedOpenGL/vboxgl.cpp (modified) (1 diff)
• trunk/src/VBox/Runtime/r0drv/darwin/memobj-r0drv-darwin.cpp (modified) (1 diff)
• trunk/src/VBox/Runtime/r0drv/os2/memobj-r0drv-os2.cpp (modified) (1 diff)
• trunk/src/VBox/Runtime/r0drv/solaris/memobj-r0drv-solaris.c (modified) (2 diffs)
• trunk/src/VBox/Runtime/r0drv/solaris/vbi/memobj-r0drv-solaris.c (modified) (1 diff)
• trunk/src/VBox/Runtime/testcase/tstLog.cpp (modified) (2 diffs)
• trunk/src/recompiler/cpu-all.h (modified) (3 diffs)
• trunk/src/recompiler/cpu-exec.c (modified) (11 diffs)
• trunk/src/recompiler/target-i386/helper.c (modified) (6 diffs)
• trunk/src/recompiler/target-i386/translate.c (modified) (1 diff)
• trunk/src/recompiler_new/cpu-all.h (modified) (4 diffs)
• trunk/src/recompiler_new/cpu-exec.c (modified) (6 diffs)
• trunk/src/recompiler_new/target-i386/translate.c (modified) (67 diffs)

trunk/src/VBox/Additions/common/VBoxGuestLib/SysHlp.cpp

@@ -42 +42 @@
-    {
-        rc = VERR_NOT_SUPPORTED;
-VGv
+p
-    }
-    else
@@ -58 +58 @@
-            IoFreeMdl (pMdl);
-            rc = VERR_INVALID_PARAMETER;
-VGv
+p
-        }
-    }
@@ -280 +280 @@
-
-    irp->AssociatedIrp.SystemBuffer = pvData; /* Output buffer. */
-    
+
-
-    /* A completion routine is required to signal the Event. */

trunk/src/VBox/Disassembler/DisasmReg.cpp

@@ -721 +721 @@
-            pParamVal->size   = sizeof(uint16_t);
-            pParamVal->val.val16 = (uint16_t)pParam->parval;
-VGv
+RX32
-        }
-        else

trunk/src/VBox/HostDrivers/Support/SUPDrv.c

@@ -2154 +2154 @@
-                {
-                    paPages[iPage] = RTR0MemObjGetPagePhysAddr(Mem.MemObj, iPage);
-V
+R
-                }
-                *ppvR0 = RTR0MemObjAddress(Mem.MemObj);

trunk/src/VBox/HostDrivers/Support/testcase/tstPin.cpp

@@ -96 +96 @@
-                    if (aPinnings[i].aPages[j].Phys >= _4G)
-                    {
-V
+R
-                        c4GPluss++;
-                    }

trunk/src/VBox/HostServices/SharedOpenGL/vboxgl.cpp

@@ -121 +121 @@
-
-#ifdef DEBUG
-V
+R
-    switch(*pLastError)
-    {

trunk/src/VBox/Runtime/r0drv/darwin/memobj-r0drv-darwin.cpp

@@ -695 +695 @@
-        AssertMsgReturn(Addr, ("iPage=%u\n", iPage), NIL_RTHCPHYS);
-        PhysAddr = Addr;
-V
+R
-    }
-

trunk/src/VBox/Runtime/r0drv/os2/memobj-r0drv-os2.cpp

@@ -197 +197 @@
-int rtR0MemObjNativeAllocPhys(PPRTR0MEMOBJINTERNAL ppMem, size_t cb, RTHCPHYS PhysHighest)
-{
-V
+R
-
-    /* create the object. */

trunk/src/VBox/Runtime/r0drv/solaris/memobj-r0drv-solaris.c

@@ -237 +237 @@
-int rtR0MemObjNativeAllocPhys(PPRTR0MEMOBJINTERNAL ppMem, size_t cb, RTHCPHYS PhysHighest)
-{
-V
+R
-
-    return rtR0MemObjNativeAllocCont(ppMem, cb, false);
@@ -305 +305 @@
-    pMemSolaris->ppShadowPages = NULL;
-    *ppMem = &pMemSolaris->Core;
-    
+
-}
-

trunk/src/VBox/Runtime/r0drv/solaris/vbi/memobj-r0drv-solaris.c

@@ -175 +175 @@
-int rtR0MemObjNativeAllocPhys(PPRTR0MEMOBJINTERNAL ppMem, size_t cb, RTHCPHYS PhysHighest)
-{
-V
+R
-
-    return rtR0MemObjNativeAllocCont(ppMem, cb, false);

trunk/src/VBox/Runtime/testcase/tstLog.cpp

@@ -47 +47 @@
-    RTLogPrintf("%%Rra %d: %Rra\n", VERR_INVALID_PARAMETER, VERR_INVALID_PARAMETER);
-
-Vt: %V
+Rt: %R
-
-    static uint8_t au8Hex[256];
-    for (unsigned iHex = 0; iHex < sizeof(au8Hex); iHex++)
-        au8Hex[iHex] = (uint8_t)iHex;
-Vhxs   : %V
+Rhxs   : %R
-    RTLogPrintf("%%.32Vhxs: %.32Vhxs\n", &au8Hex[0]);
-
-Vhxd   :\n%V
+Rhxd   :\n%R
-    RTLogPrintf("%%.64Vhxd:\n%.64Vhxd\n", &au8Hex[0]);
-    RTLogPrintf("%%.*Vhxd:\n%.*Vhxd\n", 64, &au8Hex[0]);
@@ -64 +64 @@
-    RTLogPrintf("%%*.*Vhxd : \n%*.*Vhxd\n", 7, 32, &au8Hex[0]);
-
-VGp: %V
-VGv: %V
-VHp: %V
-VHv: %V
+RGp: %R
+RGv: %R
+RHp: %R
+RHv: %R
-
-VI8 : %V
-VI16: %V
-VI32: %V
-VI64: %V
+RI8 : %R
+RI16: %R
+RI32: %R
+RI64: %R
-
-VU8 : %V
-VU16: %V
-VU32: %V
-VU64: %V
+RU8 : %R
+RU16: %R
+RU32: %R
+RU64: %R
-
-VX8 : %V
-VX16: %V
-VX32: %V
-VX64: %V
+RX8 : %R
+RX16: %R
+RX32: %R
+RX64: %R
-
-    RTLogFlush(NULL);

trunk/src/recompiler/cpu-all.h

@@ -1066 +1066 @@
-    if (RT_UNLIKELY((addr >> TARGET_PAGE_BITS) >= phys_ram_dirty_size))
-    {
-V
-V
+R
+R
-        return 0;
-    }
@@ -1080 +1080 @@
-    if (RT_UNLIKELY((addr >> TARGET_PAGE_BITS) >= phys_ram_dirty_size))
-    {
-V
-V
+R
+R
-        return 0xff & dirty_flags; /** @todo I don't think this is the right thing to return, fix! */
-    }
@@ -1093 +1093 @@
-    if (RT_UNLIKELY((addr >> TARGET_PAGE_BITS) >= phys_ram_dirty_size))
-    {
-V
-V
+R
+R
-        return;
-    }

trunk/src/recompiler/cpu-exec.c

@@ -362 +362 @@
-                       double or triple faults yet. */
-                    RAWEx_ProfileStart(env, STATS_IRQ_HANDLING);
-V
+R
-                    do_interrupt(env->exception_index,
-                                 env->exception_is_int,
@@ -388 +388 @@
-                            env->exception_index = EXCP_SINGLE_INSTR;
-                            if (emulate_single_instr(env) == -1)
-V
+R
-
-                            /* When we receive an external interrupt during execution of this single
@@ -497 +497 @@
-                    if(!(env->state & CPU_EMULATE_SINGLE_STEP))
-                    {
-VGv ESP=%V
+RGv ESP=%R
-                    }
-                }
@@ -507 +507 @@
-                        if(env->eflags & VM_MASK)
-                        {
-V
+R
-                        }
-                        else
-                        {
-VGv ESP=%V
+RGv ESP=%R
-                        }
-                    }
@@ -518 +518 @@
-                {
-                    /* Seriously slows down realmode booting. */
-VGv SS:ESP=%04X:%V
+RGv SS:ESP=%04X:%R
-                }
-#endif /* !DEBUG_bird */
@@ -542 +542 @@
-                    if(emulate_single_instr(env) == -1)
-                    {
-V
+R
-                    }
-                }
@@ -802 +802 @@
-                            env->exception_index = EXCP_SINGLE_INSTR;
-                            if (emulate_single_instr(env) == -1)
-V
+R
-
-                            /* When we receive an external interrupt during execution of this single
@@ -1201 +1201 @@
-                    if(!(env->state & CPU_EMULATE_SINGLE_STEP))
-                    {
-V
+R
-                    }
-                }
@@ -1211 +1211 @@
-                        if(env->eflags & VM_MASK)
-                        {
-V
+R
-                        }
-                        else
-                        {
-V
+R
-                        }
-                    }
@@ -1240 +1240 @@
-                    if(emulate_single_instr(env) == -1)
-                    {
-V
+R
-                    }
-                }
@@ -1422 +1422 @@
-    if (ret == 1) {
-#if 0
-VGv CR2=0x%V
+RGv CR2=0x%R
-               env->eip, env->cr[2], env->error_code);
-#endif

trunk/src/recompiler/target-i386/helper.c

@@ -1410 +1410 @@
-{
-#if defined(VBOX) && defined(DEBUG)
-V
+R
-#endif
-    env->exception_index = intno;
@@ -1978 +1978 @@
-    target_ulong ptr;
-#ifdef VBOX
-VGv, .limit=%V
+RGv, .limit=%R
-         (RTSEL)env->ldt.selector, (RTGCPTR)env->ldt.base, (RTGCPTR)env->ldt.limit, (RTSEL)(T0 & 0xffff)));
-#endif
@@ -2021 +2021 @@
-    env->ldt.selector = selector;
-#ifdef VBOX
-VGv, .limit=%V
+RGv, .limit=%R
-         (RTSEL)env->ldt.selector, (RTGCPTR)env->ldt.base, (RTGCPTR)env->ldt.limit));
-#endif
@@ -2035 +2035 @@
-
-#ifdef VBOX
-VGv, .limit=%V
+RGv, .limit=%R
-         (RTSEL)env->tr.selector, (RTGCPTR)env->tr.base, (RTGCPTR)env->tr.limit,
-         env->tr.flags, (RTSEL)(T0 & 0xffff)));
@@ -2084 +2084 @@
-    env->tr.selector = selector;
-#ifdef VBOX
-VGv, .limit=%V
+RGv, .limit=%R
-         (RTSEL)env->tr.selector, (RTGCPTR)env->tr.base, (RTGCPTR)env->tr.limit,
-         env->tr.flags, (RTSEL)(T0 & 0xffff)));
@@ -4651 +4651 @@
-    if (env->hflags & HF_INHIBIT_IRQ_MASK)
-    {
-V
+R
-        env->hflags &= ~HF_INHIBIT_IRQ_MASK;
-        emulate_single_instr(env);

trunk/src/recompiler/target-i386/translate.c

@@ -3353 +3353 @@
-    /* illegal sequence. The s->pc is past the lock prefix and that
-       is sufficient for the TB, I think. */
-V
+R
-    return true;
-}

trunk/src/recompiler_new/cpu-all.h

@@ -1192 +1192 @@
-
-/* MMIO pages are identified by a combination of an IO device index and
- 
+
-   so only a limited number of ids are avaiable.  */
-
@@ -1291 +1291 @@
-    if (RT_UNLIKELY((addr >> TARGET_PAGE_BITS) >= phys_ram_dirty_size))
-    {
-V
-V
+R
+R
-        return 0;
-    }
@@ -1311 +1311 @@
-    if (RT_UNLIKELY((addr >> TARGET_PAGE_BITS) >= phys_ram_dirty_size))
-    {
-V
-V
+R
+R
-        return 0xff & dirty_flags; /** @todo I don't think this is the right thing to return, fix! */
-    }
@@ -1329 +1329 @@
-    if (RT_UNLIKELY((addr >> TARGET_PAGE_BITS) >= phys_ram_dirty_size))
-    {
-V
-V
+R
+R
-        return;
-    }

trunk/src/recompiler_new/cpu-exec.c

@@ -326 +326 @@
-                       double or triple faults yet. */
-                    RAWEx_ProfileStart(env, STATS_IRQ_HANDLING);
-V
+R
-                    do_interrupt(env->exception_index,
-                                 env->exception_is_int,
@@ -360 +360 @@
-                            env->exception_index = EXCP_SINGLE_INSTR;
-                            if (emulate_single_instr(env) == -1)
-V
+R
-
-                            /* When we receive an external interrupt during execution of this single
@@ -504 +504 @@
-                     }
-                }
-
+
-                /* reset soft MMU for next block (it can currently
-                   only be set by a memory fault) */
@@ -695 +695 @@
-                            next_tb = 0;
-                        } else if ((interrupt_request & CPU_INTERRUPT_HARD) &&
- 
+
-                                     (env->hflags2 & HF2_HIF_MASK)) ||
- 
- 
+
+
-                                      !(env->hflags & HF_INHIBIT_IRQ_MASK))))) {
-                            int intno;
@@ -713 +713 @@
-#if !defined(CONFIG_USER_ONLY)
-                        } else if ((interrupt_request & CPU_INTERRUPT_VIRQ) &&
- 
+
-                                   !(env->hflags & HF_INHIBIT_IRQ_MASK)) {
-                            int intno;
@@ -1096 +1096 @@
-    if (ret == 1) {
-#if 0
-VGv CR2=0x%V
+RGv CR2=0x%R
-               env->eip, env->cr[2], env->error_code);
-#endif

trunk/src/recompiler_new/target-i386/translate.c

@@ -519 +519 @@
-}
-#endif
-
+
-static void gen_add_A0_im(DisasContext *s, int val)
-{
@@ -624 +624 @@
-{
-    tcg_gen_ld_tl(cpu_tmp0, cpu_env, offsetof(CPUState, regs[reg]));
- 
+
-        tcg_gen_shli_tl(cpu_tmp0, cpu_tmp0, shift);
-    tcg_gen_add_tl(cpu_A0, cpu_A0, cpu_tmp0);
@@ -690 +690 @@
-{
-    tcg_gen_ld_tl(cpu_tmp0, cpu_env, offsetof(CPUState, regs[reg]));
- 
+
-        tcg_gen_shli_tl(cpu_tmp0, cpu_tmp0, shift);
-    tcg_gen_add_tl(cpu_A0, cpu_A0, cpu_tmp0);
@@ -826 +826 @@
-    int skip_label;
-    TCGv t0;
-
+
-    skip_label = gen_new_label();
-    /* t0 = tcg_temp_local_new(TCG_TYPE_TL); */
- 
+
-
-    tcg_gen_ld32u_tl(t0, cpu_env, offsetof(CPUState, interrupt_request));
-    /* Keep in sync with helper_check_external_event() */
- 
+
-                    CPU_INTERRUPT_EXTERNAL_EXIT
-                    | CPU_INTERRUPT_EXTERNAL_TIMER
@@ -923 +923 @@
-
-#ifndef VBOX
- 
+
-#else /* VBOX */
- 
+
-#endif /* VBOX */
-{
@@ -1109 +1109 @@
-#if TCG_TARGET_REG_BITS == 32
-    tcg_gen_shli_i32(cpu_tmp2_i32, cpu_cc_op, 3);
- 
+
-                     (long)cc_table + offsetof(CCTable, compute_c));
-    tcg_gen_ld_i32(cpu_tmp2_i32, cpu_tmp2_i32, 0);
- 
+
-                 1, &cpu_tmp2_i32, 0, NULL);
-#else
-    tcg_gen_extu_i32_tl(cpu_tmp1_i64, cpu_cc_op);
-    tcg_gen_shli_i64(cpu_tmp1_i64, cpu_tmp1_i64, 4);
- 
+
-                     (long)cc_table + offsetof(CCTable, compute_c));
-    tcg_gen_ld_i64(cpu_tmp1_i64, cpu_tmp1_i64, 0);
- 
+
-                 1, &cpu_tmp2_i32, 0, NULL);
-#endif
@@ -1131 +1131 @@
-#if TCG_TARGET_REG_BITS == 32
-    tcg_gen_shli_i32(cpu_tmp2_i32, cpu_cc_op, 3);
- 
+
-                     (long)cc_table + offsetof(CCTable, compute_all));
-    tcg_gen_ld_i32(cpu_tmp2_i32, cpu_tmp2_i32, 0);
- 
+
-                 1, &cpu_tmp2_i32, 0, NULL);
-#else
-    tcg_gen_extu_i32_tl(cpu_tmp1_i64, cpu_cc_op);
-    tcg_gen_shli_i64(cpu_tmp1_i64, cpu_tmp1_i64, 4);
- 
+
-                     (long)cc_table + offsetof(CCTable, compute_all));
-    tcg_gen_ld_i64(cpu_tmp1_i64, cpu_tmp1_i64, 0);
- 
+
-                 1, &cpu_tmp2_i32, 0, NULL);
-#endif
@@ -1277 +1277 @@
-    case CC_OP_SUBL:
-    case CC_OP_SUBQ:
-
+
-        size = cc_op - CC_OP_SUBB;
-        switch(jcc_op) {
@@ -1308 +1308 @@
-            case 0:
-                tcg_gen_andi_tl(cpu_tmp0, cpu_cc_dst, 0x80);
- 
+
-                                   0, l1);
-                break;
-            case 1:
-                tcg_gen_andi_tl(cpu_tmp0, cpu_cc_dst, 0x8000);
- 
+
-                                   0, l1);
-                break;
@@ -1319 +1319 @@
-            case 2:
-                tcg_gen_andi_tl(cpu_tmp0, cpu_cc_dst, 0x80000000);
- 
+
-                                   0, l1);
-                break;
-#endif
-            default:
- 
+
-                                   0, l1);
-                break;
-            }
-            break;
-
+
-        case JCC_B:
-            cond = inv ? TCG_COND_GEU : TCG_COND_LTU;
@@ -1361 +1361 @@
-            tcg_gen_brcond_tl(cond, cpu_tmp4, t0, l1);
-            break;
-
+
-        case JCC_L:
-            cond = inv ? TCG_COND_GE : TCG_COND_LT;
@@ -1393 +1393 @@
-            tcg_gen_brcond_tl(cond, cpu_tmp4, t0, l1);
-            break;
-
+
-        default:
-            goto slow_jcc;
-        }
-        break;
-
+
-        /* some jumps are easy to compute */
-    case CC_OP_ADDB:
@@ -1404 +1404 @@
-    case CC_OP_ADDL:
-    case CC_OP_ADDQ:
-
+
-    case CC_OP_ADCB:
-    case CC_OP_ADCW:
-    case CC_OP_ADCL:
-    case CC_OP_ADCQ:
-
+
-    case CC_OP_SBBB:
-    case CC_OP_SBBW:
-    case CC_OP_SBBL:
-    case CC_OP_SBBQ:
-
+
-    case CC_OP_LOGICB:
-    case CC_OP_LOGICW:
-    case CC_OP_LOGICL:
-    case CC_OP_LOGICQ:
-
+
-    case CC_OP_INCB:
-    case CC_OP_INCW:
-    case CC_OP_INCL:
-    case CC_OP_INCQ:
-
+
-    case CC_OP_DECB:
-    case CC_OP_DECW:
-    case CC_OP_DECL:
-    case CC_OP_DECQ:
-
+
-    case CC_OP_SHLB:
-    case CC_OP_SHLW:
-    case CC_OP_SHLL:
-    case CC_OP_SHLQ:
-
+
-    case CC_OP_SARB:
-    case CC_OP_SARW:
@@ -1453 +1453 @@
-    slow_jcc:
-        gen_setcc_slow_T0(s, jcc_op);
- 
+
-                           cpu_T[0], 0, l1);
-        break;
@@ -1802 +1802 @@
-}
-
- 
+
-                            int is_right, int is_arith)
-{
@@ -1844 +1844 @@
-    else
-        gen_op_mov_reg_T0(ot, op1);
-
+
-    /* update eflags if non zero shift */
-    if (s->cc_op != CC_OP_DYNAMIC)
@@ -1865 +1865 @@
-    else
-        tcg_gen_movi_i32(cpu_cc_op, CC_OP_SHLB + ot);
-
+
-    gen_set_label(shift_label);
-    s->cc_op = CC_OP_DYNAMIC; /* cannot predict flags after */
@@ -1877 +1877 @@
-{
-    int mask;
-
+
-    if (ot == OT_QUAD)
-        mask = 0x3f;
@@ -1912 +1912 @@
-    else
-        gen_op_mov_reg_T0(ot, op1);
-
+
-    /* update eflags if non zero shift */
-    if (op2 != 0) {
@@ -1937 +1937 @@
-
-/* XXX: add faster immediate case */
- 
+
-                          int is_right)
-{
@@ -1971 +1971 @@
-    label1 = gen_new_label();
-    tcg_gen_brcondi_tl(TCG_COND_EQ, t1, 0, label1);
-
+
-    if (ot <= OT_WORD)
-        tcg_gen_andi_tl(cpu_tmp0, t1, (1 << (3 + ot)) - 1);
-    else
-        tcg_gen_mov_tl(cpu_tmp0, t1);
-
+
-    gen_extu(ot, t0);
-    tcg_gen_mov_tl(t2, t0);
@@ -2001 +2001 @@
-        gen_op_mov_reg_v(ot, op1, t0);
-    }
-
+
-    /* update eflags */
-    if (s->cc_op != CC_OP_DYNAMIC)
@@ -2020 +2020 @@
-    tcg_gen_andi_tl(t0, t0, CC_C);
-    tcg_gen_or_tl(cpu_cc_src, cpu_cc_src, t0);
-
+
-    tcg_gen_discard_tl(cpu_cc_dst);
-    tcg_gen_movi_i32(cpu_cc_op, CC_OP_EFLAGS);
-
+
-    gen_set_label(label2);
-    s->cc_op = CC_OP_DYNAMIC; /* cannot predict flags after */
@@ -2045 +2045 @@
-
-/* XXX: add faster immediate = 1 case */
- 
+
-                           int is_right)
-{
@@ -2058 +2058 @@
-    else
-        gen_op_mov_TN_reg(ot, 0, op1);
-
+
-    tcg_gen_helper_1_2(helper_rotc[ot + (is_right * 4)],
-                       cpu_T[0], cpu_T[0], cpu_T[1]);
@@ -2074 +2074 @@
-    tcg_gen_discard_tl(cpu_cc_dst);
-    tcg_gen_movi_i32(cpu_cc_op, CC_OP_EFLAGS);
-
+
-    gen_set_label(label1);
-    s->cc_op = CC_OP_DYNAMIC; /* cannot predict flags after */
@@ -2080 +2080 @@
-
-/* XXX: add faster immediate case */
- 
+
-                                int is_right)
-{
@@ -2114 +2114 @@
-    label1 = gen_new_label();
-    tcg_gen_brcondi_tl(TCG_COND_EQ, t2, 0, label1);
-
+
-    tcg_gen_addi_tl(cpu_tmp5, t2, -1);
-    if (ot == OT_WORD) {
@@ -2125 +2125 @@
-
-            tcg_gen_shr_tl(cpu_tmp4, t0, cpu_tmp5);
-
+
-            /* only needed if count > 16, but a test would complicate */
-            tcg_gen_sub_tl(cpu_tmp5, tcg_const_tl(32), t2);
@@ -2139 +2139 @@
-            tcg_gen_or_tl(t1, t1, t0);
-            tcg_gen_ext32u_tl(t1, t1);
-
+
-            tcg_gen_shl_tl(cpu_tmp4, t0, cpu_tmp5);
-            tcg_gen_sub_tl(cpu_tmp0, tcg_const_tl(32), cpu_tmp5);
@@ -2162 +2162 @@
-            tcg_gen_shl_tl(t1, t1, cpu_tmp5);
-            tcg_gen_or_tl(t0, t0, t1);
-
+
-        } else {
-            if (ot == OT_LONG)
@@ -2168 +2168 @@
-
-            tcg_gen_shl_tl(cpu_tmp4, t0, cpu_tmp5);
-
+
-            tcg_gen_shl_tl(t0, t0, t2);
-            tcg_gen_sub_tl(cpu_tmp5, tcg_const_tl(data_bits), t2);