Skip to content

Minor cleaning in annotations #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vbgl merged 6 commits into from
Nov 24, 2025
Merged

Minor cleaning in annotations #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f882c32
Add brackets around #[msf] annotations
vbgl Nov 21, 2025
7ca2cdb
Add brackets around #[spill_to_mmx] annotations
vbgl Nov 21, 2025
c8e3b7a
Add brackets around #[mmx] annotations
vbgl Nov 21, 2025
293b483
Remove legacy #[bounded] annotations
vbgl Nov 21, 2025
be02508
Remove legacy #[returnaddress=stack] annotations
vbgl Nov 21, 2025
28da4aa
Remove legacy #[no_termination_check] annotations
vbgl Nov 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions oldsrc-should-delete/common/keccak/common/fips202_4x_DIRTY.jinc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ from Jade require "common/keccak/common/fips202_params.jinc"

u256 SHAKE_SEP = (4u64)[0x8000000000000000, 0x8000000000000000, 0x8000000000000000, 0x8000000000000000];

#[returnaddress="stack"]
fn _shake128_absorb4x_34(reg ptr u256[25] s, reg ptr u8[34] m0 m1 m2 m3) -> reg ptr u256[25]
{
inline int i;
Expand Down Expand Up @@ -52,7 +51,6 @@ fn _shake128_absorb4x_34(reg ptr u256[25] s, reg ptr u8[34] m0 m1 m2 m3) -> reg
}


