diff --git a/crypto/src/hash/monolith/mod.rs b/crypto/src/hash/monolith/mod.rs index 240d5418d..acf99284b 100644 --- a/crypto/src/hash/monolith/mod.rs +++ b/crypto/src/hash/monolith/mod.rs @@ -120,8 +120,8 @@ impl MonolithMersenne31> 16) as u16 as usize] as u32) << 16 - | self.lookup1[*state as u16 as usize] as u32; + *state = ((self.lookup2[(*state >> 16) as u16 as usize] as u32) << 16) + | (self.lookup1[*state as u16 as usize] as u32); } } diff --git a/math/benches/fields/mersenne31.rs b/math/benches/fields/mersenne31.rs index e8d99d1c2..f479382ec 100644 --- a/math/benches/fields/mersenne31.rs +++ b/math/benches/fields/mersenne31.rs @@ -15,7 +15,6 @@ pub type Fp2E = FieldElement; pub type Fp4E = FieldElement; #[inline(never)] -#[no_mangle] #[export_name = "util::rand_mersenne31_field_elements"] pub fn rand_field_elements(num: usize) -> Vec<(F, F)> { let mut result = Vec::with_capacity(num); diff --git a/math/benches/fields/mersenne31_montgomery.rs b/math/benches/fields/mersenne31_montgomery.rs index a3298a0d1..a96ddde83 100644 --- a/math/benches/fields/mersenne31_montgomery.rs +++ b/math/benches/fields/mersenne31_montgomery.rs @@ -22,7 +22,6 @@ pub type F = FieldElement; const NUM_LIMBS: usize = 1; #[inline(never)] -#[no_mangle] #[export_name = "util::rand_mersenne31_mont_field_elements"] pub fn rand_field_elements(num: usize) -> Vec<(F, F)> { let mut result = Vec::with_capacity(num); diff --git a/math/benches/fields/stark252.rs b/math/benches/fields/stark252.rs index 39c4ef838..7a16f8ffc 100644 --- a/math/benches/fields/stark252.rs +++ b/math/benches/fields/stark252.rs @@ -21,7 +21,6 @@ use rand::random; pub type F = FieldElement; #[inline(never)] -#[no_mangle] #[export_name = "util::rand_field_elements"] pub fn rand_field_elements(num: usize) -> Vec<(F, F)> { let mut result = Vec::with_capacity(num); diff --git a/math/benches/utils/stark252_utils.rs b/math/benches/utils/stark252_utils.rs index 249da0b85..25cdd3040 100644 --- a/math/benches/utils/stark252_utils.rs +++ b/math/benches/utils/stark252_utils.rs @@ -14,14 +14,12 @@ pub type FE = FieldElement; // NOTE: intentional duplicate to help IAI skip setup code #[inline(never)] -#[no_mangle] #[export_name = "util::bitrev_permute"] pub fn bitrev_permute(input: &mut [FE]) { in_place_bit_reverse_permute(input); } #[inline(never)] -#[no_mangle] #[export_name = "util::rand_field_elements"] pub fn rand_field_elements(order: u64) -> Vec { let mut result = Vec::with_capacity(1 << order); @@ -33,14 +31,12 @@ pub fn rand_field_elements(order: u64) -> Vec { } #[inline(never)] -#[no_mangle] #[export_name = "util::rand_poly"] pub fn rand_poly(order: u64) -> Polynomial { Polynomial::new(&rand_field_elements(order)) } #[inline(never)] -#[no_mangle] #[export_name = "util::get_twiddles"] pub fn twiddles(order: u64, config: RootsConfig) -> Vec { get_twiddles(order, config).unwrap()