From d5be13198dfcbbb567d21136426b524c5fb9ff2b Mon Sep 17 00:00:00 2001 From: Yawning Angel Date: Mon, 1 Nov 2021 12:02:33 +0000 Subject: [PATCH] internal/asm: Bump avo to latest, regenerate affected files The avo maintainer addressed the argument size calculations that were causing `go vet` to complain. This shouldn't actually affect anything, but it does reduce the spurious static analysis complaints. --- curve/edwards_vector_amd64.s | 4 ++-- curve/window_amd64.s | 4 ++-- internal/asm/amd64/go.mod | 2 +- internal/asm/amd64/go.sum | 33 +++++++++++++++++---------------- 4 files changed, 22 insertions(+), 21 deletions(-) diff --git a/curve/edwards_vector_amd64.s b/curve/edwards_vector_amd64.s index 8f75e91..0e2cc5b 100644 --- a/curve/edwards_vector_amd64.s +++ b/curve/edwards_vector_amd64.s @@ -192,7 +192,7 @@ GLOBL shuffle_DBDB<>(SB), RODATA|NOPTR, $32 // func vecConditionalSelect_AVX2(out *fieldElement2625x4, a *fieldElement2625x4, b *fieldElement2625x4, mask uint32) // Requires: AVX, AVX2 -TEXT ·vecConditionalSelect_AVX2(SB), NOSPLIT|NOFRAME, $0-32 +TEXT ·vecConditionalSelect_AVX2(SB), NOSPLIT|NOFRAME, $0-28 MOVQ out+0(FP), AX MOVQ a+8(FP), CX MOVQ b+16(FP), DX @@ -550,7 +550,7 @@ TEXT ·vecNegateLazyCached_AVX2(SB), NOSPLIT|NOFRAME, $0-16 // func vecConditionalNegateLazyCached_AVX2(out *fieldElement2625x4, vec *cachedPoint, mask uint32) // Requires: AVX, AVX2 -TEXT ·vecConditionalNegateLazyCached_AVX2(SB), NOSPLIT|NOFRAME, $0-24 +TEXT ·vecConditionalNegateLazyCached_AVX2(SB), NOSPLIT|NOFRAME, $0-20 MOVQ out+0(FP), AX MOVQ vec+8(FP), CX VMOVDQU (CX), Y0 diff --git a/curve/window_amd64.s b/curve/window_amd64.s index 0a18886..32735b2 100644 --- a/curve/window_amd64.s +++ b/curve/window_amd64.s @@ -6,7 +6,7 @@ // func lookupAffineNiels(table *affineNielsPointLookupTable, out *affineNielsPoint, xabs uint8) // Requires: SSE2 -TEXT ·lookupAffineNiels(SB), NOSPLIT|NOFRAME, $0-24 +TEXT ·lookupAffineNiels(SB), NOSPLIT|NOFRAME, $0-17 // This is moderately annoying due to having 3x5 64-bit elements, // which does not nicely fit into vector registers. This is // handled by duplicating one element in 2 registers, since @@ -132,7 +132,7 @@ GLOBL cached_id_2_4<>(SB), RODATA|NOPTR, $32 // func lookupCached(table *cachedPointLookupTable, out *cachedPoint, xabs uint8) // Requires: AVX, AVX2 -TEXT ·lookupCached(SB), NOSPLIT|NOFRAME, $0-24 +TEXT ·lookupCached(SB), NOSPLIT|NOFRAME, $0-17 MOVQ table+0(FP), AX // Build the mask, zero all the registers diff --git a/internal/asm/amd64/go.mod b/internal/asm/amd64/go.mod index 4913a60..dd301de 100644 --- a/internal/asm/amd64/go.mod +++ b/internal/asm/amd64/go.mod @@ -2,4 +2,4 @@ module github.com/oasisprotocol/curve25519-voi/internal/asm/amd64 go 1.16 -require github.com/mmcloughlin/avo v0.2.0 +require github.com/mmcloughlin/avo v0.3.1 diff --git a/internal/asm/amd64/go.sum b/internal/asm/amd64/go.sum index dae4777..b2c673d 100644 --- a/internal/asm/amd64/go.sum +++ b/internal/asm/amd64/go.sum @@ -1,29 +1,30 @@ -github.com/mmcloughlin/avo v0.2.0 h1:6vhoSaKtxb6f4RiH+LK2qL6GSMpFzhEwJYTTSZNy09w= -github.com/mmcloughlin/avo v0.2.0/go.mod h1:5tidO2Z9Z7N6X7UMcGg+1KTj51O8OxYDCMHxCZTVpEA= -github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -golang.org/x/arch v0.0.0-20210405154355-08b684f594a5/go.mod h1:flIaEI6LNU6xOCD5PaJvn9wGP0agmIOqjrtsKGRguv4= +github.com/mmcloughlin/avo v0.3.1 h1:1aHjz13iP9WTDmEZKiDpljBpnDarQsvEOgn4/035Avg= +github.com/mmcloughlin/avo v0.3.1/go.mod h1:RzX20dJBlNy9hVB5f87ozWfEuJbLjZG/IH/b6U1y6hk= +github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo= +golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57 h1:F5Gozwx4I1xtr/sr/8CFbb57iKi3297KFs0QDbGN60A= -golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211030160813-b3129d9d1021 h1:giLT+HuUP/gXYrG2Plg9WTjj4qhfgaW424ZIFog3rlk= +golang.org/x/sys v0.0.0-20211030160813-b3129d9d1021/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.1.0 h1:po9/4sTYwZU9lPhi1tOrb4hCv3qrhiQ77LZfGa2OjwY= -golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= +golang.org/x/tools v0.1.7 h1:6j8CgantCy3yc8JGBqkDLMKWqZ0RDU2g1HVgacojGWQ= +golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=