mii/wasmer
1
0
Fork 0
mirror of https://github.com/mii443/wasmer.git synced 2025-12-09 22:28:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve Tunables memory/table creation

Browse Source
This commit is contained in:
Syrus
2020-05-03 19:37:11 -07:00
parent d23a0fb76b
commit f94e2d6bcc
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/api/src/externals.rs
View File

@@ -231,7 +231,9 @@ fn set_table_item(
impl Table {
pub fn new(store: &Store, ty: TableType, init: Val) -> Result<Table, RuntimeError> {
let item = init.into_checked_anyfunc(store)?;
let table = store.engine().tunables().create_table(ty);
let tunables = store.engine().tunables();
let table_plan = tunables.table_plan(ty);
let table = tunables.create_table(table_plan);
let definition = table.vmtable();
for i in 0..definition.current_elements {
@@ -345,7 +347,10 @@ pub struct Memory {
impl Memory {
pub fn new(store: &Store, ty: MemoryType) -> Memory {
let memory = store.engine().tunables().create_memory(ty).unwrap();
let tunables = store.engine().tunables();
let memory_plan = tunables.memory_plan(ty);
let memory = tunables.create_memory(memory_plan).unwrap();
let definition = memory.vmmemory();
Memory {

6
lib/api/src/tunables.rs
View File

@@ -92,14 +92,12 @@ impl wasmer_jit::Tunables for Tunables {
}
/// Create a memory given a memory type
fn create_memory(&self, memory_type: MemoryType) -> Result<LinearMemory, String> {
let plan = self.memory_plan(memory_type);
fn create_memory(&self, plan: MemoryPlan) -> Result<LinearMemory, String> {
LinearMemory::new(&plan)
}
/// Create a memory given a memory type
fn create_table(&self, table_type: TableType) -> Table {
let plan = self.table_plan(table_type);
fn create_table(&self, plan: TablePlan) -> Table {
Table::new(&plan)
}
}