Monadic-Cat/ableos
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Compare commits

merge into: Monadic-Cat:master
Branches Tags
Monadic-Cat:master
Monadic-Cat:feature-wasm-exe-path
Monadic-Cat:misc
Monadic-Cat:pls-build-on-my-machine
Monadic-Cat:uefi
Monadic-Cat:elfabilities
...
pull from: Monadic-Cat:feature-wasm-exe-path
Branches Tags
Monadic-Cat:feature-wasm-exe-path
Monadic-Cat:master
Monadic-Cat:misc
Monadic-Cat:pls-build-on-my-machine
Monadic-Cat:uefi
Monadic-Cat:elfabilities

1 commit
master ... feature-wa

Author SHA1 Message Date
Monadic Cat d5a4e19231 allow specifying path of wasm executable 2022-04-25 00:32:45 -05:00
3 changed files with 6 additions and 5 deletions
Show stats Expand all files Collapse all files

3
ableos/src/rhai_shell/mod.rs
View file

@ -210,7 +210,8 @@ fn engine_construction() -> Engine {
engine.register_fn("peek", peek_memory); engine.register_fn("peek", peek_memory);
engine.register_fn("poke", poke_memory); engine.register_fn("poke", poke_memory);
engine.register_fn("sloop", sloop); engine.register_fn("sloop", sloop);
engine.register_fn("wasm", interp); engine.register_fn("wasm", |s: &str| interp(s.as_bytes()));
engine.register_fn("wasm", || interp(b"/home/able/bins/aos_test.wasm"));
engine.register_fn("log_dump", log_dump); engine.register_fn("log_dump", log_dump);
engine engine

4
ableos/src/wasm_jumploader/host_functions.rs
View file

@ -167,8 +167,8 @@ impl Externals for HostExternals {
} }
GET_INPUT_INDEX => { GET_INPUT_INDEX => {
let input = None; let mut input = None;
x86_64::instructions::interrupts::without_interrupts(|| KEYBUFF.lock().pop()); input = x86_64::instructions::interrupts::without_interrupts(|| KEYBUFF.lock().pop());
if let Some(chr) = input { if let Some(chr) = input {
trace!("SYSCALL: input: {}", chr); trace!("SYSCALL: input: {}", chr);
} }

4
ableos/src/wasm_jumploader/mod.rs
View file

@ -4,13 +4,13 @@ use crate::{filesystem::FILE_SYSTEM, wasm_jumploader::host_functions::HostExtern
use genfs::{Fs, OpenOptions}; use genfs::{Fs, OpenOptions};
use wasmi::{ImportsBuilder, ModuleInstance}; use wasmi::{ImportsBuilder, ModuleInstance};
pub fn interp() { pub fn interp(file: &[u8]) {
trace!("Interpreting..."); trace!("Interpreting...");
let fs = &*FILE_SYSTEM.lock(); let fs = &*FILE_SYSTEM.lock();
trace!("Got filesystem"); trace!("Got filesystem");
let file = fs let file = fs
.open( .open(
b"/home/able/bins/aos_test.wasm", file,
OpenOptions::new().read(true), OpenOptions::new().read(true),
) )
.unwrap(); .unwrap();