Middleware for cranelift.

meskill · Jun 15, 2020 · 1144222 · 1144222
1 parent c413101
commit 1144222
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 8 deletions.
diff --git a/lib/compiler-cranelift/src/compiler.rs b/lib/compiler-cranelift/src/compiler.rs
@@ -111,6 +111,8 @@ impl Compiler for CraneliftCompiler {
                     input.module_offset,
                     &mut context.func,
                     &mut func_env,
+                    *i,
+                    &self.config,
                 )?;
 
                 let mut code_buf: Vec<u8> = Vec::new();

diff --git a/lib/compiler-cranelift/src/config.rs b/lib/compiler-cranelift/src/config.rs
@@ -1,7 +1,11 @@
 use crate::compiler::CraneliftCompiler;
 use cranelift_codegen::isa::{lookup, TargetIsa};
 use cranelift_codegen::settings::{self, Configurable};
-use wasmer_compiler::{Architecture, Compiler, CompilerConfig, CpuFeature, Features, Target};
+use std::sync::Arc;
+use wasmer_compiler::{
+    Architecture, Compiler, CompilerConfig, CpuFeature, Features, FunctionMiddlewareGenerator,
+    Target,
+};
 
 // Runtime Environment
 
@@ -44,6 +48,9 @@ pub struct CraneliftConfig {
 
     features: Features,
     target: Target,
+
+    /// The middleware chain.
+    pub(crate) middlewares: Vec<Arc<dyn FunctionMiddlewareGenerator>>,
 }
 
 impl CraneliftConfig {
@@ -57,6 +64,7 @@ impl CraneliftConfig {
             enable_pic: false,
             features,
             target,
+            middlewares: vec![],
         }
     }
 
@@ -193,6 +201,11 @@ impl CompilerConfig for CraneliftConfig {
     fn compiler(&self) -> Box<dyn Compiler + Send> {
         Box::new(CraneliftCompiler::new(&self))
     }
+
+    /// Pushes a middleware onto the back of the middleware chain.
+    fn push_middleware(&mut self, middleware: Arc<dyn FunctionMiddlewareGenerator>) {
+        self.middlewares.push(middleware);
+    }
 }
 
 impl Default for CraneliftConfig {

diff --git a/lib/compiler-cranelift/src/translator/func_translator.rs b/lib/compiler-cranelift/src/translator/func_translator.rs
@@ -8,14 +8,17 @@ use super::code_translator::{bitcast_arguments, translate_operator, wasm_param_t
 use super::func_environ::{FuncEnvironment, ReturnMode};
 use super::func_state::FuncTranslationState;
 use super::translation_utils::get_vmctx_value_label;
+use crate::config::CraneliftConfig;
 use cranelift_codegen::entity::EntityRef;
 use cranelift_codegen::ir::{self, Block, InstBuilder, ValueLabel};
 use cranelift_codegen::timing;
 use cranelift_frontend::{FunctionBuilder, FunctionBuilderContext, Variable};
 use tracing::info;
+use wasm_common::LocalFunctionIndex;
 use wasmer_compiler::wasmparser;
 use wasmer_compiler::{
-    to_wasm_error, wasm_unsupported, MiddlewareBinaryReader, ModuleTranslationState, WasmResult,
+    to_wasm_error, wasm_unsupported, GenerateMiddlewareChain, MiddlewareBinaryReader,
+    ModuleTranslationState, WasmResult,
 };
 
 /// WebAssembly to Cranelift IR function translator.
@@ -62,13 +65,16 @@ impl FuncTranslator {
         code_offset: usize,
         func: &mut ir::Function,
         environ: &mut FE,
+        local_function_index: LocalFunctionIndex,
+        config: &CraneliftConfig,
     ) -> WasmResult<()> {
-        self.translate_from_reader(
-            module_translation_state,
-            MiddlewareBinaryReader::new_with_offset(code, code_offset),
-            func,
-            environ,
-        )
+        let mut reader = MiddlewareBinaryReader::new_with_offset(code, code_offset);
+        reader.set_middleware_chain(
+            config
+                .middlewares
+                .generate_middleware_chain(local_function_index),
+        );
+        self.translate_from_reader(module_translation_state, reader, func, environ)
     }
 
     /// Translate a binary WebAssembly function from a `MiddlewareBinaryReader`.