syscall: use name+(NN)FP on linux/arm

Generated with a modified version of go vet and tested on android.

Change-Id: I1ff20135c5ab9de5a6dbf76ea2991167271ee70d
Reviewed-on: https://go-review.googlesource.com/2815
Reviewed-by: Ian Lance Taylor <iant@golang.org>

diff --git a/src/syscall/asm_linux_arm.s b/src/syscall/asm_linux_arm.s
index a9e07423c6e36e237bacda749d7b786de0e42405..997ba6f1c1e74f59c2e8447c1fb8c45a732c847d 100644 (file)
--- a/src/syscall/asm_linux_arm.s
+++ b/src/syscall/asm_linux_arm.s
@@ -15,10 +15,10 @@
 
 TEXT   ·Syscall(SB),NOSPLIT,$0-28
        BL              runtime·entersyscall(SB)
-       MOVW    4(SP), R7
-       MOVW    8(SP), R0
-       MOVW    12(SP), R1
-       MOVW    16(SP), R2
+       MOVW    trap+0(FP), R7
+       MOVW    a1+4(FP), R0
+       MOVW    a2+8(FP), R1
+       MOVW    a3+12(FP), R2
        MOVW    $0, R3
        MOVW    $0, R4
        MOVW    $0, R5
@@ -27,18 +27,18 @@ TEXT        ·Syscall(SB),NOSPLIT,$0-28
        CMP             R1, R0
        BLS             ok
        MOVW    $-1, R1
-       MOVW    R1, 20(SP)      // r1
+       MOVW    R1, r1+16(FP)
        MOVW    $0, R2
-       MOVW    R2, 24(SP)      // r2
+       MOVW    R2, r2+20(FP)
        RSB             $0, R0, R0
-       MOVW    R0, 28(SP)      // errno
+       MOVW    R0, err+24(FP)
        BL              runtime·exitsyscall(SB)
        RET
 ok:
-       MOVW    R0, 20(SP) // r1
+       MOVW    R0, r1+16(FP)
        MOVW    $0, R0
-       MOVW    R0, 24(SP)      // r2
-       MOVW    R0, 28(SP)      // errno
+       MOVW    R0, r2+20(FP)
+       MOVW    R0, err+24(FP)
        BL              runtime·exitsyscall(SB)
        RET
 
@@ -46,59 +46,59 @@ ok:
 // Actually Syscall5 but the rest of the code expects it to be named Syscall6.
 TEXT   ·Syscall6(SB),NOSPLIT,$0-40
        BL              runtime·entersyscall(SB)
-       MOVW    4(SP), R7       // syscall entry
-       MOVW    8(SP), R0
-       MOVW    12(SP), R1
-       MOVW    16(SP), R2
-       MOVW    20(SP), R3
-       MOVW    24(SP), R4
-       MOVW    28(SP), R5
+       MOVW    trap+0(FP), R7  // syscall entry
+       MOVW    a1+4(FP), R0
+       MOVW    a2+8(FP), R1
+       MOVW    a3+12(FP), R2
+       MOVW    a4+16(FP), R3
+       MOVW    a5+20(FP), R4
+       MOVW    a6+24(FP), R5
        SWI             $0
        MOVW    $0xfffff001, R6
        CMP             R6, R0
        BLS             ok6
        MOVW    $-1, R1
-       MOVW    R1, 32(SP)      // r1
+       MOVW    R1, r1+28(FP)
        MOVW    $0, R2
-       MOVW    R2, 36(SP)      // r2
+       MOVW    R2, r2+32(FP)
        RSB             $0, R0, R0
-       MOVW    R0, 40(SP)      // errno
+       MOVW    R0, err+36(FP)
        BL              runtime·exitsyscall(SB)
        RET
 ok6:
-       MOVW    R0, 32(SP) // r1
-       MOVW    R1, 36(SP)      // r2
+       MOVW    R0, r1+28(FP)
+       MOVW    R1, r2+32(FP)
        MOVW    $0, R0
-       MOVW    R0, 40(SP)      // errno
+       MOVW    R0, err+36(FP)
        BL              runtime·exitsyscall(SB)
        RET
 
 // func RawSyscall6(trap uintptr, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2, err uintptr);
 // Actually RawSyscall5 but the rest of the code expects it to be named RawSyscall6.
 TEXT   ·RawSyscall6(SB),NOSPLIT,$0-40
