Changeset 13839 in vbox for trunk/src/recompiler/cpu-exec.c

Timestamp:

Nov 5, 2008 3:27:47 AM (16 years ago)

Author:

vboxsync

Message:

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

File:

• trunk/src/recompiler/cpu-exec.c (modified) (11 diffs)

trunk/src/recompiler/cpu-exec.c

@@ -362 +362 @@
                        double or triple faults yet. */
                     RAWEx_ProfileStart(env, STATS_IRQ_HANDLING);
-                    Log(("do_interrupt %d %d %VGv\n", env->exception_index, env->exception_is_int, env->exception_next_eip));
+                    Log(("do_interrupt %d %d %RGv\n", env->exception_index, env->exception_is_int, env->exception_next_eip));
                     do_interrupt(env->exception_index,
                                  env->exception_is_int,
@@ -388 +388 @@
                             env->exception_index = EXCP_SINGLE_INSTR;
                             if (emulate_single_instr(env) == -1)
-                                AssertMsgFailed(("REM: emulate_single_instr failed for EIP=%VGv!!\n", env->eip));
+                                AssertMsgFailed(("REM: emulate_single_instr failed for EIP=%RGv!!\n", env->eip));
 
                             /* When we receive an external interrupt during execution of this single
@@ -497 +497 @@
                     if(!(env->state & CPU_EMULATE_SINGLE_STEP))
                     {
-                        Log(("EMR0: %VGv ESP=%VGv IF=%d TF=%d CPL=%d\n", env->eip, ESP, (env->eflags & IF_MASK) ? 1 : 0, (env->eflags & TF_MASK) ? 1 : 0, (env->hflags >> HF_CPL_SHIFT) & 3));
+                        Log(("EMR0: %RGv ESP=%RGv IF=%d TF=%d CPL=%d\n", env->eip, ESP, (env->eflags & IF_MASK) ? 1 : 0, (env->eflags & TF_MASK) ? 1 : 0, (env->hflags >> HF_CPL_SHIFT) & 3));
                     }
                 }
@@ -507 +507 @@
                         if(env->eflags & VM_MASK)
                         {
-                            Log(("EMV86: %04X:%VGv IF=%d TF=%d CPL=%d CR0=%RGr\n", env->segs[R_CS].selector, env->eip, (env->eflags & IF_MASK) ? 1 : 0, (env->eflags & TF_MASK) ? 1 : 0, (env->hflags >> HF_CPL_SHIFT) & 3, env->cr[0]));
+                            Log(("EMV86: %04X:%RGv IF=%d TF=%d CPL=%d CR0=%RGr\n", env->segs[R_CS].selector, env->eip, (env->eflags & IF_MASK) ? 1 : 0, (env->eflags & TF_MASK) ? 1 : 0, (env->hflags >> HF_CPL_SHIFT) & 3, env->cr[0]));
                         }
                         else
                         {
-                            Log(("EMR3: %VGv ESP=%VGv IF=%d TF=%d CPL=%d IOPL=%d CR0=%RGr\n", env->eip, ESP, (env->eflags & IF_MASK) ? 1 : 0, (env->eflags & TF_MASK) ? 1 : 0, (env->hflags >> HF_CPL_SHIFT) & 3, ((env->eflags >> IOPL_SHIFT) & 3), env->cr[0]));
+                            Log(("EMR3: %RGv ESP=%RGv IF=%d TF=%d CPL=%d IOPL=%d CR0=%RGr\n", env->eip, ESP, (env->eflags & IF_MASK) ? 1 : 0, (env->eflags & TF_MASK) ? 1 : 0, (env->hflags >> HF_CPL_SHIFT) & 3, ((env->eflags >> IOPL_SHIFT) & 3), env->cr[0]));
                         }
                     }
@@ -518 +518 @@
                 {
                     /* Seriously slows down realmode booting. */
-                    LogFlow(("EMRM: %04X:%VGv SS:ESP=%04X:%VGv IF=%d TF=%d CPL=%d PE=%d PG=%d\n", env->segs[R_CS].selector, env->eip, env->segs[R_SS].selector, ESP, (env->eflags & IF_MASK) ? 1 : 0, (env->eflags & TF_MASK) ? 1 : 0, (env->hflags >> HF_CPL_SHIFT) & 3, env->cr[0] & X86_CR0_PE, env->cr[0] & X86_CR0_PG));
+                    LogFlow(("EMRM: %04X:%RGv SS:ESP=%04X:%RGv IF=%d TF=%d CPL=%d PE=%d PG=%d\n", env->segs[R_CS].selector, env->eip, env->segs[R_SS].selector, ESP, (env->eflags & IF_MASK) ? 1 : 0, (env->eflags & TF_MASK) ? 1 : 0, (env->hflags >> HF_CPL_SHIFT) & 3, env->cr[0] & X86_CR0_PE, env->cr[0] & X86_CR0_PG));
                 }
 #endif /* !DEBUG_bird */
