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

Reverted some CPU-related changes.

Browse Source
This commit is contained in:
OBattler
2024-02-19 15:20:59 +01:00
parent c5f39507a8
commit 19f6954410
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/cpu/386_common.c
View File

@@ -1539,7 +1539,10 @@ x86_int_sw(int num)
} }
} }
trap &= ~1; if (cpu_use_exec)
trap = 0;
else
trap &= ~1;
CPU_BLOCK_END(); CPU_BLOCK_END();
} }
@@ -1582,7 +1585,10 @@ x86_int_sw_rm(int num)
#endif #endif
cycles -= timing_int_rm; cycles -= timing_int_rm;
trap &= ~1; if (cpu_use_exec)
trap = 0;
else
trap &= ~1;
CPU_BLOCK_END(); CPU_BLOCK_END();
return 0; return 0;

11
src/cpu/x86seg.c
View File

@@ -2286,10 +2286,14 @@ taskswitch286(uint16_t seg, uint16_t *segdat, int is32)
op_loadseg(new_fs, &cpu_state.seg_fs); op_loadseg(new_fs, &cpu_state.seg_fs);
op_loadseg(new_gs, &cpu_state.seg_gs); op_loadseg(new_gs, &cpu_state.seg_gs);
rf_flag_no_clear = 1; if (!cpu_use_exec)
rf_flag_no_clear = 1;
if (t_bit) { if (t_bit) {
trap |= 2; if (cpu_use_exec)
trap = 2;
else
trap |= 2;
#ifdef USE_DYNAREC #ifdef USE_DYNAREC
cpu_block_end = 1; cpu_block_end = 1;
#endif #endif
@@ -2469,7 +2473,8 @@ taskswitch286(uint16_t seg, uint16_t *segdat, int is32)
tr.limit = limit; tr.limit = limit;
tr.access = segdat[2] >> 8; tr.access = segdat[2] >> 8;
tr.ar_high = segdat[3] & 0xff; tr.ar_high = segdat[3] & 0xff;
dr[7] &= 0xFFFFFFAA; if (!cpu_use_exec)
dr[7] &= 0xFFFFFFAA;
} }
void void