support build with 32bit wasm

permaweb · Jan 20, 2025 · 67a2217 · 67a2217
1 parent e2e2820
commit 67a2217
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 17 deletions.
diff --git a/dev-cli/container/src/ao-build-module b/dev-cli/container/src/ao-build-module
@@ -74,7 +74,7 @@ def main():
 
     # Inject rust files into c_program if language is rust
     if(language == 'rust'):
-        c_program = inject_rust_files(definition, c_program)
+        c_program = inject_rust_files(definition, c_program, config)
 
     # Inject lua files into c_program always to load lua files and replace placeholders
     if(language == 'lua'):
@@ -159,10 +159,7 @@ def main():
     # shell_exec(*meter_cmd)
 
     if config.keep_js is False:
-        process_js_path = os.path.join(os.getcwd(), 'process.js')
-        # For rust case, js code is not exists
-        if os.path.exists(process_js_path):
-            shell_exec(*['rm', process_js_path])
+        shell_exec(*['rm', os.path.join(os.getcwd(), 'process.js')])
 
 if __name__ == '__main__':
     main()

diff --git a/dev-cli/container/src/ao_module_lib/languages/rust.py b/dev-cli/container/src/ao_module_lib/languages/rust.py
@@ -4,9 +4,10 @@
 
 from ao_module_lib.helper import shell_exec
 from ao_module_lib.definition import Definition
+from ao_module_lib.config import Config
 
 RUST_DIR = '/opt/aorustlib'
-def inject_rust_files(definition: Definition, c_program: str):
+def inject_rust_files(definition: Definition, c_program: str, config: Config):
 
     c_header_files = []
     # rust_source_files = []
@@ -37,19 +38,20 @@ def inject_rust_files(definition: Definition, c_program: str):
 #    os.chdir(RUST_DIR)
 
     # build rust code at '/src'
+    target = config.target == 64 and 'wasm64-unknown-unknown' or 'wasm32-unknown-unknown'
     os.environ["RUSTFLAGS"] = "--cfg=web_sys_unstable_apis --Z wasm_c_abi=spec"
     cmd = [
         'cargo',
         '+nightly',
         'build',
         '-Zbuild-std=std,panic_unwind,panic_abort',
         # '-Zbuild-std-features=panic_immediate_abort',
-        '--target=wasm64-unknown-unknown',
+        f'--target={target}',
         '--release'
         ]
 
     shell_exec(*cmd)
-    rust_lib = glob.glob('/src/target/wasm64-unknown-unknown/release/*.a', recursive=True)[0]
+    rust_lib = glob.glob(f'/src/target/{target}/release/*.a', recursive=True)[0]
     rust_lib = shutil.copy2(rust_lib, RUST_DIR)
 
     cmd = [

diff --git a/dev-cli/src/starters/rust/Makefile b/dev-cli/src/starters/rust/Makefile
@@ -1,7 +1,7 @@
 all:build bindgen
 
 build:
-	RUSTFLAGS="--cfg=web_sys_unstable_apis --Z wasm_c_abi=spec" \
+	RUSTFLAGS="--Z wasm_c_abi=spec " \
 	cargo +nightly build \
 	    -Zbuild-std=std,panic_unwind,panic_abort \
 	    --target=wasm64-unknown-unknown \
@@ -13,3 +13,6 @@ bindgen:
 clean:
 	cargo clean
 	rm aorust.h
+
+opt:
+	wasm-opt --post-emscripten -O3 --low-memory-unused process.wasm --enable-bulk-memory --enable-memory64 --no-validation -o process.wasm
diff --git a/dev-cli/src/starters/rust/src/lib.rs b/dev-cli/src/starters/rust/src/lib.rs
@@ -9,15 +9,15 @@ use core::ffi::c_char;
 use core::ffi::CStr;
 use dlmalloc::GlobalDlmalloc;
 
-#[global_allocator]
-static GLOBAL: GlobalDlmalloc = GlobalDlmalloc;
+// #[global_allocator]
+// static GLOBAL: GlobalDlmalloc = GlobalDlmalloc;
 
-/// halt the thread on panic; messages are discarded:
-#[cfg(not(test))]
-#[panic_handler]
-fn panic(_info: &core::panic::PanicInfo) -> ! {
-    loop {}
-}
+// /// halt the thread on panic; messages are discarded:
+// #[cfg(not(test))]
+// #[panic_handler]
+// fn panic(_info: &core::panic::PanicInfo) -> ! {
+//     loop {}
+// }
 
 /// Processes the input `msg` and `env` strings, performs some operations,
 /// and returns the result as a C-compatible string.