@@ -542 +542 @@
                     if(emulate_single_instr(env) == -1)
                     {
-                        Log(("emulate_single_instr failed for EIP=%VGv!!\n", env->eip));
+                        Log(("emulate_single_instr failed for EIP=%RGv!!\n", env->eip));
                     }
                 }
@@ -802 +802 @@
                             env->exception_index = EXCP_SINGLE_INSTR;
                             if (emulate_single_instr(env) == -1)
-                                AssertMsgFailed(("REM: emulate_single_instr failed for EIP=%VGv!!\n", env->eip));
+                                AssertMsgFailed(("REM: emulate_single_instr failed for EIP=%RGv!!\n", env->eip));
 
                             /* When we receive an external interrupt during execution of this single
@@ -1201 +1201 @@
                     if(!(env->state & CPU_EMULATE_SINGLE_STEP))
                     {
-                        Log(("EMR0: %VGv IF=%d TF=%d CPL=%d\n", env->eip, (env->eflags & IF_MASK) ? 1 : 0, (env->eflags & TF_MASK) ? 1 : 0, (env->hflags >> HF_CPL_SHIFT) & 3));
+                        Log(("EMR0: %RGv IF=%d TF=%d CPL=%d\n", env->eip, (env->eflags & IF_MASK) ? 1 : 0, (env->eflags & TF_MASK) ? 1 : 0, (env->hflags >> HF_CPL_SHIFT) & 3));
                     }
                 }
@@ -1211 +1211 @@
                         if(env->eflags & VM_MASK)
                         {
-                            Log(("EMV86: %VGv IF=%d TF=%d CPL=%d flags=%08X CR0=%RGr\n", env->eip, (env->eflags & IF_MASK) ? 1 : 0, (env->eflags & TF_MASK) ? 1 : 0, (env->hflags >> HF_CPL_SHIFT) & 3, flags, env->cr[0]));
+                            Log(("EMV86: %RGv IF=%d TF=%d CPL=%d flags=%08X CR0=%RGr\n", env->eip, (env->eflags & IF_MASK) ? 1 : 0, (env->eflags & TF_MASK) ? 1 : 0, (env->hflags >> HF_CPL_SHIFT) & 3, flags, env->cr[0]));
                         }
                         else
                         {
-                            Log(("EMR3: %VGv IF=%d TF=%d CPL=%d IOPL=%d flags=%08X CR0=%RGr\n", env->eip, (env->eflags & IF_MASK) ? 1 : 0, (env->eflags & TF_MASK) ? 1 : 0, (env->hflags >> HF_CPL_SHIFT) & 3, ((env->eflags >> IOPL_SHIFT) & 3), flags, env->cr[0]));
+                            Log(("EMR3: %RGv IF=%d TF=%d CPL=%d IOPL=%d flags=%08X CR0=%RGr\n", env->eip, (env->eflags & IF_MASK) ? 1 : 0, (env->eflags & TF_MASK) ? 1 : 0, (env->hflags >> HF_CPL_SHIFT) & 3, ((env->eflags >> IOPL_SHIFT) & 3), flags, env->cr[0]));
                         }
                     }
@@ -1240 +1240 @@
                     if(emulate_single_instr(env) == -1)
                     {
-                        printf("emulate_single_instr failed for EIP=%VGv!!\n", env->eip);
+                        printf("emulate_single_instr failed for EIP=%RGv!!\n", env->eip);
                     }
                 }
@@ -1422 +1422 @@
     if (ret == 1) {
 #if 0
-        printf("PF exception: EIP=0x%VGv CR2=0x%VGv error=0x%x\n",
+        printf("PF exception: EIP=0x%RGv CR2=0x%RGv error=0x%x\n",
                env->eip, env->cr[2], env->error_code);
 #endif