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

Use table min and max values from module to generate environment table

Browse Source
This commit is contained in:
Brandon Fish
2019-01-25 19:55:33 -06:00
parent 5209b5a558
commit 1a1958a0ce
4 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/emscripten/src/lib.rs
View File

@ -51,7 +51,9 @@ mod utils;
mod varargs;
pub use self::storage::align_memory;
pub use self::utils::{allocate_cstr_on_stack, allocate_on_stack, is_emscripten_module};
pub use self::utils::{
allocate_cstr_on_stack, allocate_on_stack, get_emscripten_table_size, is_emscripten_module,
};
// TODO: Magic number - how is this calculated?
const TOTAL_STACK: u32 = 5_242_880;
@ -361,10 +363,12 @@ pub struct EmscriptenGlobals {
// The emscripten table
pub table: TableBacking,
pub vm_table: LocalTable,
pub table_min: u32,
pub table_max: Option<u32>,
}
impl EmscriptenGlobals {
pub fn new() -> Self {
pub fn new(table_min: u32, table_max: Option<u32>) -> Self {
// Memory initialization
let memory_type = Memory {
min: 256,
@ -376,8 +380,8 @@ impl EmscriptenGlobals {
let table_type = Table {
ty: ElementType::Anyfunc,
min: 10,
max: Some(10),
min: table_min,
max: table_max,
};
let mut table = TableBacking::new(&table_type);
let vm_table = table.into_vm_table();
@ -406,6 +410,8 @@ impl EmscriptenGlobals {
vm_memory,
table,
vm_table,
table_min,
table_max,
}
}
}
@ -450,8 +456,8 @@ pub fn generate_emscripten_env(globals: &mut EmscriptenGlobals) -> ImportObject
ctx: null_ctx,
table: Table {
ty: ElementType::Anyfunc,
min: 8192,
max: Some(8192),
min: globals.table_min,
max: globals.table_max,
},
},
);