review 1 fixed

crates/specs/src/encode/image_table.rs

@@ -1,4 +1,3 @@
-use num_bigint::BigUint;
 use num_bigint::ToBigUint;
 
 use crate::encode::br_table::BR_TABLE_ENCODE_BOUNDARY;
@@ -22,14 +21,8 @@ impl ImageTableEncoder {
         assert!(BR_TABLE_ENCODE_BOUNDARY <= CLASS_SHIFT);
         assert!(INIT_MEMORY_ENCODE_BOUNDARY <= CLASS_SHIFT);
 
-        let tag = if cfg!(feature = "continuation") && *self == ImageTableEncoder::InitMemory {
-            // Memory Initialization Lookup with continuation
-            T::from_bn(&BigUint::zero())
-        } else {
-            T::from_bn(&(*self as u64).to_biguint().unwrap())
-                * T::from_bn(&(1u64.to_biguint().unwrap() << CLASS_SHIFT))
-        };
-
-        tag + data
+        T::from_bn(&(*self as u64).to_biguint().unwrap())
+            * T::from_bn(&(1u64.to_biguint().unwrap() << CLASS_SHIFT))
+            + data
     }
 }

crates/specs/src/encode/init_memory_table.rs

@@ -17,24 +17,24 @@ pub fn encode_init_memory_table_entry<T: FromBn>(
     eid: T,
     value: T,
 ) -> T {
-    const LTYPE_SHIFT: u32 = OFFSET_SHIFT + 32;
+    const LTYPE_SHIFT: u32 = OFFSET_SHIFT + u32::BITS;
     const OFFSET_SHIFT: u32 = IS_MUTABLE_SHIFT + 1;
-    const IS_MUTABLE_SHIFT: u32 = EID_OFFSET_SHIFT + 32;
+    const IS_MUTABLE_SHIFT: u32 = EID_OFFSET_SHIFT + u32::BITS;
     const EID_OFFSET_SHIFT: u32 = VALUE_SHIFT + 64;
     const VALUE_SHIFT: u32 = 0;
 
     assert!(LTYPE_SHIFT + 8 <= INIT_MEMORY_ENCODE_BOUNDARY);
 
+    let encode = is_mutable * T::from_bn(&(1u64.to_biguint().unwrap() << IS_MUTABLE_SHIFT))
+        + eid * T::from_bn(&(1u64.to_biguint().unwrap() << EID_OFFSET_SHIFT))
+        + value;
+
     if cfg!(feature = "continuation") {
+        encode
+    } else {
         ltype * T::from_bn(&(1u64.to_biguint().unwrap() << LTYPE_SHIFT))
             + offset * T::from_bn(&(1u64.to_biguint().unwrap() << OFFSET_SHIFT))
-            + is_mutable * T::from_bn(&(1u64.to_biguint().unwrap() << IS_MUTABLE_SHIFT))
-            + eid * T::from_bn(&(1u64.to_biguint().unwrap() << EID_OFFSET_SHIFT))
-            + value
-    } else {
-        is_mutable * T::from_bn(&(1u64.to_biguint().unwrap() << IS_MUTABLE_SHIFT))
-            + eid * T::from_bn(&(1u64.to_biguint().unwrap() << EID_OFFSET_SHIFT))
-            + value
+            + encode
     }
 }
 

crates/zkwasm/src/circuits/mtable/allocator.rs

@@ -83,9 +83,9 @@ pub(super) enum MemoryTableCellType {
 
 const BIT_COLUMNS: usize = 3;
 const U16_COLUMNS: usize = U32_CELLS.next_multiple_of(2) / 2 + U64_CELLS;
-const COMMON_RANGE_COLUMNS: usize = 2;
-const UNLIMITED_COLUMNS: usize = if cfg!(feature = "continuation") { 4 } else { 3 };
-const U32_CELLS: usize = if cfg!(feature = "continuation") { 9 } else { 6 };
+const COMMON_RANGE_COLUMNS: usize = if cfg!(feature = "continuation") { 1 } else { 2 };
+const UNLIMITED_COLUMNS: usize = if cfg!(feature = "continuation") { 3 } else { 2 };
+const U32_CELLS: usize = if cfg!(feature = "continuation") { 5 } else { 2 };
 const U64_CELLS: usize = 1;
 
 #[derive(Debug, Clone)]

crates/zkwasm/src/circuits/test_circuit/mod.rs

@@ -56,9 +56,9 @@ use super::image_table::ImageTableConfig;
 use super::post_image_table::PostImageTableConfig;
 
 pub const VAR_COLUMNS: usize = if cfg!(feature = "continuation") {
-    63
+    59
 } else {
-    54
+    51
 };
 
 // Reserve a few rows to keep usable rows away from blind rows.