Skip to content

Commit 08d6f26

Browse files
tfaoliveiratfaoliveira
authored
Merge pull request #126 from vbgl/fix-unused-vars
Remove declarations of unused variables
2 parents 8a2adc7 + 1a0cf66 commit 08d6f26

File tree

28 files changed

+21
-93
lines changed

28 files changed

+21
-93
lines changed

‎src/common/keccak/common/fips202_DIRTY.jinc

-1
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,6 @@ fn _sha3_512_32(reg ptr u8[64] out, reg const ptr u8[32] in) -> stack u8[64]
336336
inline
337337
fn __shake128_absorb34(reg u256[7] state, reg const ptr u8[34] in) -> reg u256[7]
338338
{
339-
reg u128 t128;
340339
stack u64[28] s_state;
341340
stack u64[25] a_jagged_p;
342341
reg u64 l t;

‎src/crypto_kem/kyber/common/amd64/avx2/poly.jinc

+3-14
Original file line numberDiff line numberDiff line change
@@ -208,11 +208,7 @@ fn _poly_compress(reg u64 rp, reg ptr u16[KYBER_N] a) -> reg ptr u16[KYBER_N]
208208
{
209209
inline int i;
210210
reg u256 f0 f1 f2 f3 v shift1 mask shift2 permidx;
211-
reg u128 t0 t1 t3;
212211
reg ptr u16[16] x16p;
213-
reg u64 t64;
214-
reg u32 t32;
215-
reg u16 t16;
216212

217213
a = _poly_csubq(a);
218214

@@ -258,11 +254,7 @@ fn _poly_compress_1(reg ptr u8[KYBER_POLYCOMPRESSEDBYTES] rp, reg ptr u16[KYBER_
258254
{
259255
inline int i;
260256
reg u256 f0 f1 f2 f3 v shift1 mask shift2 permidx;
261-
reg u128 t0 t1 t3;
262257
reg ptr u16[16] x16p;
263-
reg u64 t64;
264-
reg u32 t32;
265-
reg u16 t16;
266258

267259
a = _poly_csubq(a);
268260

@@ -451,7 +443,7 @@ u8[16] pfm_idx_s = {0, 1, 4, 5, 8, 9, 12, 13,
451443
fn _poly_frommsg(reg ptr u16[KYBER_N] rp, reg u64 ap) -> stack u16[KYBER_N]
452444
{
453445
inline int i;
454-
reg u256 f g0 g1 g2 g3 g4 h0 h1 h2 h3;
446+
reg u256 f g0 g1 g2 g3 h0 h1 h2 h3;
455447
reg u256 shift idx hqs;
456448
reg ptr u16[16] x16p;
457449

@@ -499,7 +491,7 @@ fn _poly_frommsg(reg ptr u16[KYBER_N] rp, reg u64 ap) -> stack u16[KYBER_N]
499491
fn _poly_frommsg_1(reg ptr u16[KYBER_N] rp, reg ptr u8[KYBER_INDCPA_MSGBYTES] ap) -> stack u16[KYBER_N]
500492
{
501493
inline int i;
502-
reg u256 f g0 g1 g2 g3 g4 h0 h1 h2 h3;
494+
reg u256 f g0 g1 g2 g3 h0 h1 h2 h3;
503495
reg u256 shift idx hqs;
504496
reg ptr u16[16] x16p;
505497

@@ -879,7 +871,7 @@ inline
879871
fn __invntt___butterfly64x(reg u256 rl0 rl1 rl2 rl3 rh0 rh1 rh2 rh3 zl0 zl1 zh0 zh1 qx16)
880872
-> reg u256, reg u256, reg u256, reg u256, reg u256, reg u256, reg u256, reg u256
881873
{
882-
reg u256 t0 t1 t2 t3 t4 t5 t6 t7;
874+
reg u256 t0 t1 t2 t3;
883875

884876
t0 = #VPSUB_16u16(rl0, rh0);
885877
t1 = #VPSUB_16u16(rl1, rh1);
@@ -921,7 +913,6 @@ fn _poly_invntt(reg ptr u16[KYBER_N] rp) -> reg ptr u16[KYBER_N]
921913
{
922914
reg u256 zeta0 zeta1 zeta2 zeta3 r0 r1 r2 r3 r4 r5 r6 r7 qx16 vx16 flox16 fhix16;
923915
reg ptr u16[400] zetasp;
924-
reg ptr u16[16] qx16p;
925916
inline int i;
926917

927918
zetasp = jzetas_inv_exp;
@@ -1119,8 +1110,6 @@ fn __butterfly64x(reg u256 rl0 rl1 rl2 rl3 rh0 rh1 rh2 rh3 zl0 zl1 zh0 zh1 qx16)
11191110
fn _poly_ntt(reg ptr u16[KYBER_N] rp) -> reg ptr u16[KYBER_N]
11201111
{
11211112
reg u256 zeta0 zeta1 zeta2 zeta3 r0 r1 r2 r3 r4 r5 r6 r7 qx16 vx16;
1122-
reg u32 t;
1123-
reg u16 w;
11241113
reg ptr u16[400] zetasp;
11251114
inline int i;
11261115

‎src/crypto_kem/kyber/common/amd64/avx2/polyvec.jinc

-2
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ fn __polyvec_compress(reg u64 rp, stack u16[KYBER_VECN] a)
8080
reg u256 f0 f1 f2 v v8 off shift1 mask shift2 sllvdidx shufbidx;
8181
reg u128 t0 t1;
8282
reg ptr u16[16] x16p;
83-
reg ptr u8[32] x8p;
8483

8584
a = __polyvec_csubq(a);
8685

@@ -127,7 +126,6 @@ fn __polyvec_compress_1(reg ptr u8[KYBER_POLYVECCOMPRESSEDBYTES] rp, stack u16[K
127126
reg u256 f0 f1 f2 v v8 off shift1 mask shift2 sllvdidx shufbidx;
128127
reg u128 t0 t1;
129128
reg ptr u16[16] x16p;
130-
reg ptr u8[32] x8p;
131129

132130
a = __polyvec_csubq(a);
133131

‎src/crypto_kem/kyber/common/amd64/kem.jinc

-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ fn __crypto_kem_enc_derand_jazz(reg u64 ctp, reg u64 shkp, reg u64 pkp, reg ptr
5050
stack u8[KYBER_SYMBYTES * 2] buf kr;
5151
stack u64 s_pkp s_ctp s_shkp;
5252
reg u64 t64;
53-
inline int i;
5453

5554
s_pkp = pkp;
5655
s_ctp = ctp;

‎src/crypto_kem/kyber/common/amd64/ref/poly.jinc

-3
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ fn _poly_csubq(reg ptr u16[KYBER_N] rp) -> reg ptr u16[KYBER_N]
4545

4646
fn _poly_basemul(reg ptr u16[KYBER_N] rp, reg const ptr u16[KYBER_N] ap bp) -> reg ptr u16[KYBER_N]
4747
{
48-
reg u64 offset;
4948
reg u16 zeta;
5049
reg u16 r0;
5150
reg u16 r1;
@@ -296,7 +295,6 @@ fn _poly_frommsg(reg ptr u16[KYBER_N] rp, reg u64 ap) -> stack u16[KYBER_N]
296295
reg u8 c;
297296
reg u16 t;
298297
inline int i;
299-
inline int j;
300298

301299
for i = 0 to KYBER_INDCPA_MSGBYTES
302300
{
@@ -359,7 +357,6 @@ fn _i_poly_frommsg(reg ptr u16[KYBER_N] rp, reg ptr u8[KYBER_INDCPA_MSGBYTES] ap
359357
reg u8 c;
360358
reg u16 t;
361359
inline int i;
362-
inline int j;
363360

364361
for i = 0 to KYBER_INDCPA_MSGBYTES
365362
{

‎src/crypto_kem/kyber/common/amd64/ref/polyvec.jinc

-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ fn __polyvec_compress(reg u64 rp, stack u16[KYBER_VECN] a)
3131
{
3232
stack u16[KYBER_VECN] aa;
3333
reg u16 c, b;
34-
reg u16 d;
3534
reg u64[4] t;
3635
reg u64 i j;
3736
inline int k;
@@ -95,7 +94,6 @@ fn __i_polyvec_compress(reg ptr u8[KYBER_POLYVECCOMPRESSEDBYTES] rp, stack u16[K
9594
{
9695
stack u16[KYBER_VECN] aa;
9796
reg u16 c, b;
98-
reg u16 d;
9997
reg u64[4] t;
10098
reg u64 i j;
10199
inline int k;

‎src/crypto_kem/kyber/common/amd64/ref/verify.jinc

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ fn __verify(reg u64 ctp, reg ptr u8[KYBER_INDCPA_BYTES] ctpc) -> reg u64
2525
inline
2626
fn __cmov(reg ptr u8[KYBER_SYMBYTES] dst, reg u64 src cnd) -> reg ptr u8[KYBER_SYMBYTES]
2727
{
28-
reg u8 t1 t2 bcond;
28+
reg u8 t1 t2;
2929
inline int i;
3030

3131
cnd = -cnd;

‎src/crypto_kem/kyber/kyber512/amd64/ref/indcpa.jinc

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ fn __indcpa_keypair_derand(reg u64 pkp, reg u64 skp, reg ptr u8[KYBER_SYMBYTES]
1212
stack u8[64] buf;
1313
stack u8[KYBER_SYMBYTES] publicseed noiseseed;
1414
reg u64 t64;
15-
reg u8 nonce, c;
15+
reg u8 nonce;
1616
inline int i;
1717

1818
spkp = pkp;

‎src/crypto_kem/kyber/kyber768/amd64/avx2/gen_matrix.jinc

-1
Original file line numberDiff line numberDiff line change
@@ -575,7 +575,6 @@ fn __gen_matrix(stack u8[KYBER_SYMBYTES] seed, inline int transposed) -> stack u
575575
stack u256 fs;
576576
reg u256 f;
577577
reg u64 ctr0 ctr1 ctr2 ctr3 tmp;
578-
stack u64 ctr0_s;
579578
reg u8 flg0 flg1 bflg;
580579
reg bool b;
581580
reg bool zf;

‎src/crypto_kem/kyber/kyber768/amd64/ref/indcpa.jinc

+4-6
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,10 @@ fn __indcpa_enc(stack u64 sctp, reg ptr u8[32] msgp, reg u64 pkp, reg ptr u8[KYB
9292
{
9393
stack u16[KYBER_VECN] pkpv sp ep bp;
9494
stack u16[KYBER_K*KYBER_VECN] aat;
95-
stack u16[KYBER_N] k poly epp v poly0 poly1 poly2;
95+
stack u16[KYBER_N] k epp v;
9696
stack u8[KYBER_SYMBYTES] publicseed;
97-
reg u64 i j t64;
97+
reg u64 i t64;
9898
reg u64 ctp;
99-
reg u16 t;
10099
reg u8 nonce;
101100
stack ptr u8[KYBER_SYMBYTES] noiseseed_s;
102101

@@ -175,10 +174,9 @@ fn __iindcpa_enc(reg ptr u8[KYBER_CT_LEN] ctp, reg ptr u8[32] msgp, reg u64 pkp,
175174
{
176175
stack u16[KYBER_VECN] pkpv sp ep bp;
177176
stack u16[KYBER_K*KYBER_VECN] aat;
178-
stack u16[KYBER_N] k poly epp v poly0 poly1 poly2;
177+
stack u16[KYBER_N] k epp v;
179178
stack u8[KYBER_SYMBYTES] publicseed;
180-
reg u64 i j t64;
181-
reg u16 t;
179+
reg u64 i t64;
182180
reg u8 nonce;
183181
stack ptr u8[KYBER_CT_LEN] sctp;
184182
stack ptr u8[KYBER_SYMBYTES] noiseseed_s;

‎src/crypto_kem/kyber/kyber768/amd64/ref/poly.jinc

-4
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ fn _poly_csubq(reg ptr u16[KYBER_N] rp) -> reg ptr u16[KYBER_N]
5959

6060
fn _poly_basemul(reg ptr u16[KYBER_N] rp, reg const ptr u16[KYBER_N] ap bp) -> reg ptr u16[KYBER_N]
6161
{
62-
reg u64 offset;
6362
reg u16 zeta;
6463
reg u16 r0;
6564
reg u16 r1;
@@ -316,7 +315,6 @@ fn _poly_frommsg(reg ptr u16[KYBER_N] rp, reg u64 ap) -> stack u16[KYBER_N]
316315
reg u8 c;
317316
reg u16 t;
318317
inline int i;
319-
inline int j;
320318

321319
for i = 0 to 32
322320
{
@@ -379,7 +377,6 @@ fn _i_poly_frommsg(reg ptr u16[KYBER_N] rp, reg ptr u8[32] ap) -> stack u16[KYBE
379377
reg u8 c;
380378
reg u16 t;
381379
inline int i;
382-
inline int j;
383380

384381
for i = 0 to 32
385382
{
@@ -441,7 +438,6 @@ fn _poly_getnoise(reg ptr u16[KYBER_N] rp, reg ptr u8[KYBER_SYMBYTES] seed, reg
441438
{
442439
stack u8[33] extseed; /* 33 = KYBER_SYMBYTES +1 */
443440
stack u8[128] buf; /* 128 = KYBER_ETA*KYBER_N/4 */
444-
reg u64 outlen;
445441
reg u8 c,a,b;
446442
reg u16 t;
447443
reg u64 i j;

‎src/crypto_kem/kyber/kyber768/amd64/ref/polyvec.jinc

-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ fn __polyvec_compress(reg u64 rp, stack u16[KYBER_VECN] a)
2525
{
2626
stack u16[KYBER_VECN] aa;
2727
reg u16 c, b;
28-
reg u16 d;
2928
reg u64[4] t;
3029
reg u64 i j;
3130
inline int k;
@@ -90,7 +89,6 @@ fn __i_polyvec_compress(reg ptr u8[KYBER_POLYVECCOMPRESSEDBYTES] rp, stack u16[K
9089
{
9190
stack u16[KYBER_VECN] aa;
9291
reg u16 c, b;
93-
reg u16 d;
9492
reg u64[4] t;
9593
reg u64 i j;
9694
inline int k;

‎src/crypto_kem/kyber/kyber768/amd64/ref/verify.jinc

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ fn __verify(reg u64 ctp, reg ptr u8[KYBER_CT_LEN] ctpc) -> reg u64
3030
inline
3131
fn __cmov(reg ptr u8[KYBER_SYMBYTES] dst, reg u64 src cnd) -> reg ptr u8[KYBER_SYMBYTES]
3232
{
33-
reg u8 t1 t2 bcond;
33+
reg u8 t1 t2;
3434
inline int i;
3535

3636
cnd = -cnd;

‎src/crypto_scalarmult/curve25519/amd64/ref5/scalarmult.jazz

-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ require "curve25519.jinc"
44
export fn jade_scalarmult_curve25519_amd64_ref5(#spill_to_mmx reg u64 qp np pp) -> reg u64
55
{
66
reg u64 r;
7-
stack u64 qps;
87
reg u64[4] q n p;
98

109
_ = #init_msf();
@@ -25,7 +24,6 @@ export fn jade_scalarmult_curve25519_amd64_ref5(#spill_to_mmx reg u64 qp np pp)
2524
export fn jade_scalarmult_curve25519_amd64_ref5_base(#spill_to_mmx reg u64 qp np) -> reg u64
2625
{
2726
reg u64 r;
28-
stack u64 qps;
2927
reg u64[4] q n;
3028

3129
_ = #init_msf();

‎src/crypto_sign/dilithium/common/amd64/avx2/expandA.jinc

-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ fn expandA_chunk(
109109

110110
stack u64[4] coeffs_filled;
111111
stack u64[4] xof_offset;
112-
reg u64 lane;
113112

114113
reg u256 v256 v256_zero;
115114
reg u64 v64;

‎src/crypto_sign/dilithium/common/amd64/avx2/expandA_end.jinc

-4
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ fn expandA_aligned(stack u8[32] rho) -> stack u32[Li2_k * Li2_l * Li2_polydeg]
88
stack u32[Li2_k * Li2_l * Li2_polydeg] matrix;
99

1010
stack u64[4] nonces;
11-
stack u64[4] coeffs_left;
12-
stack u64[4] xof_bytes_left;
1311

1412
inline int row col chunk idx lane;
1513

@@ -62,8 +60,6 @@ fn expandA_unaligned2(stack u8[32] rho) -> stack u32[Li2_k * Li2_l * Li2_polydeg
6260
stack u32[Li2_polydeg] scratch0 scratch1;
6361

6462
stack u64[4] nonces;
65-
stack u64[4] coeffs_left;
66-
stack u64[4] xof_bytes_left;
6763

6864
inline int row col chunk idx lane;
6965

‎src/crypto_sign/dilithium/common/amd64/avx2/expandMask.jinc

-4
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,6 @@ fn expandMask_poly_gamma1_217_4x(
105105
stack u64 y_packed_filled;
106106
stack u64 output_squeeze_counter;
107107
stack u256[25] xof;
108-
stack u64[4] coeffs_filled;
109-
stack u64[4] xof_offset;
110108

111109
reg u64 addr v64;
112110
reg u64 i j;
@@ -182,8 +180,6 @@ fn expandMask_poly_gamma1_219_4x(
182180
stack u64 y_packed_filled;
183181
stack u64 output_squeeze_counter;
184182
stack u256[25] xof;
185-
stack u64[4] coeffs_filled;
186-
stack u64[4] xof_offset;
187183

188184
reg u64 addr v64;
189185
reg u64 i j;

‎src/crypto_sign/dilithium/common/amd64/avx2/expandMask_end.jinc

-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ fn expandMask_buffered(
1313

1414
reg u32 v32;
1515

16-
reg ptr u32[Li2_polydeg] poly;
17-
1816
?{}, polys_generated = #set0_64();
1917
while (polys_generated < Li2_l) {
2018
if buffer_offset >= 4 {

‎src/crypto_sign/dilithium/common/amd64/avx2/ntt.jinc

+2-5
Original file line numberDiff line numberDiff line change
@@ -217,9 +217,7 @@ fn ntt_levels0t1(reg ptr u32[256] poly_ptr, reg u256 q, inline int offset)
217217
// TODO: Interleave loads/stores with arithmetic ops
218218

219219
reg u256 zeta_qinv zeta;
220-
reg u256 poly0 poly1 poly2 poly3 poly4 poly5 poly6 poly7 poly8;
221-
222-
inline int ii;
220+
reg u256 poly0 poly1 poly2 poly3 poly4 poly5 poly6 poly7;
223221

224222
poly0 = #VMOVDQU_256(poly_ptr.[u256 (32 * (0*4 + offset))]);
225223
poly1 = #VMOVDQU_256(poly_ptr.[u256 (32 * (1*4 + offset))]);
@@ -267,8 +265,7 @@ fn ntt_levels2t7(reg ptr u32[256] poly_ptr, reg u256 q, inline int offset)
267265
// TODO: Interleave shuffles with butterflies
268266

269267
reg u256 zeta_qinv0 zeta_qinv1 zeta0 zeta1;
270-
reg u256[8] poly;
271-
reg u256 poly0 poly1 poly2 poly3 poly4 poly5 poly6 poly7 poly8 polyx;
268+
reg u256 poly0 poly1 poly2 poly3 poly4 poly5 poly6 poly7 polyx;
272269

273270
poly0 = #VMOVDQU_256(poly_ptr.[u256 32 * (8*offset + 0)]);
274271
poly1 = #VMOVDQU_256(poly_ptr.[u256 32 * (8*offset + 1)]);

‎src/crypto_sign/dilithium/common/amd64/expandS.jinc

+2-5
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ fn expandSEta2_poly(stack u8[64] rho_prime, reg u16 elem_idx, reg ptr u32[Li2_po
1212

1313
// temps
1414
reg u64 i;
15-
reg u64 addr;
1615

1716
reg u8 c;
1817
reg u32 c32 t0 t1;
@@ -89,10 +88,8 @@ fn expandSEta4_poly(stack u8[64] rho_prime, reg u16 elem_idx, reg ptr u32[Li2_po
8988

9089
// temps
9190
reg u64 i;
92-
reg u8 c1 c2;
93-
reg u32 u32_c1;
91+
reg u8 c1;
9492
reg u32 v;
95-
reg u64 addr;
9693

9794
reg u8 c;
9895
reg u32 c32;
@@ -144,4 +141,4 @@ fn expandSEta4_poly(stack u8[64] rho_prime, reg u16 elem_idx, reg ptr u32[Li2_po
144141
}
145142
}
146143
return poly;
147-
}
144+
}

‎src/crypto_sign/dilithium/common/amd64/fips202.jinc

-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@ u64[24] roundconstants = {0x0000000000000001, 0x0000000000008082, 0x800000000000
126126
0x8000000080008081, 0x8000000000008080, 0x0000000080000001, 0x8000000080008008};
127127

128128
fn __keccakf1600_ref(reg ptr u64[25] state) -> reg ptr u64[25] {
129-
inline int round;
130129
reg ptr u64[24] constptr;
131130

132131
reg u64 rctr;

0 commit comments

Comments
 (0)