fix: stash code

Cargo.toml

@@ -11,7 +11,6 @@ plonky2 = { git = "https://github.com/0xPolygonZero/plonky2", branch = "main", f
 starky = { git = "https://github.com/0xPolygonZero/plonky2", branch = "main" , features = ["timing"] }
 plonky2_util = { git = "https://github.com/0xPolygonZero/plonky2", branch = "main" }
 plonky2_maybe_rayon = { git = "https://github.com/0xPolygonZero/plonky2", branch = "main" }
-#plonky2_u32 = { version = "0.1.0", default-features = false }
 
 itertools = "0.11.0"
 log = { version = "0.4.14", default-features = false }

src/cpu/memio.rs

@@ -44,7 +44,7 @@ fn sign_extend<P: PackedField, const N: usize>(limbs: &mut [P; 32]) {
 }
 
 #[inline]
-fn sign_extend_ext<F: RichField + Extendable<D>, const D: usize, const N: usize>(builder: &mut CircuitBuilder<F, D>, limbs: &mut [ExtensionTarget<D>; 32]) {
+fn sign_extend_ext<F: RichField + Extendable<D>, const D: usize, const N: usize>(_builder: &mut CircuitBuilder<F, D>, limbs: &mut [ExtensionTarget<D>; 32]) {
     for i in N..32 {
         limbs[i] = limbs[N-1];
     }
@@ -82,12 +82,13 @@ fn eval_packed_load<P: PackedField>(
     // Calculate rs:
     //    let virt_raw = (rs as u32).wrapping_add(sign_extend::<16>(offset));
     let offset = load_offset(lv);
+    println!("offset: {:?}", offset);
     let virt_raw = rs + offset;
 
-    /* FIXME: Constrain rs and rt
     let rs_from_bits = limb_from_bits_le(rs_limbs.into_iter());
     yield_constr.constraint(filter * (rs_from_bits - virt_raw));
 
+    /*
     let rt_from_bits = limb_from_bits_le(rt_limbs.into_iter());
     yield_constr.constraint(filter * (rt_from_bits - rt));
 
@@ -308,14 +309,15 @@ fn eval_ext_circuit_load<F: RichField + Extendable<D>, const D: usize>(
     // Calculate rs:
     //    let virt_raw = (rs as u32).wrapping_add(sign_extend::<16>(offset));
     let offset = load_offset_ext(builder, lv);
+    println!("offset ext: {:?}", offset);
     let virt_raw = builder.add_extension(rs, offset);
 
-    /*
     let rs_from_bits = limb_from_bits_le_recursive(builder, rs_limbs.into_iter());
     let diff = builder.sub_extension(rs_from_bits, virt_raw);
     let constr = builder.mul_extension(filter, diff);
     yield_constr.constraint(builder, constr);
 
+    /*
     let rt_from_bits = limb_from_bits_le_recursive(builder, rt_limbs.into_iter());
     let diff = builder.sub_extension(rt_from_bits, rt);
     let constr = builder.mul_extension(filter, diff);