build: update assembly variable names for vet

R=golang-dev, r
CC=golang-dev
https://golang.org/cl/7834046

diff --git a/src/pkg/bytes/asm_386.s b/src/pkg/bytes/asm_386.s
index c444b55e185fbe4d73c1ea648b18324ba51217f7..997738fe29a77ef9054f192b14223b04f43face9 100644 (file)
--- a/src/pkg/bytes/asm_386.s
+++ b/src/pkg/bytes/asm_386.s
@@ -4,21 +4,21 @@
 
 TEXT ·IndexByte(SB),7,$0
        MOVL    s+0(FP), SI
-       MOVL    s+4(FP), CX
+       MOVL    s_len+4(FP), CX
        MOVB    c+12(FP), AL
        MOVL    SI, DI
        CLD; REPN; SCASB
        JZ 3(PC)
-       MOVL    $-1, r+16(FP)
+       MOVL    $-1, ret+16(FP)
        RET
        SUBL    SI, DI
        SUBL    $1, DI
-       MOVL    DI, r+16(FP)
+       MOVL    DI, ret+16(FP)
        RET
 
 TEXT ·Equal(SB),7,$0
-       MOVL    a+4(FP), BX
-       MOVL    b+16(FP), CX
+       MOVL    a_len+4(FP), BX
+       MOVL    b_len+16(FP), CX
        MOVL    $0, AX
        CMPL    BX, CX
        JNE     eqret
@@ -29,5 +29,5 @@ TEXT ·Equal(SB),7,$0
        JNE eqret
        MOVL    $1, AX
 eqret:
-       MOVB    AX, r+24(FP)
+       MOVB    AX, ret+24(FP)
        RET

diff --git a/src/pkg/bytes/asm_amd64.s b/src/pkg/bytes/asm_amd64.s
index 482422642e769d3563f29bd57720dd5641c8c8a8..b8f9f1b8186f3c1d8a06502188ca627d46e8c71d 100644 (file)
--- a/src/pkg/bytes/asm_amd64.s
+++ b/src/pkg/bytes/asm_amd64.s
@@ -4,7 +4,7 @@
 
 TEXT ·IndexByte(SB),7,$0
        MOVQ s+0(FP), SI
-       MOVQ s+8(FP), BX
+       MOVQ s_len+8(FP), BX
        MOVB c+24(FP), AL
        MOVQ SI, DI
 
@@ -63,7 +63,7 @@ condition:
        JZ success
 
 failure:
-       MOVQ $-1, r+32(FP)
+       MOVQ $-1, ret+32(FP)
        RET
 
 // handle for lengths < 16
@@ -71,7 +71,7 @@ small:
        MOVQ BX, CX
        REPN; SCASB
        JZ success
-       MOVQ $-1, r+32(FP)
+       MOVQ $-1, ret+32(FP)
        RET
 
 // we've found the chunk containing the byte
@@ -81,18 +81,18 @@ ssesuccess:
        BSFW DX, DX
        SUBQ SI, DI
        ADDQ DI, DX
-       MOVQ DX, r+32(FP)
+       MOVQ DX, ret+32(FP)
        RET
 
 success:
        SUBQ SI, DI
        SUBL $1, DI
-       MOVQ DI, r+32(FP)
+       MOVQ DI, ret+32(FP)
        RET
 
 TEXT ·Equal(SB),7,$0
-       MOVQ    a+8(FP), BX
-       MOVQ    b+32(FP), CX
+       MOVQ    a_len+8(FP), BX
+       MOVQ    b_len+32(FP), CX
        MOVL    $0, AX
        CMPQ    BX, CX
        JNE     eqret
@@ -103,6 +103,6 @@ TEXT ·Equal(SB),7,$0
        MOVL    $1, DX
        CMOVLEQ DX, AX
 eqret:
-       MOVB    AX, r+48(FP)
+       MOVB    AX, ret+48(FP)
        RET
 

diff --git a/src/pkg/bytes/asm_arm.s b/src/pkg/bytes/asm_arm.s
index c7685f041f8e55ecb26686ea294958d8270a3aad..2e9f805a43a7fc1fb32e9a3ab4b36407b860e829 100644 (file)
--- a/src/pkg/bytes/asm_arm.s
+++ b/src/pkg/bytes/asm_arm.s
@@ -4,7 +4,7 @@
 
 TEXT ·IndexByte(SB),7,$0
        MOVW    s+0(FP), R0
-       MOVW    s+4(FP), R1
+       MOVW    s_len+4(FP), R1
        MOVBU   c+12(FP), R2    // byte to find
        MOVW    R0, R4          // store base for later
        ADD     R0, R1          // end 
@@ -18,17 +18,17 @@ _loop:
 
        SUB     $1, R0          // R0 will be one beyond the position we want
        SUB     R4, R0          // remove base
-       MOVW    R0, r+16(FP) 
+       MOVW    R0, ret+16(FP) 
        RET
 
 _notfound:
        MOVW    $-1, R0
-       MOVW    R0, r+16(FP)
+       MOVW    R0, ret+16(FP)
        RET
 
 TEXT ·Equal(SB),7,$0
-       MOVW    a+4(FP), R1
-       MOVW    b+16(FP), R3
+       MOVW    a_len+4(FP), R1
+       MOVW    b_len+16(FP), R3
        
        CMP     R1, R3          // unequal lengths are not equal
        B.NE    _notequal
@@ -47,10 +47,10 @@ _next:
 
 _notequal:
        MOVW    $0, R0
-       MOVBU   R0, r+24(FP)
+       MOVBU   R0, ret+24(FP)
        RET
 
 _equal:
        MOVW    $1, R0
-       MOVBU   R0, r+24(FP)
+       MOVBU   R0, ret+24(FP)
        RET

diff --git a/src/pkg/crypto/md5/md5block_386.s b/src/pkg/crypto/md5/md5block_386.s
index 1083d83f359017857d58cc1ccdb5bb49b7d08e9e..3ce15e37f6c431313abc9c563089271e29122307 100644 (file)
--- a/src/pkg/crypto/md5/md5block_386.s
+++ b/src/pkg/crypto/md5/md5block_386.s
@@ -60,7 +60,7 @@
 TEXT   ·block(SB),7,$24-16
        MOVL    dig+0(FP),      BP
        MOVL    p+4(FP),        SI
-       MOVL    n+8(FP), DX
+       MOVL    p_len+8(FP), DX
        SHRL    $6,             DX
        SHLL    $6,             DX
 

diff --git a/src/pkg/crypto/md5/md5block_amd64.s b/src/pkg/crypto/md5/md5block_amd64.s
index 74a361e77581dc9d2e3c010c43e3c462d01150be..e6420a28a0ac98a171f85cf1b15fb87521f9ba4d 100644 (file)
--- a/src/pkg/crypto/md5/md5block_amd64.s
+++ b/src/pkg/crypto/md5/md5block_amd64.s
@@ -14,7 +14,7 @@
 TEXT   ·block(SB),7,$0-32
        MOVQ    dig+0(FP),      BP
        MOVQ    p+8(FP),        SI
-       MOVQ    n+16(FP), DX
+       MOVQ    p_len+16(FP), DX
        SHRQ    $6,             DX
        SHLQ    $6,             DX
 

diff --git a/src/pkg/crypto/rc4/rc4_386.s b/src/pkg/crypto/rc4/rc4_386.s
index 6e12c208afdf12384679579841cd5c06bf170a43..c80ef2a3a2102cf825f6fa83ad5735d62310c724 100644 (file)
--- a/src/pkg/crypto/rc4/rc4_386.s
+++ b/src/pkg/crypto/rc4/rc4_386.s
@@ -8,9 +8,9 @@ TEXT ·xorKeyStream(SB),7,$0
        MOVL src+4(FP), SI
        MOVL state+12(FP), BP
 
-       MOVL xPtr+16(FP), AX
+       MOVL i+16(FP), AX
        MOVBLZX (AX), AX
-       MOVL yPtr+20(FP), BX
+       MOVL j+20(FP), BX
        MOVBLZX (BX), BX
        CMPL n+8(FP), $0
        JEQ done
@@ -43,9 +43,9 @@ loop:
        JNE loop
 
 done:
-       MOVL xPtr+16(FP), CX
+       MOVL i+16(FP), CX
        MOVB AX, (CX)
-       MOVL yPtr+20(FP), CX
+       MOVL j+20(FP), CX
        MOVB BX, (CX)
 
        RET

