[dev.cc] runtime, syscall: add names to FP offsets in freebsd, netbsd arm assembly
Makes them compatible with the new asm.
Applied mechanically from vet diagnostics.
Manual edits: the names for arguments in time·now(SB) in runtime/sys_*_arm.s.
Change-Id: Ib295390d9509d306afc67714e3f50dc832256625
Reviewed-on: https://go-review.googlesource.com/5576
Run-TryBot: Russ Cox <rsc@golang.org>
Reviewed-by: Rob Pike <r@golang.org>
diff --git a/src/runtime/sys_netbsd_arm.s b/src/runtime/sys_netbsd_arm.s
index fa9bc57..5628967 100644
--- a/src/runtime/sys_netbsd_arm.s
+++ b/src/runtime/sys_netbsd_arm.s
@@ -12,7 +12,7 @@
// Exit the entire program (like C exit)
TEXT runtime·exit(SB),NOSPLIT,$-4
- MOVW 0(FP), R0 // arg 1 exit status
+ MOVW code+0(FP), R0 // arg 1 exit status
SWI $0xa00001
MOVW.CS $0, R8 // crash on syscall failure
MOVW.CS R8, (R8)
@@ -25,31 +25,31 @@
RET
TEXT runtime·open(SB),NOSPLIT,$-8
- MOVW 0(FP), R0
- MOVW 4(FP), R1
- MOVW 8(FP), R2
+ MOVW name+0(FP), R0
+ MOVW mode+4(FP), R1
+ MOVW perm+8(FP), R2
SWI $0xa00005
MOVW R0, ret+12(FP)
RET
TEXT runtime·close(SB),NOSPLIT,$-8
- MOVW 0(FP), R0
+ MOVW fd+0(FP), R0
SWI $0xa00006
MOVW R0, ret+4(FP)
RET
TEXT runtime·read(SB),NOSPLIT,$-8
- MOVW 0(FP), R0
- MOVW 4(FP), R1
- MOVW 8(FP), R2
+ MOVW fd+0(FP), R0
+ MOVW p+4(FP), R1
+ MOVW n+8(FP), R2
SWI $0xa00003
MOVW R0, ret+12(FP)
RET
TEXT runtime·write(SB),NOSPLIT,$-4
- MOVW 0(FP), R0 // arg 1 - fd
- MOVW 4(FP), R1 // arg 2 - buf
- MOVW 8(FP), R2 // arg 3 - nbyte
+ MOVW fd+0(FP), R0 // arg 1 - fd
+ MOVW p+4(FP), R1 // arg 2 - buf
+ MOVW n+8(FP), R2 // arg 3 - nbyte
SWI $0xa00004 // sys_write
MOVW R0, ret+12(FP)
RET
@@ -68,17 +68,17 @@
RET
TEXT runtime·lwp_park(SB),NOSPLIT,$0
- MOVW 0(FP), R0 // arg 1 - abstime
- MOVW 4(FP), R1 // arg 2 - unpark
- MOVW 8(FP), R2 // arg 3 - hint
- MOVW 12(FP), R3 // arg 4 - unparkhint
+ MOVW abstime+0(FP), R0 // arg 1 - abstime
+ MOVW unpark+4(FP), R1 // arg 2 - unpark
+ MOVW hint+8(FP), R2 // arg 3 - hint
+ MOVW unparkhint+12(FP), R3 // arg 4 - unparkhint
SWI $0xa001b2 // sys__lwp_park
MOVW R0, ret+16(FP)
RET
TEXT runtime·lwp_unpark(SB),NOSPLIT,$0
- MOVW 0(FP), R0 // arg 1 - lwp
- MOVW 4(FP), R1 // arg 2 - hint
+ MOVW lwp+0(FP), R0 // arg 1 - lwp
+ MOVW hint+4(FP), R1 // arg 2 - hint
SWI $0xa00141 // sys__lwp_unpark
MOVW R0, ret+8(FP)
RET
@@ -124,9 +124,9 @@
RET
TEXT runtime·setitimer(SB),NOSPLIT,$-4
- MOVW 0(FP), R0 // arg 1 - which
- MOVW 4(FP), R1 // arg 2 - itv
- MOVW 8(FP), R2 // arg 3 - oitv
+ MOVW mode+0(FP), R0 // arg 1 - which
+ MOVW new+4(FP), R1 // arg 2 - itv
+ MOVW old+8(FP), R2 // arg 3 - oitv
SWI $0xa001a9 // sys_setitimer
RET
@@ -140,9 +140,9 @@
MOVW 12(R13), R1 // sec.high
MOVW 16(R13), R2 // nsec
- MOVW R0, 0(FP)
- MOVW R1, 4(FP)
- MOVW R2, 8(FP)
+ MOVW R0, sec_lo+0(FP)
+ MOVW R1, sec_hi+4(FP)
+ MOVW R2, nsec+8(FP)
RET
// int64 nanotime(void) so really
@@ -167,16 +167,16 @@
RET
TEXT runtime·getcontext(SB),NOSPLIT,$-4
- MOVW 0(FP), R0 // arg 1 - context
+ MOVW ctxt+0(FP), R0 // arg 1 - context
SWI $0xa00133 // sys_getcontext
MOVW.CS $0, R8 // crash on syscall failure
MOVW.CS R8, (R8)
RET
TEXT runtime·sigprocmask(SB),NOSPLIT,$0
- MOVW 0(FP), R0 // arg 1 - how
- MOVW 4(FP), R1 // arg 2 - set
- MOVW 8(FP), R2 // arg 3 - oset
+ MOVW mode+0(FP), R0 // arg 1 - how
+ MOVW new+4(FP), R1 // arg 2 - set
+ MOVW old+8(FP), R2 // arg 3 - oset
SWI $0xa00125 // sys_sigprocmask
MOVW.CS $0, R8 // crash on syscall failure
MOVW.CS R8, (R8)
@@ -193,9 +193,9 @@
B -2(PC) // continue exit
TEXT runtime·sigaction(SB),NOSPLIT,$4
- MOVW 0(FP), R0 // arg 1 - signum
- MOVW 4(FP), R1 // arg 2 - nsa
- MOVW 8(FP), R2 // arg 3 - osa
+ MOVW sig+0(FP), R0 // arg 1 - signum
+ MOVW new+4(FP), R1 // arg 2 - nsa
+ MOVW old+8(FP), R2 // arg 3 - osa
MOVW $runtime·sigreturn_tramp(SB), R3 // arg 4 - tramp
MOVW $2, R4 // arg 5 - vers
MOVW R4, 4(R13)
@@ -242,15 +242,15 @@
RET
TEXT runtime·mmap(SB),NOSPLIT,$12
- MOVW 0(FP), R0 // arg 1 - addr
- MOVW 4(FP), R1 // arg 2 - len
- MOVW 8(FP), R2 // arg 3 - prot
- MOVW 12(FP), R3 // arg 4 - flags
+ MOVW addr+0(FP), R0 // arg 1 - addr
+ MOVW n+4(FP), R1 // arg 2 - len
+ MOVW prot+8(FP), R2 // arg 3 - prot
+ MOVW flags+12(FP), R3 // arg 4 - flags
// arg 5 (fid) and arg6 (offset_lo, offset_hi) are passed on stack
// note the C runtime only passes the 32-bit offset_lo to us
- MOVW 16(FP), R4 // arg 5
+ MOVW fd+16(FP), R4 // arg 5
MOVW R4, 4(R13)
- MOVW 20(FP), R5 // arg 6 lower 32-bit
+ MOVW off+20(FP), R5 // arg 6 lower 32-bit
MOVW R5, 8(R13)
MOVW $0, R6 // higher 32-bit for arg 6
MOVW R6, 12(R13)
@@ -261,37 +261,37 @@
RET
TEXT runtime·munmap(SB),NOSPLIT,$0
- MOVW 0(FP), R0 // arg 1 - addr
- MOVW 4(FP), R1 // arg 2 - len
+ MOVW addr+0(FP), R0 // arg 1 - addr
+ MOVW n+4(FP), R1 // arg 2 - len
SWI $0xa00049 // sys_munmap
MOVW.CS $0, R8 // crash on syscall failure
MOVW.CS R8, (R8)
RET
TEXT runtime·madvise(SB),NOSPLIT,$0
- MOVW 0(FP), R0 // arg 1 - addr
- MOVW 4(FP), R1 // arg 2 - len
- MOVW 8(FP), R2 // arg 3 - behav
+ MOVW addr+0(FP), R0 // arg 1 - addr
+ MOVW n+4(FP), R1 // arg 2 - len
+ MOVW flags+8(FP), R2 // arg 3 - behav
SWI $0xa0004b // sys_madvise
// ignore failure - maybe pages are locked
RET
TEXT runtime·sigaltstack(SB),NOSPLIT,$-4
- MOVW 0(FP), R0 // arg 1 - nss
- MOVW 4(FP), R1 // arg 2 - oss
+ MOVW new+0(FP), R0 // arg 1 - nss
+ MOVW old+4(FP), R1 // arg 2 - oss
SWI $0xa00119 // sys___sigaltstack14
MOVW.CS $0, R8 // crash on syscall failure
MOVW.CS R8, (R8)
RET
TEXT runtime·sysctl(SB),NOSPLIT,$8
- MOVW 0(FP), R0 // arg 1 - name
- MOVW 4(FP), R1 // arg 2 - namelen
- MOVW 8(FP), R2 // arg 3 - oldp
- MOVW 12(FP), R3 // arg 4 - oldlenp
- MOVW 16(FP), R4 // arg 5 - newp
+ MOVW mib+0(FP), R0 // arg 1 - name
+ MOVW miblen+4(FP), R1 // arg 2 - namelen
+ MOVW out+8(FP), R2 // arg 3 - oldp
+ MOVW size+12(FP), R3 // arg 4 - oldlenp
+ MOVW dst+16(FP), R4 // arg 5 - newp
MOVW R4, 4(R13)
- MOVW 20(FP), R4 // arg 6 - newlen
+ MOVW ndst+20(FP), R4 // arg 6 - newlen
MOVW R4, 8(R13)
ADD $4, R13 // pass arg 5 and 6 on stack
SWI $0xa000ca // sys___sysctl
@@ -308,13 +308,13 @@
// int32 runtime·kevent(int kq, Kevent *changelist, int nchanges, Kevent *eventlist, int nevents, Timespec *timeout)
TEXT runtime·kevent(SB),NOSPLIT,$8
- MOVW 0(FP), R0 // kq
- MOVW 4(FP), R1 // changelist
- MOVW 8(FP), R2 // nchanges
- MOVW 12(FP), R3 // eventlist
- MOVW 16(FP), R4 // nevents
+ MOVW kq+0(FP), R0 // kq
+ MOVW ch+4(FP), R1 // changelist
+ MOVW nch+8(FP), R2 // nchanges
+ MOVW ev+12(FP), R3 // eventlist
+ MOVW nev+16(FP), R4 // nevents
MOVW R4, 4(R13)
- MOVW 20(FP), R4 // timeout
+ MOVW ts+20(FP), R4 // timeout
MOVW R4, 8(R13)
ADD $4, R13 // pass arg 5 and 6 on stack
SWI $0xa001b3 // sys___kevent50
@@ -325,7 +325,7 @@
// void runtime·closeonexec(int32 fd)
TEXT runtime·closeonexec(SB),NOSPLIT,$0
- MOVW 0(FP), R0 // fd
+ MOVW fd+0(FP), R0 // fd
MOVW $2, R1 // F_SETFD
MOVW $1, R2 // FD_CLOEXEC
SWI $0xa0005c // sys_fcntl
