diff options
| author | Joel Sing <joel@sing.id.au> | 2019-05-15 04:19:26 +1000 |
|---|---|---|
| committer | Joel Sing <joel@sing.id.au> | 2019-05-17 14:30:55 +0000 |
| commit | 37133b5d63a451e083d78187a252ed2ea3bf96fc (patch) | |
| tree | a3c453b5f076025cd1e8b15211c7c534e3713ce8 /src | |
| parent | 9be2d46422c90068db8bb9d29cb025907c6100b0 (diff) | |
| download | go-37133b5d63a451e083d78187a252ed2ea3bf96fc.tar.xz | |
runtime: fix netbsd/arm64 assembly
Fix various bugs in the netbsd/arm64 runtime assembly.
Updates #30824.
Change-Id: I5ca10926ab663a8ff4df9973530e645e2469c1aa
Reviewed-on: https://go-review.googlesource.com/c/go/+/177120
Reviewed-by: Benny Siegert <bsiegert@gmail.com>
Reviewed-by: Cherry Zhang <cherryyz@google.com>
Run-TryBot: Benny Siegert <bsiegert@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/runtime/sys_netbsd_arm64.s | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/runtime/sys_netbsd_arm64.s b/src/runtime/sys_netbsd_arm64.s index 09c2f28f90..fb5589addf 100644 --- a/src/runtime/sys_netbsd_arm64.s +++ b/src/runtime/sys_netbsd_arm64.s @@ -101,16 +101,14 @@ TEXT runtime·lwp_self(SB),NOSPLIT,$0 // Exit the entire program (like C exit) TEXT runtime·exit(SB),NOSPLIT,$-8 - MOVD code+0(FP), R0 // arg 1 - exit status + MOVW code+0(FP), R0 // arg 1 - exit status SVC $SYS_exit MOVD $0, R0 // If we're still running, MOVD R0, (R0) // crash -// XXX the use of R1 here does not make sense. -// Does it not matter? // func exitThread(wait *uint32) TEXT runtime·exitThread(SB),NOSPLIT,$0-8 - MOVW wait+0(FP), R0 + MOVD wait+0(FP), R0 // We're done using the stack. MOVW $0, R1 STLRW R1, (R0) @@ -156,11 +154,11 @@ TEXT runtime·write(SB),NOSPLIT,$-8 BCC ok MOVW $-1, R0 ok: - MOVW R1, ret+24(FP) + MOVW R0, ret+24(FP) RET TEXT runtime·usleep(SB),NOSPLIT,$24-4 - MOVW usec+0(FP), R3 + MOVWU usec+0(FP), R3 MOVD R3, R5 MOVW $1000000, R4 UDIV R4, R3 @@ -171,7 +169,7 @@ TEXT runtime·usleep(SB),NOSPLIT,$24-4 MUL R4, R5 MOVD R5, 16(RSP) // nsec - MOVD RSP, R0 // arg 1 - rqtp + MOVD $8(RSP), R0 // arg 1 - rqtp MOVD $0, R1 // arg 2 - rmtp SVC $SYS___nanosleep50 RET @@ -200,11 +198,11 @@ TEXT runtime·setitimer(SB),NOSPLIT,$-8 // func walltime() (sec int64, nsec int32) TEXT runtime·walltime(SB), NOSPLIT, $32 MOVW $CLOCK_REALTIME, R0 // arg 1 - clock_id - MOVW 8(RSP), R1 // arg 2 - tp + MOVD $8(RSP), R1 // arg 2 - tp SVC $SYS___clock_gettime50 MOVD 8(RSP), R0 // sec - MOVW 16(RSP), R1 // nsec + MOVD 16(RSP), R1 // nsec // sec is in R0, nsec in R1 MOVD R0, sec+0(FP) @@ -218,7 +216,7 @@ TEXT runtime·nanotime(SB), NOSPLIT, $32 MOVD $8(RSP), R1 // arg 2 - tp SVC $SYS___clock_gettime50 MOVD 8(RSP), R0 // sec - MOVW 16(RSP), R2 // nsec + MOVD 16(RSP), R2 // nsec // sec is in R0, nsec in R2 // return nsec in R2 @@ -333,7 +331,7 @@ ok: MOVD R0, ret+24(FP) RET -TEXT runtime·sigaltstack(SB),NOSPLIT,$-8 +TEXT runtime·sigaltstack(SB),NOSPLIT,$0 MOVD new+0(FP), R0 // arg 1 - nss MOVD old+8(FP), R1 // arg 2 - oss SVC $SYS___sigaltstack14 |