Skip to content

[DYNAREC] Always initialize jump table for DynaRec build #3990

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ptitSeb merged 1 commit into from
Jun 25, 2026
+20 −22
Merged

[DYNAREC] Always initialize jump table for DynaRec build #3990

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 20 additions & 22 deletions src/custommem.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3155,29 +3155,27 @@ void init_custommem_helper(box64context_t* ctx)
rb_set(blockstree, (uintptr_t)p_blocks[i].block, (uintptr_t)p_blocks[i].block+p_blocks[i].size, i);
memprot = rbtree_init("memprot");
#ifdef DYNAREC
if(BOX64ENV(dynarec)) {
#ifdef JMPTABL_SHIFT4
for(int i=0; i<(1<<JMPTABL_SHIFT4); ++i)
box64_jmptbl4[i] = box64_jmptbldefault3;
for(int i=0; i<(1<<JMPTABL_SHIFT3); ++i) {
box64_jmptbldefault3[i] = box64_jmptbldefault2;
box64_jmptbl_48[i] = box64_jmptbldefault2;
}
box64_jmptbl4[0] = box64_jmptbl_48;
#else
for(int i=0; i<(1<<JMPTABL_SHIFT3); ++i) {
box64_jmptbl3[i] = box64_jmptbldefault2;
box64_jmptbl_48[i] = box64_jmptbldefault1;
}
box64_jmptbl3[0] = box64_jmptbl_48;
#endif
for(int i=0; i<(1<<JMPTABL_SHIFT2); ++i)
box64_jmptbldefault2[i] = box64_jmptbldefault1;
for(int i=0; i<(1<<JMPTABL_SHIFT1); ++i)
box64_jmptbldefault1[i] = box64_jmptbldefault0;
for(int i=0; i<(1<<JMPTABL_SHIFT0); ++i)
box64_jmptbldefault0[i] = (uintptr_t)native_next;
#ifdef JMPTABL_SHIFT4
for(int i=0; i<(1<<JMPTABL_SHIFT4); ++i)
box64_jmptbl4[i] = box64_jmptbldefault3;
for(int i=0; i<(1<<JMPTABL_SHIFT3); ++i) {
box64_jmptbldefault3[i] = box64_jmptbldefault2;
box64_jmptbl_48[i] = box64_jmptbldefault2;
}
box64_jmptbl4[0] = box64_jmptbl_48;
#else
for(int i=0; i<(1<<JMPTABL_SHIFT3); ++i) {
box64_jmptbl3[i] = box64_jmptbldefault2;
box64_jmptbl_48[i] = box64_jmptbldefault1;
}
box64_jmptbl3[0] = box64_jmptbl_48;
#endif
for(int i=0; i<(1<<JMPTABL_SHIFT2); ++i)
box64_jmptbldefault2[i] = box64_jmptbldefault1;
for(int i=0; i<(1<<JMPTABL_SHIFT1); ++i)
box64_jmptbldefault1[i] = box64_jmptbldefault0;
for(int i=0; i<(1<<JMPTABL_SHIFT0); ++i)
box64_jmptbldefault0[i] = (uintptr_t)native_next;
lockaddress = kh_init(lockaddress);
rbt_dynmem = rbtree_init("rbt_dynmem");
#endif
Expand Down
Loading