fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2025-06-18 19:31:22 +00:00
Code Issues Projects Releases Wiki Activity

Refactor tier switching code

Browse Source
This commit is contained in:
losfair
2019-08-10 02:32:14 +08:00
parent c1619026d5
commit b8c18215aa
7 changed files with 317 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
lib/runtime-core/src/state.rs
View File

@ -102,6 +102,12 @@ pub struct InstanceImage {
pub execution_state: ExecutionStateImage,
}
#[derive(Debug, Clone)]
pub struct CodeVersion {
pub msm: ModuleStateMap,
pub base: usize,
}
impl ModuleStateMap {
fn lookup_ip<F: FnOnce(&FunctionStateMap) -> &BTreeMap<usize, OffsetInfo>>(
&self,
@ -739,9 +745,8 @@ pub mod x64 {
}
#[warn(unused_variables)]
pub unsafe fn read_stack(
msm: &ModuleStateMap,
code_base: usize,
pub unsafe fn read_stack<'a, I: Iterator<Item = &'a CodeVersion>, F: Fn() -> I + 'a>(
versions: F,
mut stack: *const u64,
initially_known_registers: [Option<u64>; 24],
mut initial_address: Option<u64>,
@ -755,13 +760,27 @@ pub mod x64 {
stack = stack.offset(1);
x
});
let (fsm, state) = match msm
.lookup_call_ip(ret_addr as usize, code_base)
.or_else(|| msm.lookup_trappable_ip(ret_addr as usize, code_base))
.or_else(|| msm.lookup_loop_ip(ret_addr as usize, code_base))
{
Some(x) => x,
_ => return ExecutionStateImage { frames: results },
let mut fsm_state: Option<(&FunctionStateMap, MachineState)> = None;
for version in versions() {
match version.msm
.lookup_call_ip(ret_addr as usize, version.base)
.or_else(|| version.msm.lookup_trappable_ip(ret_addr as usize, version.base))
.or_else(|| version.msm.lookup_loop_ip(ret_addr as usize, version.base))
{
Some(x) => {
fsm_state = Some(x);
break;
},
None => {},
};
}
let (fsm, state) = if let Some(x) = fsm_state {
x
} else {
return ExecutionStateImage { frames: results };
};
let mut wasm_stack: Vec<Option<u64>> = state