T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move translate_grow_memory and translate_current_memory too.

Browse Source 
This moves the last instruction-level callbacks into FuncEnvironment
such that the trait has all the information required to translate a
whole function.

Change the position argument to a FuncCursor. This eliminates all
exposure of FunctionBuilder<Local>, so its use properly becomes an
implementation detail.
This commit is contained in:
Jakob Stoklund Olesen
2017-09-06 15:44:23 -07:00
parent 26048c2ecc
commit b10faca534
3 changed files with 73 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/wasm/src/code_translator.rs
View File

@@ -28,7 +28,7 @@ use cretonne::ir::condcodes::{IntCC, FloatCC};
use cton_frontend::{ILBuilder, FunctionBuilder};
use wasmparser::{Parser, ParserState, Operator, WasmDecoder, MemoryImmediate};
use translation_utils::{f32_translation, f64_translation, type_to_type, translate_type, Local};
use translation_utils::{TableIndex, SignatureIndex, FunctionIndex};
use translation_utils::{TableIndex, SignatureIndex, FunctionIndex, MemoryIndex};
use state::{TranslationState, ControlStackFrame};
use std::collections::HashMap;
use runtime::{FuncEnvironment, GlobalValue, WasmRuntime};
@@ -458,12 +458,27 @@ fn translate_operator(
* Memory management is handled by runtime. It is usually translated into calls to
* special functions.
************************************************************************************/
Operator::GrowMemory { reserved: _ } => {
Operator::GrowMemory { reserved } => {
// The WebAssembly MVP only supports one linear memory, but we expect the reserved
// argument to be a memory index.
let heap_index = reserved as MemoryIndex;
let heap = state.get_heap(builder.func, reserved, runtime);
let val = state.pop1();
state.push1(runtime.translate_grow_memory(builder, val));
state.push1(runtime.translate_grow_memory(
builder.cursor(),
heap_index,
heap,
val,
))
}
Operator::CurrentMemory { reserved: _ } => {
state.push1(runtime.translate_current_memory(builder));
Operator::CurrentMemory { reserved } => {
let heap_index = reserved as MemoryIndex;
let heap = state.get_heap(builder.func, reserved, runtime);
state.push1(runtime.translate_current_memory(
builder.cursor(),
heap_index,
heap,
));
}
/******************************* Load instructions ***********************************
* Wasm specifies an integer alignment flag but we drop it in Cretonne.