fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2024-12-13 06:15:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into c-api-import_object_t

Browse Source
This commit is contained in:
Yaron Wittenstein 2019-08-01 22:27:41 +03:00
commit 18c7f96188
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/clif-backend/src/code.rs
View File

@ -89,10 +89,13 @@ impl ModuleCodeGenerator<CraneliftFunctionCodeGenerator, Caller, CodegenError>
func, func,
func_translator, func_translator,
next_local: 0, next_local: 0,
clif_signatures: self.clif_signatures.clone(),
module_info: Arc::clone(&module_info), module_info: Arc::clone(&module_info),
target_config: self.isa.frontend_config().clone(),
position: Position::default(), position: Position::default(),
func_env: FunctionEnvironment {
module_info: Arc::clone(&module_info),
target_config: self.isa.frontend_config().clone(),
clif_signatures: self.clif_signatures.clone(),
},
}; };
debug_assert_eq!(func_env.func.dfg.num_ebbs(), 0, "Function must be empty"); debug_assert_eq!(func_env.func.dfg.num_ebbs(), 0, "Function must be empty");
@ -391,10 +394,9 @@ pub struct CraneliftFunctionCodeGenerator {
func: Function, func: Function,
func_translator: FuncTranslator, func_translator: FuncTranslator,
next_local: usize, next_local: usize,
pub clif_signatures: Map<SigIndex, ir::Signature>,
module_info: Arc<RwLock<ModuleInfo>>, module_info: Arc<RwLock<ModuleInfo>>,
target_config: isa::TargetFrontendConfig,
position: Position, position: Position,
func_env: FunctionEnvironment,
} }
pub struct FunctionEnvironment { pub struct FunctionEnvironment {
@ -1138,11 +1140,6 @@ impl FunctionCodeGenerator<CodegenError> for CraneliftFunctionCodeGenerator {
//let builder = self.builder.as_mut().unwrap(); //let builder = self.builder.as_mut().unwrap();
//let func_environment = FuncEnv::new(); //let func_environment = FuncEnv::new();
//let state = TranslationState::new(); //let state = TranslationState::new();
let mut function_environment = FunctionEnvironment {
module_info: Arc::clone(&self.module_info),
target_config: self.target_config.clone(),
clif_signatures: self.clif_signatures.clone(),
};
if self.func_translator.state.control_stack.is_empty() { if self.func_translator.state.control_stack.is_empty() {
return Ok(()); return Ok(());
@ -1154,7 +1151,7 @@ impl FunctionCodeGenerator<CodegenError> for CraneliftFunctionCodeGenerator {
&mut self.position, &mut self.position,
); );
let state = &mut self.func_translator.state; let state = &mut self.func_translator.state;
translate_operator(op, &mut builder, state, &mut function_environment)?; translate_operator(op, &mut builder, state, &mut self.func_env)?;
Ok(()) Ok(())
} }