fix issues introduced after rebase

Avaneesh-axiom · Avaneesh-axiom · commit 6f58570f5eab · 2025-01-29T14:24:46.000-05:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -57,8 +57,8 @@ members = [
     "extensions/ecc/circuit",
     "extensions/ecc/transpiler",
     "extensions/ecc/guest",
-    "extensions/ecc/sw-setup",
-    "extensions/ecc/te-setup",
+    "extensions/ecc/sw-macros",
+    "extensions/ecc/te-macros",
     "extensions/ecc/tests",
     "extensions/pairing/circuit",
     "extensions/pairing/transpiler",
@@ -155,8 +155,8 @@ openvm-algebra-complex-macros = { path = "extensions/algebra/complex-macros", de
 openvm-ecc-circuit = { path = "extensions/ecc/circuit", default-features = false }
 openvm-ecc-transpiler = { path = "extensions/ecc/transpiler", default-features = false }
 openvm-ecc-guest = { path = "extensions/ecc/guest", default-features = false }
-openvm-ecc-sw-setup = { path = "extensions/ecc/sw-setup", default-features = false }
-openvm-ecc-te-setup = { path = "extensions/ecc/te-setup", default-features = false }
+openvm-ecc-sw-macros = { path = "extensions/ecc/sw-macros", default-features = false }
+openvm-ecc-te-macros = { path = "extensions/ecc/te-macros", default-features = false }
 openvm-pairing-circuit = { path = "extensions/pairing/circuit", default-features = false }
 openvm-pairing-transpiler = { path = "extensions/pairing/transpiler", default-features = false }
 openvm-pairing-guest = { path = "extensions/pairing/guest", default-features = false }
diff --git a/extensions/ecc/guest/Cargo.toml b/extensions/ecc/guest/Cargo.toml
@@ -22,7 +22,7 @@ openvm-rv32im-guest = { workspace = true }
 openvm-algebra-guest = { workspace = true }
 openvm-ecc-sw-macros = { workspace = true }
 openvm-ecc-te-macros = { workspace = true }
-openvm-algebra-moduli-setup = { workspace = true }
+openvm-algebra-moduli-macros = { workspace = true }
 num-bigint = { workspace = true }
 
 # Used for `halo2curves` feature
diff --git a/extensions/ecc/guest/src/ed25519.rs b/extensions/ecc/guest/src/ed25519.rs
@@ -24,7 +24,7 @@ lazy_static! {
     ));
 }
 
