fix comments

DelphinusLab · Nov 10, 2023 · 64e647d · 64e647d
1 parent 3594c8c
commit 64e647d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/crates/specs/src/encode/init_memory_table.rs b/crates/specs/src/encode/init_memory_table.rs
@@ -15,7 +15,7 @@ pub fn encode_init_memory_table_entry<T: FromBn>(
     eid: T,
     value: T,
 ) -> T {
-    const LTYPE_SHIFT: u32 = IS_MUTABLE_SHIFT + 8;
+    const LTYPE_SHIFT: u32 = IS_MUTABLE_SHIFT + 1;
     const IS_MUTABLE_SHIFT: u32 = START_OFFSET_SHIFT + COMMON_RANGE_OFFSET;
     const START_OFFSET_SHIFT: u32 = END_OFFSET_SHIFT + COMMON_RANGE_OFFSET;
     const END_OFFSET_SHIFT: u32 = EID_OFFSET_SHIFT + 32;

diff --git a/crates/zkwasm/src/runtime/state.rs b/crates/zkwasm/src/runtime/state.rs
@@ -88,10 +88,12 @@ impl UpdateCompilationTable for CompilationTable {
             }
         }
 
-        let mut init_memory_entries = vec![];
-        init_memory_entries.append(&mut local_map.into_iter().map(|(_, v)| v).collect::<Vec<_>>());
-        init_memory_entries.append(&mut global_map.into_iter().map(|(_, v)| v).collect::<Vec<_>>());
-        init_memory_entries.append(&mut memory_map.into_iter().map(|(_, v)| v).collect::<Vec<_>>());
+        let init_memory_entries = vec![]
+            .into_iter()
+            .chain(local_map.into_values())
+            .chain(global_map.into_values())
+            .chain(memory_map.into_values())
+            .collect();
 
         InitMemoryTable::new(init_memory_entries)
     }
@@ -112,6 +114,7 @@ impl UpdateCompilationTable for CompilationTable {
 
         for entry in execution_table.entries() {
             match &entry.step_info {
+                // TODO: fix hard code
                 StepInfo::CallHost {
                     function_name,
                     args,
@@ -133,7 +136,7 @@ impl UpdateCompilationTable for CompilationTable {
                     }
                 }
                 StepInfo::ExternalHostCall { .. } => external_host_call_call_index += 1,
-                StepInfo::Call { .. } | StepInfo::Return { .. } => {
+                StepInfo::Call { .. } | StepInfo::CallIndirect { .. } | StepInfo::Return { .. } => {
                     #[cfg(feature = "continuation")]
                     {
                         jops += 1;