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

Codeblock tree now includes both physical and virtual addresses into key. Fixes performance issues with Windows 3.1.

Browse source
This commit is contained in:
SarahW 2016-11-08 21:30:48 +00:00
commit a174a88c49
2 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/386_dynarec.c
View file

@ -1309,7 +1309,7 @@ void exec386_dynarec(int cycs)
if (page->code_present_mask & mask) if (page->code_present_mask & mask)
{ {
/*Walk page tree to see if we find the correct block*/ /*Walk page tree to see if we find the correct block*/
codeblock_t *new_block = codeblock_tree_find(phys_addr); codeblock_t *new_block = codeblock_tree_find(phys_addr, cs);
if (new_block) if (new_block)
{ {
valid_block = (new_block->pc == cs + cpu_state.pc) && (new_block->_cs == cs) && valid_block = (new_block->pc == cs + cpu_state.pc) && (new_block->_cs == cs) &&

17
src/codegen.h
View file

@ -59,6 +59,8 @@ typedef struct codeblock_t
uint32_t flags; uint32_t flags;
int TOP; int TOP;
uint64_t cmp;
uint8_t data[2048]; uint8_t data[2048];
} codeblock_t; } codeblock_t;
@ -67,15 +69,16 @@ typedef struct codeblock_t
/*Code block is always entered with the same FPU top-of-stack*/ /*Code block is always entered with the same FPU top-of-stack*/
#define CODEBLOCK_STATIC_TOP 2 #define CODEBLOCK_STATIC_TOP 2
static inline codeblock_t *codeblock_tree_find(uint32_t phys) static inline codeblock_t *codeblock_tree_find(uint32_t phys, uint32_t _cs)
{ {
codeblock_t *block = pages[phys >> 12].head; codeblock_t *block = pages[phys >> 12].head;
uint64_t a = _cs | ((uint64_t)phys << 32);
while (block) while (block)
{ {
if (phys == block->phys) if (a == block->cmp)
break; break;
else if (phys < block->phys) else if (a < block->cmp)
block = block->left; block = block->left;
else else
block = block->right; block = block->right;
@ -87,6 +90,8 @@ static inline codeblock_t *codeblock_tree_find(uint32_t phys)
static inline void codeblock_tree_add(codeblock_t *new_block) static inline void codeblock_tree_add(codeblock_t *new_block)
{ {
codeblock_t *block = pages[new_block->phys >> 12].head; codeblock_t *block = pages[new_block->phys >> 12].head;
uint64_t a = new_block->_cs | ((uint64_t)new_block->phys << 32);
new_block->cmp = a;
if (!block) if (!block)
{ {
@ -96,17 +101,17 @@ static inline void codeblock_tree_add(codeblock_t *new_block)
else else
{ {
codeblock_t *old_block = NULL; codeblock_t *old_block = NULL;
while (block) while (block)
{ {
old_block = block; old_block = block;
if (a < old_block->cmp)
if (new_block->phys < old_block->phys)
block = block->left; block = block->left;
else else
block = block->right; block = block->right;
} }
if (new_block->phys < old_block->phys) if (a < old_block->cmp)
old_block->left = new_block; old_block->left = new_block;
else else
old_block->right = new_block; old_block->right = new_block;