-openvm_algebra_moduli_setup::moduli_declare! {
+openvm_algebra_moduli_macros::moduli_declare! {
     Ed25519Coord { modulus = "0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFED" },
     Ed25519Scalar { modulus = "0x1000000000000000000000000000000014DEF9DEA2F79CD65812631A5CF5D3ED" },
 }
@@ -40,7 +40,7 @@ pub const CURVE_D: Ed25519Coord = Ed25519Coord::from_const_bytes(hex!(
     "A3785913CA4DEB75ABD841414D0A700098E879777940C78C73FE6F2BEE6C0352"
 ));
 
-openvm_ecc_te_setup::te_declare! {
+openvm_ecc_te_macros::te_declare! {
     Ed25519Point { mod_type = Ed25519Coord, a = CURVE_A, d = CURVE_D },
 }
 
diff --git a/extensions/ecc/sw-macros/src/lib.rs b/extensions/ecc/sw-macros/src/lib.rs
@@ -306,7 +306,7 @@ pub fn sw_declare(input: TokenStream) -> TokenStream {
                         }
                         #[cfg(target_os = "zkvm")]
                         {
-                            use openvm::platform as openvm_platform; // needed for hint_store_u32!
+                            use openvm::platform as openvm_platform; // needed for hint_buffer_u32!
 
                             let y = core::mem::MaybeUninit::<#intmod_type>::uninit();
                             unsafe {
diff --git a/extensions/ecc/te-macros/Cargo.toml b/extensions/ecc/te-macros/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "openvm-ecc-te-setup"
+name = "openvm-ecc-te-macros"
 version.workspace = true
 authors.workspace = true
 edition.workspace = true
diff --git a/extensions/ecc/te-macros/src/lib.rs b/extensions/ecc/te-macros/src/lib.rs
@@ -223,17 +223,13 @@ pub fn te_declare(input: TokenStream) -> TokenStream {
                         }
                         #[cfg(target_os = "zkvm")]
                         {
-                            use openvm::platform as openvm_platform; // needed for hint_store_u32!
+                            use openvm::platform as openvm_platform; // needed for hint_buffer_u32!
 
                             let x = core::mem::MaybeUninit::<#intmod_type>::uninit();
                             unsafe {
                                 #te_hint_decompress_extern_func(y as *const _ as usize, rec_id as *const u8 as usize);
-                                let mut ptr = x.as_ptr() as *const u8;
-                                // NOTE[jpw]: this loop could be unrolled using seq_macro and hint_store_u32(ptr, $imm)
-                                for _ in (0..<#intmod_type as openvm_algebra_guest::IntMod>::NUM_LIMBS).step_by(4) {
-                                    openvm_rv32im_guest::hint_store_u32!(ptr, 0);
-                                    ptr = ptr.add(4);
-                                }
+                                let ptr = x.as_ptr() as *const u8;
+                                openvm_rv32im_guest::hint_buffer_u32!(ptr, <#intmod_type as openvm_algebra_guest::IntMod>::NUM_LIMBS / 4);
                                 x.assume_init()
                             }
                         }
diff --git a/extensions/ecc/tests/programs/examples/decompress.rs b/extensions/ecc/tests/programs/examples/decompress.rs
@@ -20,7 +20,7 @@ openvm_ecc_sw_macros::sw_init! {
     Secp256k1Point,
 }
 
-openvm_ecc_te_setup::te_init! {
+openvm_ecc_te_macros::te_init! {
     Ed25519Point,
 }
 
diff --git a/extensions/ecc/tests/programs/examples/edwards_ec.rs b/extensions/ecc/tests/programs/examples/edwards_ec.rs
@@ -2,11 +2,11 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 use hex_literal::hex;
-use openvm_algebra_guest::{moduli_setup::moduli_init, IntMod};
+use openvm_algebra_guest::{moduli_macros::moduli_init, IntMod};
 use openvm_ecc_guest::{
     ed25519::{Ed25519Coord, Ed25519Point},
     edwards::TwistedEdwardsPoint,
-    te_setup::te_init,
+    te_macros::te_init,
     CyclicGroup, Group,
 };
 
diff --git a/extensions/ecc/transpiler/src/lib.rs b/extensions/ecc/transpiler/src/lib.rs
@@ -105,7 +105,7 @@ impl EccTranspilerExtension {
                     _ => unimplemented!(),
                 };
                 let global_opcode = global_opcode.as_usize() + curve_idx_shift;
-                Some(from_r_type(global_opcode, 2, &dec_insn))
+                Some(from_r_type(global_opcode, 2, &dec_insn, true))
             }
         };
         instruction.map(TranspilerOutput::one_to_one)

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ lazy_static! {`
`24`	`24`	`));`
`25`	`25`	`}`
`26`	`26`
`27`		`-openvm_algebra_moduli_setup::moduli_declare! {`
	`27`	`+openvm_algebra_moduli_macros::moduli_declare! {`
`28`	`28`	`Ed25519Coord { modulus = "0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFED" },`
`29`	`29`	`Ed25519Scalar { modulus = "0x1000000000000000000000000000000014DEF9DEA2F79CD65812631A5CF5D3ED" },`
`30`	`30`	`}`
`@@ -40,7 +40,7 @@ pub const CURVE_D: Ed25519Coord = Ed25519Coord::from_const_bytes(hex!(`
`40`	`40`	`"A3785913CA4DEB75ABD841414D0A700098E879777940C78C73FE6F2BEE6C0352"`
`41`	`41`	`));`
`42`	`42`
`43`		`-openvm_ecc_te_setup::te_declare! {`
	`43`	`+openvm_ecc_te_macros::te_declare! {`
`44`	`44`	`Ed25519Point { mod_type = Ed25519Coord, a = CURVE_A, d = CURVE_D },`
`45`	`45`	`}`
`46`	`46`
Original file line number	Diff line number	Diff line change
`@@ -306,7 +306,7 @@ pub fn sw_declare(input: TokenStream) -> TokenStream {`
`306`	`306`	`}`
`307`	`307`	`#[cfg(target_os = "zkvm")]`
`308`	`308`	`{`
`309`		`- use openvm::platform as openvm_platform; // needed for hint_store_u32!`
	`309`	`+ use openvm::platform as openvm_platform; // needed for hint_buffer_u32!`
`310`	`310`
`311`	`311`	`let y = core::mem::MaybeUninit::<#intmod_type>::uninit();`
`312`	`312`	`unsafe {`
Original file line number	Diff line number	Diff line change
`@@ -223,17 +223,13 @@ pub fn te_declare(input: TokenStream) -> TokenStream {`
`223`	`223`	`}`
`224`	`224`	`#[cfg(target_os = "zkvm")]`
`225`	`225`	`{`
`226`		`- use openvm::platform as openvm_platform; // needed for hint_store_u32!`
	`226`	`+ use openvm::platform as openvm_platform; // needed for hint_buffer_u32!`
`227`	`227`
`228`	`228`	`let x = core::mem::MaybeUninit::<#intmod_type>::uninit();`
`229`	`229`	`unsafe {`
`230`	`230`	`#te_hint_decompress_extern_func(y as const _ as usize, rec_id as const u8 as usize);`
`231`		`- let mut ptr = x.as_ptr() as *const u8;`
`232`		`- // NOTE[jpw]: this loop could be unrolled using seq_macro and hint_store_u32(ptr, $imm)`
`233`		`- for _ in (0..<#intmod_type as openvm_algebra_guest::IntMod>::NUM_LIMBS).step_by(4) {`
`234`		`- openvm_rv32im_guest::hint_store_u32!(ptr, 0);`
`235`		`- ptr = ptr.add(4);`
`236`		`- }`
	`231`	`+ let ptr = x.as_ptr() as *const u8;`
	`232`	`+ openvm_rv32im_guest::hint_buffer_u32!(ptr, <#intmod_type as openvm_algebra_guest::IntMod>::NUM_LIMBS / 4);`
`237`	`233`	`x.assume_init()`
`238`	`234`	`}`
`239`	`235`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ openvm_ecc_sw_macros::sw_init! {`
`20`	`20`	`Secp256k1Point,`
`21`	`21`	`}`
`22`	`22`
`23`		`-openvm_ecc_te_setup::te_init! {`
	`23`	`+openvm_ecc_te_macros::te_init! {`
`24`	`24`	`Ed25519Point,`
`25`	`25`	`}`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ impl EccTranspilerExtension {`
`105`	`105`	`_ => unimplemented!(),`
`106`	`106`	`};`
`107`	`107`	`let global_opcode = global_opcode.as_usize() + curve_idx_shift;`
`108`		`- Some(from_r_type(global_opcode, 2, &dec_insn))`
	`108`	`+ Some(from_r_type(global_opcode, 2, &dec_insn, true))`
`109`	`109`	`}`
`110`	`110`	`};`
`111`	`111`	`instruction.map(TranspilerOutput::one_to_one)`