draft

Author: coypoop

src/runtime/cgo/gcc_netbsd_arm64.c

@@ -41,6 +41,7 @@ _cgo_sys_thread_start(ThreadStart *ts)
 
 	pthread_attr_init(&attr);
 	pthread_attr_getstacksize(&attr, &size);
+
 	// Leave stacklo=0 and set stackhi=size; mstart will do the rest.
 	ts->g->stackhi = size;
 	err = _cgo_try_pthread_create(&p, &attr, threadentry, ts);

src/runtime/os_netbsd_arm64.go

@@ -10,9 +10,9 @@ func lwp_mcontext_init(mc *mcontextt, stk unsafe.Pointer, mp *m, gp *g, fn uintp
 	// Machine dependent mcontext initialisation for LWP.
 	mc.__gregs[_REG_ELR] = uint64(funcPC(lwp_tramp))
 	mc.__gregs[_REG_X31] = uint64(uintptr(stk))
-	mc.__gregs[_REG_X0] = uint64(uintptr(unsafe.Pointer(mp)))
-	mc.__gregs[_REG_X1] = uint64(uintptr(unsafe.Pointer(mp.g0)))
-	mc.__gregs[_REG_X2] = uint64(fn)
+	mc.__gregs[_REG_X2] = uint64(uintptr(unsafe.Pointer(mp)))
+	mc.__gregs[_REG_X3] = uint64(uintptr(unsafe.Pointer(gp)))
+	mc.__gregs[_REG_X4] = uint64(fn)
 }
 
 //go:nosplit

src/runtime/sys_netbsd_arm64.s

@@ -8,6 +8,7 @@
 
 #include "go_asm.h"
 #include "go_tls.h"
+#include "tls_arm64.h"
 #include "textflag.h"
 
 #define	CLOCK_REALTIME		0
@@ -34,6 +35,7 @@
 #define	SYS__lwp_create			309
 #define	SYS__lwp_exit			310
 #define	SYS__lwp_self			311
+#define	SYS__lwp_setprivate		317
 #define	SYS__lwp_kill			318
 #define	SYS__lwp_unpark			321
 #define	SYS___sigaction_sigtramp	340
@@ -58,16 +60,20 @@ ok:
 	MOVW	R0, ret+24(FP)
 	RET
 
+
 TEXT runtime·lwp_tramp(SB),NOSPLIT,$0
-	CMP	$0, R1
-	BEQ	nog
-	CMP	$0, R2
-	BEQ	nog
 
-	MOVD	R0, g_m(R1)
-	MOVD	R1, g
-nog:
-	CALL	(R2)
+	// Set tpidr_el0 to point at m->tls
+	MOVD	m_tls(R8), R0
+	BL	runtime·settls(SB)
+
+	MRS_TPIDR_R0	// get_tls
+	MOVD	R2, g_m(R9)
+	MOVD	R3, g(R0)
+	//CALL	runtime·stackcheck(SB)
+
+	// Call fn
+	CALL	(R12)
 
 	MOVD	$0, R0  // crash (not reached)
 	MOVD	R0, (R8)
@@ -343,6 +349,15 @@ fail:
 	MOVD	$0, R0
 	MOVD	R0, (R0)		// crash
 
+// set TLS base to R0
+TEXT runtime·settls(SB),NOSPLIT,$8
+	SVC	$SYS__lwp_setprivate
+	BCS	fail
+	RET
+fail:
+	MOVD	$0, R0
+	MOVD	R0, (R0)
+
 TEXT runtime·sysctl(SB),NOSPLIT,$0
 	MOVD	mib+0(FP), R0		// arg 1 - name
 	MOVW	miblen+8(FP), R1	// arg 2 - namelen

src/runtime/tls_arm64.h

@@ -22,6 +22,7 @@
 
 #ifdef GOOS_netbsd
 #define TPIDR TPIDRRO_EL0
+#define TLSG_IS_VARIABLE
 #define MRS_TPIDR_R0 WORD $0xd53bd040 // MRS TPIDRRO_EL0, R0
 #endif