rebase to 47a0a17

junchao-loongson · May 31, 2024 · ab12fbe · ab12fbe
1 parent fd76a9a
commit ab12fbe
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/runtime/caml/config.h b/runtime/caml/config.h
@@ -258,7 +258,7 @@ typedef uint64_t uintnat;
    #define Cache_line_bsize 256
 #elif defined(TARGET_arm64) || defined(TARGET_power)
    #define Cache_line_bsize 128
-#elif defined(TARGET_amd64) || defined(TARGET_riscv)
+#elif defined(TARGET_amd64) || defined(TARGET_riscv) || defined(TARGET_loongarch64)
    #define Cache_line_bsize 64
 #elif (!defined(NATIVE_CODE))
    #define Cache_line_bsize 64

diff --git a/runtime/caml/stack.h b/runtime/caml/stack.h
@@ -99,9 +99,9 @@
    See loongarch64.S and loongarch64/proc.ml for the indices */
 #define Wosize_gc_regs (2 + 23 /* int regs */ + 24 /* float regs */)
 #define Saved_return_address(sp) *((intnat *)((sp) - 8))
-/* LoongArch does not use a frame pointer, but requires the stack to be
-   16-aligned. */
-#define Pop_frame_pointer(sp) sp += sizeof(value)
+#define First_frame(sp) ((sp) + 16)
+#define Saved_gc_regs(sp) (*(value **)((sp) + 24))
+#define Stack_header_size 32
 #endif
 
 /* Declaration of variables used in the asm code */