From f22b55e2b63ff52e1dfb6da0d740c2605cb0bef7 Mon Sep 17 00:00:00 2001 From: Able Date: Mon, 22 Nov 2021 03:42:54 -0600 Subject: [PATCH] multiple wasmtest files added --- src/main.rs | 31 ++++++++++--------------------- wasm/ableos-wasm-test.wasm | Bin 173 -> 0 bytes wasm/c.wasm | Bin 0 -> 94 bytes wasm/rust.wasm | Bin 0 -> 174 bytes wasm/test.wat | 8 -------- wasm/wasm.wasm | Bin 0 -> 51 bytes wasm/zig.wasm | Bin 0 -> 402 bytes 7 files changed, 10 insertions(+), 29 deletions(-) delete mode 100755 wasm/ableos-wasm-test.wasm create mode 100644 wasm/c.wasm create mode 100755 wasm/rust.wasm delete mode 100644 wasm/test.wat create mode 100644 wasm/wasm.wasm create mode 100644 wasm/zig.wasm diff --git a/src/main.rs b/src/main.rs index 779b5c4..6922629 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,4 +1,4 @@ -use wabt; +// use wabt; use wasmi::{ Error, Externals, FuncInstance, FuncRef, ImportsBuilder, ModuleImportResolver, ModuleInstance, RuntimeArgs, RuntimeValue, Signature, Trap, ValueType, @@ -33,11 +33,11 @@ impl Externals for HostFunctions { /// Do nothing SysCall::EMPTY => Ok(None), SysCall::EXIT => Ok(None), - // SysCall::CONSOLE_RESET => {} - // SysCall::CONSOLE_IN => {} - // SysCall::CONSOLE_OUT => {} - // SysCall::CONSOLE_GET_TITLE => {} - // SysCall::CONSOLE_SET_TITLE => {} + SysCall::CONSOLE_RESET => Ok(None), + SysCall::CONSOLE_IN => Ok(None), + SysCall::CONSOLE_OUT => Ok(None), + SysCall::CONSOLE_GET_TITLE => Ok(None), + SysCall::CONSOLE_SET_TITLE => Ok(None), _ => panic!("Unimplemented function at {}", index), } } @@ -71,21 +71,10 @@ impl ModuleImportResolver for HostFunctions { } fn main() { - // Parse WAT (WebAssembly Text format) into wasm bytecode. - // let wasm_binary = wabt::wat2wasm(include_str!("../wasm/test.wat")); - let wasm_binary = //wabt::wat2wasm( - include_bytes!("../wasm/ableos-wasm-test.wasm"); //.unwrap(); - // ); - /* - let wasm_binary = match wasm_binary { - Ok(abc) => abc, - Err(abc) => { - println!("{}", abc); - return; - } - }; - */ - // .expect("failed to parse wat"); + let wasm_binary = include_bytes!("../wasm/rust.wasm"); + // include_bytes!("../wasm/zig.wasm"); + // include_bytes!("../wasm/c.wasm"); + // include_bytes!("../wasm/wasm.wasm"); // Load wasm binary and prepare it for instantiation. let module = wasmi::Module::from_buffer(&wasm_binary).expect("failed to load wasm"); diff --git a/wasm/ableos-wasm-test.wasm b/wasm/ableos-wasm-test.wasm deleted file mode 100755 index 808cd28db7792acbc24510768fa549229c8b7cce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 173 zcmY+7O%8%E5JtagD)P85u!gX*ggV>WnU2fygrD*6eDAWLp&uUx8Ba;Z1S*&tNx~W%OP=|vGVoa@ nwWg?Oje2R((%x@G3odMvMniv diff --git a/wasm/c.wasm b/wasm/c.wasm new file mode 100644 index 0000000000000000000000000000000000000000..9448d4a7fbaafdd442176e32117137c221f866b4 GIT binary patch literal 94 zcmZQbEY4+QU|?WuZD?pZlGZ|P~z;pov18XxxgpsWg#9&~b45FCWa#M5j biz=BI*y4*z5{pV07`VE?3c(r~9JROsVkj7y literal 0 HcmV?d00001 diff --git a/wasm/rust.wasm b/wasm/rust.wasm new file mode 100755 index 0000000000000000000000000000000000000000..d3da416ab20c48e1073bd77edc5256b64bf2e0c3 GIT binary patch literal 174 zcmY+7O%8%E7zN*J5e$$(+<65T-hq>RRB0lC7E&4$S8z0s=1<%>o7v64ERF!US1r(j zt179jzb8XKj(}F=P7`%{)GM29d!ktJ@9dnU&blc)6jE8D2@%XiIungp-)R;iH*03O mn8j+9m&{RbZ_u#7De=ZxRtn!Ie~IisRPxDP2brhdM;l)1_$o~R literal 0 HcmV?d00001 diff --git a/wasm/test.wat b/wasm/test.wat deleted file mode 100644 index 77f65c4..0000000 --- a/wasm/test.wat +++ /dev/null @@ -1,8 +0,0 @@ -(module - (import "host" "add" (func $add (param i32 i32)(result i32))) - (; (import "host" "empty" (func $empty)) ;) - (func (export "main") (result i32) - (; (call $empty) ;) - (call $add (i32.const 123) (i32.const 456)) - ) -) diff --git a/wasm/wasm.wasm b/wasm/wasm.wasm new file mode 100644 index 0000000000000000000000000000000000000000..1d68a461dd4dd56f9410865bc9c8e138a5795813 GIT binary patch literal 51 zcmZQbEY4+QU|?WmWlUgTtY>CoWMJoFWQ#8@Nh~U1VBlh7WMOb*;%4At$xF;lWnu=Z F1pv4H2JHX< literal 0 HcmV?d00001 diff --git a/wasm/zig.wasm b/wasm/zig.wasm new file mode 100644 index 0000000000000000000000000000000000000000..72a2519ad086066f6414443d70dea65caf7beac9 GIT binary patch literal 402 zcmZvXKTpFj5XJB8{3%IMfepmq2nHl}P{*hP3*X`DCMFGa?8tG2n9`9C!H30d*x-hf ze(#;$>46+N1OS||HNYBhuZdbyw@y`_-u9;Qtu^H3Mk|ClQ9W4NN>gjaF$*ZY zBxP#O&WRdrH&W9^4vO=fXscvDQ54+i`^0fbI%Q6nWUq`t{(|XvcL)OolotgG5V$Lt zVD~4n#DWVZ_!FB8_Q2*v6prGc#P3BSlIci9iyWRKBRhq+|5e4`rs);Jf{v}L9rd;~ aUOBiq>z%Flm2v~lv^33LHVXM_xr84;lxENX literal 0 HcmV?d00001