i#3544: RV64: Port test common.getretaddr to RV64

Port assembly in common/getretaddr.c to riscv64 and implements tailcall_with_retaddr(). Issue: #3544
DynamoRIO · Dec 24, 2024 · 2a51c8e · 2a51c8e
1 parent fa2eaa8
commit 2a51c8e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/suite/tests/common/getretaddr.c b/suite/tests/common/getretaddr.c
@@ -113,8 +113,11 @@ GLOBAL_LABEL(FUNCNAME:)
         ldr      x30, [sp], #16
         ret
 # elif defined(RISCV64)
-        /* TODO i#3544: Port tests to RISC-V 64 */
-        ret
+        mv       t0, ra
+        call     next_instr
+    next_instr:
+        mv       a0, ra
+        jr       t0
 # else
 #  error NYI
 # endif
@@ -134,7 +137,7 @@ GLOBAL_LABEL(FUNCNAME:)
         ldr      x0, [x29, #8]
         ret
 # elif defined(RISCV64)
-        /* TODO i#3544: Port tests to RISC-V 64 */
+        ld       a0, -8(fp)
         ret
 # else
 #  error NYI

diff --git a/suite/tests/tools.c b/suite/tests/tools.c
@@ -805,8 +805,9 @@ GLOBAL_LABEL(FUNCNAME:)
         mov      x0, x30             /* Replace first argument with return address. */
         br       x9                  /* Tailcall to function pointer. */
 #elif defined(RISCV64)
-        /* TODO i#3544: Port tests to RISC-V64 */
-        ret
+        mv       t0, a0
+        mv       a0, ra
+        jr       t0
 #else
 # error NYI
 #endif