T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support multiple globals.

Browse Source
This commit is contained in:
Dan Gohman
2017-10-03 13:25:37 -07:00
parent 865a3d9f31
commit 31a962fa1b
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/wasmstandalone/src/standalone.rs
View File

@@ -76,6 +76,8 @@ pub struct Runtime {
pub func_indices: EntityMap<FuncRef, FunctionIndex>, pub func_indices: EntityMap<FuncRef, FunctionIndex>,
the_heap: PackedOption<ir::Heap>, the_heap: PackedOption<ir::Heap>,
current_global_offset: usize,
} }
impl Runtime { impl Runtime {
@@ -102,6 +104,7 @@ impl Runtime {
has_grow_memory: None, has_grow_memory: None,
func_indices: EntityMap::new(), func_indices: EntityMap::new(),
the_heap: PackedOption::default(), the_heap: PackedOption::default(),
current_global_offset: 0,
} }
} }
} }
@@ -334,14 +337,11 @@ impl WasmRuntime for Runtime {
} }
fn declare_global(&mut self, global: Global) { fn declare_global(&mut self, global: Global) {
debug_assert!(!self.instantiated); debug_assert!(!self.instantiated);
debug_assert!(
self.globals.info.is_empty(),
"multiple globals not supported yet"
);
self.globals.info.push(GlobalInfo { self.globals.info.push(GlobalInfo {
global: global, global: global,
offset: 0, offset: self.current_global_offset,
}); });
self.current_global_offset += global.ty.bytes() as usize;
} }
fn declare_table(&mut self, table: Table) { fn declare_table(&mut self, table: Table) {
debug_assert!(!self.instantiated); debug_assert!(!self.instantiated);