gendef fixes

Author: Blackhex

winsup/cygwin/scripts/gendef

@@ -380,21 +380,23 @@ EOF
 	.seh_proc _sigfe_maybe
 _sigfe_maybe:					# stack is aligned on entry!
 	.seh_endprologue
+	ldr x10, [x18, #0x8]
 0:	ret
 	.seh_endproc
 
 	.seh_proc _sigfe
 _sigfe:						# stack is aligned on entry!
 	.seh_endprologue
-	ldr	x9, [sp], #0x10
-	br	x9
+	ldr	x10, [sp], #0x10
+	br	x10
 	.seh_endproc
 
 	.global _sigbe
 	.seh_proc _sigbe
 _sigbe:						# return here after cygwin syscall
 						# stack is aligned on entry!
 	.seh_endprologue
+	ret
 	.seh_endproc
 
 	.global	sigdelayed
@@ -442,10 +444,10 @@ _ZN7_cygtls6lockedEv:
 	.seh_proc stabilize_sig_stack
 stabilize_sig_stack:
 	// prologue
-	stp	fp, lr, [sp, #-0x10]!		// save registers
-	.seh_save_fplr_x 0x10
-	sub	sp, sp, #0x20			// allocate 32 bytes on stack
-	.seh_stackalloc 0x20
+	stp	fp, lr, [sp, #-0x10]!		// save FP and LR registers
+	stp	x9, x10, [sp, #-0x10]!		// save x9 and x10 registers used next
+	stp	x11, x12, [sp, #-0x10]!		// save x11 and x12 registers used next
+	stp	x13, x14, [sp, #-0x10]!		// save x13 register used next and x14 just to keep stack orientation and alignment
 	.seh_endprologue
 
 	ldr	x10, [x18, #0x8]		// get thread local storage pointer
@@ -499,10 +501,13 @@ stabilize_sig_stack:
 	sub	w9, w9, #1			// decrement incyg counter
 	str	w9, [x11]
 
+	mov	x0, x10				// return TLS address in x0 (return value)
+
 	// epilogue
-	add	sp, sp, #0x20			// restore stack
-	mov	x1, x10				// return TLS address in x0 (return value)
-	ldp	fp, lr, [sp], #0x10		// restore saved registers
+	ldp	x13, x14, [sp], #0x10
+	ldp	x11, x12, [sp], #0x10
+	ldp	x9, x10, [sp], #0x10
+	ldp	fp, lr, [sp], #0x10
 	ret
 	.seh_endproc
 EOF
@@ -651,15 +656,23 @@ EOF
 	.seh_proc sigsetjmp
 sigsetjmp:
 	// prologue
+	stp	fp, lr, [sp, #-0x10]!		// save FP and LR registers
+	mov	fp, sp				// set FP to current SP
+	sub	sp, sp, #0x20			// allocate 32 bytes on stack
 	.seh_endprologue
 
-	mov	x0, 0
+	bl setjmp
+
+	// epilogue
+	ldp	fp, lr, [sp], #0x10		// restore saved FP and LR registers
 	ret
 	.seh_endproc
 
 	.globl  setjmp
 	.seh_proc setjmp
 setjmp:
+	// prologue
+	stp	fp, lr, [sp, #-0x10]!		// save FP and LR registers
 	.seh_endprologue
 
 	// save callee-saved registers from jump buffer
@@ -668,8 +681,7 @@ setjmp:
 	stp	x23, x24, [x0, #0x28]		// save x23 and x24
 	stp	x25, x26, [x0, #0x38]		// save x25 and x26
 	stp	x27, x28, [x0, #0x48]		// save x27 and x28
-	str	x29, [x0, #0x58]		// save x29 (frame pointer)
-	str	x30, [x0, #0x60] 		// save x30 (link register)
+	stp	x29, x30, [x0, #0x58]		// save x29 (frame pointer) and x30 (link register)
 	mov	x1, sp				// get the current stack pointer
 	str	x1, [x0, #0x68]			// save SP
 	mrs	x1, fpsr			// get floating-point status register
@@ -683,93 +695,103 @@ setjmp:
 	stp	q4, q5, [x0, #0xC0]
 	stp	q6, q7, [x0, #0xE0]
 
-	bl	stabilize_sig_stack		// call stabilize_sig_stack (returns TLS in x1)
+	bl	stabilize_sig_stack		// call stabilize_sig_stack (returns TLS in x0)
 
 	// store the stack pointer to ...
 	ldr	x2, =_cygtls.stackptr
-	add	x2, x1, x2
-	ldr	x2, [x2]
+	add	x2, x0, x2
+	ldr	x3, [x2]
 	// TODO: Save the value somewhere.
 
 	// decrement the stack lock
 	ldr	x2, =_cygtls.stacklock
-	add	x2, x1, x2
-	ldr	w2, [x2]
-	sub	w2, w2, #1
-	str	w2, [x2]
+	add	x2, x0, x2
+	ldr	w3, [x2]
+	sub	w3, w3, #1
+	str	w3, [x2]
 
 	mov	w0, #0				// return 0
 
 	// epilogue
+	ldp	fp, lr, [sp], #0x10		// restore saved FP and LR registers
 	ret
 	.seh_endproc
 
 	.globl	siglongjmp
 	.seh_proc siglongjmp
 siglongjmp:
+	// prologue
+	stp	fp, lr, [sp, #-0x10]!		// save FP and LR registers
+	mov	fp, sp				// set FP to current SP
+	sub	sp, sp, #32			// allocate 32 bytes on stack
 	.seh_endprologue
+
+	bl longjmp
+
+	// epilogue
+	ldp	fp, lr, [sp], #0x10		// restore saved FP and LR registers
 	ret
 	.seh_endproc
 
 	.globl  longjmp
 	.seh_proc longjmp
 longjmp:
 	// prologue
-	stp	fp, lr, [sp, #-0x20]!		// save FP and LR registers
-	mov	fp, sp				// set FP to current SP
-	sub	sp, sp, #0x20			// allocate 32 bytes on stack
-	.seh_stackalloc 0x20
+	stp	fp, lr, [sp, #-0x20]!		// save FP and LR registers, allocate additional 16 bytes for function arguments
+	stp	x0, x1, [sp, #0x10]		// save function arguments (jump buffer and return value)
+	mov	fp, sp				// establishing frame chain
 	.seh_endprologue
-
-	mov	w19, w1				// save the return value
 1:
-	bl	stabilize_sig_stack		// call stabilize_sig_stack which returns TLS pointer in x1
-	mov	w0, w19				// restore return value to w0 (ARM64 return register)
-	ldr	x10, [x0]			// get old signal stack from jump buffer
+	bl	stabilize_sig_stack		// call stabilize_sig_stack which returns TLS pointer in x0
+	ldr	x2, [sp, #0x10]			// get jump buffer pointer from stack
+	ldr	x10, [x2]			// get old signal stack from jump buffer
 
 	// restore stack pointer in TLS
 	ldr	x11, =_cygtls.stackptr
-	add	x11, x1, x11
+	add	x11, x0, x11
 	str	x10, [x11]
 
 	// release lock by decrementing counter
 	ldr	x11, =_cygtls.stacklock
-	add	x11, x1, x11
+	add	x11, x0, x11
 	ldr	w12, [x11]
 	sub	w12, w12, #1
 	str	w12, [x11]
 
 	// we're not in cygwin anymore, clear "in cygwin" flag
 	ldr	x11, =_cygtls.incyg
-	add	x11, x1, x11
+	add	x11, x0, x11
 	mov	w12, #0
 	str	w12, [x11]
 
+	// get saved return value before SP is restored
+	ldr	x0, [sp, #0x10]
+
 	// restore callee-saved registers from jump buffer
-	ldp	x19, x20, [x0, #0x08]		// restore x19, x20
-	ldp	x21, x22, [x0, #0x18]		// restore x21, x22
-	ldp	x23, x24, [x0, #0x28]		// restore x23, x24
-	ldp	x25, x26, [x0, #0x38]		// restore x25, x26
-	ldp	x27, x28, [x0, #0x48]		// restore x27, x28
-	ldp	x29, x30, [x0, #0x58]		// restore x29 (frame pointer) and x30 (link register)
-	ldr	x9, [x0, #0x68]			// get saved stack pointer
-	ldr	x10, [x0, #0x70]		// load floating-point status register
+	ldp	x19, x20, [x2, #0x08]		// restore x19, x20
+	ldp	x21, x22, [x2, #0x18]		// restore x21, x22
+	ldp	x23, x24, [x2, #0x28]		// restore x23, x24
+	ldp	x25, x26, [x2, #0x38]		// restore x25, x26
+	ldp	x27, x28, [x2, #0x48]		// restore x27, x28
+	ldp	x29, x30, [x2, #0x58]		// restore x29 (frame pointer) and x30 (link register)
+	ldr	x10, [x2, #0x68]		// get saved stack pointer
+	mov	sp, x10				// restore stack pointer
+	ldr	x10, [x2, #0x70]		// load floating-point status register
 	msr	fpsr, x10			// restore FPSR
-	ldr	x10, [x0, #0x78]		// load floating-point control register
+	ldr	x10, [x2, #0x78]		// load floating-point control register
 	msr	fpcr, x10			// restore FPCR
 
 	// restore SIMD registers
-	ldp	q0, q1, [x0, #0x80]
-	ldp	q2, q3, [x0, #0xA0]
-	ldp	q4, q5, [x0, #0xC0]
-	ldp	q6, q7, [x0, #0xE0]
+	ldp	q0, q1, [x2, #0x80]
+	ldp	q2, q3, [x2, #0xA0]
+	ldp	q4, q5, [x2, #0xC0]
+	ldp	q6, q7, [x2, #0xE0]
 
 	// ensure return value is non-zero (C standard requirement)
-	cbnz	w0, 0f
-	mov	w0, #1
+	cbnz	x0, 0f
+	mov	x0, #1
 0:
-	// epilogue
-	ldp	fp, lr, [sp], #0x10		// restore saved FP and LR registers
+	// epilogue is empty as FP and LR are already restored
 	ret
 	.seh_endproc
 EOF