#[returnaddress="stack"]
fn _shake256_absorb4x_33(reg ptr u256[25] s, reg ptr u8[33] m0 m1 m2 m3) -> reg ptr u256[25]
{
inline int i;
Expand Down
7 changes: 0 additions & 7 deletions oldsrc-should-delete/common/keccak/common/fips202_DIRTY.jinc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ from Jade require "common/keccak/keccak1600/amd64/avx2/keccak1600_nomsf.jinc"
from Jade require "common/keccak/keccak1600/amd64/avx2/keccakf1600_nomsf.jinc"
require "fips202_params.jinc"

#[returnaddress="stack"]
fn _sha3_256(reg ptr u8[32] out, reg u64 in inlen) -> reg ptr u8[32]
{
reg u256[7] state;
Expand Down Expand Up @@ -35,7 +34,6 @@ fn _sha3_256(reg ptr u8[32] out, reg u64 in inlen) -> reg ptr u8[32]
}


#[returnaddress="stack"]
fn _sha3_256_32(reg ptr u8[32] out, reg ptr u8[KYBER_SYMBYTES] in) -> reg ptr u8[32]
{
reg u256[7] state;
Expand Down Expand Up @@ -82,7 +80,6 @@ fn _sha3_256_32(reg ptr u8[32] out, reg ptr u8[KYBER_SYMBYTES] in) -> reg ptr u8
return out;
}

#[returnaddress="stack"]
fn _sha3_256_134(reg ptr u8[32] out, reg ptr u8[134] in) -> reg ptr u8[32]
{
reg u256[7] state;
Expand Down Expand Up @@ -140,7 +137,6 @@ fn _sha3_256_134(reg ptr u8[32] out, reg ptr u8[134] in) -> reg ptr u8[32]
return out;
}

#[returnaddress="stack"]
fn _shake256_64(reg u64 out outlen, reg const ptr u8[64] in)
{
reg u256[7] state;
Expand Down Expand Up @@ -180,7 +176,6 @@ fn _shake256_64(reg u64 out outlen, reg const ptr u8[64] in)
}


#[returnaddress="stack"]
fn _shake256_128_33(reg ptr u8[128] out, reg const ptr u8[33] in) -> reg ptr u8[128]
{
reg u256[7] state;
Expand Down Expand Up @@ -234,7 +229,6 @@ fn _shake256_128_33(reg ptr u8[128] out, reg const ptr u8[33] in) -> reg ptr u8[
return out;
}

#[returnaddress="stack"]
fn _sha3_512_64(reg ptr u8[64] out, reg const ptr u8[64] in) -> reg ptr u8[64]
{
reg u256[7] state;
Expand Down Expand Up @@ -283,7 +277,6 @@ fn _sha3_512_64(reg ptr u8[64] out, reg const ptr u8[64] in) -> reg ptr u8[64]
return out;
}

#[returnaddress="stack"]
fn _sha3_512_32(reg ptr u8[64] out, reg const ptr u8[32] in) -> reg ptr u8[64]
{
reg u256[7] state;
Expand Down
11 changes: 0 additions & 11 deletions oldsrc-should-delete/common/keccak/common/fips202_ref_DIRTY.jinc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
require "fips202_params.jinc"
from Jade require "common/keccak/keccak1600/amd64/ref1/keccak1600.jinc"

#[returnaddress="stack"]
fn _shake256_128_33(reg ptr u8[128] out, reg const ptr u8[33] in) -> reg ptr u8[128]
{
stack ptr u8[128] s_out;
Expand Down Expand Up @@ -33,7 +32,6 @@ fn _shake256_128_33(reg ptr u8[128] out, reg const ptr u8[33] in) -> reg ptr u8[
return out;
}

#[returnaddress="stack"]
fn _shake256_192_33(reg ptr u8[192] out, reg const ptr u8[33] in) -> reg ptr u8[192]
{
stack ptr u8[192] s_out;
Expand Down Expand Up @@ -77,7 +75,6 @@ fn _shake256_192_33(reg ptr u8[192] out, reg const ptr u8[33] in) -> reg ptr u8[
return out;
}

#[returnaddress="stack"]
fn _sha3_512_32(reg ptr u8[64] out, reg const ptr u8[32] in) -> reg ptr u8[64]
{
stack ptr u8[64] s_out;
Expand Down Expand Up @@ -109,7 +106,6 @@ fn _sha3_512_32(reg ptr u8[64] out, reg const ptr u8[32] in) -> reg ptr u8[64]
return out;
}

#[returnaddress="stack"]
fn _shake128_absorb34(reg ptr u64[25] state, reg const ptr u8[34] in) -> reg ptr u64[25]
{
reg u8 c;
Expand All @@ -127,7 +123,6 @@ fn _shake128_absorb34(reg ptr u64[25] state, reg const ptr u8[34] in) -> reg ptr
return state;
}

#[returnaddress="stack"]
fn _shake128_squeezeblock(reg ptr u64[25] state, reg ptr u8[SHAKE128_RATE] out) -> reg ptr u64[25], reg ptr u8[SHAKE128_RATE]
{
stack ptr u8[SHAKE128_RATE] s_out;
Expand All @@ -148,7 +143,6 @@ fn _shake128_squeezeblock(reg ptr u64[25] state, reg ptr u8[SHAKE128_RATE] out)
return state, out;
}

#[returnaddress="stack"]
fn _sha3_256(reg ptr u8[32] out, reg u64 in inlen) -> reg ptr u8[32]
{
stack u64[25] _state;
Expand All @@ -167,7 +161,6 @@ fn _sha3_256(reg ptr u8[32] out, reg u64 in inlen) -> reg ptr u8[32]
r8 = SHA3_256_RATE;
ilen = inlen;

#bounded
while(ilen >= r8)
{
state, in, ilen = __add_full_block_ref1(state, in, ilen, r8);
Expand Down Expand Up @@ -199,7 +192,6 @@ fn _sha3_256(reg ptr u8[32] out, reg u64 in inlen) -> reg ptr u8[32]
return out;
}

#[returnaddress="stack"]
fn _sha3_256_32(reg ptr u8[32] out, reg ptr u8[KYBER_SYMBYTES] in) -> reg ptr u8[32]
{
stack u64[25] _state;
Expand Down Expand Up @@ -236,7 +228,6 @@ fn _sha3_256_32(reg ptr u8[32] out, reg ptr u8[KYBER_SYMBYTES] in) -> reg ptr u8
}


#[returnaddress="stack"]
fn _sha3_256_134(reg ptr u8[32] out, reg ptr u8[134] in) -> reg ptr u8[32]
{
stack u64[25] state;
Expand Down Expand Up @@ -269,7 +260,6 @@ fn _sha3_256_134(reg ptr u8[32] out, reg ptr u8[134] in) -> reg ptr u8[32]
return out;
}

#[returnaddress="stack"]
fn _sha3_512_64(reg ptr u8[64] out, reg const ptr u8[64] in) -> reg ptr u8[64]
{
stack u64[25] _state;
Expand Down Expand Up @@ -305,7 +295,6 @@ fn _sha3_512_64(reg ptr u8[64] out, reg const ptr u8[64] in) -> reg ptr u8[64]
return out;
}

#[returnaddress="stack"]
fn _shake256_64(reg u64 out outlen, reg const ptr u8[64] in)
{
reg u64 t64 j;
Expand Down
24 changes: 12 additions & 12 deletions oldsrc-should-delete/common/keccak/keccak1600/amd64/avx2/keccak1600.jinc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ inline fn __add_full_block_avx2(
reg ptr u64[25] a_jagged_p,
reg u64 in inlen,
reg u64 rate,
#msf reg u64 ms
) -> reg u256[7], stack u64[28], reg u64, reg u64, #msf reg u64
#[msf] reg u64 ms
) -> reg u256[7], stack u64[28], reg u64, reg u64, #[msf] reg u64
{

inline int i;
Expand Down Expand Up @@ -84,8 +84,8 @@ inline fn __add_final_block_avx2(
reg u64 in inlen,
reg u8 trail_byte,
reg u64 rate,
#msf reg u64 ms
) -> reg u256[7], #msf reg u64
#[msf] reg u64 ms
) -> reg u256[7], #[msf] reg u64
{
inline int i;
reg u64 j l t inlen8;
Expand Down Expand Up @@ -158,8 +158,8 @@ inline fn __xtr_full_block_avx2(
reg ptr u64[25] a_jagged_p,
reg u64 out,
reg u64 len,
#msf reg u64 ms
) -> reg u64, #msf reg u64
#[msf] reg u64 ms
) -> reg u64, #[msf] reg u64
{
inline int i;
stack u64[28] s_state;
Expand Down Expand Up @@ -197,7 +197,7 @@ inline fn __xtr_bytes_avx2(
reg ptr u64[25] a_jagged_p,
reg u64 out,
reg u64 len,
#msf reg u64 ms
#[msf] reg u64 ms
) -> reg u64
{
inline int i;
Expand Down Expand Up @@ -250,8 +250,8 @@ inline fn __absorb_avx2(
reg u64 in inlen,
reg u8 trail_byte,
reg u64 rate,
#msf reg u64 ms
) -> reg u256[7], #msf reg u64
#[msf] reg u64 ms
) -> reg u256[7], #[msf] reg u64
{
stack u64[28] s_state;
reg ptr u64[25] a_jagged_p;
Expand All @@ -278,7 +278,7 @@ inline fn __absorb_avx2(
}


inline fn __squeeze_avx2(reg u256[7] state, reg u64 out outlen rate, #msf reg u64 ms)
inline fn __squeeze_avx2(reg u256[7] state, reg u64 out outlen rate, #[msf] reg u64 ms)
{
reg ptr u64[25] a_jagged_p;
reg bool loop_condition;
Expand All @@ -301,7 +301,7 @@ inline fn __squeeze_avx2(reg u256[7] state, reg u64 out outlen rate, #msf reg u6
}


inline fn __keccak1600_avx2(reg u64 out outlen in inlen, reg u8 trail_byte, reg u64 rate, #msf reg u64 ms)
inline fn __keccak1600_avx2(reg u64 out outlen in inlen, reg u8 trail_byte, reg u64 rate, #[msf] reg u64 ms)
{
reg u256[7] state;

Expand All @@ -315,7 +315,7 @@ inline fn __keccak1600_avx2(reg u64 out outlen in inlen, reg u8 trail_byte, reg
}


fn _keccak1600_avx2(reg u64 out outlen in inlen, reg u8 trail_byte, reg u64 rate, #msf reg u64 ms)
fn _keccak1600_avx2(reg u64 out outlen in inlen, reg u8 trail_byte, reg u64 rate, #[msf] reg u64 ms)
{
__keccak1600_avx2(out, outlen, in, inlen, trail_byte, rate, ms);
}
Expand Down
2 changes: 1 addition & 1 deletion oldsrc-should-delete/common/keccak/keccak1600/amd64/avx2/keccakf1600.jinc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ u64[25] KECCAK_A_JAGGED =
};


inline fn __keccakf1600_avx2(reg u256[7] state, #msf reg u64 ms) -> reg u256[7], #msf reg u64
inline fn __keccakf1600_avx2(reg u256[7] state, #[msf] reg u64 ms) -> reg u256[7], #[msf] reg u64
{
reg u256[9] t;
reg u256 c00 c14 d00 d14;
Expand Down
1 change: 0 additions & 1 deletion oldsrc-should-delete/common/keccak/keccak1600/amd64/avx2/keccakf1600_4x.jinc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,6 @@ inline fn __keccakf1600_4x_avx2(reg ptr u256[25] a) -> reg ptr u256[25]
return a;
}

#[returnaddress="stack"]
fn _keccakf1600_4x_avx2(reg ptr u256[25] a) -> reg ptr u256[25]
{
a = __keccakf1600_4x_avx2(a);
Expand Down
9 changes: 4 additions & 5 deletions oldsrc-should-delete/common/keccak/keccak1600/amd64/bmi1/keccak1600.jinc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ inline fn __absorb_bmi1(
reg u64 rate // rate already in bytes -- it is returned bc of spills
) -> reg ptr u64[25], reg u64
{
#mmx reg u64 s_in s_inlen s_rate;
#[mmx] reg u64 s_in s_inlen s_rate;
reg u8 trail_byte;

// intermediate blocks
Expand Down Expand Up @@ -174,13 +174,13 @@ inline fn __xtr_bytes_bmi1(

inline fn __squeeze_bmi1(
reg mut ptr u64[25] state,
#mmx reg u64 s_out,
#[mmx] reg u64 s_out,
reg u64 outlen,
reg u64 rate
)
{
reg u64 out;
#mmx reg u64 s_outlen s_rate;
#[mmx] reg u64 s_outlen s_rate;

// intermediate blocks
while ( outlen > rate )
Expand Down Expand Up @@ -213,7 +213,7 @@ inline fn __keccak1600_bmi1(reg u64 out outlen in inlen, reg u8 trail_byte, reg
{
stack u64[25] _state;
reg ptr u64[25] state;
#mmx reg u64 s_out s_outlen;
#[mmx] reg u64 s_out s_outlen;
stack u8 s_trail_byte;

s_out = out;
Expand All @@ -232,7 +232,6 @@ inline fn __keccak1600_bmi1(reg u64 out outlen in inlen, reg u8 trail_byte, reg
}


#[returnaddress="stack"]
fn _keccak1600_bmi1(reg u64 out outlen in inlen, reg u8 trail_byte, reg u64 rate)
{
__keccak1600_bmi1(out, outlen, in, inlen, trail_byte, rate);
Expand Down
3 changes: 1 addition & 2 deletions oldsrc-should-delete/common/keccak/keccak1600/amd64/bmi1/keccakf1600.jinc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ inline fn __round_bmi1(reg ptr u64[25] e a, reg u64 rc) -> reg ptr u64[25]
inline fn __keccakf1600_bmi1(reg ptr u64[25] a) -> reg ptr u64[25]
{
reg ptr u64[24] RC;
#mmx reg ptr u64[24] s_RC;
#[mmx] reg ptr u64[24] s_RC;
stack u64[25] s_e;
reg ptr u64[25] e;
reg u64 c rc;
Expand All @@ -156,7 +156,6 @@ inline fn __keccakf1600_bmi1(reg ptr u64[25] a) -> reg ptr u64[25]
}


#[returnaddress="stack"]
fn _keccakf1600_bmi1(reg ptr u64[25] a) -> reg ptr u64[25]
{
a = __keccakf1600_bmi1(a);
Expand Down
8 changes: 4 additions & 4 deletions oldsrc-should-delete/common/keccak/keccak1600/amd64/ref/keccak1600.jinc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ inline fn __absorb_ref(
reg u64 rate // rate already in bytes -- it is returned bc of spills
) -> stack u64[25], reg u64
{
#mmx reg u64 s_in s_inlen s_rate;
#[mmx] reg u64 s_in s_inlen s_rate;
reg u8 trail_byte;

// intermediate blocks
Expand Down Expand Up @@ -171,13 +171,13 @@ inline fn __xtr_bytes_ref(

inline fn __squeeze_ref(
stack u64[25] state,
#mmx reg u64 s_out,
#[mmx] reg u64 s_out,
reg u64 outlen,
reg u64 rate
)
{
reg u64 out;
#mmx reg u64 s_outlen s_rate;
#[mmx] reg u64 s_outlen s_rate;

// intermediate blocks
while ( outlen > rate )
Expand Down Expand Up @@ -205,7 +205,7 @@ inline fn __squeeze_ref(
inline fn __keccak1600_ref(reg u64 out outlen in inlen, reg u8 trail_byte, reg u64 rate)
{
stack u64[25] state;
#mmx reg u64 s_out s_outlen;
#[mmx] reg u64 s_out s_outlen;
stack u8 s_trail_byte;

s_out = out;
Expand Down
9 changes: 4 additions & 5 deletions oldsrc-should-delete/common/keccak/keccak1600/amd64/ref1/keccak1600.jinc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ inline fn __absorb_ref1(
reg u64 rate // rate already in bytes -- it is returned bc of spills
) -> reg ptr u64[25], reg u64
{
#mmx reg u64 s_in s_inlen s_rate;
#[mmx] reg u64 s_in s_inlen s_rate;
reg u8 trail_byte;

// intermediate blocks
Expand Down Expand Up @@ -173,13 +173,13 @@ inline fn __xtr_bytes_ref1(

inline fn __squeeze_ref1(
reg mut ptr u64[25] state,
#mmx reg u64 s_out,
#[mmx] reg u64 s_out,
reg u64 outlen,
reg u64 rate
)
{
reg u64 out;
#mmx reg u64 s_outlen s_rate;
#[mmx] reg u64 s_outlen s_rate;

// intermediate blocks
while ( outlen > rate )
Expand Down Expand Up @@ -212,7 +212,7 @@ inline fn __keccak1600_ref1(reg u64 out outlen in inlen, reg u8 trail_byte, reg
{
stack u64[25] _state;
reg ptr u64[25] state;
#mmx reg u64 s_out s_outlen;
#[mmx] reg u64 s_out s_outlen;
stack u8 s_trail_byte;

s_out = out;
Expand All @@ -231,7 +231,6 @@ inline fn __keccak1600_ref1(reg u64 out outlen in inlen, reg u8 trail_byte, reg
}


#[returnaddress="stack"]
fn _keccak1600_ref1(reg u64 out outlen in inlen, reg u8 trail_byte, reg u64 rate)
{
__keccak1600_ref1(out, outlen, in, inlen, trail_byte, rate);
Expand Down
1 change: 0 additions & 1 deletion oldsrc-should-delete/common/keccak/keccak1600/amd64/ref1/keccakf1600.jinc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,6 @@ inline fn __keccakf1600_ref1(reg ptr u64[25] a) -> reg ptr u64[25]
}


#[returnaddress="stack"]
fn _keccakf1600_ref1(reg ptr u64[25] a) -> reg ptr u64[25]
{
a = __keccakf1600_ref1(a);
Expand Down
Loading
Loading