fix return types

formosa-crypto · Feb 18, 2025 · 0d27b59 · 0d27b59
1 parent 7a22f64
commit 0d27b59
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/code/jasmin/mlkem_avx2/poly.jinc b/code/jasmin/mlkem_avx2/poly.jinc
@@ -5,7 +5,7 @@ require "reduce.jinc"
 
 require "mlkem_keccak_avx2.jinc"
 
-fn _poly_add2(reg ptr u16[MLKEM_N] rp bp) -> stack u16[MLKEM_N]
+fn _poly_add2(reg mut ptr u16[MLKEM_N] rp, reg const ptr u16[MLKEM_N] bp) -> reg ptr u16[MLKEM_N]
 {
   inline int i;
   reg u256 a;
@@ -298,7 +298,7 @@ u8[32] pd_jshufbidx = {0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,
 u32 pd_mask_s = 0x00F0000F;
 u32 pd_shift_s = 0x800800;
 
-fn _poly_decompress(reg ptr u16[MLKEM_N] rp, reg u64 ap) -> stack u16[MLKEM_N]
+fn _poly_decompress(reg mut ptr u16[MLKEM_N] rp, reg u64 ap) -> reg ptr u16[MLKEM_N]
 {
   inline int i;
   reg u256 f q shufbidx mask shift;
@@ -437,7 +437,7 @@ u32[4] pfm_shift_s = {3, 2, 1, 0};
 u8[16] pfm_idx_s = {0, 1, 4, 5, 8, 9, 12, 13,
                 2, 3, 6, 7, 10, 11, 14, 15};
 
-fn _poly_frommsg(reg ptr u16[MLKEM_N] rp, reg u64 ap) -> stack u16[MLKEM_N]
+fn _poly_frommsg(reg mut ptr u16[MLKEM_N] rp, reg u64 ap) -> reg ptr u16[MLKEM_N]
 {
   inline int i;
   reg u256 f g0 g1 g2 g3 h0 h1 h2 h3;
@@ -485,7 +485,7 @@ fn _poly_frommsg(reg ptr u16[MLKEM_N] rp, reg u64 ap) -> stack u16[MLKEM_N]
 }
 
 
-fn _poly_frommsg_1(reg ptr u16[MLKEM_N] rp, reg ptr u8[32] ap) -> stack u16[MLKEM_N]
+fn _poly_frommsg_1(reg mut ptr u16[MLKEM_N] rp, reg const ptr u8[32] ap) -> reg ptr u16[MLKEM_N]
 {
   inline int i;
   reg u256 f g0 g1 g2 g3 h0 h1 h2 h3;

diff --git a/code/jasmin/mlkem_avx2_stack/indcpa.jinc b/code/jasmin/mlkem_avx2_stack/indcpa.jinc
@@ -77,7 +77,7 @@ fn __indcpa_keypair(#spill_to_mmx reg ptr u8[MLKEM_PUBLICKEYBYTES] pk, #spill_to
 
 inline
 fn __indcpa_enc(
-  stack u8[MLKEM_CIPHERTEXTBYTES] ct,
+  reg mut ptr u8[MLKEM_CIPHERTEXTBYTES] ct,
   reg ptr u8[MLKEM_INDCPA_MSGBYTES] msgp,
   reg ptr u8[MLKEM_PUBLICKEYBYTES] pk,
   reg ptr u8[MLKEM_SYMBYTES] noiseseed)

diff --git a/code/jasmin/mlkem_avx2_stack/poly.jinc b/code/jasmin/mlkem_avx2_stack/poly.jinc
@@ -48,7 +48,7 @@ fn _i_poly_compress(reg ptr u8[MLKEM_POLYCOMPRESSEDBYTES] rp, reg ptr u16[MLKEM_
 }
 
 
-fn _i_poly_decompress(reg ptr u16[MLKEM_N] rp, reg ptr u8 [MLKEM_POLYCOMPRESSEDBYTES] a) -> stack u16[MLKEM_N]
+fn _i_poly_decompress(reg mut ptr u16[MLKEM_N] rp, reg ptr u8 [MLKEM_POLYCOMPRESSEDBYTES] a) -> reg ptr u16[MLKEM_N]
 {  inline int i;
   reg u256 f q shufbidx mask shift;
   reg u128 h;
@@ -154,7 +154,7 @@ fn _i_poly_frombytes(reg ptr u16[MLKEM_N] rp, reg ptr u8[MLKEM_POLYBYTES] ap) ->
  }
 
 
-fn _i_poly_frommsg(reg ptr u16[MLKEM_N] rp, reg ptr u8[32] ap) -> stack u16[MLKEM_N]
+fn _i_poly_frommsg(reg mut ptr u16[MLKEM_N] rp, reg ptr u8[32] ap) -> reg ptr u16[MLKEM_N]
 {
   inline int i;
   reg u256 f g0 g1 g2 g3 h0 h1 h2 h3;

diff --git a/formosa-keccak b/formosa-keccak
+1 −1		src/amd64/avx2/keccak1600_array_avx2_ASIZE.jinc
+1 −1		src/amd64/avx2/keccak1600_avx2.jinc
+1 −1		src/amd64/avx2/keccak1600_imem_avx2.jinc