finally got the macro done, now merging
This commit is contained in:
elfein
commit
796f9ae128
158
src/main.rs
158
src/main.rs
|
|
@ -1,7 +1,7 @@
|
|||
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;
|
||||
|
|
@ -11,96 +11,102 @@ pub const KILL: usize = 0;
|
|||
|
||||
struct HostFunctions;
|
||||
impl HostFunctions {
|
||||
fn check_signature(&self, index: usize, signature: &Signature) -> bool {
|
||||
let (params, ret_ty): (&[ValueType], Option<ValueType>) = match index.into() {
|
||||
SysCall::KILL => (&[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<ValueType>) = match index.into() {
|
||||
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<Option<RuntimeValue>, Trap> {
|
||||
match index.into() {
|
||||
SysCall::KILL => {
|
||||
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<Option<RuntimeValue>, Trap> {
|
||||
match index.into() {
|
||||
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)))
|
||||
}
|
||||
SysCall::CONSOLE_RESET => {}
|
||||
SysCall::CONSOLE_IN => {}
|
||||
SysCall::CONSOLE_OUT => {}
|
||||
SysCall::CONSOLE_GET_TITLE => {}
|
||||
SysCall::CONSOLE_SET_TITLE => {}
|
||||
|
||||
_ => panic!("Unimplemented function at {}", index),
|
||||
}
|
||||
}
|
||||
}
|
||||
impl ModuleImportResolver for HostFunctions {
|
||||
fn resolve_func(&self, field_name: &str, signature: &Signature) -> Result<FuncRef, Error> {
|
||||
let index = match field_name {
|
||||
"add" => SysCall::KILL as usize,
|
||||
_ => {
|
||||
fn resolve_func(&self, field_name: &str, signature: &Signature) -> Result<FuncRef, Error> {
|
||||
let index = match field_name {
|
||||
"add" => SysCall::KILL as usize,
|
||||
_ => {
|
||||
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!("../wasm/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()
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,7 +32,8 @@ syscall_enum! {
|
|||
CONSOLE_OUT = 3, // Console output
|
||||
CONSOLE_GET_TITLE = 4, // Get the console title
|
||||
CONSOLE_SET_TITLE = 5, // Set the console title
|
||||
|
||||
GET_PID = 6; // Get the proccess ID
|
||||
PROCESS_INFO = 7; // Get information about the process
|
||||
//scheduler Related Syscals
|
||||
GET_PRIORITY = 10, // Get scheduler priority
|
||||
SET_PRIORITY = 11, // Set scheduler priority
|
||||
|
|
@ -57,6 +58,24 @@ syscall_enum! {
|
|||
FILE_READ = 30,
|
||||
FILE_WRITE = 31,
|
||||
|
||||
SLEEP=32, // Sleep in milliseconds
|
||||
SLEEP_UNTIL=33, // Sleep until this time in milliseconds (if this is below the current time return)
|
||||
NANOSLEEP=34, // Sleep in nanoseconds
|
||||
NANOSLEEP_UNTIL=35, // Sleep until this time nanoseconds (if this is below the current time return)
|
||||
GET_TIME = 36, // Gets the system time (some derivitive of seconds)
|
||||
SET_TIME = 37, // Sets the system time (some derivitive of seconds)
|
||||
|
||||
|
||||
// Socket SysCall
|
||||
SOCKET_BIND=39, // Used by servers to lock a port
|
||||
SOCKET_CONNECT=40,
|
||||
SOCKET_DISCONNECT=41,
|
||||
SOCKET_SEND=42,
|
||||
SOCKET_RECIEVE=43,
|
||||
|
||||
|
||||
|
||||
|
||||
// Security Syscalls
|
||||
ENCRYPT = 50,
|
||||
EMPTY = 0xFFFF,
|
||||
|
|
|
|||
Reference in a new issue