Add current_memory and grow_memory operators

6 files changed, 169 insertions, 2 deletions

diff --git a/include/nanowasm/private.h b/include/nanowasm/private.h
index bd42f1e..d42023f 100644
--- a/include/nanowasm/private.h
+++ b/include/nanowasm/private.h
@@ -430,6 +430,19 @@ union nw_i_sm
         union nw_value value;
     } drop;
 
+    struct nw_i_sm_cm
+    {
+        struct nw_sm_leb128 leb128;
+        struct nw_sm_io io;
+    } cm;
+
+    struct nw_i_sm_gm
+    {
+        unsigned long pages;
+        struct nw_sm_leb128 leb128;
+        struct nw_sm_io io;
+    } gm;
+
     struct nw_i_sm_call_import
     {
         enum nw_type type;
diff --git a/private_include/nw/ops.h b/private_include/nw/ops.h
index 373da07..2953ecb 100644
--- a/private_include/nw/ops.h
+++ b/private_include/nw/ops.h
@@ -40,6 +40,7 @@ void nwp_op_i32_store(struct nw_interp *i);
 void nwp_op_i64_store(struct nw_interp *i);
 void nwp_op_i32_store8(struct nw_interp *i);
 void nwp_op_current_memory(struct nw_interp *i);
+void nwp_op_grow_memory(struct nw_interp *i);
 void nwp_op_i32_const(struct nw_interp *i);
 void nwp_op_i64_const(struct nw_interp *i);
 void nwp_op_f32_const(struct nw_interp *i);
diff --git a/src/interp/ops.c b/src/interp/ops.c
index 2bfdff0..4a76fba 100644
--- a/src/interp/ops.c
+++ b/src/interp/ops.c
@@ -77,8 +77,8 @@ static void (*const ops[])(struct nw_interp *) =
     NULL, /* OP_I64_STORE8 */
     NULL, /* OP_I64_STORE16 */
     NULL, /* OP_I64_STORE32 */
-    NULL, /* OP_CURRENT_MEMORY */
-    NULL, /* OP_GROW_MEMORY */
+    nwp_op_current_memory, /* OP_CURRENT_MEMORY */
+    nwp_op_grow_memory, /* OP_GROW_MEMORY */
     nwp_op_i32_const, /* OP_I32_CONST */
     nwp_op_i64_const, /* OP_I64_CONST */
     NULL, /* OP_F32_CONST */
diff --git a/src/op/CMakeLists.txt b/src/op/CMakeLists.txt
index bea3555..27f2ff1 100644
--- a/src/op/CMakeLists.txt
+++ b/src/op/CMakeLists.txt
@@ -11,11 +11,13 @@ target_sources(${PROJECT_NAME} PRIVATE
     br_if.c
     call.c
     call_indirect.c
+    current_memory.c
     drop.c
     else.c
     end.c
     get_local.c
     get_global.c
+    grow_memory.c
     i32_add.c
     i32_and.c
     i32_const.c
diff --git a/src/op/current_memory.c b/src/op/current_memory.c
new file mode 100644
index 0000000..d7ce395
--- /dev/null
+++ b/src/op/current_memory.c
@@ -0,0 +1,70 @@
+/*
+ * nanowasm, a tiny WebAssembly/Wasm interpreter
+ * Copyright (C) 2023-2025  Xavier Del Campo Romero
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+#include <nanowasm/nw.h>
+#include <nw/interp.h>
+#include <nw/io.h>
+#include <nw/log.h>
+#include <nw/ops.h>
+#include <nw/routines.h>
+#include <nw/stack.h>
+
+static enum nw_state push(struct nw_interp *const i)
+{
+    struct nw_i_sm_cm *const cm = &i->sm.cm;
+    const enum nw_state n = nwp_stack_push(i, &cm->io);
+
+    if (n)
+        return n;
+
+    nwp_interp_resume(i);
+    return NW_AGAIN;
+}
+
+static enum nw_state get_reserved(struct nw_interp *const i)
+{
+    nw_varuint1 reserved;
+    struct nw_i_sm_cm *const cm = &i->sm.cm;
+    const struct nw_io_cfg *const cfg = &i->cfg.io;
+    const enum nw_state n = nwp_varuint1(cfg, &cm->leb128, &reserved, cfg->user);
+
+    if (n)
+        return n;
+    else if (reserved)
+    {
+        static const char *const exc = "invalid reserved value";
+
+        i->exception = exc;
+#ifdef NW_LOG
+        nwp_log("%s: %#x\n", exc, (unsigned)reserved);
+#endif
+        return NW_FATAL;
+    }
+    else
+    {
+        struct nw_sm_io io = {0};
+        nw_varuint32 *const np = &i->linear.n_pages;
+
+        io.buf = np;
+        io.n = sizeof *np;
+        cm->io = io;
+    }
+
+    i->next = push;
+    return NW_AGAIN;
+}
+
+void nwp_op_current_memory(struct nw_interp *const i)
+{
+    static const struct nw_i_sm_cm cm;
+    struct nw_i_sm_cm *const pcm = &i->sm.cm;
+
+    *pcm = cm;
+    i->next = get_reserved;
+}
diff --git a/src/op/grow_memory.c b/src/op/grow_memory.c
new file mode 100644
index 0000000..9a2c203
--- /dev/null
+++ b/src/op/grow_memory.c
@@ -0,0 +1,81 @@
+/*
+ * nanowasm, a tiny WebAssembly/Wasm interpreter
+ * Copyright (C) 2023-2025  Xavier Del Campo Romero
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+#include <nanowasm/nw.h>
+#include <nw/interp.h>
+#include <nw/io.h>
+#include <nw/log.h>
+#include <nw/ops.h>
+#include <nw/routines.h>
+#include <nw/stack.h>
+
+static enum nw_state pop(struct nw_interp *const i)
+{
+    struct nw_i_sm_gm *const gm = &i->sm.gm;
+    const unsigned long max = i->cfg.m->out.linear.max;
+    const enum nw_state n = nwp_stack_pop(i, &gm->io);
+
+    if (n)
+        return n;
+    else if (gm->pages > max || i->linear.n_pages > max - gm->pages)
+    {
+        static const char *const exc = "cannot grow linear memory pages";
+
+        i->exception = exc;
+#ifdef NW_LOG
+        nwp_log("%s: %#lx\n", exc, (unsigned long)gm->pages);
+#endif
+        return NW_FATAL;
+    }
+
+    i->linear.n_pages += gm->pages;
+    nwp_interp_resume(i);
+    return NW_AGAIN;
+}
+
+static enum nw_state get_reserved(struct nw_interp *const i)
+{
+    nw_varuint1 reserved;
+    struct nw_i_sm_gm *const gm = &i->sm.gm;
+    const struct nw_io_cfg *const cfg = &i->cfg.io;
+    const enum nw_state n = nwp_varuint1(cfg, &gm->leb128, &reserved, cfg->user);
+
+    if (n)
+        return n;
+    else if (reserved)
+    {
+        static const char *const exc = "invalid reserved value";
+
+        i->exception = exc;
+#ifdef NW_LOG
+        nwp_log("%s: %#x\n", exc, (unsigned)reserved);
+#endif
+        return NW_FATAL;
+    }
+    else
+    {
+        struct nw_sm_io io = {0};
+
+        io.buf = &gm->pages;
+        io.n = sizeof gm->pages;
+        gm->io = io;
+    }
+
+    i->next = pop;
+    return NW_AGAIN;
+}
+
+void nwp_op_grow_memory(struct nw_interp *const i)
+{
+    static const struct nw_i_sm_gm gm;
+    struct nw_i_sm_gm *const pgm = &i->sm.gm;
+
+    *pgm = gm;
+    i->next = get_reserved;
+}