Add assembler

.gitattributes

@@ -0,0 +1,6 @@
+tests/* linguist-vendored
+tools/* linguist-vendored
+docs/* linguist-documentation
+
+lib/wasm_asm/src/_generated/* linguist-generated
+src/_generated/* linguist-generated

.github/workflows/rust.yml

@@ -19,4 +19,4 @@ jobs:
     - name: Build
       run: cargo build --verbose
     - name: Run tests
-      run: cargo test --verbose
+      run: cargo test --workspace --verbose

.vscode/settings.json

@@ -1,7 +1,8 @@
 {
     "rust-analyzer.linkedProjects": [
         "./Cargo.toml",
-        "./example/cli/Cargo.toml",
-        "./example/hello/Cargo.toml",
+        "example/cli/Cargo.toml",
+        "example/hello/Cargo.toml",
+        "tools/wat2wasm/Cargo.toml",
     ]
 }

Cargo.toml

@@ -1,5 +1,3 @@
-cargo-features = ["edition2024"]
-
 [package]
 authors = ["Nerry <[email protected]>"]
 edition = "2024"
@@ -13,12 +11,20 @@ default = []
 
 [dependencies]
 wami_macro = {path="./lib/wami_macro"}
+leb128 = {path="./lib/leb128"}
 
-libm = {version="0.2.8"}
+libm = {version="0.2.11"}
 smallvec = {version = "1.13.2", default-features = false}
 
+[dev-dependencies]
+wa_asm = { path = "./lib/wa_asm" }
+
 [workspace]
 members = [
   "example/cli",
   "example/hello",
+  "tools/wat2wasm",
+  "lib/wami_macro",
+  "lib/leb128",
+  "lib/wa_asm",
 ]

build.rs

@@ -1,6 +1,6 @@
 use std::{
     collections::BTreeMap,
-    fs::{read_to_string, File},
+    fs::{File, read_to_string},
     io::*,
     num::ParseIntError,
     result,
@@ -178,8 +178,9 @@ fn make_opcode(os: &mut File, lines: &[String]) {
         "//
 // This file is automatically generated at build time. DO NOT EDIT DIRECTLY.
 //
-use crate::{{leb128::*, BrTableVec, WasmBlockType, WasmCompileErrorKind, WasmMemArg}};
 use core::fmt;
+use crate::{{BrTableVec, WasmBlockType, WasmCompileErrorKind, WasmMemArg}};
+use leb128::*;
 
 /// WebAssembly Opcode
 #[non_exhaustive]

example/cli/Cargo.toml

@@ -1,5 +1,3 @@
-cargo-features = ["edition2024"]
-
 [package]
 authors = ["Nerry <[email protected]>"]
 edition = "2024"

example/hello/Cargo.toml

@@ -1,6 +1,3 @@
-cargo-features = ["edition2024"]
-
-
 [package]
 authors = ["Nerry <[email protected]>"]
 edition = "2024"
@@ -11,3 +8,4 @@ version = "0.1.0"
 
 [dependencies]
 wami = { path="../../" }
+wa_asm = { path = "../../lib/wa_asm" }

example/hello/src/main.rs

@@ -1,10 +1,25 @@
 // Hello world
-
+use wa_asm::WasmAssembler;
 use wami::prelude::*;
 
 fn main() {
-    let env = Env {};
-    let instance = WebAssembly::instantiate(include_bytes!("../hello.wasm"), &env).unwrap();
+    let src = r#"
+(module
+  (import "env" "println" (func $println (param i32) (param i32)))
+
+  (memory 1)
+
+  (data (i32.const 16) "hello world!")
+
+  (func $main (export "main")
+    i32.const 12
+    i32.const 16
+    call $println
+  )
+)
+"#;
+    let bin = WasmAssembler::to_wasm("hello.wat", src.as_bytes().to_vec()).unwrap();
+    let instance = WebAssembly::instantiate(&bin, &Env {}).unwrap();
     instance.exports().main().unwrap();
 }
 

lib/leb128/Cargo.toml

@@ -0,0 +1,6 @@
+[package]
+name = "leb128"
+version = "0.1.0"
+edition = "2024"
+
+[dependencies]