Improve importing things #130

lachlansneff · 2019-01-29T18:22:52Z

Now, you can import memories, tables, and globals like such:

let memory = Memory::new(MemoryDesc {
    min: 1,
    max: Some(1),
    shared: false,
})?;

let table = Table::new(TableDesc {
    ty: ElementType::Anyfunc,
    min: 10,
    max: None,
})?;

let global = Global::new(Value::I32(42));

let import_object = imports! {
    "env" => {
        "print_i32" => func!(print_num, [i32] -> [i32]),
        "memory" => memory,
        "global" => global,
        "table" => table,
    },
};

syrusakbary · 2019-01-29T18:41:30Z

Love this!

bjfish · 2019-01-29T18:39:58Z

lib/runtime-core/src/vmcalls.rs

+    let local_memory = *ctx.memories.add(memory_index.index());
+    let memory = (*local_memory).memory as *mut DynamicMemory;
+
+    if let Some(old) = (*memory).grow(delta, &mut *local_memory) {


Is there a way to make this less verbose? The js API for this is memory.grow(1)

The user can just call memory.grow(delta). This cruft in this function is because it's specifically accessing a particular type of memory. The user-exposed api doesn't expose that.

lib/runtime-core/src/vm.rs

bjfish · 2019-01-29T18:43:53Z

lib/clif-backend/src/module_env.rs

@@ -20,6 +22,8 @@ pub struct ModuleEnv<'module, 'isa> {
    pub signatures: Map<SigIndex, ir::Signature>,
    globals: Map<GlobalIndex, cranelift_wasm::Global>,
    func_bodies: Map<LocalFuncIndex, ir::Function>,
+    pub deduplicated: PrimaryMap<cranelift_wasm::SignatureIndex, SigIndex>,
+    duplicated: HashMap<SigIndex, cranelift_wasm::SignatureIndex>,


Maybe the naming could be more specific deduplicated_signatures duplicated_signatures or signatures_all/signatures_unique

This could probably be designed better tbh. I was just trying to get it to work as quickly as possible.

lib/clif-backend/src/module_env.rs

lib/clif-backend/src/relocation.rs

lib/runtime-core/src/backing.rs

lib/runtime-core/src/global.rs

lib/runtime-core/src/memory/dynamic.rs

lib/runtime-core/src/memory/mod.rs

lib/runtime-core/src/error.rs

lib/runtime-core/src/memory/static_/unshared.rs

lib/runtime-core/src/vm.rs

lib/runtime-core/examples/simple/main.rs

This commit fixes a bug where the lock guard (for concurrently accessing the same scope from different threads) had basically no effect, due to being bound to a temporary only.

fix(compiler-llvm) Remove an unused import

lachlansneff added 10 commits January 25, 2019 15:28

Add importable memories and dynamic memories

e4686e6

reexport memory

db3a20a

Modify imports macro to work with all things that are exports

a58f331

Fix memory api to be sound

9b491ec

Add unused global type

1be20b1

Add new global import api

98305c8

Get table imports working

19242a4

Fix lint, reexport tables and globals

a601323

Merge branch 'master' into feature/improve-importing

5aa7d71

allow clippy lint aligned pointers

951dadd