fluencelabs/parity-wasm
1
0
Fork 0
mirror of https://github.com/fluencelabs/parity-wasm synced 2025-06-15 07:51:46 +00:00
Code Issues Projects Releases Wiki Activity

global_get_set

Browse Source
This commit is contained in:
Svyatoslav Nikolsky
2017-05-03 11:06:26 +03:00
parent 1498ce1ec1
commit cc3abac681
6 changed files with 107 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/builder/module.rs
View File

@ -299,6 +299,12 @@ impl<F> ModuleBuilder<F> where F: Invoke<elements::Module> {
import::ImportBuilder::with_callback(self)
}
/// With global variable
pub fn with_global(mut self, global: elements::GlobalEntry) -> Self {
self.module.global.entries_mut().push(global);
self
}
/// Build module (final step)
pub fn build(self) -> F::Result {
self.callback.invoke(self.module.into())

7
src/elements/global_entry.rs
View File

@ -8,6 +8,13 @@ pub struct GlobalEntry {
}
impl GlobalEntry {
/// Create new global.
pub fn new(global_type: GlobalType, init_expr: InitExpr) -> Self {
GlobalEntry {
global_type: global_type,
init_expr: init_expr,
}
}
/// Global type.
pub fn global_type(&self) -> &GlobalType { &self.global_type }
/// Initialization expression (opcodes) for global.

5
src/elements/section.rs
View File

@ -409,6 +409,11 @@ impl GlobalSection {
pub fn entries(&self) -> &[GlobalEntry] {
&self.0
}
/// Mutable list of all global entries in the section
pub fn entries_mut(&mut self) -> &mut Vec<GlobalEntry> {
&mut self.0
}
}
impl Deserialize for GlobalSection {

87
src/interpreter/tests/basics.rs Normal file
View File

@ -0,0 +1,87 @@
///! Basic tests for instructions/constructions, missing in wabt tests
use builder::module;
use elements::{ExportEntry, Internal, ImportEntry, External, GlobalEntry, GlobalType,
InitExpr, ValueType, Opcodes, Opcode};
use interpreter::Error;
use interpreter::program::ProgramInstance;
use interpreter::value::RuntimeValue;
#[test]
fn import_function() {
let module1 = module()
.with_export(ExportEntry::new("external_func".into(), Internal::Function(0)))
.function()
.signature().return_type().i32().build()
.body().with_opcodes(Opcodes::new(vec![
Opcode::I32Const(3),
Opcode::End,
])).build()
.build()
.build();
let module2 = module()
.with_import(ImportEntry::new("external_module".into(), "external_func".into(), External::Function(0)))
.function()
.signature().return_type().i32().build()
.body().with_opcodes(Opcodes::new(vec![
Opcode::Call(0),
Opcode::I32Const(7),
Opcode::I32Add,
Opcode::End,
])).build()
.build()
.build();
let program = ProgramInstance::new();
let external_module = program.add_module("external_module", module1).unwrap();
let main_module = program.add_module("main", module2).unwrap();
assert_eq!(external_module.execute(0, vec![]).unwrap().unwrap(), RuntimeValue::I32(3));
assert_eq!(main_module.execute(1, vec![]).unwrap().unwrap(), RuntimeValue::I32(10));
}
#[test]
fn global_get_set() {
let module = module()
.with_global(GlobalEntry::new(GlobalType::new(ValueType::I32, true), InitExpr::new(vec![Opcode::I32Const(42)])))
.with_global(GlobalEntry::new(GlobalType::new(ValueType::I32, false), InitExpr::new(vec![Opcode::I32Const(777)])))
.function()
.signature().return_type().i32().build()
.body().with_opcodes(Opcodes::new(vec![
Opcode::GetGlobal(0),
Opcode::I32Const(8),
Opcode::I32Add,
Opcode::SetGlobal(0),
Opcode::GetGlobal(0),
Opcode::End,
])).build()
.build()
.function()
.signature().return_type().i32().build()
.body().with_opcodes(Opcodes::new(vec![
Opcode::GetGlobal(1),
Opcode::I32Const(8),
Opcode::I32Add,
Opcode::SetGlobal(1),
Opcode::GetGlobal(1),
Opcode::End,
])).build()
.build()
.function()
.signature().return_type().i32().build()
.body().with_opcodes(Opcodes::new(vec![
Opcode::I64Const(8),
Opcode::SetGlobal(0),
Opcode::GetGlobal(0),
Opcode::End,
])).build()
.build()
.build();
let program = ProgramInstance::new();
let module = program.add_module("main", module).unwrap();
assert_eq!(module.execute(0, vec![]).unwrap().unwrap(), RuntimeValue::I32(50));
assert_eq!(module.execute(1, vec![]).unwrap_err(), Error::Variable("trying to update immutable variable".into()));
assert_eq!(module.execute(2, vec![]).unwrap_err(), Error::Variable("trying to update variable of type I32 with value of type Some(I64)".into()));
}

38
src/interpreter/tests/import.rs
View File

@ -1,38 +0,0 @@
use builder::module;
use elements::{ExportEntry, Internal, ImportEntry, External, Opcodes, Opcode};
use interpreter::program::ProgramInstance;
use interpreter::value::RuntimeValue;
#[test]
fn import_function() {
let module1 = module()
.with_export(ExportEntry::new("external_func".into(), Internal::Function(0)))
.function()
.signature().return_type().i32().build()
.body().with_opcodes(Opcodes::new(vec![
Opcode::I32Const(3),
Opcode::End,
])).build()
.build()
.build();
let module2 = module()
.with_import(ImportEntry::new("external_module".into(), "external_func".into(), External::Function(0)))
.function()
.signature().return_type().i32().build()
.body().with_opcodes(Opcodes::new(vec![
Opcode::Call(0),
Opcode::I32Const(7),
Opcode::I32Add,
Opcode::End,
])).build()
.build()
.build();
let program = ProgramInstance::new();
let external_module = program.add_module("external_module", module1).unwrap();
let main_module = program.add_module("main", module2).unwrap();
assert_eq!(external_module.execute(0, vec![]).unwrap().unwrap(), RuntimeValue::I32(3));
assert_eq!(main_module.execute(1, vec![]).unwrap().unwrap(), RuntimeValue::I32(10));
}

4
src/interpreter/tests/mod.rs
View File

@ -1,2 +1,2 @@
mod import;
mod wabt;
mod basics;
mod wabt;