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::str;
use std::sync::Arc; use std::sync::Arc;
use std::{ffi::c_void, mem, ptr}; 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::export::{Context, Export, FuncPointer};
use wasmer_runtime_core::import::{LikeNamespace, Namespace}; 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; use wasmer_runtime_core::units::Pages;
#[allow(non_camel_case_types)] #[allow(non_camel_case_types)]
@ -79,6 +81,13 @@ pub struct wasmer_value_t {
value: wasmer_value, value: wasmer_value,
} }
#[repr(C)]
#[derive(Clone)]
pub struct wasmer_global_descriptor_t {
mutable: bool,
kind: wasmer_value_tag,
}
#[repr(C)] #[repr(C)]
#[derive(Clone)] #[derive(Clone)]
pub struct wasmer_memory_t(); pub struct wasmer_memory_t();
@ -87,6 +96,10 @@ pub struct wasmer_memory_t();
#[derive(Clone)] #[derive(Clone)]
pub struct wasmer_table_t(); pub struct wasmer_table_t();
#[repr(C)]
#[derive(Clone)]
pub struct wasmer_global_t();
#[repr(C)] #[repr(C)]
pub struct wasmer_limits_t { pub struct wasmer_limits_t {
pub min: uint32_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)] #[allow(clippy::cast_ptr_alignment)]
#[no_mangle] #[no_mangle]
pub extern "C" fn wasmer_import_object_destroy(import_object: *mut wasmer_import_object_t) { 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 { impl From<wasmer_value_tag> for Type {
fn from(v: wasmer_value_tag) -> Self { fn from(v: wasmer_value_tag) -> Self {
unsafe { unsafe {

View File

@ -9,6 +9,7 @@ install_manifest.txt
compile_commands.json compile_commands.json
CTestTestfile.cmake CTestTestfile.cmake
_deps _deps
test-globals
test-instantiate test-instantiate
test-import-function test-import-function
test-memory test-memory

View File

@ -1,6 +1,7 @@
cmake_minimum_required (VERSION 2.6) cmake_minimum_required (VERSION 2.6)
project (WasmerCApiTests) project (WasmerCApiTests)
add_executable(test-globals test-globals.c)
add_executable(test-instantiate test-instantiate.c) add_executable(test-instantiate test-instantiate.c)
add_executable(test-import-function test-import-function.c) add_executable(test-import-function test-import-function.c)
add_executable(test-memory test-memory.c) add_executable(test-memory test-memory.c)
@ -16,6 +17,8 @@ if(NOT WASMER_LIB)
message(FATAL_ERROR "wasmer library not found") message(FATAL_ERROR "wasmer library not found")
endif() endif()
target_link_libraries(test-globals
general ${WASMER_LIB})
target_link_libraries(test-instantiate target_link_libraries(test-instantiate
general ${WASMER_LIB}) general ${WASMER_LIB})
target_link_libraries(test-import-function target_link_libraries(test-import-function
@ -28,6 +31,7 @@ target_link_libraries(test-tables
general ${WASMER_LIB}) general ${WASMER_LIB})
enable_testing() enable_testing()
add_test(test-globals test-globals)
add_test(test-instantiate test-instantiate) add_test(test-instantiate test-instantiate)
add_test(test-import-function test-import-function) add_test(test-import-function test-import-function)
add_test(test-memory test-memory) add_test(test-memory test-memory)

View File

@ -0,0 +1,30 @@
#include <stdio.h>
#include "../wasmer.h"
#include <assert.h>
#include <stdint.h>
int main()
{
wasmer_value_t val;
val.tag = WASM_I32;
val.value.I32 = 7;
wasmer_global_t *global = wasmer_global_new(val, true);
wasmer_value_t get_val = wasmer_global_get(global);
assert( get_val.value.I32 == 7);
wasmer_value_t val2;
val2.tag = WASM_I32;
val2.value.I32 = 14;
wasmer_global_set(global, val2);
wasmer_value_t new_get_val = wasmer_global_get(global);
assert( new_get_val.value.I32 == 14);
wasmer_global_descriptor_t desc = wasmer_global_get_descriptor(global);
assert(desc.mutable_);
assert(desc.kind == WASM_I32);
wasmer_global_destroy(global);
return 0;
}

View File

@ -37,6 +37,10 @@ typedef struct wasmer_instance_context_t wasmer_instance_context_t;
typedef struct wasmer_instance_t wasmer_instance_t; typedef struct wasmer_instance_t wasmer_instance_t;
typedef struct {
} wasmer_global_t;
typedef union { typedef union {
int32_t I32; int32_t I32;
int64_t I64; int64_t I64;
@ -49,6 +53,11 @@ typedef struct {
wasmer_value value; wasmer_value value;
} wasmer_value_t; } wasmer_value_t;
typedef struct {
bool mutable_;
wasmer_value_tag kind;
} wasmer_global_descriptor_t;
typedef struct { typedef struct {
} wasmer_memory_t; } wasmer_memory_t;
@ -62,6 +71,16 @@ typedef struct {
} wasmer_table_t; } wasmer_table_t;
void wasmer_global_destroy(wasmer_global_t *global);
wasmer_value_t wasmer_global_get(wasmer_global_t *global);
wasmer_global_descriptor_t wasmer_global_get_descriptor(wasmer_global_t *global);
wasmer_global_t *wasmer_global_new(wasmer_value_t value, bool mutable_);
void wasmer_global_set(wasmer_global_t *global, wasmer_value_t value);
void wasmer_import_object_destroy(wasmer_import_object_t *import_object); void wasmer_import_object_destroy(wasmer_import_object_t *import_object);
wasmer_import_object_t *wasmer_import_object_new(void); wasmer_import_object_t *wasmer_import_object_new(void);

View File

@ -35,6 +35,10 @@ struct wasmer_instance_context_t;
struct wasmer_instance_t; struct wasmer_instance_t;
struct wasmer_global_t {
};
union wasmer_value { union wasmer_value {
int32_t I32; int32_t I32;
int64_t I64; int64_t I64;
@ -47,6 +51,11 @@ struct wasmer_value_t {
wasmer_value value; wasmer_value value;
}; };
struct wasmer_global_descriptor_t {
bool mutable_;
wasmer_value_tag kind;
};
struct wasmer_memory_t { struct wasmer_memory_t {
}; };
@ -62,6 +71,16 @@ struct wasmer_table_t {
extern "C" { extern "C" {
void wasmer_global_destroy(wasmer_global_t *global);
wasmer_value_t wasmer_global_get(wasmer_global_t *global);
wasmer_global_descriptor_t wasmer_global_get_descriptor(wasmer_global_t *global);
wasmer_global_t *wasmer_global_new(wasmer_value_t value, bool mutable_);
void wasmer_global_set(wasmer_global_t *global, wasmer_value_t value);
void wasmer_import_object_destroy(wasmer_import_object_t *import_object); void wasmer_import_object_destroy(wasmer_import_object_t *import_object);
wasmer_import_object_t *wasmer_import_object_new(); wasmer_import_object_t *wasmer_import_object_new();