80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Do not raise CPU trap if an exception has occurred, fixes #2577.

Browse Source
This commit is contained in:
OBattler
2022-10-28 04:12:31 +02:00
parent cb13ca526a
commit 535b19a027
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/cpu/386.c
View File

@@ -172,17 +172,6 @@ exec386(int cycs)
if (cpu_end_block_after_ins) if (cpu_end_block_after_ins)
cpu_end_block_after_ins--; cpu_end_block_after_ins--;
if (trap) {
flags_rebuild();
trap = 0;
#ifndef USE_NEW_DYNAREC
oldcs = CS;
#endif
cpu_state.oldpc = cpu_state.pc;
dr[6] |= 0x4000;
x86_int(1);
}
if (cpu_state.abrt) { if (cpu_state.abrt) {
flags_rebuild(); flags_rebuild();
tempi = cpu_state.abrt & ABRT_MASK; tempi = cpu_state.abrt & ABRT_MASK;
@@ -205,6 +194,15 @@ exec386(int cycs)
#endif #endif
} }
} }
} else if (trap) {
flags_rebuild();
trap = 0;
#ifndef USE_NEW_DYNAREC
oldcs = CS;
#endif
cpu_state.oldpc = cpu_state.pc;
dr[6] |= 0x4000;
x86_int(1);
} }
if (smi_line) if (smi_line)

2
src/cpu/386_dynarec.c
View File

@@ -398,7 +398,7 @@ exec386_dynarec_int(void)
CPU_BLOCK_END(); CPU_BLOCK_END();
} }
if (trap) { if (!cpu_state.abrt && trap) {
trap = 0; trap = 0;
#ifndef USE_NEW_DYNAREC #ifndef USE_NEW_DYNAREC
oldcs = CS; oldcs = CS;