Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-07 18:04:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

[FAST486]: Implement a basic support for the Trap Flag.

Browse source 
svn path=/trunk/; revision=64803
This commit is contained in:
Hermès Bélusca-Maïto 2014-10-18 14:08:50 +00:00
parent 9333ffdf62
commit dcd0795cd0
2 changed files with 35 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
reactos/lib/fast486/debug.c
View file

@ -83,7 +83,21 @@ 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->IntStatus == FAST486_INT_EXECUTE) if (State->Flags.Tf)
{
/* Perform the interrupt */
Fast486PerformInterrupt(State, 0x01);
/*
* Flags and TF are pushed on stack so we can reset TF now,
* to not break into the INT 0x01 handler.
* After the INT 0x01 handler returns, the flags and therefore
* TF are popped back off the stack and restored, so TF will be
* automatically reset to its previous state.
*/
State->Flags.Tf = FALSE;
}
else if (State->IntStatus == FAST486_INT_EXECUTE)
{ {
/* Perform the interrupt */ /* Perform the interrupt */
Fast486PerformInterrupt(State, State->PendingIntNum); Fast486PerformInterrupt(State, State->PendingIntNum);
@ -91,8 +105,7 @@ NextInst:
/* Clear the interrupt status */ /* Clear the interrupt status */
State->IntStatus = FAST486_INT_NONE; State->IntStatus = FAST486_INT_NONE;
} }
else if (State->Flags.If && (State->IntStatus == FAST486_INT_SIGNAL) else if (State->Flags.If && (State->IntStatus == FAST486_INT_SIGNAL))
&& (State->IntAckCallback != NULL))
{ {
/* Acknowledge the interrupt to get the number */ /* Acknowledge the interrupt to get the number */
State->PendingIntNum = State->IntAckCallback(State); State->PendingIntNum = State->IntAckCallback(State);

24
reactos/lib/fast486/fast486.c
View file

@ -82,7 +82,21 @@ 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->IntStatus == FAST486_INT_EXECUTE) if (State->Flags.Tf)
{
/* Perform the interrupt */
Fast486PerformInterrupt(State, 0x01);
/*
* Flags and TF are pushed on stack so we can reset TF now,
* to not break into the INT 0x01 handler.
* After the INT 0x01 handler returns, the flags and therefore
* TF are popped back off the stack and restored, so TF will be
* automatically reset to its previous state.
*/
State->Flags.Tf = FALSE;
}
else if (State->IntStatus == FAST486_INT_EXECUTE)
{ {
/* Perform the interrupt */ /* Perform the interrupt */
Fast486PerformInterrupt(State, State->PendingIntNum); Fast486PerformInterrupt(State, State->PendingIntNum);
@ -90,8 +104,7 @@ NextInst:
/* Clear the interrupt status */ /* Clear the interrupt status */
State->IntStatus = FAST486_INT_NONE; State->IntStatus = FAST486_INT_NONE;
} }
else if (State->Flags.If && (State->IntStatus == FAST486_INT_SIGNAL) else if (State->Flags.If && (State->IntStatus == FAST486_INT_SIGNAL))
&& (State->IntAckCallback != NULL))
{ {
/* Acknowledge the interrupt to get the number */ /* Acknowledge the interrupt to get the number */
State->PendingIntNum = State->IntAckCallback(State); State->PendingIntNum = State->IntAckCallback(State);
@ -171,8 +184,8 @@ Fast486IntAckCallback(PFAST486_STATE State)
{ {
UNREFERENCED_PARAMETER(State); UNREFERENCED_PARAMETER(State);
/* Return something... */ /* Return something... defaulted to single-step interrupt */
return 0; return 0x01;
} }
/* PUBLIC FUNCTIONS ***********************************************************/ /* PUBLIC FUNCTIONS ***********************************************************/
@ -211,6 +224,7 @@ Fast486Reset(PFAST486_STATE State)
{ {
FAST486_SEG_REGS i; FAST486_SEG_REGS i;
/* Save the callbacks and TLB */
FAST486_MEM_READ_PROC MemReadCallback = State->MemReadCallback; FAST486_MEM_READ_PROC MemReadCallback = State->MemReadCallback;
FAST486_MEM_WRITE_PROC MemWriteCallback = State->MemWriteCallback; FAST486_MEM_WRITE_PROC MemWriteCallback = State->MemWriteCallback;
FAST486_IO_READ_PROC IoReadCallback = State->IoReadCallback; FAST486_IO_READ_PROC IoReadCallback = State->IoReadCallback;