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

i#3544 riscv64: Implemented dr_setjmp and dr_longjmp #6071

Merged
merged 9 commits into from
May 21, 2023
Merged

i#3544 riscv64: Implemented dr_setjmp and dr_longjmp #6071

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1f6b12e
i#3544 riscv64: Implemented dr_setjmp
shiptux May 19, 2023
7a1ccc0
Implemented dr_setjmp
shiptux May 19, 2023
3859e20
Fix review
shiptux May 20, 2023
702e762
Fix review
shiptux May 20, 2023
55d5d5e
fixed review2
shiptux May 20, 2023
7757a58
fixed review3
shiptux May 20, 2023
7afbe5b
fixed review
shiptux May 21, 2023
6779b41
fixed review2
shiptux May 21, 2023
1451c1c
Fix review4
shiptux May 21, 2023
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
5 changes: 4 additions & 1 deletion core/arch/arch_exports.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1608,7 +1608,10 @@ typedef struct dr_jmp_buf_t {
#elif defined(AARCH64) /* for aarch64.asm */
# define REGS_IN_JMP_BUF 22 /* See dr_setjmp and dr_longjmp. */
reg_t regs[REGS_IN_JMP_BUF];
#endif /* X86/AARCH64/ARM */
#elif defined(RISCV64) /* For riscv64.asm. */
# define REGS_IN_JMP_BUF 26 /* See dr_setjmp and dr_longjmp. */
reg_t regs[REGS_IN_JMP_BUF];
#endif /* X86/AARCH64/ARM/RISCV64 */
#if defined(UNIX) && defined(DEBUG)
/* i#226/PR 492568: we avoid the cost of storing this by using the
* mask in the fault's signal frame, but we do record it in debug
Expand Down
72 changes: 68 additions & 4 deletions core/arch/riscv64/riscv64.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,16 +208,52 @@ ADDRTAKEN_LABEL(safe_read_asm_recover:)
*/
DECLARE_EXPORTED_FUNC(dr_try_start)
GLOBAL_LABEL(dr_try_start:)
addi ARG1, ARG1, TRY_CXT_SETJMP_OFFS
addi ARG1, ARG1, TRY_CXT_SETJMP_OFFS
j GLOBAL_REF(dr_setjmp)
END_FUNC(dr_try_start)

/*
/* We save only callee-saved registers and ra: ra, SP, x8/fp, x9, x18-x27, f8-9, f18-27:
* a total of 26 reg_t (64-bit) slots. See definition of dr_jmp_buf_t.
*
* int dr_setjmp(dr_jmp_buf_t *buf);
*/
DECLARE_FUNC(dr_setjmp)
GLOBAL_LABEL(dr_setjmp:)
/* FIXME i#3544: Not implemented */
sd ra, 0 (ARG1)
sd t0, ARG_SZ (ARG1)
mv t0, sp
shiptux marked this conversation as resolved.
Show resolved Hide resolved
sd s0, 2*ARG_SZ (ARG1)
sd s1, 3*ARG_SZ (ARG1)
sd s2, 4*ARG_SZ (ARG1)
sd s3, 5*ARG_SZ (ARG1)
sd s4, 6*ARG_SZ (ARG1)
sd s5, 7*ARG_SZ (ARG1)
sd s6, 8*ARG_SZ (ARG1)
sd s7, 9*ARG_SZ (ARG1)
sd s8, 10*ARG_SZ (ARG1)
sd s9, 11*ARG_SZ (ARG1)
sd s10, 12*ARG_SZ (ARG1)
sd s11, 13*ARG_SZ (ARG1)
fsd fs0, 14*ARG_SZ (ARG1)
fsd fs1, 15*ARG_SZ (ARG1)
fsd fs2, 16*ARG_SZ (ARG1)
fsd fs3, 17*ARG_SZ (ARG1)
fsd fs4, 18*ARG_SZ (ARG1)
fsd fs5, 19*ARG_SZ (ARG1)
fsd fs6, 20*ARG_SZ (ARG1)
fsd fs7, 21*ARG_SZ (ARG1)
fsd fs8, 22*ARG_SZ (ARG1)
fsd fs9, 23*ARG_SZ (ARG1)
fsd fs10, 24*ARG_SZ (ARG1)
fsd fs11, 25*ARG_SZ (ARG1)
# ifdef UNIX
addi sp, sp, -16
sd ra, 0 (sp)
jal GLOBAL_REF(dr_setjmp_sigmask)
ld ra, 0 (sp)
add sp, sp, 16
# endif
li a0, 0
ret
END_FUNC(dr_setjmp)

Expand All @@ -226,7 +262,35 @@ GLOBAL_LABEL(dr_setjmp:)
*/
DECLARE_FUNC(dr_longjmp)
GLOBAL_LABEL(dr_longjmp:)
/* FIXME i#3544: Not implemented */
ld ra, 0 (ARG1) /* Restore return address from buf */
ld t0, ARG_SZ (ARG1)
mv sp, t0
ld s0, 2*ARG_SZ (ARG1)
ld s1, 3*ARG_SZ (ARG1)
ld s2, 4*ARG_SZ (ARG1)
ld s3, 5*ARG_SZ (ARG1)
ld s4, 6*ARG_SZ (ARG1)
ld s5, 7*ARG_SZ (ARG1)
ld s6, 8*ARG_SZ (ARG1)
ld s7, 9*ARG_SZ (ARG1)
ld s8, 10*ARG_SZ (ARG1)
ld s9, 11*ARG_SZ (ARG1)
ld s10, 12*ARG_SZ (ARG1)
ld s11, 13*ARG_SZ (ARG1)
fld fs0, 14*ARG_SZ (ARG1)
fld fs1, 15*ARG_SZ (ARG1)
fld fs2, 16*ARG_SZ (ARG1)
fld fs3, 17*ARG_SZ (ARG1)
fld fs4, 18*ARG_SZ (ARG1)
fld fs5, 19*ARG_SZ (ARG1)
fld fs6, 20*ARG_SZ (ARG1)
fld fs7, 21*ARG_SZ (ARG1)
fld fs8, 22*ARG_SZ (ARG1)
fld fs9, 23*ARG_SZ (ARG1)
fld fs10, 24*ARG_SZ (ARG1)
fld fs11, 25*ARG_SZ (ARG1)
seqz ARG1, ARG2
add ARG1, ARG1, ARG2 /* ARG1 = ( ARG2 == 0 ) ? 1 : ARG2 */
ret
END_FUNC(dr_longjmp)

Expand Down