rename spaen stdlib call to clone_wrapper

Author: robertmuth

BE/CodeGenA32/isel_tab.py

@@ -1067,8 +1067,8 @@ def InitMiscBra():
 
     Pattern(o.TRAP, [], [InsTmpl("ud2", [])])
 
-    # not any change in the stack behavior of the code below needs to be reflected
-    # in the spawn() code in StdLib/syscall.a32.asm
+    # note: any change in the stack behavior of the code below needs to be reflected
+    # in the clone_wrapper() code in StdLib/syscall.a32.asm
     Pattern(o.SYSCALL, [o.DK.INVALID, o.DK.U32],
             [  # push r7 on stack twice for 8 byte alignment
         InsTmpl("str_imm_sub_pre", [arm.REG.sp, 4, arm.REG.r7]),

BE/StdLib/syscall.a32.asm

@@ -222,7 +222,7 @@
 .fun a32_syscall_clone SIGNATURE [S32] = [U32 A32 A32 A32 A32]
 .fun a32_thread_function SIGNATURE [] = [U32]
 
-.fun spawn NORMAL [S32] = [C32 A32 A32 U32 U32]
+.fun clone_wrapper NORMAL [S32] = [C32 A32 A32 U32 U32]
 .bbl entry
     poparg proc:C32
     poparg new_stack:A32
@@ -270,6 +270,52 @@
     ret
 
 
+.fun a32_syscall_clone3 SIGNATURE [S32] = [A32 U32]
+
+.fun clone3_wrapper NORMAL [S32] = [C32 U32 A32 U32]
+.bbl entry
+    poparg proc:C32
+    poparg user_arg:U32
+    poparg param:A32
+    poparg param_size:U32
+    # make space on stack
+    ld stk:U32 param 20
+    ld stk_size:U32 param  24
+    sub stk_size stk_size 8  # make space for two parameters (preserves 16 byte alignment)
+    add stk stk stk_size
+    # We need to save this to the new stack as there is not guarantee
+    # that these values will end up in (preserved) registers. (see below)
+    bitcast sp:A32 stk
+    st sp 4 proc
+    st sp 0 user_arg
+    st param 24 stk_size
+    #
+    pusharg param_size
+    pusharg param
+    syscall a32_syscall_clone3 435:U16
+    poparg res:S32
+    beq res 0 child
+    pusharg res
+    ret
+
+.bbl child
+    # Why do we have to save the user_arg temporarily onto the new stack?
+    # If user_arg ends up in register we might get lucky because the register
+    # are presumably preserved when we reach here.
+    # But if user_arg is spilled onto the old stack it is not clear if we can see it
+    # at this point.
+    getsp sp
+    lea sp sp -8 # compensate for the syscall poping 16 bytes off the stack
+               # needs to be adjusted when the syscall expansion changes
+    ld user_arg sp 0
+    ld proc sp 4
+    pusharg user_arg
+    jsr proc a32_thread_function
+    pusharg 0:S32
+    syscall a32_syscall_exit 1:U8
+    trap # unreachable
+    pusharg 0:S32
+    ret
 
 .fun socket NORMAL [S32] = [U32 U32 U32]
 .bbl entry

BE/StdLib/syscall.a64.asm

@@ -222,7 +222,7 @@
 .fun a64_syscall_clone SIGNATURE [S32] = [U64 A64 A64 A64 A64]
 .fun a64_thread_function SIGNATURE [] = [U64]
 
-.fun spawn NORMAL [S32] = [C64 A64 A64 U64 U64]
+.fun clone_wrapper NORMAL [S32] = [C64 A64 A64 U64 U64]
 .bbl entry
     poparg proc:C64
     poparg new_stack:A64
@@ -267,6 +267,52 @@
     pusharg 0:S32
     ret
 
+.fun a64_syscall_clone3 SIGNATURE [S32] = [A64 U64]
+
+.fun clone3_wrapper NORMAL [S32] = [C64 U64 A64 U64]
+.bbl entry
+    poparg proc:C64
+    poparg user_arg:U64
+    poparg param:A64
+    poparg param_size:U64
+    # make space on stack
+    ld stk:U64 param 40
+    ld stk_size:U64 param  48
+    sub stk_size stk_size 16  # make space for two parameters (preserves 16 byte alignment)
+    add stk stk stk_size
+    # We need to save this to the new stack as there is not guarantee
+    # that these values will end up in (preserved) registers. (see below)
+    bitcast sp:A64 stk
+    st sp 8 proc
+    st sp 0 user_arg
+    st param 48 stk_size
+    #
+    pusharg param_size
+    pusharg param
+    syscall a64_syscall_clone3 435:U16
+    poparg res:S32
+    beq res 0 child
+    pusharg res
+    ret
+
+.bbl child
+    # Why do we have to save the user_arg temporarily onto the new stack?
+    # If user_arg ends up in register we might get lucky because the register
+    # are presumably preserved when we reach here.
+    # But if user_arg is spilled onto the old stack it is not clear if we can see it
+    # at this point.
+    getsp sp
+    lea sp sp -16 # compensate for the syscall poping 16 bytes off the stack
+               # needs to be adjusted when the syscall expansion changes
+    ld user_arg sp 0
+    ld proc sp 8
+    pusharg user_arg
+    jsr proc a64_thread_function
+    pusharg 0:S32
+    syscall a64_syscall_exit 60:U8
+    trap # unreachable
+    pusharg 0:S32
+    ret
 
 .fun socket NORMAL [S32] = [U32 U32 U32]
 .bbl entry

BE/StdLib/syscall.x64.asm

@@ -224,7 +224,7 @@
 .fun x64_thread_function SIGNATURE [] = [U64]
 
 
-.fun spawn NORMAL [S32] = [C64 A64 A64 U64 U64]
+.fun clone_wrapper NORMAL [S32] = [C64 A64 A64 U64 U64]
 .bbl entry
     poparg proc:C64
     poparg new_stack:A64

BE/TestData/threads.32.asm

@@ -44,7 +44,7 @@
     cas.mem prev_val:U32 old_val new_val gSUM 0
     #bsr yield
     #poparg res:S32
-    bne prev_val old_val cas_loop 
+    bne prev_val old_val cas_loop
 
     bne i 0 loop
     ret
@@ -67,7 +67,7 @@
     pusharg 0:A32  # tls
     pusharg stk
     pusharg proc
-    bsr spawn
+    bsr clone_wrapper
     poparg x:S32
 
     bne i 0 loop
@@ -76,7 +76,7 @@
     bsr print_s_ln
 
     # bsr short_sleep
-     
+
      mov i = 100
 .bbl loop2
     sub i i 1
@@ -87,18 +87,14 @@
     pusharg siginfo
     pusharg 0:S32
     pusharg 0:S32  # P_ALL
-    bsr waitid 
+    bsr waitid
     poparg x
     bne i 0 loop2
- 
+
     ld.mem sum:U32 gSUM 0
     conv iarg:U32 sum
     pusharg iarg
     bsr print_x_ln
 
     pusharg 0:S32
     ret
-
-
-
-

BE/TestData/threads.64.asm

@@ -44,7 +44,7 @@
     cas.mem prev_val:U64 old_val new_val gSUM 0
     #bsr yield
     #poparg res:S32
-    bne prev_val old_val cas_loop 
+    bne prev_val old_val cas_loop
 
     bne i 0 loop
     ret
@@ -67,14 +67,14 @@
     pusharg 0:A64  # tls
     pusharg stk
     pusharg proc
-    bsr spawn
+    bsr clone_wrapper
     poparg x:S32
 
     bne i 0 loop
     lea msg:A64 gWORKER_SPAWNED_MSG 0
     pusharg msg
     bsr print_s_ln
-  
+
     # bsr short_sleep
 
     mov i = 100
@@ -87,7 +87,7 @@
     pusharg siginfo
     pusharg 0:S32
     pusharg 0:S32  # P_ALL
-    bsr waitid 
+    bsr waitid
     poparg x
     bne i 0 loop2
 
@@ -99,7 +99,3 @@
 
     pusharg 0:S32
     ret
-
-
-
-