Index: /trunk/src/recompiler/VBoxRecompiler.c
===================================================================
--- /trunk/src/recompiler/VBoxRecompiler.c	(revision 62285)
+++ /trunk/src/recompiler/VBoxRecompiler.c	(revision 62286)
@@ -2454,8 +2454,6 @@
         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;
         }
Index: /trunk/src/recompiler/cpu-exec.c
===================================================================
--- /trunk/src/recompiler/cpu-exec.c	(revision 62285)
+++ /trunk/src/recompiler/cpu-exec.c	(revision 62286)
@@ -345,16 +345,11 @@
                          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 */
Index: /trunk/src/recompiler/target-i386/cpu.h
===================================================================
--- /trunk/src/recompiler/target-i386/cpu.h	(revision 62285)
+++ /trunk/src/recompiler/target-i386/cpu.h	(revision 62286)
@@ -706,4 +706,7 @@
     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 */