diff --git a/src/pkg/crypto/rc4/rc4_amd64.s b/src/pkg/crypto/rc4/rc4_amd64.s
index f0962a4c1760f0d276048b7b859c93cb7c8353c2..353fe3720078e1e72847d7943caf960a069b571f 100644 (file)
--- a/src/pkg/crypto/rc4/rc4_amd64.s
+++ b/src/pkg/crypto/rc4/rc4_amd64.s
@@ -37,13 +37,13 @@
 */
 
 TEXT ·xorKeyStream(SB),7,$0
-       MOVQ    len+16(FP),     BX              // rbx = ARG(len)
-       MOVQ    in+8(FP),       SI              // in = ARG(in)
-       MOVQ    out+0(FP),      DI              // out = ARG(out)
-       MOVQ    d+24(FP),       BP              // d = ARG(data)
-       MOVQ    xp+32(FP),      AX
+       MOVQ    n+16(FP),       BX              // rbx = ARG(len)
+       MOVQ    src+8(FP),      SI              // in = ARG(in)
+       MOVQ    dst+0(FP),      DI              // out = ARG(out)
+       MOVQ    state+24(FP),   BP              // d = ARG(data)
+       MOVQ    i+32(FP),       AX
        MOVBQZX 0(AX),          CX              // x = *xp
-       MOVQ    yp+40(FP),      AX
+       MOVQ    j+40(FP),       AX
        MOVBQZX 0(AX),          DX              // y = *yp
 
        LEAQ    (SI)(BX*1),     R9              // limit = in+len
@@ -170,8 +170,8 @@ l2: CMPQ    SI,             R9              // cmp in with in+len
        JMP l2
 
 finished:
-       MOVQ    yp+40(FP),      BX
+       MOVQ    j+40(FP),       BX
        MOVB    DX, 0(BX)
-       MOVQ    xp+32(FP),      AX
+       MOVQ    i+32(FP),       AX
        MOVB    CX, 0(AX)
        RET

diff --git a/src/pkg/crypto/sha1/sha1block_386.s b/src/pkg/crypto/sha1/sha1block_386.s
index fbf237b3fe0eacd44c0a75456b6ed11665b61aab..e60a7b9b09e55d498a2aabc15500c4493ce646b8 100644 (file)
--- a/src/pkg/crypto/sha1/sha1block_386.s
+++ b/src/pkg/crypto/sha1/sha1block_386.s
@@ -102,7 +102,7 @@
 TEXT ·block(SB),7,$92-16
        MOVL    dig+0(FP),      BP
        MOVL    p+4(FP),        SI
-       MOVL    n+8(FP),        DX
+       MOVL    p_len+8(FP),    DX
        SHRL    $6,             DX
        SHLL    $6,             DX
        

diff --git a/src/pkg/crypto/sha1/sha1block_amd64.s b/src/pkg/crypto/sha1/sha1block_amd64.s
index e2b286a91c076802bfeff070cad3570c4fd85bba..452578aa44b6088a751c9fab01c366f5905bd9bd 100644 (file)
--- a/src/pkg/crypto/sha1/sha1block_amd64.s
+++ b/src/pkg/crypto/sha1/sha1block_amd64.s
@@ -89,8 +89,8 @@
 
 TEXT ·block(SB),7,$64-32
        MOVQ    dig+0(FP),      BP
-       MOVQ    p+8(FP),        SI
-       MOVQ    n+16(FP),       DX
+       MOVQ    p_base+8(FP),   SI
+       MOVQ    p_len+16(FP),   DX
        SHRQ    $6,             DX
        SHLQ    $6,             DX
        

diff --git a/src/pkg/crypto/sha1/sha1block_decl.go b/src/pkg/crypto/sha1/sha1block_decl.go
index 348a6aaaa3f2ee2c87c2c69c84931ff48168d0a0..3512a58299140546b63c179a61b9037ad3322d2b 100644 (file)
--- a/src/pkg/crypto/sha1/sha1block_decl.go
+++ b/src/pkg/crypto/sha1/sha1block_decl.go
@@ -6,4 +6,4 @@
 
 package sha1
 
-func block(*digest, []byte)
+func block(dig *digest, p []byte)

diff --git a/src/pkg/hash/crc32/crc32_amd64.s b/src/pkg/hash/crc32/crc32_amd64.s
index 6e6a364ee868248f2f293981261512a75ca5addb..826306a3e866926379d4bbeb1659a44cc2870900 100644 (file)
--- a/src/pkg/hash/crc32/crc32_amd64.s
+++ b/src/pkg/hash/crc32/crc32_amd64.s
@@ -6,7 +6,7 @@
 TEXT ·castagnoliSSE42(SB),7,$0
        MOVL crc+0(FP), AX  // CRC value
        MOVQ p+8(FP), SI  // data pointer
-       MOVQ p+16(FP), CX  // len(p)
+       MOVQ p_len+16(FP), CX  // len(p)
 
        NOTL AX
 
@@ -47,7 +47,7 @@ cleanup:
 
 done:
        NOTL AX
-       MOVL AX, r+32(FP)
+       MOVL AX, ret+32(FP)
        RET
 
 // func haveSSE42() bool
@@ -57,6 +57,6 @@ TEXT ·haveSSE42(SB),7,$0
        CPUID
        SHRQ $20, CX
        ANDQ $1, CX
-       MOVB CX, r+0(FP)
+       MOVB CX, ret+0(FP)
        RET
 

diff --git a/src/pkg/math/abs_386.s b/src/pkg/math/abs_386.s
index 889e801818bbc3c3a54007d0d0f29a2e6af2cb96..5746764756df43e3b934f65c62124afb0b76feb9 100644 (file)
--- a/src/pkg/math/abs_386.s
+++ b/src/pkg/math/abs_386.s
@@ -6,5 +6,5 @@
 TEXT ·Abs(SB),7,$0
        FMOVD   x+0(FP), F0  // F0=x
        FABS                 // F0=|x|
-       FMOVDP  F0, r+8(FP)
+       FMOVDP  F0, ret+8(FP)
        RET

diff --git a/src/pkg/math/abs_amd64.s b/src/pkg/math/abs_amd64.s
index 32b78539a8d9b514f4d34de1818687f8c503d083..11934604587da0791a49c5080de3b211c79c6edf 100644 (file)
--- a/src/pkg/math/abs_amd64.s
+++ b/src/pkg/math/abs_amd64.s
@@ -8,5 +8,5 @@ TEXT ·Abs(SB),7,$0
        MOVQ   BX, X0 // movsd $(-0.0), x0
        MOVSD  x+0(FP), X1
        ANDNPD X1, X0
-       MOVSD  X0, r+8(FP)
+       MOVSD  X0, ret+8(FP)
        RET

diff --git a/src/pkg/math/abs_arm.s b/src/pkg/math/abs_arm.s
index 37a1459fe629b21189f92f7a78a1e4a2582bd2d5..929e1ce675cc388e8bad870cd6149a9579ecf850 100644 (file)
--- a/src/pkg/math/abs_arm.s
+++ b/src/pkg/math/abs_arm.s
@@ -3,9 +3,9 @@
 // license that can be found in the LICENSE file.
 
 TEXT ·Abs(SB),7,$0
-       MOVW    x+0(FP), R0
-       MOVW    x+4(FP), R1
+       MOVW    x_lo+0(FP), R0
+       MOVW    x_hi+4(FP), R1
        AND     $((1<<31)-1), R1
-       MOVW    R0, r+8(FP)
-       MOVW    R1, r+12(FP)
+       MOVW    R0, ret_lo+8(FP)
+       MOVW    R1, ret_hi+12(FP)
        RET

diff --git a/src/pkg/math/asin_386.s b/src/pkg/math/asin_386.s
index 93df552dc922f63019f782c225be9104ca9cffe8..cd3f9cd9bde118fa82e655099293e5e8768b55a6 100644 (file)
--- a/src/pkg/math/asin_386.s
+++ b/src/pkg/math/asin_386.s
@@ -11,7 +11,7 @@ TEXT ·Asin(SB),7,$0
        FSUBRDP F0, F1       // F0=1-sin(x)*sin(x) (=cos(x)*cos(x)), F1=sin(x)
        FSQRT                // F0=cos(x), F1=sin(x)
        FPATAN               // F0=arcsin(sin(x))=x