-       MOVW    4(SP), R7       // syscall entry
-       MOVW    8(SP), R0
-       MOVW    12(SP), R1
-       MOVW    16(SP), R2
-       MOVW    20(SP), R3
-       MOVW    24(SP), R4
-       MOVW    28(SP), R5
+       MOVW    trap+0(FP), R7  // syscall entry
+       MOVW    a1+4(FP), R0
+       MOVW    a2+8(FP), R1
+       MOVW    a3+12(FP), R2
+       MOVW    a4+16(FP), R3
+       MOVW    a5+20(FP), R4
+       MOVW    a6+24(FP), R5
        SWI             $0
        MOVW    $0xfffff001, R6
        CMP             R6, R0
        BLS             ok2
        MOVW    $-1, R1
-       MOVW    R1, 32(SP)      // r1
+       MOVW    R1, r1+28(FP)
        MOVW    $0, R2
-       MOVW    R2, 36(SP)      // r2
+       MOVW    R2, r2+32(FP)
        RSB             $0, R0, R0
-       MOVW    R0, 40(SP)      // errno
+       MOVW    R0, err+36(FP)
        RET
 ok2:
-       MOVW    R0, 32(SP) // r1
-       MOVW    R1, 36(SP)      // r2
+       MOVW    R0, r1+28(FP)
+       MOVW    R1, r2+32(FP)
        MOVW    $0, R0
-       MOVW    R0, 40(SP)      // errno
+       MOVW    R0, err+36(FP)
        RET
 
 #define SYS__LLSEEK 140  /* from zsysnum_linux_arm.go */
@@ -110,50 +110,50 @@ ok2:
 TEXT ·seek(SB),NOSPLIT,$0-28
        BL      runtime·entersyscall(SB)
        MOVW    $SYS__LLSEEK, R7        // syscall entry
-       MOVW    4(SP), R0       // fd
-       MOVW    12(SP), R1      // offset-high
-       MOVW    8(SP), R2       // offset-low
-       MOVW    $20(SP), R3
-       MOVW    16(SP), R4      // whence
+       MOVW    fd+0(FP), R0
+       MOVW    offset_hi+8(FP), R1
+       MOVW    offset_lo+4(FP), R2
+       MOVW    $newoffset_lo+16(FP), R3
+       MOVW    whence+12(FP), R4
        SWI     $0
        MOVW    $0xfffff001, R6
        CMP     R6, R0
        BLS     okseek
        MOVW    $0, R1
-       MOVW    R1, 20(SP)
-       MOVW    R1, 24(SP)
+       MOVW    R1, newoffset_lo+16(FP)
+       MOVW    R1, newoffset_hi+20(FP)
        RSB     $0, R0, R0
-       MOVW    R0, 28(SP)      // errno
+       MOVW    R0, err+24(FP)
        BL      runtime·exitsyscall(SB)
        RET
 okseek:
        // system call filled in newoffset already
        MOVW    $0, R0
-       MOVW    R0, 28(SP)      // errno
+       MOVW    R0, err+24(FP)
        BL      runtime·exitsyscall(SB)
        RET     
 
 // func RawSyscall(trap uintptr, a1, a2, a3 uintptr) (r1, r2, err uintptr);
 TEXT ·RawSyscall(SB),NOSPLIT,$0-28
-       MOVW    4(SP), R7       // syscall entry
-       MOVW    8(SP), R0
-       MOVW    12(SP), R1
-       MOVW    16(SP), R2
+       MOVW    trap+0(FP), R7  // syscall entry
+       MOVW    a1+4(FP), R0
+       MOVW    a2+8(FP), R1
+       MOVW    a3+12(FP), R2
        SWI             $0
        MOVW    $0xfffff001, R1
        CMP             R1, R0
        BLS             ok1
        MOVW    $-1, R1
-       MOVW    R1, 20(SP)      // r1
+       MOVW    R1, r1+16(FP)
        MOVW    $0, R2
-       MOVW    R2, 24(SP)      // r2
+       MOVW    R2, r2+20(FP)
        RSB             $0, R0, R0
-       MOVW    R0, 28(SP)      // errno
+       MOVW    R0, err+24(FP)
        RET
 ok1:
-       MOVW    R0, 20(SP) // r1
+       MOVW    R0, r1+16(FP)
        MOVW    $0, R0
-       MOVW    R0, 24(SP)      // r2
-       MOVW    R0, 28(SP)      // errno
+       MOVW    R0, r2+20(FP)
+       MOVW    R0, err+24(FP)
        RET