First commit

4 files changed, 257 insertions, 0 deletions

diff --git a/src/op/memory/CMakeLists.txt b/src/op/memory/CMakeLists.txt
new file mode 100644
index 0000000..ca4ba5a
--- /dev/null
+++ b/src/op/memory/CMakeLists.txt
@@ -0,0 +1,12 @@
+# nanowasm, a tiny WebAssembly/Wasm interpreter
+# Copyright (C) 2023-2024  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/.
+
+target_sources(${PROJECT_NAME} PRIVATE
+    current_memory.c
+    i32_load.c
+    i32_store.c
+)
diff --git a/src/op/memory/current_memory.c b/src/op/memory/current_memory.c
new file mode 100644
index 0000000..c67d425
--- /dev/null
+++ b/src/op/memory/current_memory.c
@@ -0,0 +1,44 @@
+/*
+ * nanowasm, a tiny WebAssembly/Wasm interpreter
+ * Copyright (C) 2023-2024  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 <nw/log.h>
+#include <nw/ops.h>
+#include <nanowasm/nw.h>
+#include <nw/types.h>
+#include <stddef.h>
+#include <stdio.h>
+
+static int op(struct nw_interp *const i, FILE *const f)
+{
+    varuint1 reserved;
+
+    if (varuint1_read(f, &reserved))
+    {
+        LOG("%s: varuint1_read failed\n", __func__);
+        return 1;
+    }
+    else if (reserved)
+    {
+        LOG("%s: unexpected non-zero reserved value %u\n",
+            __func__, (unsigned)reserved);
+        return 1;
+    }
+
+    return 0;
+}
+
+int op_current_memory(struct nw_interp *const i)
+{
+    return op(i, i->f);
+}
+
+int check_current_memory(FILE *const f)
+{
+    return op(NULL, f);
+}
diff --git a/src/op/memory/i32_load.c b/src/op/memory/i32_load.c
new file mode 100644
index 0000000..04dbec7
--- /dev/null
+++ b/src/op/memory/i32_load.c
@@ -0,0 +1,76 @@
+/*
+ * nanowasm, a tiny WebAssembly/Wasm interpreter
+ * Copyright (C) 2023-2024  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 <nw/log.h>
+#include <nw/ops.h>
+#include <nanowasm/nw.h>
+#include <nw/interp.h>
+#include <nw/types.h>
+#include <stddef.h>
+#include <stdio.h>
+
+static int load(struct nw_interp *const i, const varuint32 flags,
+    const varuint32 offset)
+{
+    enum {ALIGN = 2};
+    int32_t value;
+
+    if (flags != ALIGN)
+    {
+        LOG("%s: expected 32-bit alignment (%d), got %lu\n",
+            __func__, ALIGN, (unsigned long)flags);
+        i->exception = "unaligned access";
+        return -1;
+    }
+    else if (interp_heap_load(i, offset, &value, sizeof value))
+    {
+        LOG("%s: interp_heap_load failed\n", __func__);
+        return -1;
+    }
+    else if (interp_stack_push(i, &value, sizeof value))
+    {
+        LOG("%s: interp_stack_push failed\n", __func__);
+        return -1;
+    }
+
+    return 0;
+}
+
+static int op(struct nw_interp *const i, FILE *const f)
+{
+    varint32 flags, offset;
+
+    if (varint32_read(f, &flags))
+    {
+        LOG("%s: varint32_read flags failed\n", __func__);
+        return 1;
+    }
+    else if (varint32_read(f, &offset))
+    {
+        LOG("%s: varint32_read offset failed\n", __func__);
+        return 1;
+    }
+    else if (i && load(i, flags, offset))
+    {
+        LOG("%s: load failed\n", __func__);
+        return -1;
+    }
+
+    return 0;
+}
+
+int op_i32_load(struct nw_interp *const i)
+{
+    return op(i, i->f);
+}
+
+int check_i32_load(FILE *const f)
+{
+    return op(NULL, f);
+}
diff --git a/src/op/memory/i32_store.c b/src/op/memory/i32_store.c
new file mode 100644
index 0000000..212cd86
--- /dev/null
+++ b/src/op/memory/i32_store.c
@@ -0,0 +1,125 @@
+/*
+ * nanowasm, a tiny WebAssembly/Wasm interpreter
+ * Copyright (C) 2023-2024  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 <nw/log.h>
+#include <nw/ops.h>
+#include <nanowasm/nw.h>
+#include <nw/types.h>
+#include <nw/interp.h>
+#include <stdint.h>
+#include <stddef.h>
+#include <stdio.h>
+
+static int store(struct nw_interp *const i, const varuint32 flags,
+    const varuint32 offset)
+{
+    enum {ALIGN = 2};
+
+    if (flags != ALIGN)
+    {
+        LOG("%s: expected 32-bit alignment (%d), got %lu\n",
+            __func__, ALIGN, (unsigned long)flags);
+        i->exception = "unaligned access";
+        return -1;
+    }
+
+    int32_t value, addr;
+
+    if (interp_stack_pop(i, &value, sizeof value))
+    {
+        LOG("%s: inter_stack_pop value failed\n", __func__);
+        return -1;
+    }
+    else if (interp_stack_pop(i, &addr, sizeof addr))
+    {
+        LOG("%s: inter_stack_pop addr failed\n", __func__);
+        return -1;
+    }
+    else if (offset > SIZE_MAX - addr)
+    {
+        static const char exc[] = "offset address overflow";
+
+        LOG("%s: %s\n", __func__, exc);
+        i->exception = exc;
+        return -1;
+    }
+    else if (interp_heap_store(i, offset + addr, &value, sizeof value))
+    {
+        LOG("%s: interp_heap_store failed\n", __func__);
+        return -1;
+    }
+
+    return 0;
+#if 0
+    stack_i -= sizeof addr;
+
+    if (max < addr || offset >= max - addr)
+    {
+        LOG("%s: heap overflow\n", __func__);
+        i->exception = "heap overflow";
+        return -1;
+    }
+
+    const size_t raddr = offset + addr;
+
+    if (raddr % sizeof addr)
+    {
+        LOG("%s: unaligned memory address\n", __func__);
+        i->exception = "unaligned access";
+        return -1;
+    }
+    else if (stack_i < sizeof (uint32_t))
+    {
+        LOG("%s: stack underflow (value)\n", __func__);
+        i->exception = "stack underflow";
+        return -1;
+    }
+
+    const int32_t value = htoni32(*stackptr);
+    void *dst = &((char *)i->cfg.heap.buf)[raddr];
+
+    *(int32_t *)dst = value;
+    stack_i -= sizeof addr;
+    i->stack_i = stack_i;
+    return 0;
+#endif
+}
+
+static int op(struct nw_interp *const i, FILE *const f)
+{
+    varuint32 flags, offset;
+
+    if (varuint32_read(f, &flags))
+    {
+        LOG("%s: varint32_read flags failed\n", __func__);
+        return -1;
+    }
+    else if (varuint32_read(f, &offset))
+    {
+        LOG("%s: varint32_read offset failed\n", __func__);
+        return -1;
+    }
+    else if (i && store(i, flags, offset))
+    {
+        LOG("%s: store failed\n", __func__);
+        return -1;
+    }
+
+    return 0;
+}
+
+int op_i32_store(struct nw_interp *const i)
+{
+    return op(i, i->f);
+}
+
+int check_i32_store(FILE *const f)
+{
+    return op(NULL, f);
+}