-       FMOVDP  F0, r+8(FP)
+       FMOVDP  F0, ret+8(FP)
        RET
 
 // func Acos(x float64) float64
@@ -24,5 +24,5 @@ TEXT ·Acos(SB),7,$0
        FSQRT                // F0=sin(x), F1=cos(x)
        FXCHD   F0, F1       // F0=cos(x), F1=sin(x)
        FPATAN               // F0=arccos(cos(x))=x
-       FMOVDP  F0, r+8(FP)
+       FMOVDP  F0, ret+8(FP)
        RET

diff --git a/src/pkg/math/atan2_386.s b/src/pkg/math/atan2_386.s
index 9a664926abaea09450a140af4f615be9db19ae97..1bf301c4c0da5e68ecace8a789660f174b01c0ec 100644 (file)
--- a/src/pkg/math/atan2_386.s
+++ b/src/pkg/math/atan2_386.s
@@ -7,5 +7,5 @@ TEXT ·Atan2(SB),7,$0
        FMOVD   y+0(FP), F0  // F0=y
        FMOVD   x+8(FP), F0  // F0=x, F1=y
        FPATAN               // F0=atan(F1/F0)
-       FMOVDP  F0, r+16(FP)
+       FMOVDP  F0, ret+16(FP)
        RET

diff --git a/src/pkg/math/atan_386.s b/src/pkg/math/atan_386.s
index 245437a7867e783d46a49b4b2715f317b07e1579..c988705beee4f0f8b0375aeae498f835edefdfdc 100644 (file)
--- a/src/pkg/math/atan_386.s
+++ b/src/pkg/math/atan_386.s
@@ -7,5 +7,5 @@ TEXT ·Atan(SB),7,$0
        FMOVD   x+0(FP), F0  // F0=x
        FLD1                 // F0=1, F1=x
        FPATAN               // F0=atan(F1/F0)
-       FMOVDP  F0, r+8(FP)
+       FMOVDP  F0, ret+8(FP)
        RET

diff --git a/src/pkg/math/big/arith_386.s b/src/pkg/math/big/arith_386.s
index c62483317a7165f9ab9da82a182933a2ec12abc9..f0118ec0db0e2eb956c63dbe73fa4919389e8019 100644 (file)
--- a/src/pkg/math/big/arith_386.s
+++ b/src/pkg/math/big/arith_386.s
@@ -29,7 +29,7 @@ TEXT ·addVV(SB),7,$0
        MOVL z+0(FP), DI
        MOVL x+12(FP), SI
        MOVL y+24(FP), CX
-       MOVL z+4(FP), BP
+       MOVL z_len+4(FP), BP
        MOVL $0, BX             // i = 0
        MOVL $0, DX             // c = 0
        JMP E1
@@ -54,7 +54,7 @@ TEXT ·subVV(SB),7,$0
        MOVL z+0(FP), DI
        MOVL x+12(FP), SI
        MOVL y+24(FP), CX
-       MOVL z+4(FP), BP
+       MOVL z_len+4(FP), BP
        MOVL $0, BX             // i = 0
        MOVL $0, DX             // c = 0
        JMP E2
@@ -78,7 +78,7 @@ TEXT ·addVW(SB),7,$0
        MOVL z+0(FP), DI
        MOVL x+12(FP), SI
        MOVL y+24(FP), AX       // c = y
-       MOVL z+4(FP), BP
+       MOVL z_len+4(FP), BP
        MOVL $0, BX             // i = 0
        JMP E3
 
@@ -100,7 +100,7 @@ TEXT ·subVW(SB),7,$0
        MOVL z+0(FP), DI
        MOVL x+12(FP), SI
        MOVL y+24(FP), AX       // c = y
-       MOVL z+4(FP), BP
+       MOVL z_len+4(FP), BP
        MOVL $0, BX             // i = 0
        JMP E4
 
@@ -120,7 +120,7 @@ E4: CMPL BX, BP             // i < n
 
 // func shlVU(z, x []Word, s uint) (c Word)
 TEXT ·shlVU(SB),7,$0
-       MOVL z+4(FP), BX        // i = z
+       MOVL z_len+4(FP), BX    // i = z
        SUBL $1, BX             // i--
        JL X8b                  // i < 0        (n <= 0)
 
@@ -155,7 +155,7 @@ X8b:        MOVL $0, c+28(FP)
 
 // func shrVU(z, x []Word, s uint) (c Word)
 TEXT ·shrVU(SB),7,$0
-       MOVL z+4(FP), BP
+       MOVL z_len+4(FP), BP
        SUBL $1, BP             // n--
        JL X9b                  // n < 0        (n <= 0)
 
@@ -196,7 +196,7 @@ TEXT ·mulAddVWW(SB),7,$0
        MOVL x+12(FP), SI
        MOVL y+24(FP), BP
        MOVL r+28(FP), CX       // c = r
-       MOVL z+4(FP), BX
+       MOVL z_len+4(FP), BX
        LEAL (DI)(BX*4), DI
        LEAL (SI)(BX*4), SI
        NEGL BX                 // i = -n
@@ -222,7 +222,7 @@ TEXT ·addMulVVW(SB),7,$0
        MOVL z+0(FP), DI
        MOVL x+12(FP), SI
        MOVL y+24(FP), BP
-       MOVL z+4(FP), BX
+       MOVL z_len+4(FP), BX
        LEAL (DI)(BX*4), DI
        LEAL (SI)(BX*4), SI
        NEGL BX                 // i = -n
@@ -251,7 +251,7 @@ TEXT ·divWVW(SB),7,$0
        MOVL xn+12(FP), DX      // r = xn
        MOVL x+16(FP), SI
        MOVL y+28(FP), CX
-       MOVL z+4(FP), BX        // i = z
+       MOVL z_len+4(FP), BX    // i = z
        JMP E7
 
 L7:    MOVL (SI)(BX*4), AX

diff --git a/src/pkg/math/big/arith_amd64.s b/src/pkg/math/big/arith_amd64.s
index d85964502901a12e314576a7c0027eeddba4f387..62da650308c6a53b552c6c85386da75b45617795 100644 (file)
--- a/src/pkg/math/big/arith_amd64.s
+++ b/src/pkg/math/big/arith_amd64.s
@@ -36,7 +36,7 @@ TEXT ·divWW(SB),7,$0
 
 // func addVV(z, x, y []Word) (c Word)
 TEXT ·addVV(SB),7,$0
-       MOVQ z+8(FP), DI
+       MOVQ z_len+8(FP), DI
        MOVQ x+24(FP), R8
        MOVQ y+48(FP), R9
        MOVQ z+0(FP), R10
@@ -90,7 +90,7 @@ E1:   MOVQ CX, c+72(FP)       // return c
 // func subVV(z, x, y []Word) (c Word)
 // (same as addVV except for SBBQ instead of ADCQ and label names)
 TEXT ·subVV(SB),7,$0
-       MOVQ z+8(FP), DI
+       MOVQ z_len+8(FP), DI
        MOVQ x+24(FP), R8
        MOVQ y+48(FP), R9
        MOVQ z+0(FP), R10
@@ -143,7 +143,7 @@ E2: MOVQ CX, c+72(FP)       // return c
 
 // func addVW(z, x []Word, y Word) (c Word)
 TEXT ·addVW(SB),7,$0
-       MOVQ z+8(FP), DI
+       MOVQ z_len+8(FP), DI
        MOVQ x+24(FP), R8
        MOVQ y+48(FP), CX       // c = y
        MOVQ z+0(FP), R10
@@ -195,7 +195,7 @@ E3: MOVQ CX, c+56(FP)       // return c
 // func subVW(z, x []Word, y Word) (c Word)
 // (same as addVW except for SUBQ/SBBQ instead of ADDQ/ADCQ and label names)
 TEXT ·subVW(SB),7,$0
-       MOVQ z+8(FP), DI
+       MOVQ z_len+8(FP), DI
        MOVQ x+24(FP), R8
        MOVQ y+48(FP), CX       // c = y
        MOVQ z+0(FP), R10
@@ -247,7 +247,7 @@ E4: MOVQ CX, c+56(FP)       // return c
 
 // func shlVU(z, x []Word, s uint) (c Word)
 TEXT ·shlVU(SB),7,$0
-       MOVQ z+8(FP), BX        // i = z
+       MOVQ z_len+8(FP), BX    // i = z
        SUBQ $1, BX             // i--
        JL X8b                  // i < 0        (n <= 0)
 
