clean up and use wac fork

Author: cpetig

Cargo.lock

@@ -322,7 +322,7 @@ def_instruction! {
             id: TypeId,
         } : [1] => [*size as usize],
 
-        /// Pops an array and an address off the stack, passes each element to a block
+        /// Pops an array and an address off the stack, passes each element to a block storing it
         FixedSizeListLowerBlock {
             element: &'a Type,
             size: u32,
@@ -1766,38 +1766,15 @@ impl<'a, B: Bindgen> Generator<'a, B> {
 
                 TypeDefKind::Unknown => unreachable!(),
                 TypeDefKind::FixedSizeList(element, size) => {
-                    // let increment = self.bindgen.sizes().size(ty);
-                    // let mut position = offset;
-//                    let resultvar = self.stack[0];
-                    // for _ in 0..*size {
-                    //     // push index
-                    //     self.stack.push("", );
-                    //     self.write_to_memory(ty, addr.clone(), position);
-                    //     position = position + increment;
-                    // }
-                    // @@@@
-                    // self.emit(&FixedSizeListLower {
-                    //     elements: ty,
-                    //     size: *size,
-                    //     id,
-                    // });
-
                     // resembles write_list_to_memory
                     self.push_block();
                     self.emit(&IterElem { element });
                     self.emit(&IterBasePointer);
                     let elem_addr = self.stack.pop().unwrap();
                     self.write_to_memory(element, elem_addr, Default::default());
                     self.finish_block(0);
-                    // let target = self.stack.pop().unwrap();
                     self.stack.push(addr);
                     self.emit(&FixedSizeListLowerBlock { element, size: *size, id });
-
-                    // for idx in 0..*size {
-                    //     //self.write_fields_to_memory(tuple.types.iter(), addr, offset);
-                    //     self.emit(&FixedSizeListLowerElement { elements: ty, idx, });
-                    //     self.write_to_memory(ty, addr.clone(), offset + (field_offset));
-                    // }
                 }
             },
         }

crates/core/src/abi.rs

@@ -799,16 +799,9 @@ impl Bindgen for FunctionBindgen<'_, '_> {
 
             Instruction::FixedSizeListLowerBlock { element, size: _, id: _ } => {
                 let body = self.blocks.pop().unwrap();
-                // let tmp = self.tmp();
                 let vec = operands[0].clone();
-                //format!("vec{tmp}");
-                // self.push_str(&format!(
-                //     "let {vec} = {operand0};\n",
-                //     operand0 = operands[0]
-                // ));
-                let size = self.r#gen.sizes.size(element);
                 let target = operands[1].clone();
-                // let align = self.r#gen.sizes.align(element);
+                let size = self.r#gen.sizes.size(element);
                 self.push_str(&format!("for (i, e) in {vec}.into_iter().enumerate() {{\n",));
                 self.push_str(&format!(
                     "let base = {target}.add(i * {});\n",

crates/rust/src/bindgen.rs

@@ -24,9 +24,9 @@ regex = "1.11.1"
 serde = { workspace = true }
 toml = "0.8.20"
 wasi-preview1-component-adapter-provider = "30.0.2"
-wac-parser = { path = "../../../wac/crates/wac-parser" }
-wac-types = { path = "../../../wac/crates/wac-types" }
-wac-graph = { path = "../../../wac/crates/wac-graph" }
+wac-parser = { git = "https://github.com/cpetig/wac", branch = "fixed-size-lists" }
+wac-types = { git = "https://github.com/cpetig/wac", branch = "fixed-size-lists" }
+wac-graph = { git = "https://github.com/cpetig/wac", branch = "fixed-size-lists" }
 indexmap = { workspace = true }
 wasm-encoder = { workspace = true }
 wasmparser = { workspace = true, features = ["features"] }