mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-21 17:15:32 -07:00
Code Issues Packages Projects Releases Activity

Revert RichardG's recompiler changes from build 8136 due to too many regressions, a way to bring them back with fewer regressions will be looked into for 6.0.

Browse Source
This commit is contained in:
OBattler
2025-12-17 19:12:56 +01:00
parent 82728f4ebb
commit 54322a7ece
4 changed files with 9 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/86box.c
View File

@@ -331,7 +331,6 @@ int scrnsz_y = SCREEN_RES_Y; /* current screen size, Y */
int config_changed; /* config has changed */
int title_update;
int framecountx = 0;
int seconds_elapsed = 0;
int hard_reset_pending = 0;
#if 0
@@ -1975,8 +1974,6 @@ pc_onesec(void)
framecount = 0;
title_update = 1;
seconds_elapsed++;
}
void

32
src/cpu/386_dynarec.c
View File

@@ -392,9 +392,10 @@ static inline void __attribute__((optimize("O2")))
#else
static __inline void
#endif
exec386_dynarec_dyn(uint32_t phys_addr, page_t *page)
exec386_dynarec_dyn(void)
{
uint32_t start_pc = 0;
uint32_t phys_addr = get_phys(cs + cpu_state.pc);
int hash = HASH(phys_addr);
# ifdef USE_NEW_DYNAREC
codeblock_t *block = &codeblock[codeblock_hash[hash]];
@@ -409,6 +410,8 @@ exec386_dynarec_dyn(uint32_t phys_addr, page_t *page)
if (block && !cpu_state.abrt)
# endif
{
page_t *page = &pages[phys_addr >> 12];
/* Block must match current CS, PC, code segment size,
and physical address. The physical address check will
also catch any page faults at this stage */
@@ -442,30 +445,16 @@ exec386_dynarec_dyn(uint32_t phys_addr, page_t *page)
if (valid_block && (block->page_mask & *block->dirty_mask)) {
# ifdef USE_NEW_DYNAREC
codegen_check_flush(page, page->dirty_mask, phys_addr);
if (block->pc == BLOCK_PC_INVALID) {
if (block->pc == BLOCK_PC_INVALID)
valid_block = 0;
goto invalid_block;
} else if (block->flags & CODEBLOCK_IN_DIRTY_LIST) {
else if (block->flags & CODEBLOCK_IN_DIRTY_LIST)
block->flags &= ~CODEBLOCK_WAS_RECOMPILED;
invalid_block:
# else
codegen_check_flush(page, page->dirty_mask[(phys_addr >> 10) & 3], phys_addr);
page->dirty_mask[(phys_addr >> 10) & 3] = 0;
if (!block->valid) {
if (!block->valid)
valid_block = 0;
# endif
if (page->inv_timestamp != seconds_elapsed) {
page->inv_timestamp = seconds_elapsed;
page->inv_count = 1;
} else {
page->inv_count++;
# define INVALIDATION_LIMIT 100 /* amount of invalidations *per second* to kick a page to the interpreter */
# ifdef ENABLE_386_DYNAREC_LOG
if (page->inv_count >= INVALIDATION_LIMIT)
x386_dynarec_log("Forcing interpreter on page %08X\n", phys_addr & 0xfffff000);
# endif
}
}
}
if (valid_block && block->page_mask2) {
/* We don't want the second page to cause a page
@@ -790,14 +779,11 @@ exec386_dynarec(int32_t cycs)
cycles_old = cycles;
oldtsc = tsc;
tsc_old = tsc;
uint32_t phys_addr = get_phys(cs + cpu_state.pc);
page_t *page = &pages[phys_addr >> 12];
if (cpu_force_interpreter || cpu_override_dynarec || (page->inv_count >= INVALIDATION_LIMIT) || (!CACHE_ON())) /*Interpret block*/
if (cpu_force_interpreter || cpu_override_dynarec || (!CACHE_ON())) /*Interpret block*/
{
exec386_dynarec_int();
} else {
exec386_dynarec_dyn(phys_addr, page);
exec386_dynarec_dyn();
}
if (cpu_init) {

1
src/include/86box/86box.h
View File

@@ -320,7 +320,6 @@ extern void do_pause(int p);
extern double isa_timing;
extern int io_delay;
extern int framecountx;
extern int seconds_elapsed;
extern volatile int cpu_thread_run;
extern uint8_t postcard_codes[POSTCARDS_NUM];

6
src/include/86box/mem.h
View File

@@ -224,9 +224,6 @@ typedef struct page_t {
uint64_t *byte_dirty_mask;
uint64_t *byte_code_present_mask;
uint32_t inv_count;
uint32_t inv_timestamp;
} page_t;
extern uint32_t purgable_page_list_head;
@@ -253,9 +250,6 @@ typedef struct _page_ {
/*Head of codeblock tree associated with this page*/
struct codeblock_t *head;
uint32_t inv_count;
uint32_t inv_timestamp;
} page_t;
#endif