@@ -282,7 +282,7 @@ X8b:        MOVQ $0, c+56(FP)
 
 // func shrVU(z, x []Word, s uint) (c Word)
 TEXT ·shrVU(SB),7,$0
-       MOVQ z+8(FP), R11
+       MOVQ z_len+8(FP), R11
        SUBQ $1, R11            // n--
        JL X9b                  // n < 0        (n <= 0)
 
@@ -323,7 +323,7 @@ TEXT ·mulAddVWW(SB),7,$0
        MOVQ x+24(FP), R8
        MOVQ y+48(FP), R9
        MOVQ r+56(FP), CX       // c = r
-       MOVQ z+8(FP), R11
+       MOVQ z_len+8(FP), R11
        MOVQ $0, BX             // i = 0
        JMP E5
 
@@ -347,7 +347,7 @@ TEXT ·addMulVVW(SB),7,$0
        MOVQ z+0(FP), R10
        MOVQ x+24(FP), R8
        MOVQ y+48(FP), R9
-       MOVQ z+8(FP), R11
+       MOVQ z_len+8(FP), R11
        MOVQ $0, BX             // i = 0
        MOVQ $0, CX             // c = 0
        JMP E6
@@ -374,7 +374,7 @@ TEXT ·divWVW(SB),7,$0
        MOVQ xn+24(FP), DX      // r = xn
        MOVQ x+32(FP), R8
        MOVQ y+56(FP), R9
-       MOVQ z+8(FP), BX        // i = z
+       MOVQ z_len+8(FP), BX    // i = z
        JMP E7
 
 L7:    MOVQ (R8)(BX*8), AX

diff --git a/src/pkg/math/big/arith_arm.s b/src/pkg/math/big/arith_arm.s
index 64610f915e704a245b70d70e1115c5987ade5843..6e2d23d332a327b450d1c5de0ccbf5349705b91c 100644 (file)
--- a/src/pkg/math/big/arith_arm.s
+++ b/src/pkg/math/big/arith_arm.s
@@ -13,7 +13,7 @@ TEXT ·addVV(SB),7,$0
        MOVW    z+0(FP), R1
        MOVW    x+12(FP), R2
        MOVW    y+24(FP), R3
-       MOVW    z+4(FP), R4
+       MOVW    z_len+4(FP), R4
        MOVW    R4<<2, R4
        ADD     R1, R4
        B E1
@@ -41,7 +41,7 @@ TEXT ·subVV(SB),7,$0
        MOVW    z+0(FP), R1
        MOVW    x+12(FP), R2
        MOVW    y+24(FP), R3
-       MOVW    z+4(FP), R4
+       MOVW    z_len+4(FP), R4
        MOVW    R4<<2, R4
        ADD     R1, R4
        B E2
@@ -68,7 +68,7 @@ TEXT ·addVW(SB),7,$0
        MOVW    z+0(FP), R1
        MOVW    x+12(FP), R2
        MOVW    y+24(FP), R3
-       MOVW    z+4(FP), R4
+       MOVW    z_len+4(FP), R4
        MOVW    R4<<2, R4
        ADD     R1, R4
        CMP     R1, R4
@@ -102,7 +102,7 @@ TEXT ·subVW(SB),7,$0
        MOVW    z+0(FP), R1
        MOVW    x+12(FP), R2
        MOVW    y+24(FP), R3
-       MOVW    z+4(FP), R4
+       MOVW    z_len+4(FP), R4
        MOVW    R4<<2, R4
        ADD     R1, R4
        CMP     R1, R4
@@ -134,7 +134,7 @@ E4:
 
 // func shlVU(z, x []Word, s uint) (c Word)
 TEXT ·shlVU(SB),7,$0
-       MOVW    z+4(FP), R5
+       MOVW    z_len+4(FP), R5
        CMP     $0, R5
        BEQ     X7
        
@@ -183,7 +183,7 @@ X7:
 
 // func shrVU(z, x []Word, s uint) (c Word)
 TEXT ·shrVU(SB),7,$0
-       MOVW    z+4(FP), R5
+       MOVW    z_len+4(FP), R5
        CMP     $0, R5
        BEQ     X6
 
@@ -238,7 +238,7 @@ TEXT ·mulAddVWW(SB),7,$0
        MOVW    x+12(FP), R2
        MOVW    y+24(FP), R3
        MOVW    r+28(FP), R4
-       MOVW    z+4(FP), R5
+       MOVW    z_len+4(FP), R5
        MOVW    R5<<2, R5
        ADD     R1, R5
        B E8
@@ -265,7 +265,7 @@ TEXT ·addMulVVW(SB),7,$0
        MOVW    z+0(FP), R1
        MOVW    x+12(FP), R2
        MOVW    y+24(FP), R3
-       MOVW    z+4(FP), R5
+       MOVW    z_len+4(FP), R5
        MOVW    R5<<2, R5
        ADD     R1, R5
        MOVW    $0, R4

diff --git a/src/pkg/math/dim_amd64.s b/src/pkg/math/dim_amd64.s
index a1505ce44c7081aa787d7491171289fdd1c227d8..0ae8ad19629c6cb57a96aeb75b50b1af04918647 100644 (file)
--- a/src/pkg/math/dim_amd64.s
+++ b/src/pkg/math/dim_amd64.s
@@ -36,12 +36,12 @@ dim3:       // (NaN, x) or (x, NaN)
        SUBSD y+8(FP), X0
        MOVSD $(0.0), X1
        MAXSD X1, X0
-       MOVSD X0, r+16(FP)
+       MOVSD X0, ret+16(FP)
        RET
 bothInf: // Dim(-Inf, -Inf) or Dim(+Inf, +Inf)
        MOVQ    $NaN, AX
 isDimNaN:
-       MOVQ    AX, r+16(FP)
+       MOVQ    AX, ret+16(FP)
        RET
 
 // func ·Max(x, y float64) float64
@@ -72,28 +72,28 @@ TEXT ·Max(SB),7,$0
        MOVQ    R8, X0
        MOVQ    R9, X1
        MAXSD   X1, X0
-       MOVSD   X0, r+16(FP)
+       MOVSD   X0, ret+16(FP)
        RET
 isMaxNaN: // return NaN
 isPosInf: // return +Inf
-       MOVQ    AX, r+16(FP)
+       MOVQ    AX, ret+16(FP)
        RET
 isMaxZero:
        MOVQ    $(1<<63), AX // -0.0
        CMPQ    AX, R8
        JEQ     +3(PC)
-       MOVQ    R8, r+16(FP) // return 0
+       MOVQ    R8, ret+16(FP) // return 0
        RET
-       MOVQ    R9, r+16(FP) // return other 0
+       MOVQ    R9, ret+16(FP) // return other 0
        RET
 
 /*
        MOVQ    $0, AX
        CMPQ    AX, R8
        JNE     +3(PC)
-       MOVQ    R8, r+16(FP) // return 0
+       MOVQ    R8, ret+16(FP) // return 0
        RET
-       MOVQ    R9, r+16(FP) // return other 0
+       MOVQ    R9, ret+16(FP) // return other 0
        RET
 */
 
@@ -125,18 +125,18 @@ TEXT ·Min(SB),7,$0
        MOVQ    R8, X0
        MOVQ    R9, X1
        MINSD   X1, X0
-       MOVSD X0, r+16(FP)
+       MOVSD X0, ret+16(FP)
        RET
 isMinNaN: // return NaN
 isNegInf: // return -Inf
-       MOVQ    AX, r+16(FP)
+       MOVQ    AX, ret+16(FP)
        RET
 isMinZero:
        MOVQ    $(1<<63), AX // -0.0
        CMPQ    AX, R8
        JEQ     +3(PC)
-       MOVQ    R9, r+16(FP) // return other 0
+       MOVQ    R9, ret+16(FP) // return other 0
        RET
-       MOVQ    R8, r+16(FP) // return -0
+       MOVQ    R8, ret+16(FP) // return -0
        RET
 

diff --git a/src/pkg/math/exp2_386.s b/src/pkg/math/exp2_386.s
index ed82a4dd322b25500b0b2e6869d29cf25f21afc2..15376263194a50ae47078d6b943b5e883267a628 100644 (file)
--- a/src/pkg/math/exp2_386.s
+++ b/src/pkg/math/exp2_386.s
@@ -5,7 +5,7 @@
 // func Exp2(x float64) float64
 TEXT ·Exp2(SB),7,$0
 // test bits for not-finite
