mlkem786: merge add

tfaoliveira · tfaoliveira · commit 37c95022caaf · 2024-02-07T16:37:43.000+01:00
diff --git a/src/crypto_kem/mlkem/mlkem768/amd64/avx2/kem.jinc b/src/crypto_kem/mlkem/mlkem768/amd64/avx2/kem.jinc
@@ -106,9 +106,8 @@ fn __crypto_kem_dec_jazz(reg u64 shkp, reg u64 ctp, reg u64 skp)
 
   buf[0:MLKEM_INDCPA_MSGBYTES] = __indcpa_dec_1(buf[0:MLKEM_INDCPA_MSGBYTES], ctp, skp);
 
-  //hp = #LEA(skp + 32);
-  hp = skp; hp += 32;
-  hp += 24 * MLKEM_K * MLKEM_N>>3;
+  hp = skp;
+  hp += 32 + (24 * MLKEM_K * MLKEM_N>>3);
 
   /* fixme: should loads be 256-bits long? */
   for i=0 to MLKEM_SYMBYTES/8
diff --git a/src/crypto_kem/mlkem/mlkem768/amd64/ref/kem.jinc b/src/crypto_kem/mlkem/mlkem768/amd64/ref/kem.jinc
@@ -107,9 +107,8 @@ fn __crypto_kem_dec_jazz(reg u64 shkp, reg u64 ctp, reg u64 skp)
 
   buf[0:MLKEM_MSGBYTES] = __indcpa_dec(buf[0:MLKEM_MSGBYTES], ctp, skp);
 
-  //hp = #LEA(skp + 32);
-  hp = skp; hp += 32;
-  hp += 24 * MLKEM_K * MLKEM_N>>3;
+  hp = skp;
+  hp += 32 + (24 * MLKEM_K * MLKEM_N>>3);
 
   for i=0 to MLKEM_SYMBYTES/8
   {

Original file line number	Diff line number	Diff line change
`@@ -107,9 +107,8 @@ fn __crypto_kem_dec_jazz(reg u64 shkp, reg u64 ctp, reg u64 skp)`
`107`	`107`
`108`	`108`	`buf[0:MLKEM_MSGBYTES] = __indcpa_dec(buf[0:MLKEM_MSGBYTES], ctp, skp);`
`109`	`109`
`110`		`- //hp = #LEA(skp + 32);`
`111`		`- hp = skp; hp += 32;`
`112`		`- hp += 24 * MLKEM_K * MLKEM_N>>3;`
	`110`	`+ hp = skp;`
	`111`	`+ hp += 32 + (24 * MLKEM_K * MLKEM_N>>3);`
`113`	`112`
`114`	`113`	`for i=0 to MLKEM_SYMBYTES/8`
`115`	`114`	`{`