crypto/*, runtime: nacl asm fixes

Found by vet.

Updates #11041

Change-Id: I5217b3e20c6af435d7500d6bb487b9895efe6605
Reviewed-on: https://go-review.googlesource.com/27493
Run-TryBot: Josh Bleecher Snyder <josharian@gmail.com>
Reviewed-by: Ian Lance Taylor <iant@golang.org>

diff --git a/src/crypto/md5/md5block_amd64p32.s b/src/crypto/md5/md5block_amd64p32.s
index d918a67c51406ad91ecb3867a3d2e704a4eb2bf2..ee05f8613b388df397d58fc5aa54073d51a188a4 100644 (file)
--- a/src/crypto/md5/md5block_amd64p32.s
+++ b/src/crypto/md5/md5block_amd64p32.s
@@ -17,7 +17,7 @@
 // Licence: I hereby disclaim the copyright on this code and place it
 // in the public domain.
 
-TEXT   ·block(SB),NOSPLIT,$0-32
+TEXT   ·block(SB),NOSPLIT,$0-16
        MOVL    dig+0(FP),      R11
        MOVL    p+4(FP),        SI
        MOVL    p_len+8(FP), DX

diff --git a/src/crypto/sha1/sha1block_amd64p32.s b/src/crypto/sha1/sha1block_amd64p32.s
index efebbf076685f2d02ecefa55f34bf40688d94ab0..0159d238ae134d82386406ed4e652c276238c8ea 100644 (file)
--- a/src/crypto/sha1/sha1block_amd64p32.s
+++ b/src/crypto/sha1/sha1block_amd64p32.s
@@ -91,7 +91,7 @@
        FUNC4(a, b, c, d, e); \
        MIX(a, b, c, d, e, 0xCA62C1D6)
 
-TEXT ·block(SB),NOSPLIT,$64-32
+TEXT ·block(SB),NOSPLIT,$64-16
        MOVL    dig+0(FP),      R14
        MOVL    p_base+4(FP),   SI
        MOVL    p_len+8(FP),    DX

diff --git a/src/runtime/asm_amd64p32.s b/src/runtime/asm_amd64p32.s
index 452ce04143adf833e13fd6188bd6767dd8993b71..dec77e9542e93babf5087a5ec30ead04d1d76675 100644 (file)
--- a/src/runtime/asm_amd64p32.s
+++ b/src/runtime/asm_amd64p32.s
@@ -449,13 +449,13 @@ TEXT runtime·asmcgocall(SB),NOSPLIT,$0-12
 
 // cgocallback(void (*fn)(void*), void *frame, uintptr framesize)
 // Not implemented.
-TEXT runtime·cgocallback(SB),NOSPLIT,$0-12
+TEXT runtime·cgocallback(SB),NOSPLIT,$0-16
        MOVL    0, AX
        RET
 
 // cgocallback_gofunc(FuncVal*, void *frame, uintptr framesize)
 // Not implemented.
-TEXT ·cgocallback_gofunc(SB),NOSPLIT,$0-12
+TEXT ·cgocallback_gofunc(SB),NOSPLIT,$0-16
        MOVL    0, AX
        RET
 
@@ -561,20 +561,20 @@ TEXT runtime·aeshash(SB),NOSPLIT,$0-20
        MOVL    AX, ret+16(FP)
        RET
 
-TEXT runtime·aeshashstr(SB),NOSPLIT,$0-20
-       MOVL    AX, ret+16(FP)
+TEXT runtime·aeshashstr(SB),NOSPLIT,$0-12
+       MOVL    AX, ret+8(FP)
        RET
 
-TEXT runtime·aeshash32(SB),NOSPLIT,$0-20
-       MOVL    AX, ret+16(FP)
+TEXT runtime·aeshash32(SB),NOSPLIT,$0-12
+       MOVL    AX, ret+8(FP)
        RET
 
-TEXT runtime·aeshash64(SB),NOSPLIT,$0-20
-       MOVL    AX, ret+16(FP)
+TEXT runtime·aeshash64(SB),NOSPLIT,$0-12
+       MOVL    AX, ret+8(FP)
        RET
 
 // memequal(p, q unsafe.Pointer, size uintptr) bool
-TEXT runtime·memequal(SB),NOSPLIT,$0-13
+TEXT runtime·memequal(SB),NOSPLIT,$0-17
        MOVL    a+0(FP), SI
        MOVL    b+4(FP), DI
        CMPL    SI, DI
@@ -607,16 +607,16 @@ eq:
 // See runtime_test.go:eqstring_generic for
 // equivalent Go code.
 TEXT runtime·eqstring(SB),NOSPLIT,$0-17
-       MOVL    s1str+0(FP), SI
-       MOVL    s2str+8(FP), DI
+       MOVL    s1_base+0(FP), SI
+       MOVL    s2_base+8(FP), DI
        CMPL    SI, DI
        JEQ     same
-       MOVL    s1len+4(FP), BX
+       MOVL    s1_len+4(FP), BX
        CALL    runtime·memeqbody(SB)
-       MOVB    AX, v+16(FP)
+       MOVB    AX, ret+16(FP)
        RET
 same:
-       MOVB    $1, v+16(FP)
+       MOVB    $1, ret+16(FP)
        RET
 
 // a in SI

diff --git a/src/runtime/sys_nacl_amd64p32.s b/src/runtime/sys_nacl_amd64p32.s
index 0b29c9f889e03958b51b14ff3f349e02aa92c4d6..c2a24e8a62edccdb5702e765d91ece53f5c6aa89 100644 (file)
--- a/src/runtime/sys_nacl_amd64p32.s
+++ b/src/runtime/sys_nacl_amd64p32.s
@@ -414,8 +414,8 @@ MOVL $1, DI; NACL_SYSCALL(SYS_exit)
 
 // func getRandomData([]byte)
 TEXT runtime·getRandomData(SB),NOSPLIT,$0-12
-       MOVL buf+0(FP), DI
-       MOVL len+4(FP), SI
+       MOVL arg_base+0(FP), DI
+       MOVL arg_len+4(FP), SI
        NACL_SYSCALL(SYS_get_random_bytes)
        RET
 

diff --git a/src/runtime/sys_nacl_arm.s b/src/runtime/sys_nacl_arm.s
index 474d9fe17465562ded1defb8a52222c0b38b4204..6cbc23fd7d16faaba9d1eb7ccfc930bfad9f318a 100644 (file)
--- a/src/runtime/sys_nacl_arm.s
+++ b/src/runtime/sys_nacl_arm.s
@@ -303,8 +303,8 @@ TEXT runtime·nacl_sysinfo(SB),NOSPLIT,$16
 
 // func getRandomData([]byte)
 TEXT runtime·getRandomData(SB),NOSPLIT,$0-12
-       MOVW buf+0(FP), R0
-       MOVW len+4(FP), R1
+       MOVW arg_base+0(FP), R0
+       MOVW arg_len+4(FP), R1
        NACL_SYSCALL(SYS_get_random_bytes)
        RET