Skip to content
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

Jump to bottom

[DYNAREC] Optimized CALL/RET RAS for out of dynablock jumps #1909

Merged
merged 1 commit into from
Oct 7, 2024
Merged

[DYNAREC] Optimized CALL/RET RAS for out of dynablock jumps #1909

Show file tree
Hide file tree
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
30 changes: 22 additions & 8 deletions src/dynarec/arm64/dynarec_arm64_00.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3162,10 +3162,9 @@ uintptr_t dynarec64_00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nin
ADR_S20(x4, j64);
MESSAGE(LOG_NONE, "\tCALLRET set return to +%di\n", j64>>2);
} else {
MESSAGE(LOG_NONE, "\tCALLRET set return to Jmptable(%p)\n", (void*)addr);
j64 = getJumpTableAddress64(addr);
TABLE64(x4, j64);
LDRx_U12(x4, x4, 0);
j64 = (dyn->insts)?(GETMARK-(dyn->native_size)):0;
ADR_S20(x4, j64);
MESSAGE(LOG_NONE, "\tCALLRET set return to +%di\n", j64>>2);
}
STPx_S7_preindex(x4, x2, xSP, -16);
} else {
Expand All @@ -3177,6 +3176,14 @@ uintptr_t dynarec64_00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nin
else
j64 = addr+i32;
jump_to_next(dyn, j64, 0, ninst, rex.is32bits);
if(box64_dynarec_callret && addr >= (dyn->start + dyn->isize)) {
ksco marked this conversation as resolved.
Show resolved Hide resolved
// jumps out of current dynablock...
ksco marked this conversation as resolved.
Show resolved Hide resolved
MARK;
j64 = getJumpTableAddress64(addr);
TABLE64(x4, j64);
LDRx_U12(x4, x4, 0);
BR(x4);
}
break;
}
break;
Expand Down Expand Up @@ -3674,15 +3681,22 @@ uintptr_t dynarec64_00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nin
ADR_S20(x4, j64);
MESSAGE(LOG_NONE, "\tCALLRET set return to +%di\n", j64>>2);
} else {
MESSAGE(LOG_NONE, "\tCALLRET set return to Jmptable(%p)\n", (void*)addr);
j64 = getJumpTableAddress64(addr);
TABLE64(x4, j64);
LDRx_U12(x4, x4, 0);
j64 = (dyn->insts)?(GETMARK-(dyn->native_size)):0;
ADR_S20(x4, j64);
MESSAGE(LOG_NONE, "\tCALLRET set return to +%di\n", j64>>2);
}
STPx_S7_preindex(x4, xRIP, xSP, -16);
}
PUSH1z(xRIP);
jump_to_next(dyn, 0, ed, ninst, rex.is32bits);
if(box64_dynarec_callret && addr >= (dyn->start + dyn->isize)) {
// jumps out of current dynablock...
MARK;
j64 = getJumpTableAddress64(addr);
TABLE64(x4, j64);
LDRx_U12(x4, x4, 0);
BR(x4);
}
break;
case 3: // CALL FAR Ed
if(MODREG) {
Expand Down
15 changes: 11 additions & 4 deletions src/dynarec/arm64/dynarec_arm64_64.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1349,15 +1349,22 @@ uintptr_t dynarec64_64(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nin
ADR_S20(x4, j64);
MESSAGE(LOG_NONE, "\tCALLRET set return to +%di\n", j64>>2);
} else {
MESSAGE(LOG_NONE, "\tCALLRET set return to Jmptable(%p)\n", (void*)addr);
j64 = getJumpTableAddress64(addr);
TABLE64(x4, j64);
LDRx_U12(x4, x4, 0);
j64 = (dyn->insts)?(GETMARK-(dyn->native_size)):0;
ADR_S20(x4, j64);
MESSAGE(LOG_NONE, "\tCALLRET set return to +%di\n", j64>>2);
}
STPx_S7_preindex(x4, xRIP, xSP, -16);
}
PUSH1z(xRIP);
jump_to_next(dyn, 0, ed, ninst, rex.is32bits);
if(box64_dynarec_callret && addr >= (dyn->start + dyn->isize)) {
// jumps out of current dynablock...
MARK;
j64 = getJumpTableAddress64(addr);
TABLE64(x4, j64);
LDRx_U12(x4, x4, 0);
BR(x4);
}
break;
case 4: // JMP Ed
INST_NAME("JMP Ed");
Expand Down
15 changes: 11 additions & 4 deletions src/dynarec/arm64/dynarec_arm64_67.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1541,15 +1541,22 @@ uintptr_t dynarec64_67(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nin
ADR_S20(x4, j64);
MESSAGE(LOG_NONE, "\tCALLRET set return to +%di\n", j64>>2);
} else {
MESSAGE(LOG_NONE, "\tCALLRET set return to Jmptable(%p)\n", (void*)addr);
j64 = getJumpTableAddress64(addr);
TABLE64(x4, j64);
LDRx_U12(x4, x4, 0);
j64 = (dyn->insts)?(GETMARK-(dyn->native_size)):0;
ADR_S20(x4, j64);
MESSAGE(LOG_NONE, "\tCALLRET set return to +%di\n", j64>>2);
}
STPx_S7_preindex(x4, xRIP, xSP, -16);
}
PUSH1z(xRIP);
jump_to_next(dyn, 0, ed, ninst, rex.is32bits);
if(box64_dynarec_callret && addr >= (dyn->start + dyn->isize)) {
// jumps out of current dynablock...
MARK;
j64 = getJumpTableAddress64(addr);
TABLE64(x4, j64);
LDRx_U12(x4, x4, 0);
BR(x4);
}
break;
default:
DEFAULT;
Expand Down
32 changes: 24 additions & 8 deletions src/dynarec/la64/dynarec_la64_00.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2030,10 +2030,10 @@ uintptr_t dynarec64_00(dynarec_la64_t* dyn, uintptr_t addr, uintptr_t ip, int ni
ADDI_D(x4, x4, j64 & 0xfff);
MESSAGE(LOG_NONE, "\tCALLRET set return to +%di\n", j64 >> 2);
} else {
MESSAGE(LOG_NONE, "\tCALLRET set return to Jmptable(%p)\n", (void*)addr);
j64 = getJumpTableAddress64(addr);
TABLE64(x4, j64);
LD_D(x4, x4, 0);
j64 = (dyn->insts)?(GETMARK-(dyn->native_size)):0;
PCADDU12I(x4, ((j64 + 0x800) >> 12) & 0xfffff);
ADDI_D(x4, x4, j64 & 0xfff);
MESSAGE(LOG_NONE, "\tCALLRET set return to +%di\n", j64>>2);
}
ADDI_D(xSP, xSP, -16);
ST_D(x4, xSP, 0);
Expand All @@ -2047,6 +2047,14 @@ uintptr_t dynarec64_00(dynarec_la64_t* dyn, uintptr_t addr, uintptr_t ip, int ni
else
j64 = addr+i32;
jump_to_next(dyn, j64, 0, ninst, rex.is32bits);
if(box64_dynarec_callret && addr >= (dyn->start + dyn->isize)) {
// jumps out of current dynablock...
MARK;
j64 = getJumpTableAddress64(addr);
TABLE64(x4, j64);
LD_D(x4, x4, 0);
BR(x4);
}
break;
}
break;
Expand Down Expand Up @@ -2371,17 +2379,25 @@ uintptr_t dynarec64_00(dynarec_la64_t* dyn, uintptr_t addr, uintptr_t ip, int ni
ADDI_D(x4, x4, j64 & 0xfff);
MESSAGE(LOG_NONE, "\tCALLRET set return to +%di\n", j64 >> 2);
} else {
MESSAGE(LOG_NONE, "\tCALLRET set return to Jmptable(%p)\n", (void*)addr);
j64 = getJumpTableAddress64(addr);
TABLE64(x4, j64);
LD_D(x4, x4, 0);
j64 = (dyn->insts)?(GETMARK-(dyn->native_size)):0;
PCADDU12I(x4, ((j64 + 0x800) >> 12) & 0xfffff);
ADDI_D(x4, x4, j64 & 0xfff);
MESSAGE(LOG_NONE, "\tCALLRET set return to +%di\n", j64>>2);
}
ADDI_D(xSP, xSP, -16);
ST_D(x4, xSP, 0);
ST_D(xRIP, xSP, 8);
}
PUSH1z(xRIP);
jump_to_next(dyn, 0, ed, ninst, rex.is32bits);
if(box64_dynarec_callret && addr >= (dyn->start + dyn->isize)) {
// jumps out of current dynablock...
MARK;
j64 = getJumpTableAddress64(addr);
TABLE64(x4, j64);
LD_D(x4, x4, 0);
BR(x4);
}
break;
case 4: // JMP Ed
INST_NAME("JMP Ed");
Expand Down
32 changes: 24 additions & 8 deletions src/dynarec/rv64/dynarec_rv64_00_3.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -957,10 +957,10 @@ uintptr_t dynarec64_00_3(dynarec_rv64_t* dyn, uintptr_t addr, uintptr_t ip, int
ADDI(x4, x4, j64 & 0xfff);
MESSAGE(LOG_NONE, "\tCALLRET set return to +%di\n", j64>>2);
} else {
MESSAGE(LOG_NONE, "\tCALLRET set return to Jmptable(%p)\n", (void*)addr);
j64 = getJumpTableAddress64(addr);
TABLE64(x4, j64);
LD(x4, x4, 0);
j64 = (dyn->insts)?(GETMARK-(dyn->native_size)):0;
AUIPC(x4, ((j64 + 0x800) >> 12) & 0xfffff);
ADDI(x4, x4, j64 & 0xfff);
MESSAGE(LOG_NONE, "\tCALLRET set return to +%di\n", j64>>2);
}
ADDI(xSP, xSP, -16);
SD(x4, xSP, 0);
Expand All @@ -974,6 +974,14 @@ uintptr_t dynarec64_00_3(dynarec_rv64_t* dyn, uintptr_t addr, uintptr_t ip, int
else
j64 = addr+i32;
jump_to_next(dyn, j64, 0, ninst, rex.is32bits);
if(box64_dynarec_callret && addr >= (dyn->start + dyn->isize)) {
// jumps out of current dynablock...
MARK;
j64 = getJumpTableAddress64(addr);
TABLE64(x4, j64);
LD(x4, x4, 0);
BR(x4);
}
break;
}
break;
Expand Down Expand Up @@ -1443,17 +1451,25 @@ uintptr_t dynarec64_00_3(dynarec_rv64_t* dyn, uintptr_t addr, uintptr_t ip, int
ADDI(x4, x4, j64 & 0xfff);
MESSAGE(LOG_NONE, "\tCALLRET set return to +%di\n", j64>>2);
} else {
MESSAGE(LOG_NONE, "\tCALLRET set return to Jmptable(%p)\n", (void*)addr);
j64 = getJumpTableAddress64(addr);
TABLE64(x4, j64);
LD(x4, x4, 0);
j64 = (dyn->insts)?(GETMARK-(dyn->native_size)):0;
AUIPC(x4, ((j64 + 0x800) >> 12) & 0xfffff);
ADDI(x4, x4, j64 & 0xfff);
MESSAGE(LOG_NONE, "\tCALLRET set return to +%di\n", j64>>2);
}
ADDI(xSP, xSP, -16);
SD(x4, xSP, 0);
SD(xRIP, xSP, 8);
}
PUSH1z(xRIP);
jump_to_next(dyn, 0, ed, ninst, rex.is32bits);
if(box64_dynarec_callret && addr >= (dyn->start + dyn->isize)) {
// jumps out of current dynablock...
MARK;
j64 = getJumpTableAddress64(addr);
TABLE64(x4, j64);
LD(x4, x4, 0);
BR(x4);
}
break;
case 4: // JMP Ed
INST_NAME("JMP Ed");
Expand Down
2 changes: 1 addition & 1 deletion src/dynarec/rv64/rv64_prolog.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,4 @@ rv64_prolog:
xori x5, x0, -1
srli x5, x5, 32
// jump to block
jalr a1
jr a1
Loading