language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-10-03 08:34:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

wasm_interp: Fixes to get CLI mode working

Browse source
This commit is contained in:
Brian Carroll 2022-11-25 00:03:41 +00:00
parent 9d437fe3fd
commit 3d756a8fff
No known key found for this signature in database
GPG key ID: 5C7B2EC4101703C0
1 changed files with 23 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

29
crates/wasm_interp/src/execute.rs
View file

@ -67,7 +67,7 @@ impl<'a> ExecutionState<'a> {
Vec::from_iter_in(sig_iter, arena) Vec::from_iter_in(sig_iter, arena)
}; };
let program_counter = { let mut program_counter = {
let mut export_iter = module.export.exports.iter(); let mut export_iter = module.export.exports.iter();
let start_fn_index = export_iter let start_fn_index = export_iter
.find_map(|ex| { .find_map(|ex| {
@ -87,10 +87,21 @@ impl<'a> ExecutionState<'a> {
cursor cursor
}; };
let mut value_stack = ValueStack::new(arena);
let mut call_stack = CallStack::new(arena);
call_stack.push_frame(
0, // return_addr
0, // return_block_depth
0, // n_args
&mut value_stack,
&module.code.bytes,
&mut program_counter,
);
Ok(ExecutionState { Ok(ExecutionState {
memory: Vec::with_capacity_in(mem_bytes as usize, arena), memory: Vec::with_capacity_in(mem_bytes as usize, arena),
call_stack: CallStack::new(arena), call_stack,
value_stack: ValueStack::new(arena), value_stack,
globals, globals,
program_counter, program_counter,
block_depth: 0, block_depth: 0,
@ -104,10 +115,16 @@ impl<'a> ExecutionState<'a> {
fn do_return(&mut self) -> Action { fn do_return(&mut self) -> Action {
if let Some((return_addr, block_depth)) = self.call_stack.pop_frame() { if let Some((return_addr, block_depth)) = self.call_stack.pop_frame() {
self.program_counter = return_addr as usize; if self.call_stack.is_empty() {
self.block_depth = block_depth; // We just popped the stack frame for the entry function. Terminate the program.
Action::Continue Action::Break
} else {
self.program_counter = return_addr as usize;
self.block_depth = block_depth;
Action::Continue
}
} else { } else {
// We should never get here with real programs but maybe in tests. Terminate the program.
Action::Break Action::Break
} }
} }