Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-06 04:43:45 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

i386: use correct PL and stack address size in call gates (nw)

Browse Source 
---
fixes win95 hw detection
This commit is contained in:
cracyc 2013-09-13 13:57:47 +00:00
parent b4ac65f937
commit ddc3074ec6
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/emu/cpu/i386/i386.c
View File

@ -1760,6 +1760,10 @@ static void i386_protected_mode_call(i386_state *cpustate, UINT16 seg, UINT32 of
FAULT(FAULT_SS,stack.selector) // #SS(SS selector) FAULT(FAULT_SS,stack.selector) // #SS(SS selector)
} }
UINT32 newESP = i386_get_stack_ptr(cpustate,DPL); UINT32 newESP = i386_get_stack_ptr(cpustate,DPL);
if(!stack.d)
{
newESP &= 0xffff;
}
if(operand32 != 0) if(operand32 != 0)
{ {
if(newESP < ((gate.dword_count & 0x1f) + 16)) if(newESP < ((gate.dword_count & 0x1f) + 16))
@ -1775,7 +1779,6 @@ static void i386_protected_mode_call(i386_state *cpustate, UINT16 seg, UINT32 of
} }
else else
{ {
newESP &= 0x0000ffff;
if(newESP < ((gate.dword_count & 0x1f) + 8)) if(newESP < ((gate.dword_count & 0x1f) + 8))
{ {
logerror("CALL: Call gate: New stack has no room for 16-bit return address and parameters.\n"); logerror("CALL: Call gate: New stack has no room for 16-bit return address and parameters.\n");
@ -1795,7 +1798,7 @@ static void i386_protected_mode_call(i386_state *cpustate, UINT16 seg, UINT32 of
WRITE_TEST(cpustate, stack.base+newESP-1); WRITE_TEST(cpustate, stack.base+newESP-1);
/* switch to new stack */ /* switch to new stack */
oldSS = cpustate->sreg[SS].selector; oldSS = cpustate->sreg[SS].selector;
cpustate->sreg[SS].selector = i386_get_stack_segment(cpustate,gate.selector & 0x03); cpustate->sreg[SS].selector = i386_get_stack_segment(cpustate,cpustate->CPL);
if(operand32 != 0) if(operand32 != 0)
{ {
oldESP = REG32(ESP); oldESP = REG32(ESP);