Skip to content

Commit e2103ad

Browse files
committed
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 <[email protected]> Reviewed-by: Ian Lance Taylor <[email protected]>
1 parent 5abfc97 commit e2103ad

File tree

5 files changed

+20
-20
lines changed

5 files changed

+20
-20
lines changed

src/crypto/md5/md5block_amd64p32.s

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
// Licence: I hereby disclaim the copyright on this code and place it
1818
// in the public domain.
1919

20-
TEXT ·block(SB),NOSPLIT,$0-32
20+
TEXT ·block(SB),NOSPLIT,$0-16
2121
MOVL dig+0(FP), R11
2222
MOVL p+4(FP), SI
2323
MOVL p_len+8(FP), DX

src/crypto/sha1/sha1block_amd64p32.s

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
FUNC4(a, b, c, d, e); \
9292
MIX(a, b, c, d, e, 0xCA62C1D6)
9393

94-
TEXT ·block(SB),NOSPLIT,$64-32
94+
TEXT ·block(SB),NOSPLIT,$64-16
9595
MOVL dig+0(FP), R14
9696
MOVL p_base+4(FP), SI
9797
MOVL p_len+8(FP), DX

src/runtime/asm_amd64p32.s

+14-14
Original file line numberDiff line numberDiff line change
@@ -449,13 +449,13 @@ TEXT runtime·asmcgocall(SB),NOSPLIT,$0-12
449449

450450
// cgocallback(void (*fn)(void*), void *frame, uintptr framesize)
451451
// Not implemented.
452-
TEXT runtime·cgocallback(SB),NOSPLIT,$0-12
452+
TEXT runtime·cgocallback(SB),NOSPLIT,$0-16
453453
MOVL 0, AX
454454
RET
455455

456456
// cgocallback_gofunc(FuncVal*, void *frame, uintptr framesize)
457457
// Not implemented.
458-
TEXT ·cgocallback_gofunc(SB),NOSPLIT,$0-12
458+
TEXT ·cgocallback_gofunc(SB),NOSPLIT,$0-16
459459
MOVL 0, AX
460460
RET
461461

@@ -561,20 +561,20 @@ TEXT runtime·aeshash(SB),NOSPLIT,$0-20
561561
MOVL AX, ret+16(FP)
562562
RET
563563

564-
TEXT runtime·aeshashstr(SB),NOSPLIT,$0-20
565-
MOVL AX, ret+16(FP)
564+
TEXT runtime·aeshashstr(SB),NOSPLIT,$0-12
565+
MOVL AX, ret+8(FP)
566566
RET
567567

568-
TEXT runtime·aeshash32(SB),NOSPLIT,$0-20
569-
MOVL AX, ret+16(FP)
568+
TEXT runtime·aeshash32(SB),NOSPLIT,$0-12
569+
MOVL AX, ret+8(FP)
570570
RET
571571

572-
TEXT runtime·aeshash64(SB),NOSPLIT,$0-20
573-
MOVL AX, ret+16(FP)
572+
TEXT runtime·aeshash64(SB),NOSPLIT,$0-12
573+
MOVL AX, ret+8(FP)
574574
RET
575575

576576
// memequal(p, q unsafe.Pointer, size uintptr) bool
577-
TEXT runtime·memequal(SB),NOSPLIT,$0-13
577+
TEXT runtime·memequal(SB),NOSPLIT,$0-17
578578
MOVL a+0(FP), SI
579579
MOVL b+4(FP), DI
580580
CMPL SI, DI
@@ -607,16 +607,16 @@ eq:
607607
// See runtime_test.go:eqstring_generic for
608608
// equivalent Go code.
609609
TEXT runtime·eqstring(SB),NOSPLIT,$0-17
610-
MOVL s1str+0(FP), SI
611-
MOVL s2str+8(FP), DI
610+
MOVL s1_base+0(FP), SI
611+
MOVL s2_base+8(FP), DI
612612
CMPL SI, DI
613613
JEQ same
614-
MOVL s1len+4(FP), BX
614+
MOVL s1_len+4(FP), BX
615615
CALL runtime·memeqbody(SB)
616-
MOVB AX, v+16(FP)
616+
MOVB AX, ret+16(FP)
617617
RET
618618
same:
619-
MOVB $1, v+16(FP)
619+
MOVB $1, ret+16(FP)
620620
RET
621621

622622
// a in SI

src/runtime/sys_nacl_amd64p32.s

+2-2
Original file line numberDiff line numberDiff line change
@@ -414,8 +414,8 @@ MOVL $1, DI; NACL_SYSCALL(SYS_exit)
414414

415415
// func getRandomData([]byte)
416416
TEXT runtime·getRandomData(SB),NOSPLIT,$0-12
417-
MOVL buf+0(FP), DI
418-
MOVL len+4(FP), SI
417+
MOVL arg_base+0(FP), DI
418+
MOVL arg_len+4(FP), SI
419419
NACL_SYSCALL(SYS_get_random_bytes)
420420
RET
421421

src/runtime/sys_nacl_arm.s

+2-2
Original file line numberDiff line numberDiff line change
@@ -303,8 +303,8 @@ TEXT runtime·nacl_sysinfo(SB),NOSPLIT,$16
303303

304304
// func getRandomData([]byte)
305305
TEXT runtime·getRandomData(SB),NOSPLIT,$0-12
306-
MOVW buf+0(FP), R0
307-
MOVW len+4(FP), R1
306+
MOVW arg_base+0(FP), R0
307+
MOVW arg_len+4(FP), R1
308308
NACL_SYSCALL(SYS_get_random_bytes)
309309
RET
310310

0 commit comments

Comments
 (0)