-       MOVL    x+4(FP), AX
+       MOVL    x_hi+4(FP), AX
        ANDL    $0x7ff00000, AX
        CMPL    AX, $0x7ff00000
        JEQ     not_finite
@@ -19,20 +19,20 @@ TEXT ·Exp2(SB),7,$0
        FADDDP  F0, F1        // F0=2**(x-int(x)), F1=int(x)
        FSCALE                // F0=2**x, F1=int(x)
        FMOVDP  F0, F1        // F0=2**x
-       FMOVDP  F0, r+8(FP)
+       FMOVDP  F0, ret+8(FP)
        RET
 not_finite:
 // test bits for -Inf
-       MOVL    x+4(FP), BX
-       MOVL    x+0(FP), CX
+       MOVL    x_hi+4(FP), BX
+       MOVL    x_lo+0(FP), CX
        CMPL    BX, $0xfff00000
        JNE     not_neginf
        CMPL    CX, $0
        JNE     not_neginf
-       MOVL    $0, r+8(FP)
-       MOVL    $0, r+12(FP)
+       MOVL    $0, ret_lo+8(FP)
+       MOVL    $0, ret_hi+12(FP)
        RET
 not_neginf:
-       MOVL    CX, r+8(FP)
-       MOVL    BX, r+12(FP)
+       MOVL    CX, ret_lo+8(FP)
+       MOVL    BX, ret_hi+12(FP)
        RET

diff --git a/src/pkg/math/exp_386.s b/src/pkg/math/exp_386.s
index e0743e72a22d2e77b0116d316c6bd8073f4ca465..aeceb3cadc2dc0cb433e10f180cef181dee6c9f3 100644 (file)
--- a/src/pkg/math/exp_386.s
+++ b/src/pkg/math/exp_386.s
@@ -5,7 +5,7 @@
 // func Exp(x float64) float64
 TEXT ·Exp(SB),7,$0
 // test bits for not-finite
-       MOVL    x+4(FP), AX
+       MOVL    x_hi+4(FP), AX
        ANDL    $0x7ff00000, AX
        CMPL    AX, $0x7ff00000
        JEQ     not_finite
@@ -20,20 +20,20 @@ TEXT ·Exp(SB),7,$0
        FADDDP  F0, F1        // F0=2**(x*log2(e)-int(x*log2(e))), F1=int(x*log2(e))
        FSCALE                // F0=e**x, F1=int(x*log2(e))
        FMOVDP  F0, F1        // F0=e**x
-       FMOVDP  F0, r+8(FP)
+       FMOVDP  F0, ret+8(FP)
        RET
 not_finite:
 // test bits for -Inf
-       MOVL    x+4(FP), BX
-       MOVL    x+0(FP), CX
+       MOVL    x_hi+4(FP), BX
+       MOVL    x_lo+0(FP), CX
        CMPL    BX, $0xfff00000
        JNE     not_neginf
        CMPL    CX, $0
        JNE     not_neginf
        FLDZ                  // F0=0
-       FMOVDP  F0, r+8(FP)
+       FMOVDP  F0, ret+8(FP)
        RET
 not_neginf:
-       MOVL    CX, r+8(FP)
-       MOVL    BX, r+12(FP)
+       MOVL    CX, ret_lo+8(FP)
+       MOVL    BX, ret_hi+12(FP)
        RET

diff --git a/src/pkg/math/exp_amd64.s b/src/pkg/math/exp_amd64.s
index 74c9c876affd988af47ff64f09c4df713059b866..eb6fb043230ca323925e814ea567456b931ca125 100644 (file)
--- a/src/pkg/math/exp_amd64.s
+++ b/src/pkg/math/exp_amd64.s
@@ -93,7 +93,7 @@ TEXT ·Exp(SB),7,$0
        SHLQ    CX, BX
        MOVQ    BX, X1
        MULSD   X1, X0
-       MOVSD   X0, r+8(FP)
+       MOVSD   X0, ret+8(FP)
        RET
 notFinite:
        // test bits for -Inf
@@ -103,10 +103,10 @@ notFinite:
        // -Inf, return 0
 underflow: // return 0
        MOVQ    $0, AX
-       MOVQ    AX, r+8(FP)
+       MOVQ    AX, ret+8(FP)
        RET
 overflow: // return +Inf
        MOVQ    $PosInf, BX
 notNegInf: // NaN or +Inf, return x
-       MOVQ    BX, r+8(FP)
+       MOVQ    BX, ret+8(FP)
        RET

diff --git a/src/pkg/math/expm1_386.s b/src/pkg/math/expm1_386.s
index 8185f49a4164ea45c14543e3ba3b631aa8abfece..0ff9c4ab04d1d40bb38a5f8441d6b49289c7db35 100644 (file)
--- a/src/pkg/math/expm1_386.s
+++ b/src/pkg/math/expm1_386.s
@@ -14,11 +14,11 @@ TEXT ·Expm1(SB),7,$0
        FLDL2E                // F0=log2(e)
        FMULD   x+0(FP), F0   // F0=x*log2(e) (-1<F0<1)
        F2XM1                 // F0=e**x-1 = 2**(x*log2(e))-1
-       FMOVDP  F0, r+8(FP)
+       FMOVDP  F0, ret+8(FP)
        RET
 use_exp:
 // test bits for not-finite
-       MOVL    x+4(FP), AX
+       MOVL    x_hi+4(FP), AX
        ANDL    $0x7ff00000, AX
        CMPL    AX, $0x7ff00000
        JEQ     not_finite
@@ -35,21 +35,21 @@ use_exp:
        FMOVDP  F0, F1        // F0=e**x
        FLD1                  // F0=1, F1=e**x
        FSUBDP  F0, F1        // F0=e**x-1 
-       FMOVDP  F0, r+8(FP)
+       FMOVDP  F0, ret+8(FP)
        RET
 not_finite:
 // test bits for -Inf
-       MOVL    x+4(FP), BX
-       MOVL    x+0(FP), CX
+       MOVL    x_hi+4(FP), BX
+       MOVL    x_lo+0(FP), CX
        CMPL    BX, $0xfff00000
        JNE     not_neginf
        CMPL    CX, $0
        JNE     not_neginf
        FLD1                 // F0=1
        FCHS                 // F0=-1
-       FMOVDP  F0, r+8(FP)
+       FMOVDP  F0, ret+8(FP)
        RET
 not_neginf:
-       MOVL    CX, r+8(FP)
-       MOVL    BX, r+12(FP)
+       MOVL    CX, ret_lo+8(FP)
+       MOVL    BX, ret_hi+12(FP)
        RET

diff --git a/src/pkg/math/floor_386.s b/src/pkg/math/floor_386.s
index a4ae9d2ebad48af3baad6ead41a80bd827be3a24..9aa71c043f7017e2a0150aab1ad400d121e8c4ff 100644 (file)
--- a/src/pkg/math/floor_386.s
+++ b/src/pkg/math/floor_386.s
@@ -13,7 +13,7 @@ TEXT ·Ceil(SB),7,$0
        FLDCW   -4(SP)       // load new Control Word
        FRNDINT              // F0=Ceil(x)
        FLDCW   -2(SP)       // load old Control Word
-       FMOVDP  F0, r+8(FP)
+       FMOVDP  F0, ret+8(FP)
        RET
 
 // func Floor(x float64) float64
@@ -27,7 +27,7 @@ TEXT ·Floor(SB),7,$0
        FLDCW   -4(SP)       // load new Control Word
        FRNDINT              // F0=Floor(x)
        FLDCW   -2(SP)       // load old Control Word
-       FMOVDP  F0, r+8(FP)
+       FMOVDP  F0, ret+8(FP)
        RET
 
 // func Trunc(x float64) float64
@@ -40,5 +40,5 @@ TEXT ·Trunc(SB),7,$0
        FLDCW   -4(SP)       // load new Control Word
        FRNDINT              // F0=Trunc(x)
        FLDCW   -2(SP)       // load old Control Word
-       FMOVDP  F0, r+8(FP)
+       FMOVDP  F0, ret+8(FP)
        RET

