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

SMI : Fix 'NOTFLAT' status when leaving SMI, set oldcpl on enter/leave.

Browse source
This commit is contained in:
SarahW 2020-11-30 22:29:03 +00:00
commit fe96629ced
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/x86seg.c
View file

@ -3150,6 +3150,8 @@ void x86_smi_enter(void)
stack32 = 0; stack32 = 0;
} }
oldcpl = 0;
// pclog("x86_smi_enter\n"); // pclog("x86_smi_enter\n");
} }
@ -3240,14 +3242,16 @@ void x86_smi_leave(void)
} }
} }
} }
if (cpu_state.seg_ds.base == 0 && cpu_state.seg_ds.limit_low == 0 && cpu_state.seg_ds.limit_high == 0xffffffff) if (!(cpu_state.seg_ds.base == 0 && cpu_state.seg_ds.limit_low == 0 && cpu_state.seg_ds.limit_high == 0xffffffff))
cpu_cur_status |= CPU_STATUS_NOTFLATDS; cpu_cur_status |= CPU_STATUS_NOTFLATDS;
if (cpu_state.seg_ss.base == 0 && cpu_state.seg_ss.limit_low == 0 && cpu_state.seg_ss.limit_high == 0xffffffff) if (!(cpu_state.seg_ss.base == 0 && cpu_state.seg_ss.limit_low == 0 && cpu_state.seg_ss.limit_high == 0xffffffff))
cpu_cur_status |= CPU_STATUS_NOTFLATSS; cpu_cur_status |= CPU_STATUS_NOTFLATSS;
if (smram_disable) if (smram_disable)
smram_disable(); smram_disable();
flushmmucache(); flushmmucache();
oldcpl = CPL;
// pclog("x86_smi_leave\n"); // pclog("x86_smi_leave\n");
} }