Retro/pcem
Watch
1
0
Fork
You've already forked pcem
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move trap handling out of main dynarec loop.

Browse source
This commit is contained in:
SarahW 2020-09-05 17:16:33 +01:00
commit eb524e6f12
1 changed files with 26 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

54
src/386_dynarec.c
View file

@ -309,6 +309,29 @@ void exec386_dynarec(int cycs)
ins++; ins++;
insc++; insc++;
} }
if (trap)
{
trap = 0;
flags_rebuild();
if (msw&1)
{
pmodeint(1,0);
}
else
{
writememw(ss,(SP-2)&0xFFFF,cpu_state.flags);
writememw(ss,(SP-4)&0xFFFF,CS);
writememw(ss,(SP-6)&0xFFFF,cpu_state.pc);
SP-=6;
addr = (1 << 2) + idt.base;
cpu_state.flags &= ~I_FLAG;
cpu_state.flags &= ~T_FLAG;
cpu_state.pc=readmemw(0,addr);
loadcs(readmemw(0,addr+2));
}
}
cpu_end_block_after_ins = 0; cpu_end_block_after_ins = 0;
} }
else else
@ -439,8 +462,6 @@ void exec386_dynarec(int cycs)
uint8_t opcode = fetchdat & 0xFF; uint8_t opcode = fetchdat & 0xFF;
fetchdat >>= 8; fetchdat >>= 8;
trap = cpu_state.flags & T_FLAG;
// if (output == 3) // if (output == 3)
// pclog("%04X(%06X):%04X : %08X %08X %08X %08X %04X %04X %04X(%08X) %04X %04X %04X(%08X) %08X %08X %08X SP=%04X:%08X %02X %04X %i %08X %08X %i %i %02X %02X %02X %02X %02X %08x %08x\n",CS,cs,pc,EAX,EBX,ECX,EDX,CS,DS,ES,es,FS,GS,SS,ss,EDI,ESI,EBP,SS,ESP,opcode,flags,ins,0, ldt.base, CPL, stack32, pic.pend, pic.mask, pic.mask2, pic2.pend, pic2.mask, cs+pc, pccache); // pclog("%04X(%06X):%04X : %08X %08X %08X %08X %04X %04X %04X(%08X) %04X %04X %04X(%08X) %08X %08X %08X SP=%04X:%08X %02X %04X %i %08X %08X %i %i %02X %02X %02X %02X %02X %08x %08x\n",CS,cs,pc,EAX,EBX,ECX,EDX,CS,DS,ES,es,FS,GS,SS,ss,EDI,ESI,EBP,SS,ESP,opcode,flags,ins,0, ldt.base, CPL, stack32, pic.pend, pic.mask, pic.mask2, pic2.pend, pic2.mask, cs+pc, pccache);
@ -461,7 +482,7 @@ void exec386_dynarec(int cycs)
if (((cs+cpu_state.pc) - start_pc) >= max_block_size) if (((cs+cpu_state.pc) - start_pc) >= max_block_size)
CPU_BLOCK_END(); CPU_BLOCK_END();
if (trap) if (cpu_state.flags & T_FLAG)
CPU_BLOCK_END(); CPU_BLOCK_END();
if (nmi && nmi_enable && nmi_mask) if (nmi && nmi_enable && nmi_mask)
@ -521,8 +542,6 @@ void exec386_dynarec(int cycs)
uint8_t opcode = fetchdat & 0xFF; uint8_t opcode = fetchdat & 0xFF;
fetchdat >>= 8; fetchdat >>= 8;
trap = cpu_state.flags & T_FLAG;
// if (output == 3) // if (output == 3)
// pclog("%04X(%06X):%04X : %08X %08X %08X %08X %04X %04X %04X(%08X) %04X %04X %04X(%08X) %08X %08X %08X SP=%04X:%08X %02X %04X %i %08X %08X %i %i %02X %02X %02X %02X %02X %08x %08x\n",CS,cs,pc,EAX,EBX,ECX,EDX,CS,DS,ES,es,FS,GS,SS,ss,EDI,ESI,EBP,SS,ESP,opcode,flags,ins,0, ldt.base, CPL, stack32, pic.pend, pic.mask, pic.mask2, pic2.pend, pic2.mask, cs+pc, pccache); // pclog("%04X(%06X):%04X : %08X %08X %08X %08X %04X %04X %04X(%08X) %04X %04X %04X(%08X) %08X %08X %08X SP=%04X:%08X %02X %04X %i %08X %08X %i %i %02X %02X %02X %02X %02X %08x %08x\n",CS,cs,pc,EAX,EBX,ECX,EDX,CS,DS,ES,es,FS,GS,SS,ss,EDI,ESI,EBP,SS,ESP,opcode,flags,ins,0, ldt.base, CPL, stack32, pic.pend, pic.mask, pic.mask2, pic2.pend, pic2.mask, cs+pc, pccache);
@ -541,7 +560,7 @@ void exec386_dynarec(int cycs)
if (((cs+cpu_state.pc) - start_pc) >= max_block_size) if (((cs+cpu_state.pc) - start_pc) >= max_block_size)
CPU_BLOCK_END(); CPU_BLOCK_END();
if (trap) if (cpu_state.flags & T_FLAG)
CPU_BLOCK_END(); CPU_BLOCK_END();
if (nmi && nmi_enable && nmi_mask) if (nmi && nmi_enable && nmi_mask)
@ -601,28 +620,7 @@ void exec386_dynarec(int cycs)
} }
} }
if (trap) if (nmi && nmi_enable && nmi_mask)
{
trap = 0;
flags_rebuild();
if (msw&1)
{
pmodeint(1,0);
}
else
{
writememw(ss,(SP-2)&0xFFFF,cpu_state.flags);
writememw(ss,(SP-4)&0xFFFF,CS);
writememw(ss,(SP-6)&0xFFFF,cpu_state.pc);
SP-=6;
addr = (1 << 2) + idt.base;
cpu_state.flags &= ~I_FLAG;
cpu_state.flags &= ~T_FLAG;
cpu_state.pc=readmemw(0,addr);
loadcs(readmemw(0,addr+2));
}
}
else if (nmi && nmi_enable && nmi_mask)
{ {
cpu_state.oldpc = cpu_state.pc; cpu_state.oldpc = cpu_state.pc;
// pclog("NMI\n"); // pclog("NMI\n");