Add basic Global API

This commit is contained in:
Brandon Fish
2019-02-09 17:39:15 -06:00
parent 8364c39b4c
commit 94c5acedbf
6 changed files with 176 additions and 2 deletions

View File

@ -7,10 +7,12 @@ use std::slice;
use std::str;
use std::sync::Arc;
use std::{ffi::c_void, mem, ptr};
use wasmer_runtime::{ImportObject, Instance, Memory, Table, Value};
use wasmer_runtime::{Global, ImportObject, Instance, Memory, Table, Value};
use wasmer_runtime_core::export::{Context, Export, FuncPointer};
use wasmer_runtime_core::import::{LikeNamespace, Namespace};
use wasmer_runtime_core::types::{ElementType, FuncSig, MemoryDescriptor, TableDescriptor, Type};
use wasmer_runtime_core::types::{
ElementType, FuncSig, GlobalDescriptor, MemoryDescriptor, TableDescriptor, Type,
};
use wasmer_runtime_core::units::Pages;
#[allow(non_camel_case_types)]
@ -79,6 +81,13 @@ pub struct wasmer_value_t {
value: wasmer_value,
}
#[repr(C)]
#[derive(Clone)]
pub struct wasmer_global_descriptor_t {
mutable: bool,
kind: wasmer_value_tag,
}
#[repr(C)]
#[derive(Clone)]
pub struct wasmer_memory_t();
@ -87,6 +96,10 @@ pub struct wasmer_memory_t();
#[derive(Clone)]
pub struct wasmer_table_t();
#[repr(C)]
#[derive(Clone)]
pub struct wasmer_global_t();
#[repr(C)]
pub struct wasmer_limits_t {
pub min: uint32_t,
@ -196,6 +209,59 @@ pub extern "C" fn wasmer_table_destroy(table: *mut wasmer_table_t) {
}
}
#[no_mangle]
pub unsafe extern "C" fn wasmer_global_new(
value: wasmer_value_t,
mutable: bool,
) -> *mut wasmer_global_t {
let global = if mutable {
Global::new_mutable(value.into())
} else {
Global::new(value.into())
};
unsafe { Box::into_raw(Box::new(global)) as *mut wasmer_global_t }
}
#[allow(clippy::cast_ptr_alignment)]
#[no_mangle]
pub extern "C" fn wasmer_global_get(global: *mut wasmer_global_t) -> wasmer_value_t {
let global = unsafe { Box::from_raw(global as *mut Global) };
let value: wasmer_value_t = global.get().into();
Box::into_raw(global);
value
}
#[allow(clippy::cast_ptr_alignment)]
#[no_mangle]
pub extern "C" fn wasmer_global_set(global: *mut wasmer_global_t, value: wasmer_value_t) {
let global = unsafe { Box::from_raw(global as *mut Global) };
global.set(value.into());
Box::into_raw(global);
}
#[allow(clippy::cast_ptr_alignment)]
#[no_mangle]
pub extern "C" fn wasmer_global_get_descriptor(
global: *mut wasmer_global_t,
) -> wasmer_global_descriptor_t {
let global = unsafe { Box::from_raw(global as *mut Global) };
let descriptor = global.descriptor();
let desc = wasmer_global_descriptor_t {
mutable: descriptor.mutable,
kind: descriptor.ty.into(),
};
Box::into_raw(global);
desc
}
#[allow(clippy::cast_ptr_alignment)]
#[no_mangle]
pub extern "C" fn wasmer_global_destroy(global: *mut wasmer_global_t) {
if !global.is_null() {
drop(unsafe { Box::from_raw(global as *mut Global) });
}
}
#[allow(clippy::cast_ptr_alignment)]
#[no_mangle]
pub extern "C" fn wasmer_import_object_destroy(import_object: *mut wasmer_import_object_t) {
@ -396,6 +462,41 @@ impl From<wasmer_value_t> for Value {
}
}
impl From<Value> for wasmer_value_t {
fn from(val: Value) -> Self {
match val {
Value::I32(x) => wasmer_value_t {
tag: wasmer_value_tag::WASM_I32,
value: wasmer_value { I32: x },
},
Value::I64(x) => wasmer_value_t {
tag: wasmer_value_tag::WASM_I64,
value: wasmer_value { I64: x },
},
Value::F32(x) => wasmer_value_t {
tag: wasmer_value_tag::WASM_F32,
value: wasmer_value { F32: x },
},
Value::F64(x) => wasmer_value_t {
tag: wasmer_value_tag::WASM_F64,
value: wasmer_value { F64: x },
},
}
}
}
impl From<Type> for wasmer_value_tag {
fn from(ty: Type) -> Self {
match ty {
Type::I32 => wasmer_value_tag::WASM_I32,
Type::I64 => wasmer_value_tag::WASM_I64,
Type::F32 => wasmer_value_tag::WASM_F32,
Type::F64 => wasmer_value_tag::WASM_F64,
_ => panic!("not implemented"),
}
}
}
impl From<wasmer_value_tag> for Type {
fn from(v: wasmer_value_tag) -> Self {
unsafe {