mirror of
https://github.com/reactos/reactos.git
synced 2024-10-02 07:26:47 +00:00
[FAST486]
- Control register 0 is CR0: use FAST486_REG_CR0 instead of 0, as it is done in the rest of the code. - Improve a if/else if control. - Don't halt the processor in the middle of prefixes processing. svn path=/trunk/; revision=64851
This commit is contained in:
parent
e46ceff760
commit
705dcd2d05
|
@ -55,7 +55,7 @@ Fast486ReadMemory(PFAST486_STATE State,
|
|||
}
|
||||
|
||||
/* Check for protected mode */
|
||||
if (State->ControlRegisters[0] & FAST486_CR0_PE)
|
||||
if (State->ControlRegisters[FAST486_REG_CR0] & FAST486_CR0_PE)
|
||||
{
|
||||
/* Privilege checks */
|
||||
|
||||
|
@ -122,7 +122,7 @@ Fast486WriteMemory(PFAST486_STATE State,
|
|||
}
|
||||
|
||||
/* Check for protected mode */
|
||||
if (State->ControlRegisters[0] & FAST486_CR0_PE)
|
||||
if (State->ControlRegisters[FAST486_REG_CR0] & FAST486_CR0_PE)
|
||||
{
|
||||
/* Privilege checks */
|
||||
|
||||
|
|
|
@ -762,7 +762,7 @@ Fast486ParseModRegRm(PFAST486_STATE State,
|
|||
ModRegRm->Register = (ModRmByte >> 3) & 0x07;
|
||||
|
||||
/* Check the mode */
|
||||
if ((ModRmByte >> 6) == 3)
|
||||
if (Mode == 3)
|
||||
{
|
||||
/* The second operand is also a register */
|
||||
ModRegRm->Memory = FALSE;
|
||||
|
@ -886,7 +886,6 @@ Fast486ParseModRegRm(PFAST486_STATE State,
|
|||
/* [BX + SI] */
|
||||
ModRegRm->MemoryAddress = State->GeneralRegs[FAST486_REG_EBX].LowWord
|
||||
+ State->GeneralRegs[FAST486_REG_ESI].LowWord;
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
|
@ -895,7 +894,6 @@ Fast486ParseModRegRm(PFAST486_STATE State,
|
|||
/* [BX + DI] */
|
||||
ModRegRm->MemoryAddress = State->GeneralRegs[FAST486_REG_EBX].LowWord
|
||||
+ State->GeneralRegs[FAST486_REG_EDI].LowWord;
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
|
@ -904,7 +902,6 @@ Fast486ParseModRegRm(PFAST486_STATE State,
|
|||
/* SS:[BP + SI] */
|
||||
ModRegRm->MemoryAddress = State->GeneralRegs[FAST486_REG_EBP].LowWord
|
||||
+ State->GeneralRegs[FAST486_REG_ESI].LowWord;
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
|
@ -913,7 +910,6 @@ Fast486ParseModRegRm(PFAST486_STATE State,
|
|||
/* SS:[BP + DI] */
|
||||
ModRegRm->MemoryAddress = State->GeneralRegs[FAST486_REG_EBP].LowWord
|
||||
+ State->GeneralRegs[FAST486_REG_EDI].LowWord;
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
|
@ -921,7 +917,6 @@ Fast486ParseModRegRm(PFAST486_STATE State,
|
|||
{
|
||||
/* [SI] */
|
||||
ModRegRm->MemoryAddress = State->GeneralRegs[FAST486_REG_ESI].LowWord;
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
|
@ -929,7 +924,6 @@ Fast486ParseModRegRm(PFAST486_STATE State,
|
|||
{
|
||||
/* [DI] */
|
||||
ModRegRm->MemoryAddress = State->GeneralRegs[FAST486_REG_EDI].LowWord;
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
|
@ -953,7 +947,6 @@ Fast486ParseModRegRm(PFAST486_STATE State,
|
|||
{
|
||||
/* [BX] */
|
||||
ModRegRm->MemoryAddress = State->GeneralRegs[FAST486_REG_EBX].LowWord;
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -137,7 +137,7 @@ Fast486DumpState(PFAST486_STATE State)
|
|||
{
|
||||
DbgPrint("\nFast486DumpState -->\n");
|
||||
DbgPrint("\nCPU currently executing in %s mode at %04X:%08X\n",
|
||||
(State->ControlRegisters[0] & FAST486_CR0_PE) ? "protected" : "real",
|
||||
(State->ControlRegisters[FAST486_REG_CR0] & FAST486_CR0_PE) ? "protected" : "real",
|
||||
State->SegmentRegs[FAST486_REG_CS].Selector,
|
||||
State->InstPtr.Long);
|
||||
DbgPrint("\nGeneral purpose registers:\n"
|
||||
|
|
|
@ -54,9 +54,9 @@ Fast486ExecutionControl(PFAST486_STATE State, FAST486_EXEC_CMD Command)
|
|||
/* Main execution loop */
|
||||
do
|
||||
{
|
||||
NextInst:
|
||||
if (!State->Halted)
|
||||
{
|
||||
NextInst:
|
||||
/* Check if this is a new instruction */
|
||||
if (State->PrefixFlags == 0) State->SavedInstPtr = State->InstPtr;
|
||||
|
||||
|
|
|
@ -4985,8 +4985,7 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeLoop)
|
|||
/* Additional rule for LOOPNZ */
|
||||
if (State->Flags.Zf) Condition = FALSE;
|
||||
}
|
||||
|
||||
if (Opcode == 0xE1)
|
||||
else if (Opcode == 0xE1)
|
||||
{
|
||||
/* Additional rule for LOOPZ */
|
||||
if (!State->Flags.Zf) Condition = FALSE;
|
||||
|
|
Loading…
Reference in a new issue