diff --git a/src/pkg/math/floor_amd64.s b/src/pkg/math/floor_amd64.s
index e72cc3cf9c069d5f6234200caab7feb459266baa..bb1a2fd22a1ebc185b69f1b53b2449357b409983 100644 (file)
--- a/src/pkg/math/floor_amd64.s
+++ b/src/pkg/math/floor_amd64.s
@@ -20,10 +20,10 @@ TEXT ·Floor(SB),7,$0
        MOVSD   $(-1.0), X2
        ANDPD   X2, X0 // if x < float(int(x)) {X0 = -1} else {X0 = 0}
        ADDSD   X1, X0
-       MOVSD   X0, r+8(FP)
+       MOVSD   X0, ret+8(FP)
        RET
 isBig_floor:
-       MOVQ    AX, r+8(FP) // return x
+       MOVQ    AX, ret+8(FP) // return x
        RET
 
 // func Ceil(x float64) float64
@@ -46,10 +46,10 @@ TEXT ·Ceil(SB),7,$0
        ANDNPD  X3, X0
        ORPD    X2, X0 // if float(int(x)) <= x {X0 = 1} else {X0 = -0}
        ADDSD   X1, X0
-       MOVSD   X0, r+8(FP)
+       MOVSD   X0, ret+8(FP)
        RET
 isBig_ceil:
-       MOVQ    AX, r+8(FP)
+       MOVQ    AX, ret+8(FP)
        RET
 
 // func Trunc(x float64) float64
@@ -67,8 +67,8 @@ TEXT ·Trunc(SB),7,$0
        ANDNPD  X0, X2 // X2 = sign
        CVTSQ2SD        AX, X0 // X0 = float(int(x))
        ORPD    X2, X0 // if X0 = 0.0, incorporate sign
-       MOVSD   X0, r+8(FP)
+       MOVSD   X0, ret+8(FP)
        RET
 isBig_trunc:
-       MOVQ    AX, r+8(FP) // return x
+       MOVQ    AX, ret+8(FP) // return x
        RET

diff --git a/src/pkg/math/hypot_386.s b/src/pkg/math/hypot_386.s
index 51cd90419494f5d0bd265f05996c62710f285b6a..8edfe064f7e7c79c41fb5989f14dc2df82c5d5b1 100644 (file)
--- a/src/pkg/math/hypot_386.s
+++ b/src/pkg/math/hypot_386.s
@@ -5,11 +5,11 @@
 // func Hypot(p, q float64) float64
 TEXT ·Hypot(SB),7,$0
 // test bits for not-finite
-       MOVL    p+4(FP), AX   // high word p
+       MOVL    p_hi+4(FP), AX   // high word p
        ANDL    $0x7ff00000, AX
        CMPL    AX, $0x7ff00000
        JEQ     not_finite
-       MOVL    q+12(FP), AX   // high word q
+       MOVL    q_hi+12(FP), AX   // high word q
        ANDL    $0x7ff00000, AX
        CMPL    AX, $0x7ff00000
        JEQ     not_finite
@@ -31,27 +31,27 @@ TEXT ·Hypot(SB),7,$0
        FADDDP  F0, F1       // F0=1+q*q, F1=p
        FSQRT                // F0=sqrt(1+q*q), F1=p
        FMULDP  F0, F1       // F0=p*sqrt(1+q*q)
-       FMOVDP  F0, r+16(FP)
+       FMOVDP  F0, ret+16(FP)
        RET
        FMOVDP  F0, F1       // F0=0
-       FMOVDP  F0, r+16(FP)
+       FMOVDP  F0, ret+16(FP)
        RET
 not_finite:
 // test bits for -Inf or +Inf
-       MOVL    p+4(FP), AX  // high word p
-       ORL     p+0(FP), AX  // low word p
+       MOVL    p_hi+4(FP), AX  // high word p
+       ORL     p_lo+0(FP), AX  // low word p
        ANDL    $0x7fffffff, AX
        CMPL    AX, $0x7ff00000
        JEQ     is_inf
-       MOVL    q+12(FP), AX  // high word q
-       ORL     q+8(FP), AX   // low word q
+       MOVL    q_hi+12(FP), AX  // high word q
+       ORL     q_lo+8(FP), AX   // low word q
        ANDL    $0x7fffffff, AX
        CMPL    AX, $0x7ff00000
        JEQ     is_inf
-       MOVL    $0x7ff80000, r+20(FP)  // return NaN = 0x7FF8000000000001
-       MOVL    $0x00000001, r+16(FP)
+       MOVL    $0x7ff80000, ret_hi+20(FP)  // return NaN = 0x7FF8000000000001
+       MOVL    $0x00000001, ret_lo+16(FP)
        RET
 is_inf:
-       MOVL    AX, r+20(FP)  // return +Inf = 0x7FF0000000000000
-       MOVL    $0x00000000, r+16(FP)
+       MOVL    AX, ret_hi+20(FP)  // return +Inf = 0x7FF0000000000000
+       MOVL    $0x00000000, ret_lo+16(FP)
        RET

diff --git a/src/pkg/math/hypot_amd64.s b/src/pkg/math/hypot_amd64.s
index 02fff5b925ef7ec88e6be5a1b28b3212b2e286e2..40ba6f41dd4b4355133a3769ca9ebf86a84262f9 100644 (file)
--- a/src/pkg/math/hypot_amd64.s
+++ b/src/pkg/math/hypot_amd64.s
@@ -31,7 +31,7 @@ TEXT ·Hypot(SB),7,$0
        ADDSD   $1.0, X1
        SQRTSD  X1, X1
        MULSD   X1, X0
-       MOVSD   X0, r+16(FP)
+       MOVSD   X0, ret+16(FP)
        RET
 isInfOrNaN:
        CMPQ    AX, BX
@@ -39,12 +39,12 @@ isInfOrNaN:
        CMPQ    AX, CX
        JEQ     isInf
        MOVQ    $NaN, AX
-       MOVQ    AX, r+16(FP) // return NaN
+       MOVQ    AX, ret+16(FP) // return NaN
        RET
 isInf:
-       MOVQ    AX, r+16(FP) // return +Inf
+       MOVQ    AX, ret+16(FP) // return +Inf
        RET
 isZero:
        MOVQ    $0, AX
-       MOVQ    AX, r+16(FP) // return 0
+       MOVQ    AX, ret+16(FP) // return 0
        RET

diff --git a/src/pkg/math/ldexp_386.s b/src/pkg/math/ldexp_386.s
index 3a65629d22848db892507ce58cdd407ad7e5094e..566245dc2e472b1fd5383a2c8ce7cc3faadc2156 100644 (file)
--- a/src/pkg/math/ldexp_386.s
+++ b/src/pkg/math/ldexp_386.s
@@ -8,5 +8,5 @@ TEXT ·Ldexp(SB),7,$0
        FMOVD   frac+0(FP), F0   // F0=frac, F1=e
        FSCALE                // F0=x*2**e, F1=e
        FMOVDP  F0, F1        // F0=x*2**e
-       FMOVDP  F0, r+12(FP)
+       FMOVDP  F0, ret+12(FP)
        RET

diff --git a/src/pkg/math/log10_386.s b/src/pkg/math/log10_386.s
index cc473b424fddf7cdc262585e05a7db9c6ed1744b..d4f94235e12b9bee8b4f43a023a75cdd2595892d 100644 (file)
--- a/src/pkg/math/log10_386.s
+++ b/src/pkg/math/log10_386.s
@@ -7,7 +7,7 @@ TEXT ·Log10(SB),7,$0
        FLDLG2               // F0=log10(2)
        FMOVD   x+0(FP), F0  // F0=x, F1=log10(2)
        FYL2X                // F0=log10(x)=log2(x)*log10(2)
-       FMOVDP  F0, r+8(FP)
+       FMOVDP  F0, ret+8(FP)
        RET
 
 // func Log2(x float64) float64
@@ -15,5 +15,5 @@ TEXT ·Log2(SB),7,$0
        FLD1                 // F0=1
        FMOVD   x+0(FP), F0  // F0=x, F1=1
        FYL2X                // F0=log2(x)
-       FMOVDP  F0, r+8(FP)
+       FMOVDP  F0, ret+8(FP)
        RET

diff --git a/src/pkg/math/log1p_386.s b/src/pkg/math/log1p_386.s
index 30df88e1fba96c23e6c3e73897f9b8fd686a2a58..30dc8033d291e876d9e1249dc9a6ff6cf007095b 100644 (file)
--- a/src/pkg/math/log1p_386.s
+++ b/src/pkg/math/log1p_386.s
@@ -14,12 +14,12 @@ TEXT ·Log1p(SB),7,$0
        JEQ     use_fyl2x    // jump if F0 >= F1
        FMOVD   x+0(FP), F0  // F0=x, F1=log(2)
        FYL2XP1              // F0=log(1+x)=log2(1+x)*log(2)
