runtime: remove memset/memclr shim

This CL resolves https://golang.org/cl/6300043/#msg3
by renaming memset_arm.s to memclr_arm.s and merging the function
of the same name from asm_arm.s.

R=minux.ma, rsc
CC=golang-dev
https://golang.org/cl/6336054

diff --git a/src/pkg/runtime/asm_arm.s b/src/pkg/runtime/asm_arm.s
index 9b73f1797b89d202583873715a5555447c0a46ab..2c89139805f38b7d01e31603ebd54d92694fc9a5 100644 (file)
--- a/src/pkg/runtime/asm_arm.s
+++ b/src/pkg/runtime/asm_arm.s
@@ -345,13 +345,6 @@ TEXT       runtime·cgocallback(SB),7,$16
        // Done!
        RET
 
-TEXT runtime·memclr(SB),7,$0
-       MOVW    0(FP), R0
-       MOVW    $0, R1
-       MOVW    R1, 0(FP)
-       BL      runtime·memset(SB)
-       RET
-
 TEXT runtime·getcallerpc(SB),7,$-4
        MOVW    0(SP), R0
        RET

diff --git a/src/pkg/runtime/memset_arm.s b/src/pkg/runtime/memclr_arm.s
similarity index 96%
rename from src/pkg/runtime/memset_arm.s
rename to src/pkg/runtime/memclr_arm.s
index 8bc20040223fe2580311fd82971a3058ba00e4ae..afc529d90789c158d3d463c98981bedc2f95df2e 100644 (file)
--- a/src/pkg/runtime/memset_arm.s
+++ b/src/pkg/runtime/memclr_arm.s
@@ -28,10 +28,10 @@ TOE = 11
 N = 12
 TMP = 12                               /* N and TMP don't overlap */
 
-TEXT runtime·memset(SB), $0
-       MOVW    R0, R(TO)
-       MOVW    data+4(FP), R(0)
-       MOVW    n+8(FP), R(N)
+TEXT runtime·memclr(SB),7,$0
+       MOVW    ptr+0(FP), R(TO)
+       MOVW    n+4(FP), R(N)
+       MOVW    $0, R(0)
 
        ADD     R(N), R(TO), R(TOE)     /* to end pointer */