claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

386 Interpreter: Fix execute breakpoints.

Browse Source
This commit is contained in:
OBattler
2025-03-16 23:54:55 +01:00
parent 9f200fe2e8
commit 52a16529dc
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/cpu/386.c
View File

@@ -269,9 +269,11 @@ exec386_2386(int32_t cycs)
ins_fetch_fault = cpu_386_check_instruction_fault(); ins_fetch_fault = cpu_386_check_instruction_fault();
/* Breakpoint fault has priority over other faults. */ /* Breakpoint fault has priority over other faults. */
if (ins_fetch_fault) { if ((cpu_state.abrt == 0) & ins_fetch_fault) {
x86gen();
ins_fetch_fault = 0; ins_fetch_fault = 0;
cpu_state.abrt = 1; /* No instructions executed at this point. */
goto block_ended;
} else if (cpu_16bitbus) { } else if (cpu_16bitbus) {
CHECK_READ_CS(MIN(ol, 2)); CHECK_READ_CS(MIN(ol, 2));
} else { } else {
@@ -288,7 +290,6 @@ exec386_2386(int32_t cycs)
trap |= !!(cpu_state.flags & T_FLAG); trap |= !!(cpu_state.flags & T_FLAG);
cpu_state.pc++; cpu_state.pc++;
cpu_state.eflags &= ~(RF_FLAG);
if (opcode == 0xf0) if (opcode == 0xf0)
in_lock = 1; in_lock = 1;
x86_2386_opcodes[(opcode | cpu_state.op32) & 0x3ff](fetchdat); x86_2386_opcodes[(opcode | cpu_state.op32) & 0x3ff](fetchdat);
@@ -316,6 +317,7 @@ exec386_2386(int32_t cycs)
if (cpu_end_block_after_ins) if (cpu_end_block_after_ins)
cpu_end_block_after_ins--; cpu_end_block_after_ins--;
block_ended:
if (cpu_state.abrt) { if (cpu_state.abrt) {
flags_rebuild(); flags_rebuild();
tempi = cpu_state.abrt & ABRT_MASK; tempi = cpu_state.abrt & ABRT_MASK;
@@ -338,6 +340,9 @@ exec386_2386(int32_t cycs)
#endif #endif
} }
} }
if (!x86_was_reset && ins_fetch_fault)
x86gen();
} else if (new_ne) { } else if (new_ne) {
flags_rebuild(); flags_rebuild();
new_ne = 0; new_ne = 0;