-       FMOVDP  F0, r+8(FP)
+       FMOVDP  F0, ret+8(FP)
        RET
 use_fyl2x:
        FLD1                 // F0=1, F2=log(2)
        FADDD   x+0(FP), F0  // F0=1+x, F1=log(2)
        FYL2X                // F0=log(1+x)=log2(1+x)*log(2)
-       FMOVDP  F0, r+8(FP)
+       FMOVDP  F0, ret+8(FP)
        RET
 

diff --git a/src/pkg/math/log_386.s b/src/pkg/math/log_386.s
index 6cfbc7605b82333310d6644882922f8bbb9f1279..7a6f2c052542510b3948b7d9c80ce27aa9fb0e58 100644 (file)
--- a/src/pkg/math/log_386.s
+++ b/src/pkg/math/log_386.s
@@ -7,5 +7,5 @@ TEXT ·Log(SB),7,$0
        FLDLN2               // F0=log(2)
        FMOVD   x+0(FP), F0  // F0=x, F1=log(2)
        FYL2X                // F0=log(x)=log2(x)*log(2)
-       FMOVDP  F0, r+8(FP)
+       FMOVDP  F0, ret+8(FP)
        RET

diff --git a/src/pkg/math/log_amd64.s b/src/pkg/math/log_amd64.s
index 75bc55764dc72182fe0e20e288d56c58aafc2673..6ae5fbc95ebd6b154845d51bfa2b06cc16d16b61 100644 (file)
--- a/src/pkg/math/log_amd64.s
+++ b/src/pkg/math/log_amd64.s
@@ -94,16 +94,16 @@ TEXT ·Log(SB),7,$0
        SUBSD   X2, X0 // x0= (hfsq-(s*(hfsq+R)+k*Ln2Lo))-f, x1= k
        MULSD   $Ln2Hi, X1 // x0= (hfsq-(s*(hfsq+R)+k*Ln2Lo))-f, x1= k*Ln2Hi
        SUBSD   X0, X1 // x1= k*Ln2Hi-((hfsq-(s*(hfsq+R)+k*Ln2Lo))-f)
-       MOVSD   X1, r+8(FP)
+       MOVSD   X1, ret+8(FP)
        RET
 isInfOrNaN:
-       MOVQ    BX, r+8(FP) // +Inf or NaN, return x
+       MOVQ    BX, ret+8(FP) // +Inf or NaN, return x
        RET
 isNegative:
        MOVQ    $NaN, AX
-       MOVQ    AX, r+8(FP) // return NaN
+       MOVQ    AX, ret+8(FP) // return NaN
        RET
 isZero:
        MOVQ    $NegInf, AX
-       MOVQ    AX, r+8(FP) // return -Inf
+       MOVQ    AX, ret+8(FP) // return -Inf
        RET

diff --git a/src/pkg/math/mod_386.s b/src/pkg/math/mod_386.s
index 6b9c28d4fe8287f91411a20d71b470a671c7760b..bcb451b5dd97ba477c4b269b3cf3ad670fbb4cd1 100644 (file)
--- a/src/pkg/math/mod_386.s
+++ b/src/pkg/math/mod_386.s
@@ -11,5 +11,5 @@ TEXT ·Mod(SB),7,$0
        ANDW    $0x0400, AX
        JNE     -3(PC)       // jump if reduction incomplete
        FMOVDP  F0, F1       // F0=x-q*y
-       FMOVDP  F0, r+16(FP)
+       FMOVDP  F0, ret+16(FP)
        RET

diff --git a/src/pkg/math/remainder_386.s b/src/pkg/math/remainder_386.s
index 4cb98233a617031356ddc7df872cb8321ea75362..2238aba49f2925bccbb6a42db6010e7912023746 100644 (file)
--- a/src/pkg/math/remainder_386.s
+++ b/src/pkg/math/remainder_386.s
@@ -11,5 +11,5 @@ TEXT ·Remainder(SB),7,$0
        ANDW    $0x0400, AX
        JNE     -3(PC)       // jump if reduction incomplete
        FMOVDP  F0, F1       // F0=x-q*y
-       FMOVDP  F0, r+16(FP)
+       FMOVDP  F0, ret+16(FP)
        RET

diff --git a/src/pkg/math/sin_386.s b/src/pkg/math/sin_386.s
index 9d00bd92b2d28ea175b34c15b2fa137863b397a1..b2a836eb1267408b39943737ad88ec1584a49752 100644 (file)
--- a/src/pkg/math/sin_386.s
+++ b/src/pkg/math/sin_386.s
@@ -9,7 +9,7 @@ TEXT ·Cos(SB),7,$0
        FSTSW   AX           // AX=status word
        ANDW    $0x0400, AX
        JNE     3(PC)        // jump if x outside range
-       FMOVDP  F0, r+8(FP)
+       FMOVDP  F0, ret+8(FP)
        RET
        FLDPI                // F0=Pi, F1=x
        FADDD   F0, F0       // F0=2*Pi, F1=x
@@ -20,7 +20,7 @@ TEXT ·Cos(SB),7,$0
        JNE     -3(PC)       // jump if reduction incomplete
        FMOVDP  F0, F1       // F0=reduced_x
        FCOS                 // F0=cos(reduced_x)
-       FMOVDP  F0, r+8(FP)
+       FMOVDP  F0, ret+8(FP)
        RET
        
 // func Sin(x float64) float64
@@ -30,7 +30,7 @@ TEXT ·Sin(SB),7,$0
        FSTSW   AX           // AX=status word
        ANDW    $0x0400, AX
        JNE     3(PC)        // jump if x outside range
-       FMOVDP  F0, r+8(FP)
+       FMOVDP  F0, ret+8(FP)
        RET
        FLDPI                // F0=Pi, F1=x
        FADDD   F0, F0       // F0=2*Pi, F1=x
@@ -41,5 +41,5 @@ TEXT ·Sin(SB),7,$0
        JNE     -3(PC)       // jump if reduction incomplete
        FMOVDP  F0, F1       // F0=reduced_x
        FSIN                 // F0=sin(reduced_x)
-       FMOVDP  F0, r+8(FP)
+       FMOVDP  F0, ret+8(FP)
        RET

diff --git a/src/pkg/math/sqrt_386.s b/src/pkg/math/sqrt_386.s
index d0a428d52e4737eb5615b1d704c86ab4f47e74d1..824fa634c5012397aa6811244815f8128bb3a025 100644 (file)
--- a/src/pkg/math/sqrt_386.s
+++ b/src/pkg/math/sqrt_386.s
@@ -6,5 +6,5 @@
 TEXT ·Sqrt(SB),7,$0
        FMOVD   x+0(FP),F0
        FSQRT
-       FMOVDP  F0,r+8(FP)
+       FMOVDP  F0,ret+8(FP)
        RET

diff --git a/src/pkg/math/sqrt_amd64.s b/src/pkg/math/sqrt_amd64.s
index f5b329e70a874d07d7d4fe17dcf1fd3b3c25df17..553c4e01b6a2c5a5bb9dcea26b8b8a19385a3b54 100644 (file)
--- a/src/pkg/math/sqrt_amd64.s
+++ b/src/pkg/math/sqrt_amd64.s
@@ -5,5 +5,5 @@
 // func Sqrt(x float64) float64
 TEXT ·Sqrt(SB),7,$0
        SQRTSD x+0(FP), X0
-       MOVSD X0, r+8(FP)
+       MOVSD X0, ret+8(FP)
        RET

diff --git a/src/pkg/math/sqrt_arm.s b/src/pkg/math/sqrt_arm.s
index befbb8a898f5da59ae8cb6bc313d758115eacb70..b965b4845c2727cb7641ebb4dd7e06ec6431d925 100644 (file)
--- a/src/pkg/math/sqrt_arm.s
+++ b/src/pkg/math/sqrt_arm.s
@@ -6,5 +6,5 @@
 TEXT ·Sqrt(SB),7,$0
        MOVD   x+0(FP),F0
        SQRTD  F0,F0
-       MOVD  F0,r+8(FP)
+       MOVD  F0,ret+8(FP)
        RET

