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

Merge remote-tracking branch 'origin/master' into feature/llvm-osr

Browse Source
This commit is contained in:
losfair
2019-08-14 16:33:26 -07:00
parent 44f71759f6 804e586196
commit 0e0573c73c
289 changed files with 35513 additions and 7333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -98,7 +98,7 @@ pub struct ExecutionStateImage {
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct InstanceImage {
pub memory: Option<Vec<u8>>,
pub globals: Vec<u64>,
pub globals: Vec<u128>,
pub execution_state: ExecutionStateImage,
}
@ -145,6 +145,7 @@ impl ModuleStateMap {
self.lookup_ip(ip, base, |fsm| &fsm.call_offsets)
}
#[warn(dead_code)]
fn lookup_trappable_ip(
&self,
ip: usize,
@ -153,6 +154,7 @@ impl ModuleStateMap {
self.lookup_ip(ip, base, |fsm| &fsm.trappable_offsets)
}
#[warn(dead_code)]
fn lookup_loop_ip(&self, ip: usize, base: usize) -> Option<(&FunctionStateMap, MachineState)> {
self.lookup_ip(ip, base, |fsm| &fsm.loop_offsets)
}
@ -728,11 +730,11 @@ pub mod x64 {
// FIXME: Imported globals
let globals_len = (*vmctx.module).info.globals.len();
let globals: Vec<u64> = (0..globals_len)
let globals: Vec<u128> = (0..globals_len)
.map(|i| {
(*vmctx.local_backing).globals[LocalGlobalIndex::new(i)]
.get()
.to_u64()
.to_u128()
})
.collect();