Fix some ugliness

This commit is contained in:
Jef
2019-03-01 08:15:42 +01:00
parent 71662af0fa
commit 0cfc917c97
2 changed files with 5 additions and 26 deletions

View File

@@ -26,6 +26,8 @@ impl Block {
} }
} }
const DISASSEMBLE: bool = false;
pub fn translate_wasm<M: ModuleContext>( pub fn translate_wasm<M: ModuleContext>(
session: &mut CodeGenSession<M>, session: &mut CodeGenSession<M>,
func_idx: u32, func_idx: u32,
@@ -36,7 +38,7 @@ where
{ {
let ty = session.module_context.func_type(func_idx); let ty = session.module_context.func_type(func_idx);
if false { if DISASSEMBLE {
let mut microwasm = vec![]; let mut microwasm = vec![];
let microwasm_conv = MicrowasmConv::new( let microwasm_conv = MicrowasmConv::new(

View File

@@ -112,40 +112,17 @@ pub fn code(
) -> Result<TranslatedCodeSection, Error> { ) -> Result<TranslatedCodeSection, Error> {
let func_count = code.get_count(); let func_count = code.get_count();
let mut session = CodeGenSession::new(func_count, translation_ctx); let mut session = CodeGenSession::new(func_count, translation_ctx);
for (idx, body) in code.into_iter().enumerate() { for (idx, body) in code.into_iter().enumerate() {
let body = body?; let body = body?;
if true {
let mut microwasm = vec![];
let mut microwasm_conv = MicrowasmConv::new(
translation_ctx,
translation_ctx
.func_type(idx as _)
.params
.iter()
.map(|t| MWType::from_wasm(*t).unwrap()),
translation_ctx
.func_type(idx as _)
.returns
.iter()
.map(|t| MWType::from_wasm(*t).unwrap()),
&body,
);
for ops in microwasm_conv {
microwasm.extend(ops?);
}
println!("{}", crate::microwasm::dis(idx, &microwasm));
}
function_body::translate_wasm( function_body::translate_wasm(
&mut session, &mut session,
idx as u32, idx as u32,
&body, &body,
)?; )?;
} }
Ok(session.into_translated_code_section()?) Ok(session.into_translated_code_section()?)
} }