diff --git a/src/pkg/math/tan_386.s b/src/pkg/math/tan_386.s
index ebb9e798b0c23a00c7cf610371569a868bfa1a5b..f3ad33907368113ab1592da1d184bb09e352fb41 100644 (file)
--- a/src/pkg/math/tan_386.s
+++ b/src/pkg/math/tan_386.s
@@ -10,7 +10,7 @@ TEXT ·Tan(SB),7,$0
        ANDW    $0x0400, AX
        JNE     4(PC)        // jump if x outside range
        FMOVDP  F0, F0       // F0=tan(x)
-       FMOVDP  F0, r+8(FP)
+       FMOVDP  F0, ret+8(FP)
        RET
        FLDPI                // F0=Pi, F1=x
        FADDD   F0, F0       // F0=2*Pi, F1=x
@@ -22,5 +22,5 @@ TEXT ·Tan(SB),7,$0
        FMOVDP  F0, F1       // F0=reduced_x
        FPTAN                // F0=1, F1=tan(reduced_x)
        FMOVDP  F0, F0       // F0=tan(reduced_x)
-       FMOVDP  F0, r+8(FP)
+       FMOVDP  F0, ret+8(FP)
        RET

diff --git a/src/pkg/os/signal/sig.s b/src/pkg/os/signal/sig.s
index 7d0c92b19508cd3e69d062e6c543a97110e79223..df4855de8d6bbec0161df99a2f980927a5edea72 100644 (file)
--- a/src/pkg/os/signal/sig.s
+++ b/src/pkg/os/signal/sig.s
@@ -4,6 +4,8 @@
 
 // Assembly to get into package runtime without using exported symbols.
 
+// +build amd64 arm 386
+
 #ifdef GOARCH_arm
 #define JMP B
 #endif

diff --git a/src/pkg/reflect/asm_386.s b/src/pkg/reflect/asm_386.s
index 068ab64a624cab87c2f307c60af826e262dfa40e..bbd068d98e46f37eb328ec2b84658230c76015a8 100644 (file)
--- a/src/pkg/reflect/asm_386.s
+++ b/src/pkg/reflect/asm_386.s
@@ -7,7 +7,7 @@
 // for more details.
 TEXT ·makeFuncStub(SB),7,$8
        MOVL    DX, 0(SP)
-       LEAL    arg+0(FP), CX
+       LEAL    argframe+0(FP), CX
        MOVL    CX, 4(SP)
        CALL    ·callReflect(SB)
        RET
@@ -17,7 +17,7 @@ TEXT ·makeFuncStub(SB),7,$8
 // for more details.
 TEXT ·methodValueCall(SB),7,$8
        MOVL    DX, 0(SP)
-       LEAL    arg+0(FP), CX
+       LEAL    argframe+0(FP), CX
        MOVL    CX, 4(SP)
        CALL    ·callMethod(SB)
        RET

diff --git a/src/pkg/reflect/asm_amd64.s b/src/pkg/reflect/asm_amd64.s
index 06a593a65f7640392d328d8cdb71d0a912be2842..2e7fce55d6f7c9494aca2595fcbcbfe5def05297 100644 (file)
--- a/src/pkg/reflect/asm_amd64.s
+++ b/src/pkg/reflect/asm_amd64.s
@@ -7,7 +7,7 @@
 // for more details.
 TEXT ·makeFuncStub(SB),7,$16
        MOVQ    DX, 0(SP)
-       LEAQ    arg+0(FP), CX
+       LEAQ    argframe+0(FP), CX
        MOVQ    CX, 8(SP)
        CALL    ·callReflect(SB)
        RET
@@ -17,7 +17,7 @@ TEXT ·makeFuncStub(SB),7,$16
 // for more details.
 TEXT ·methodValueCall(SB),7,$16
        MOVQ    DX, 0(SP)
-       LEAQ    arg+0(FP), CX
+       LEAQ    argframe+0(FP), CX
        MOVQ    CX, 8(SP)
        CALL    ·callMethod(SB)
        RET

diff --git a/src/pkg/reflect/asm_arm.s b/src/pkg/reflect/asm_arm.s
index 4add1e32113793c311fc7649a1bf6a83e3d757c9..fb1dddebe92bfbb3e8a889e3b88bdd0726affa34 100644 (file)
--- a/src/pkg/reflect/asm_arm.s
+++ b/src/pkg/reflect/asm_arm.s
@@ -7,7 +7,7 @@
 // for more details.
 TEXT ·makeFuncStub(SB),7,$8
        MOVW    R7, 4(R13)
-       MOVW    $arg+0(FP), R1
+       MOVW    $argframe+0(FP), R1
        MOVW    R1, 8(R13)
        BL      ·callReflect(SB)
        RET
@@ -17,7 +17,7 @@ TEXT ·makeFuncStub(SB),7,$8
 // for more details.
 TEXT ·methodValueCall(SB),7,$8
        MOVW    R7, 4(R13)
-       MOVW    $arg+0(FP), R1
+       MOVW    $argframe+0(FP), R1
        MOVW    R1, 8(R13)
        BL      ·callMethod(SB)
        RET

diff --git a/src/pkg/runtime/asm_386.s b/src/pkg/runtime/asm_386.s
index e4b841cfa517bb2b70cf75dcd49dd114e69d6fae..6bcacf4cc04d6d995384e8751af4319752f06d32 100644 (file)
--- a/src/pkg/runtime/asm_386.s
+++ b/src/pkg/runtime/asm_386.s
@@ -717,7 +717,7 @@ TEXT runtime·stackguard(SB),7,$0
        get_tls(CX)
        MOVL    g(CX), BX
        MOVL    g_stackguard(BX), DX
-       MOVL    DX, guard+4(FP)
+       MOVL    DX, limit+4(FP)
        RET
 
 GLOBL runtime·tls0(SB), $32

diff --git a/src/pkg/runtime/asm_amd64.s b/src/pkg/runtime/asm_amd64.s
index 709bc48d8d1aa2dd130e7664359dad850caef4de..f4cfa576eb71d82abc56e031b882556f4af7aa7b 100644 (file)
--- a/src/pkg/runtime/asm_amd64.s
+++ b/src/pkg/runtime/asm_amd64.s
@@ -737,7 +737,7 @@ TEXT runtime·stackguard(SB),7,$0
        get_tls(CX)
        MOVQ    g(CX), BX
        MOVQ    g_stackguard(BX), DX
-       MOVQ    DX, guard+8(FP)
+       MOVQ    DX, limit+8(FP)
        RET
 
 GLOBL runtime·tls0(SB), $64

diff --git a/src/pkg/sync/atomic/asm_386.s b/src/pkg/sync/atomic/asm_386.s
index 19d129bcb74ac2cc1f33ee24f13421909c5718a7..8c02f106f547fe6710ed0efb54f3888528a3b6a3 100644 (file)
--- a/src/pkg/sync/atomic/asm_386.s
+++ b/src/pkg/sync/atomic/asm_386.s
@@ -31,10 +31,10 @@ TEXT ·CompareAndSwapUint64(SB),7,$0
        TESTL   $7, BP
        JZ      2(PC)
        MOVL    0, AX // crash with nil ptr deref
-       MOVL    old+4(FP), AX
-       MOVL    old+8(FP), DX
-       MOVL    new+12(FP), BX
-       MOVL    new+16(FP), CX
+       MOVL    old_lo+4(FP), AX
+       MOVL    old_hi+8(FP), DX
+       MOVL    new_lo+12(FP), BX
+       MOVL    new_hi+16(FP), CX
        // CMPXCHG8B was introduced on the Pentium.
        LOCK
        CMPXCHG8B       0(BP)
@@ -68,8 +68,8 @@ TEXT ·AddUint64(SB),7,$0
        JZ      2(PC)
        MOVL    0, AX // crash with nil ptr deref
        // DI:SI = delta
-       MOVL    delta+4(FP), SI
-       MOVL    delta+8(FP), DI
+       MOVL    delta_lo+4(FP), SI
+       MOVL    delta_hi+8(FP), DI
        // DX:AX = *addr
        MOVL    0(BP), AX
        MOVL    4(BP), DX
@@ -93,8 +93,8 @@ addloop:
 
        // success
        // return CX:BX
-       MOVL    BX, new+12(FP)
-       MOVL    CX, new+16(FP)
+       MOVL    BX, new_lo+12(FP)
+       MOVL    CX, new_hi+16(FP)
        RET
 
 TEXT ·LoadInt32(SB),7,$0