[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/syscall/asm_netbsd_arm.s b/src/syscall/asm_netbsd_arm.s
index 290bb580..18bca56 100644
--- a/src/syscall/asm_netbsd_arm.s
+++ b/src/syscall/asm_netbsd_arm.s
@@ -15,113 +15,113 @@
TEXT ·Syscall(SB),NOSPLIT,$0-28
BL runtime·entersyscall(SB)
- MOVW 0(FP), R0 // sigcall num
- MOVW 4(FP), R1 // a1
- MOVW 8(FP), R2 // a2
- MOVW 12(FP), R3 // a3
+ MOVW trap+0(FP), R0 // sigcall num
+ MOVW a1+4(FP), R1 // a1
+ MOVW a2+8(FP), R2 // a2
+ MOVW a3+12(FP), R3 // a3
SWI $0 // syscall
MOVW $0, R2
BCS error
- MOVW R0, 16(FP) // r1
- MOVW R1, 20(FP) // r2
- MOVW R2, 24(FP) // err
+ MOVW R0, r1+16(FP) // r1
+ MOVW R1, r2+20(FP) // r2
+ MOVW R2, err+24(FP) // err
BL runtime·exitsyscall(SB)
RET
error:
MOVW $-1, R3
- MOVW R3, 16(FP) // r1
- MOVW R2, 20(FP) // r2
- MOVW R0, 24(FP) // err
+ MOVW R3, r1+16(FP) // r1
+ MOVW R2, r2+20(FP) // r2
+ MOVW R0, err+24(FP) // err
BL runtime·exitsyscall(SB)
RET
TEXT ·Syscall6(SB),NOSPLIT,$0-40
BL runtime·entersyscall(SB)
- MOVW 0(FP), R0 // sigcall num
- MOVW 4(FP), R1 // a1
- MOVW 8(FP), R2 // a2
- MOVW 12(FP), R3 // a3
+ MOVW trap+0(FP), R0 // sigcall num
+ MOVW a1+4(FP), R1 // a1
+ MOVW a2+8(FP), R2 // a2
+ MOVW a3+12(FP), R3 // a3
MOVW R13, R4
- MOVW $16(FP), R13 // a4 to a6 are passed on stack
+ MOVW $a4+16(FP), R13 // a4 to a6 are passed on stack
SWI $0 // syscall
MOVW R4, R13
MOVW $0, R2
BCS error6
- MOVW R0, 28(FP) // r1
- MOVW R1, 32(FP) // r2
- MOVW R2, 36(FP) // err
+ MOVW R0, r1+28(FP) // r1
+ MOVW R1, r2+32(FP) // r2
+ MOVW R2, err+36(FP) // err
BL runtime·exitsyscall(SB)
RET
error6:
MOVW $-1, R3
- MOVW R3, 28(FP) // r1
- MOVW R2, 32(FP) // r2
- MOVW R0, 36(FP) // err
+ MOVW R3, r1+28(FP) // r1
+ MOVW R2, r2+32(FP) // r2
+ MOVW R0, err+36(FP) // err
BL runtime·exitsyscall(SB)
RET
TEXT ·Syscall9(SB),NOSPLIT,$0-52
BL runtime·entersyscall(SB)
- MOVW 0(FP), R0 // sigcall num
- MOVW 4(FP), R1 // a1
- MOVW 8(FP), R2 // a2
- MOVW 12(FP), R3 // a3
+ MOVW trap+0(FP), R0 // sigcall num
+ MOVW a1+4(FP), R1 // a1
+ MOVW a2+8(FP), R2 // a2
+ MOVW a3+12(FP), R3 // a3
MOVW R13, R4
- MOVW $16(FP), R13 // a4 to a9 are passed on stack
+ MOVW $a4+16(FP), R13 // a4 to a9 are passed on stack
SWI $0 // syscall
MOVW R4, R13
MOVW $0, R2
BCS error9
- MOVW R0, 40(FP) // r1
- MOVW R1, 44(FP) // r2
- MOVW R2, 48(FP) // err
+ MOVW R0, r1+40(FP) // r1
+ MOVW R1, r2+44(FP) // r2
+ MOVW R2, err+48(FP) // err
BL runtime·exitsyscall(SB)
RET
error9:
MOVW $-1, R3
- MOVW R3, 40(FP) // r1
- MOVW R2, 44(FP) // r2
- MOVW R0, 48(FP) // err
+ MOVW R3, r1+40(FP) // r1
+ MOVW R2, r2+44(FP) // r2
+ MOVW R0, err+48(FP) // err
BL runtime·exitsyscall(SB)
RET
TEXT ·RawSyscall(SB),NOSPLIT,$0-28
- MOVW 0(FP), R0 // sigcall num
- MOVW 4(FP), R1 // a1
- MOVW 8(FP), R2 // a2
- MOVW 12(FP), R3 // a3
+ MOVW trap+0(FP), R0 // sigcall num
+ MOVW a1+4(FP), R1 // a1
+ MOVW a2+8(FP), R2 // a2
+ MOVW a3+12(FP), R3 // a3
SWI $0 // syscall
MOVW $0, R2
BCS errorr
- MOVW R0, 16(FP) // r1
- MOVW R1, 20(FP) // r2
- MOVW R2, 24(FP) // err
+ MOVW R0, r1+16(FP) // r1
+ MOVW R1, r2+20(FP) // r2
+ MOVW R2, err+24(FP) // err
RET
errorr:
MOVW $-1, R3
- MOVW R3, 16(FP) // r1
- MOVW R2, 20(FP) // r2
- MOVW R0, 24(FP) // err
+ MOVW R3, r1+16(FP) // r1
+ MOVW R2, r2+20(FP) // r2
+ MOVW R0, err+24(FP) // err
RET
TEXT ·RawSyscall6(SB),NOSPLIT,$0-40
- MOVW 0(FP), R0 // sigcall num
- MOVW 4(FP), R1 // a1
- MOVW 8(FP), R2 // a2
- MOVW 12(FP), R3 // a3
+ MOVW trap+0(FP), R0 // sigcall num
+ MOVW a1+4(FP), R1 // a1
+ MOVW a2+8(FP), R2 // a2
+ MOVW a3+12(FP), R3 // a3
MOVW R13, R4
- MOVW $16(FP), R13 // a4 to a9 are passed on stack
+ MOVW $a4+16(FP), R13 // a4 to a9 are passed on stack
SWI $0 // syscall
MOVW R4, R13
MOVW $0, R2
BCS errorr6
- MOVW R0, 28(FP) // r1
- MOVW R1, 32(FP) // r2
- MOVW R2, 36(FP) // err
+ MOVW R0, r1+28(FP) // r1
+ MOVW R1, r2+32(FP) // r2
+ MOVW R2, err+36(FP) // err
RET
errorr6:
MOVW $-1, R3
- MOVW R3, 28(FP) // r1
- MOVW R2, 32(FP) // r2
- MOVW R0, 36(FP) // err
+ MOVW R3, r1+28(FP) // r1
+ MOVW R2, r2+32(FP) // r2
+ MOVW R0, err+36(FP) // err
RET
