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

808x flags fixes - fixes HWiNFO v2.2 hanging.

Browse Source
This commit is contained in:
OBattler
2022-11-03 00:14:31 +01:00
parent 6da8e07c7a
commit 19d6fcec24
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/cpu/808x.c
View File

@@ -568,7 +568,8 @@ reset_808x(int hard)
load_cs(0xFFFF); load_cs(0xFFFF);
cpu_state.pc = 0; cpu_state.pc = 0;
cpu_state.flags |= MD_FLAG; if (is_nec)
cpu_state.flags |= MD_FLAG;
rammask = 0xfffff; rammask = 0xfffff;
prefetching = 1; prefetching = 1;
@@ -963,7 +964,7 @@ interrupt(uint16_t addr)
pfq_clear(); pfq_clear();
ovr_seg = NULL; ovr_seg = NULL;
access(39, 16); access(39, 16);
tempf = cpu_state.flags & ((is_nec && cpu_state.inside_emulation_mode) ? 0x8fd7 : 0x0fd7); tempf = cpu_state.flags & (is_nec ? 0x8fd7 : 0x0fd7);
push(&tempf); push(&tempf);
cpu_state.flags &= ~(I_FLAG | T_FLAG); cpu_state.flags &= ~(I_FLAG | T_FLAG);
access(40, 16); access(40, 16);
@@ -1003,7 +1004,7 @@ custom_nmi(void)
pfq_clear(); pfq_clear();
ovr_seg = NULL; ovr_seg = NULL;
access(39, 16); access(39, 16);
tempf = cpu_state.flags & 0x0fd7; tempf = cpu_state.flags & (is_nec ? 0x8fd7 : 0x0fd7);
push(&tempf); push(&tempf);
cpu_state.flags &= ~(I_FLAG | T_FLAG); cpu_state.flags &= ~(I_FLAG | T_FLAG);
access(40, 16); access(40, 16);
@@ -2743,12 +2744,18 @@ execx86(int cycs)
break; break;
case 0x9C: /*PUSHF*/ case 0x9C: /*PUSHF*/
access(33, 16); access(33, 16);
tempw = cpu_state.flags & ((is_nec && cpu_state.inside_emulation_mode) ? (MD_FLAG | 0x0fd7) : 0x0fd7); if (is_nec)
tempw = (cpu_state.flags & 0x8fd7) | 0x7000;
else
tempw = (cpu_state.flags & 0x0fd7) | 0xf000;
push(&tempw); push(&tempw);
break; break;
case 0x9D: /*POPF*/ case 0x9D: /*POPF*/
access(25, 16); access(25, 16);
cpu_state.flags = pop() | 2; if (is_nec)
cpu_state.flags = pop() | 0x8002;
else
cpu_state.flags = pop() | 0x0002;
wait(1, 0); wait(1, 0);
break; break;
case 0x9E: /*SAHF*/ case 0x9E: /*SAHF*/
@@ -3015,7 +3022,10 @@ execx86(int cycs)
access(62, 8); access(62, 8);
set_ip(new_ip); set_ip(new_ip);
access(45, 8); access(45, 8);
cpu_state.flags = pop() | 2 | (!is_nec ? 0 : (!cpu_state.inside_emulation_mode ? MD_FLAG : 0)); if (is_nec)
cpu_state.flags = pop() | 0x8002;
else
cpu_state.flags = pop() | 0x0002;
wait(5, 0); wait(5, 0);
noint = 1; noint = 1;
nmi_enable = 1; nmi_enable = 1;