diff options
| author | Josh Bleecher Snyder <josharian@gmail.com> | 2016-07-21 08:49:07 -0700 |
|---|---|---|
| committer | Josh Bleecher Snyder <josharian@gmail.com> | 2016-08-16 14:12:29 +0000 |
| commit | 33f95ec4ecf96c795d69c643f80e4bd7f6a8f1bb (patch) | |
| tree | c9c6970112480780772e628afe7e2af148cb9d54 | |
| parent | 856342d844a66cb15e13d73b60b2d2de3ea56090 (diff) | |
| download | go-33f95ec4ecf96c795d69c643f80e4bd7f6a8f1bb.tar.gz go-33f95ec4ecf96c795d69c643f80e4bd7f6a8f1bb.zip | |
syscall: superficial cleanup of amd64 unix assembly
This is preliminary work to unifying them.
Updates #11041
Change-Id: Ibe83da3d626f1da9e8888e26cedd3af2152b42e6
Reviewed-on: https://go-review.googlesource.com/25114
Run-TryBot: Josh Bleecher Snyder <josharian@gmail.com>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
| -rw-r--r-- | src/syscall/asm_dragonfly_amd64.s | 22 | ||||
| -rw-r--r-- | src/syscall/asm_freebsd_amd64.s | 22 |
2 files changed, 22 insertions, 22 deletions
diff --git a/src/syscall/asm_dragonfly_amd64.s b/src/syscall/asm_dragonfly_amd64.s index 6339b7ea55..78df9b7b3b 100644 --- a/src/syscall/asm_dragonfly_amd64.s +++ b/src/syscall/asm_dragonfly_amd64.s @@ -14,23 +14,23 @@ // func Syscall(trap int64, a1, a2, a3 int64) (r1, r2, err int64); // func Syscall6(trap int64, a1, a2, a3, a4, a5, a6 int64) (r1, r2, err int64); -// func Syscall9(trap int64, a1, a2, a3, a4, a5, a6, a7, a8, a9 int64) (r1, r2, err int64) +// func Syscall9(trap int64, a1, a2, a3, a4, a5, a6, a7, a8, a9 int64) (r1, r2, err int64); // Trap # in AX, args in DI SI DX, return in AX DX TEXT ·Syscall(SB),NOSPLIT,$0-56 CALL runtime·entersyscall(SB) + MOVQ 8(SP), AX // syscall entry MOVQ 16(SP), DI MOVQ 24(SP), SI MOVQ 32(SP), DX MOVQ $0, R10 MOVQ $0, R8 MOVQ $0, R9 - MOVQ 8(SP), AX // syscall entry SYSCALL JCC ok MOVQ $-1, 40(SP) // r1 MOVQ $0, 48(SP) // r2 - MOVQ AX, 56(SP) // errno + MOVQ AX, 56(SP) // errno CALL runtime·exitsyscall(SB) RET ok: @@ -42,18 +42,18 @@ ok: TEXT ·Syscall6(SB),NOSPLIT,$0-80 CALL runtime·entersyscall(SB) + MOVQ 8(SP), AX // syscall entry MOVQ 16(SP), DI MOVQ 24(SP), SI MOVQ 32(SP), DX MOVQ 40(SP), R10 MOVQ 48(SP), R8 MOVQ 56(SP), R9 - MOVQ 8(SP), AX // syscall entry SYSCALL JCC ok6 MOVQ $-1, 64(SP) // r1 MOVQ $0, 72(SP) // r2 - MOVQ AX, 80(SP) // errno + MOVQ AX, 80(SP) // errno CALL runtime·exitsyscall(SB) RET ok6: @@ -65,11 +65,11 @@ ok6: TEXT ·Syscall9(SB),NOSPLIT,$0-104 CALL runtime·entersyscall(SB) - MOVQ 8(SP), AX + MOVQ 8(SP), AX // syscall entry MOVQ 16(SP), DI MOVQ 24(SP), SI MOVQ 32(SP), DX - MOVQ 40(SP), R10 + MOVQ 40(SP), R10 MOVQ 48(SP), R8 MOVQ 56(SP), R9 @@ -86,7 +86,7 @@ TEXT ·Syscall9(SB),NOSPLIT,$0-104 JCC ok9 MOVQ $-1, 88(SP) // r1 MOVQ $0, 96(SP) // r2 - MOVQ AX, 104(SP) // errno + MOVQ AX, 104(SP) // errno CALL runtime·exitsyscall(SB) RET ok9: @@ -96,7 +96,7 @@ ok9: CALL runtime·exitsyscall(SB) RET -TEXT ·RawSyscall(SB),NOSPLIT,$0-56 +TEXT ·RawSyscall(SB),NOSPLIT,$0-56 MOVQ 16(SP), DI MOVQ 24(SP), SI MOVQ 32(SP), DX @@ -108,7 +108,7 @@ TEXT ·RawSyscall(SB),NOSPLIT,$0-56 JCC ok1 MOVQ $-1, 40(SP) // r1 MOVQ $0, 48(SP) // r2 - MOVQ AX, 56(SP) // errno + MOVQ AX, 56(SP) // errno RET ok1: MOVQ AX, 40(SP) // r1 @@ -128,7 +128,7 @@ TEXT ·RawSyscall6(SB),NOSPLIT,$0-80 JCC ok2 MOVQ $-1, 64(SP) // r1 MOVQ $0, 72(SP) // r2 - MOVQ AX, 80(SP) // errno + MOVQ AX, 80(SP) // errno RET ok2: MOVQ AX, 64(SP) // r1 diff --git a/src/syscall/asm_freebsd_amd64.s b/src/syscall/asm_freebsd_amd64.s index c6988c94b3..51ef44ca9c 100644 --- a/src/syscall/asm_freebsd_amd64.s +++ b/src/syscall/asm_freebsd_amd64.s @@ -14,23 +14,23 @@ // func Syscall(trap int64, a1, a2, a3 int64) (r1, r2, err int64); // func Syscall6(trap int64, a1, a2, a3, a4, a5, a6 int64) (r1, r2, err int64); -// func Syscall9(trap int64, a1, a2, a3, a4, a5, a6, a7, a8, a9 int64) (r1, r2, err int64) +// func Syscall9(trap int64, a1, a2, a3, a4, a5, a6, a7, a8, a9 int64) (r1, r2, err int64); // Trap # in AX, args in DI SI DX, return in AX DX TEXT ·Syscall(SB),NOSPLIT,$0-56 CALL runtime·entersyscall(SB) + MOVQ 8(SP), AX // syscall entry MOVQ 16(SP), DI MOVQ 24(SP), SI MOVQ 32(SP), DX MOVQ $0, R10 MOVQ $0, R8 MOVQ $0, R9 - MOVQ 8(SP), AX // syscall entry SYSCALL JCC ok MOVQ $-1, 40(SP) // r1 MOVQ $0, 48(SP) // r2 - MOVQ AX, 56(SP) // errno + MOVQ AX, 56(SP) // errno CALL runtime·exitsyscall(SB) RET ok: @@ -42,18 +42,18 @@ ok: TEXT ·Syscall6(SB),NOSPLIT,$0-80 CALL runtime·entersyscall(SB) + MOVQ 8(SP), AX // syscall entry MOVQ 16(SP), DI MOVQ 24(SP), SI MOVQ 32(SP), DX MOVQ 40(SP), R10 MOVQ 48(SP), R8 MOVQ 56(SP), R9 - MOVQ 8(SP), AX // syscall entry SYSCALL JCC ok6 MOVQ $-1, 64(SP) // r1 MOVQ $0, 72(SP) // r2 - MOVQ AX, 80(SP) // errno + MOVQ AX, 80(SP) // errno CALL runtime·exitsyscall(SB) RET ok6: @@ -65,11 +65,11 @@ ok6: TEXT ·Syscall9(SB),NOSPLIT,$0-104 CALL runtime·entersyscall(SB) - MOVQ 8(SP), AX + MOVQ 8(SP), AX // syscall entry MOVQ 16(SP), DI MOVQ 24(SP), SI MOVQ 32(SP), DX - MOVQ 40(SP), R10 + MOVQ 40(SP), R10 MOVQ 48(SP), R8 MOVQ 56(SP), R9 @@ -86,7 +86,7 @@ TEXT ·Syscall9(SB),NOSPLIT,$0-104 JCC ok9 MOVQ $-1, 88(SP) // r1 MOVQ $0, 96(SP) // r2 - MOVQ AX, 104(SP) // errno + MOVQ AX, 104(SP) // errno CALL runtime·exitsyscall(SB) RET ok9: @@ -96,7 +96,7 @@ ok9: CALL runtime·exitsyscall(SB) RET -TEXT ·RawSyscall(SB),NOSPLIT,$0-56 +TEXT ·RawSyscall(SB),NOSPLIT,$0-56 MOVQ 16(SP), DI MOVQ 24(SP), SI MOVQ 32(SP), DX @@ -108,7 +108,7 @@ TEXT ·RawSyscall(SB),NOSPLIT,$0-56 JCC ok1 MOVQ $-1, 40(SP) // r1 MOVQ $0, 48(SP) // r2 - MOVQ AX, 56(SP) // errno + MOVQ AX, 56(SP) // errno RET ok1: MOVQ AX, 40(SP) // r1 @@ -128,7 +128,7 @@ TEXT ·RawSyscall6(SB),NOSPLIT,$0-80 JCC ok2 MOVQ $-1, 64(SP) // r1 MOVQ $0, 72(SP) // r2 - MOVQ AX, 80(SP) // errno + MOVQ AX, 80(SP) // errno RET ok2: MOVQ AX, 64(SP) // r1 |