Changeset 62286 in vbox

Timestamp:

Jul 15, 2016 6:02:42 PM (8 years ago)

Author:

vboxsync

Message:

REM: Fixed TRPM -> recompiler IRQ translation problem, well hacked it.

Location:

trunk/src/recompiler

Files:

• VBoxRecompiler.c (modified) (1 diff)
• cpu-exec.c (modified) (1 diff)
• target-i386/cpu.h (modified) (1 diff)

trunk/src/recompiler/VBoxRecompiler.c

@@ -2454 +2454 @@
         if (enmType != TRPM_SOFTWARE_INT)
         {
-            pVM->rem.s.Env.exception_is_int     = 0;
-#ifdef IEM_VERIFICATION_MODE /* Ugly hack, needs proper fixing. */
-            pVM->rem.s.Env.exception_is_int     = enmType == TRPM_HARDWARE_INT ? 0x42 : 0;
-#endif
+            pVM->rem.s.Env.exception_is_int     = enmType == TRPM_HARDWARE_INT
+                                                ? EXCEPTION_IS_INT_VALUE_HARDWARE_IRQ : 0; /* HACK ALERT! */
             pVM->rem.s.Env.exception_next_eip   = pVM->rem.s.Env.eip;
         }

trunk/src/recompiler/cpu-exec.c

@@ -345 +345 @@
                          env->segs[R_CS].selector, (RTGCPTR)env->exception_next_eip));
 #  endif /* VBOX */
-#  ifdef IEM_VERIFICATION_MODE /* Ugly hacks */
                     do_interrupt(env->exception_index,
-                                 env->exception_is_int && env->exception_is_int != 0x42,
+                                 env->exception_is_int && env->exception_is_int != EXCEPTION_IS_INT_VALUE_HARDWARE_IRQ,
                                  env->error_code,
                                  env->exception_next_eip,
-                                 env->exception_is_int == 0x42);
+                                 env->exception_is_int == EXCEPTION_IS_INT_VALUE_HARDWARE_IRQ);
+#  ifdef IEM_VERIFICATION_MODE /* Ugly hacks */
                     cpu_loop_exit();
-#  else
-                    do_interrupt(env->exception_index,
-                                 env->exception_is_int,
-                                 env->error_code,
-                                 env->exception_next_eip, 0);
 #  endif
                     /* successfully delivered */

trunk/src/recompiler/target-i386/cpu.h

@@ -706 +706 @@
     int error_code;
     int exception_is_int;
+#ifdef VBOX
+# define EXCEPTION_IS_INT_VALUE_HARDWARE_IRQ 0x42 /**< Special CPUX86State::exception_is_int value indicating hardware irq.  (HACK ALERT) */
+#endif
     target_ulong exception_next_eip;
     target_ulong dr[8]; /* debug registers */