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

stack32 is now always 0 or 1, to prevent failed comparisons in 386_dynarec.c.

Browse source 
Only clear an entry in codeblock_hash if it's pointing to the block actually being deleted.
Speeds up menus in Railroad Tycoon II significantly.
This commit is contained in:
TomW 2016-01-23 14:36:59 +00:00
commit 38fb86cb95
3 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/codegen_x86-64.c
View file

@ -118,7 +118,8 @@ void dump_block()
static void delete_block(codeblock_t *block)
{
// pclog("delete_block: pc=%08x\n", block->pc);
codeblock_hash[HASH(block->phys)] = NULL;
if (block == codeblock_hash[HASH(block->phys)])
codeblock_hash[HASH(block->phys)] = NULL;
if (!block->pc)
fatal("Deleting deleted block\n");

3
src/codegen_x86.c
View file

@ -116,7 +116,8 @@ void dump_block()
static void delete_block(codeblock_t *block)
{
// pclog("delete_block: pc=%08x\n", block->pc);
codeblock_hash[HASH(block->phys)] = NULL;
if (block == codeblock_hash[HASH(block->phys)])
codeblock_hash[HASH(block->phys)] = NULL;
if (!block->pc)
fatal("Deleting deleted block\n");

11
src/x86seg.c
View file

@ -345,8 +345,7 @@ void loadseg(uint16_t seg, x86seg *s)
x86ss(NULL,seg&~3);
return;
}
if (segdat[3]&0x40) stack32=1;
else stack32=0;
stack32 = (segdat[3] & 0x40) ? 1 : 0;
// pclog("Load SS %04x %04x %04x %04x\n", segdat[0], segdat[1], segdat[2], segdat[3]);
}
else if (s!=&_cs)
@ -1106,7 +1105,7 @@ void loadcscall(uint16_t seg)
}
if (!stack32) oldsp &= 0xFFFF;
SS=newss;
stack32=segdat2[3]&0x40;
stack32 = (segdat2[3] & 0x40) ? 1 : 0;
if (stack32) ESP=newsp;
else SP=newsp;
@ -1527,7 +1526,7 @@ void pmoderetf(int is32, uint16_t off)
return;
}
SS=newss;
stack32=segdat2[3]&0x40;
stack32 = (segdat2[3] & 0x40) ? 1 : 0;
if (stack32) ESP=newsp;
else SP=newsp;
do_seg_load(&_ss, segdat2);
@ -1778,7 +1777,7 @@ void pmodeint(int num, int soft)
return;
}
SS=newss;
stack32=segdat3[3]&0x40;
stack32 = (segdat3[3] & 0x40) ? 1 : 0;
if (stack32) ESP=newsp;
else SP=newsp;
do_seg_load(&_ss, segdat3);
@ -2284,7 +2283,7 @@ void pmodeiret(int is32)
return;
}
SS=newss;
stack32=segdat2[3]&0x40;
stack32 = (segdat2[3] & 0x40) ? 1 : 0;
if (stack32) ESP=newsp;
else SP=newsp;
do_seg_load(&_ss, segdat2);