diff --git a/src/main.rs b/src/main.rs index 589c419..6554912 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,107 +1,106 @@ -extern crate wabt; -extern crate wasmi; - +use wabt; use wasmi::{ - Error, Externals, FuncInstance, FuncRef, ImportsBuilder, ModuleImportResolver, ModuleInstance, - RuntimeArgs, RuntimeValue, Signature, Trap, ValueType, + Error, Externals, FuncInstance, FuncRef, ImportsBuilder, ModuleImportResolver, ModuleInstance, + RuntimeArgs, RuntimeValue, Signature, Trap, ValueType, }; +mod wasm_sys; +use wasm_sys::SysCall; + pub const KILL: usize = 0; -pub const ADD_FUNC_INDEX: usize = 1; struct HostFunctions; impl HostFunctions { - fn check_signature(&self, index: usize, signature: &Signature) -> bool { - let (params, ret_ty): (&[ValueType], Option) = match index { - ADD_FUNC_INDEX => (&[ValueType::I32, ValueType::I32], Some(ValueType::I32)), - _ => return false, - }; - signature.params() == params && signature.return_type() == ret_ty - } + fn check_signature(&self, index: usize, signature: &Signature) -> bool { + let (params, ret_ty): (&[ValueType], Option) = match index { + *SysCall::KILL => (&[ValueType::I32, ValueType::I32], Some(ValueType::I32)), + _ => return false, + }; + signature.params() == params && signature.return_type() == ret_ty + } } impl Externals for HostFunctions { - fn invoke_index( - &mut self, - index: usize, - args: RuntimeArgs, - ) -> Result, Trap> { - match index { - ADD_FUNC_INDEX => { - println!("you pe"); - let a: u32 = args.nth_checked(0)?; - let b: u32 = args.nth_checked(1)?; - let result = a + b; + fn invoke_index( + &mut self, + index: usize, + args: RuntimeArgs, + ) -> Result, Trap> { + match index { + SysCall::KILL => { + let a: u32 = args.nth_checked(0)?; + let b: u32 = args.nth_checked(1)?; + let result = a + b; - Ok(Some(RuntimeValue::I32(result as i32))) - } - _ => panic!("Unimplemented function at {}", index), - } - } + Ok(Some(RuntimeValue::I32(result as i32))) + } + _ => panic!("Unimplemented function at {}", index), + } + } } impl ModuleImportResolver for HostFunctions { - fn resolve_func(&self, field_name: &str, signature: &Signature) -> Result { - let index = match field_name { - "add" => ADD_FUNC_INDEX, - _ => { + fn resolve_func(&self, field_name: &str, signature: &Signature) -> Result { + let index = match field_name { + "add" => SysCall::KILL, + _ => { + return Err(Error::Instantiation(format!( + "Export {} not found", + field_name + ))) + } + }; + + if !self.check_signature(index, signature) { return Err(Error::Instantiation(format!( - "Export {} not found", - field_name - ))) - } - }; + "Export {} has a bad signature", + field_name + ))); + } - if !self.check_signature(index, signature) { - return Err(Error::Instantiation(format!( - "Export {} has a bad signature", - field_name - ))); - } - - Ok(FuncInstance::alloc_host( - Signature::new(&[ValueType::I32, ValueType::I32][..], Some(ValueType::I32)), - index, - )) - } + Ok(FuncInstance::alloc_host( + Signature::new(&[ValueType::I32, ValueType::I32][..], Some(ValueType::I32)), + index, + )) + } } fn main() { - // Parse WAT (WebAssembly Text format) into wasm bytecode. - let wasm_binary = wabt::wat2wasm(include_str!("test.wat")); + // Parse WAT (WebAssembly Text format) into wasm bytecode. + let wasm_binary = wabt::wat2wasm(include_str!("../wasm/test.wat")); - let wasm_binary = match wasm_binary { - Ok(abc) => abc, - Err(abc) => { - println!("{}", abc); - return; - } - }; + let wasm_binary = match wasm_binary { + Ok(abc) => abc, + Err(abc) => { + println!("{}", abc); + return; + } + }; - // .expect("failed to parse wat"); + // .expect("failed to parse wat"); - // Load wasm binary and prepare it for instantiation. - let module = wasmi::Module::from_buffer(&wasm_binary).expect("failed to load wasm"); + // Load wasm binary and prepare it for instantiation. + let module = wasmi::Module::from_buffer(&wasm_binary).expect("failed to load wasm"); - let imports = ImportsBuilder::new().with_resolver("host", &HostFunctions); + let imports = ImportsBuilder::new().with_resolver("host", &HostFunctions); - // Instantiate a module with empty imports and - // assert that there is no `start` function. - let instance = ModuleInstance::new(&module, &imports) - .expect("failed to instantiate wasm module") - .assert_no_start(); + // Instantiate a module with empty imports and + // assert that there is no `start` function. + let instance = ModuleInstance::new(&module, &imports) + .expect("failed to instantiate wasm module") + .assert_no_start(); - // Finally, invoke the exported function "test" with no parameters - // and empty external function executor. - let result: i32 = instance - .invoke_export("main", &[], &mut HostFunctions) - // .with_resolver(&mut HostFunctions) - .expect("failed to execute export") - .unwrap() - .try_into() - .unwrap(); + // Finally, invoke the exported function "test" with no parameters + // and empty external function executor. + let result: i32 = instance + .invoke_export("main", &[], &mut HostFunctions) + // .with_resolver(&mut HostFunctions) + .expect("failed to execute export") + .unwrap() + .try_into() + .unwrap(); - println!( - "{:?}", - result // .unwrap() - ); + println!( + "{:?}", + result // .unwrap() + ); } diff --git a/src/test.wat b/src/test.wat deleted file mode 100644 index f70add2..0000000 --- a/src/test.wat +++ /dev/null @@ -1,16 +0,0 @@ -(module - (import "host" "add" (func $add (param i32 i32)(result i32))) - (func (export "main") (result i32) - (call $add (i32.const 123) (i32.const 456)) - (; i32.const 1337 ;) - ) -) - - - -(;; -(func $main (export "_start") - (; (call $print_greeting) ;) - return - ) -;;) diff --git a/src/wasm_sys.rs b/src/wasm_sys.rs new file mode 100644 index 0000000..cbe651e --- /dev/null +++ b/src/wasm_sys.rs @@ -0,0 +1,36 @@ +#[repr(usize)] +pub enum SysCall { + KILL = 0, // Provide a PID + CONSOLE_RESET = 1, // Reset the console + CONSOLE_IN = 2, // Console Input + CONSOLE_OUT = 3, // Console output + CONSOLE_GET_TITLE = 4, // Get the console title + CONSOLE_SET_TITLE = 5, // Set the console title + + //scheduler Related Syscals + GET_PRIORITY = 10, // Get scheduler priority + SET_PRIORITY = 11, // Set scheduler priority + // + GET_HOSTNAME = 12, + SET_HOSTNAME = 13, + + //File Related syscalls + GET_CONFIG = 20, // Get config + SET_CONFIG = 21, // Set the config + // + MAKE_DIRECTORY = 22, // + DELETE_DIRECTORY = 23, // + RENAME_DIRECTORY = 24, // + SET_DIRECTORY_ACCESS = 25, // + // + MAKE_FILE = 26, // + DELETE_FILE = 27, // + RENAME_FILE = 28, // + SET_FILE_ACCESS = 29, // + + FILE_READ = 30, + FILE_WRITE = 31, + + // Security Syscalls + ENCRYPT = 50, +} diff --git a/wasm/test.wat b/wasm/test.wat new file mode 100644 index 0000000..e12d5d5 --- /dev/null +++ b/wasm/test.wat @@ -0,0 +1,6 @@ +(module + (import "host" "add" (func $add (param i32 i32)(result i32))) + (func (export "main") (result i32) + (call $add (i32.const 123) (i32.const 456)) + ) +)