feat: translate Wasm memory.grow op

Add `InstBuilder::mem_grow`, make `OpCode::MemGrow` to return 1 result in `OpCode::results`.
0xPolygonMiden · Sep 25, 2023 · 9988fed · 9988fed
1 parent f333511
commit 9988fed
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/frontend-wasm/src/code_translator/mod.rs b/frontend-wasm/src/code_translator/mod.rs
@@ -120,10 +120,11 @@ pub fn translate_operator(
         }
         /******************************* Memory management *********************************/
         Operator::MemoryGrow { .. } => {
-            // Do nothing and return total Miden memory size
-            state.push1(builder.ins().i32(mem_total_pages(), span));
+            let arg = state.pop1();
+            state.push1(builder.ins().mem_grow(arg, span));
         }
         Operator::MemorySize { .. } => {
+            // Return total Miden memory size
             state.push1(builder.ins().i32(mem_total_pages(), span));
         }
         /******************************* Load instructions ***********************************/

diff --git a/frontend-wasm/src/code_translator/tests.rs b/frontend-wasm/src/code_translator/tests.rs
@@ -368,7 +368,7 @@ fn memory_grow() {
         "#,
         expect![[r#"
             v0 = const.i32 1  : i32
-            v1 = const.i32 1048575  : i32
+            v1 = memory.grow v0  : i32
         "#]],
     )
 }

diff --git a/frontend-wasm/tests/expected/dlmalloc.mir b/frontend-wasm/tests/expected/dlmalloc.mir
@@ -5362,7 +5362,7 @@ block0(v0: i32, v1: i32, v2: i32):
     v6 = cast v4  : u32
     v7 = shr v5, v6  : u32
     v8 = cast v7  : i32
-    v9 = const.i32 1048575  : i32
+    v9 = memory.grow v8  : i32
     v10 = const.i32 0  : i32
     v11 = const.i32 8  : i32
     v12 = add v0, v11  : i32

diff --git a/hir/src/builder.rs b/hir/src/builder.rs
@@ -553,6 +553,16 @@ pub trait InstBuilder<'f>: InstBuilderBase<'f> {
         ))
     }
 
+    fn mem_grow(mut self, value: Value, span: SourceSpan) -> Value {
+        require_integer!(self, value, Type::I32);
+        let mut vlist = ValueList::default();
+        {
+            let pool = &mut self.data_flow_graph_mut().value_lists;
+            vlist.push(value, pool);
+        }
+        into_first_result!(self.PrimOp(Opcode::MemGrow, Type::I32, vlist, span,))
+    }
+
     /// Get a [GlobalValue] which represents the address of a global variable whose symbol is `name`
     ///
     /// On it's own, this does nothing, you must use the resulting [GlobalValue] with a builder

diff --git a/hir/src/instruction.rs b/hir/src/instruction.rs
@@ -549,7 +549,6 @@ impl Opcode {
             | Self::Assertz
             | Self::AssertEq
             | Self::Store
-            | Self::MemGrow
             | Self::MemCpy
             | Self::Br
             | Self::CondBr
@@ -611,7 +610,8 @@ impl Opcode {
             | Self::Shl
             | Self::Shr
             | Self::Rotl
-            | Self::Rotr => {
+            | Self::Rotr
+            | Self::MemGrow => {
                 smallvec![ctrl_ty]
             }
             // The result type of a load is derived from the pointee type