[FAST486]
authorAleksandar Andrejevic <aandrejevic@reactos.org>
Sun, 19 Oct 2014 15:02:37 +0000 (15:02 +0000)
committerAleksandar Andrejevic <aandrejevic@reactos.org>
Sun, 19 Oct 2014 15:02:37 +0000 (15:02 +0000)
The r64823 patch was not properly merged.

svn path=/trunk/; revision=64824

reactos/lib/fast486/fast486.c

index 7725c9b..9df60e5 100644 (file)
@@ -85,11 +85,8 @@ NextInst:
          * Check if there is an interrupt to execute, or a hardware interrupt signal
          * while interrupts are enabled.
          */
-        if (State->Flags.Tf)
+        if (State->Flags.Tf && !State->Halted)
         {
-            /* No longer halted */
-            State->Halted = FALSE;
-
             /* Perform the interrupt */
             Fast486PerformInterrupt(State, 0x01);
 
@@ -104,6 +101,9 @@ NextInst:
         }
         else if (State->IntStatus == FAST486_INT_EXECUTE)
         {
+            /* No longer halted */
+            State->Halted = FALSE;
+
             /* Perform the interrupt */
             Fast486PerformInterrupt(State, State->PendingIntNum);