Changeset 36811 in vbox

Timestamp:

Apr 22, 2011 1:22:08 AM (14 years ago)

Author:

vboxsync

Message:

REM: Don't set cr2 and error_code when TRPM reports a pending software or hardware interrupt, only do that for traps. (hardware int 0eh causes trouble otherwise)

File:

• trunk/src/recompiler/VBoxRecompiler.c (modified) (1 diff)

trunk/src/recompiler/VBoxRecompiler.c

@@ -2414 +2414 @@
 
         /* get error code and cr2 if needed. */
-        switch (u8TrapNo)
+        if (enmType == TRPM_TRAP)
         {
-            case 0x0e:
-                pVM->rem.s.Env.cr[2] = TRPMGetFaultAddress(pVCpu);
-                /* fallthru */
-            case 0x0a: case 0x0b: case 0x0c: case 0x0d:
-                pVM->rem.s.Env.error_code = TRPMGetErrorCode(pVCpu);
-                break;
-
-            case 0x11: case 0x08:
-            default:
-                pVM->rem.s.Env.error_code = 0;
-                break;
+            switch (u8TrapNo)
+            {
+                case 0x0e:
+                    pVM->rem.s.Env.cr[2] = TRPMGetFaultAddress(pVCpu);
+                    /* fallthru */
+                case 0x0a: case 0x0b: case 0x0c: case 0x0d:
+                    pVM->rem.s.Env.error_code = TRPMGetErrorCode(pVCpu);
+                    break;
+
+                case 0x11: case 0x08:
+                default:
+                    pVM->rem.s.Env.error_code = 0;
+                    break;
+            }
         }
+        else
+            pVM->rem.s.Env.error_code = 0;
 
         /*