mirror of
https://github.com/reactos/reactos.git
synced 2024-08-12 06:06:27 +00:00
[FAST486]
The r64823 patch was not properly merged. svn path=/trunk/; revision=64824
This commit is contained in:
parent
c46f3aa372
commit
bff1bdafaf
|
@ -85,11 +85,8 @@ NextInst:
|
||||||
* Check if there is an interrupt to execute, or a hardware interrupt signal
|
* Check if there is an interrupt to execute, or a hardware interrupt signal
|
||||||
* while interrupts are enabled.
|
* while interrupts are enabled.
|
||||||
*/
|
*/
|
||||||
if (State->Flags.Tf)
|
if (State->Flags.Tf && !State->Halted)
|
||||||
{
|
{
|
||||||
/* No longer halted */
|
|
||||||
State->Halted = FALSE;
|
|
||||||
|
|
||||||
/* Perform the interrupt */
|
/* Perform the interrupt */
|
||||||
Fast486PerformInterrupt(State, 0x01);
|
Fast486PerformInterrupt(State, 0x01);
|
||||||
|
|
||||||
|
@ -104,6 +101,9 @@ NextInst:
|
||||||
}
|
}
|
||||||
else if (State->IntStatus == FAST486_INT_EXECUTE)
|
else if (State->IntStatus == FAST486_INT_EXECUTE)
|
||||||
{
|
{
|
||||||
|
/* No longer halted */
|
||||||
|
State->Halted = FALSE;
|
||||||
|
|
||||||
/* Perform the interrupt */
|
/* Perform the interrupt */
|
||||||
Fast486PerformInterrupt(State, State->PendingIntNum);
|
Fast486PerformInterrupt(State, State->PendingIntNum);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue