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

Simplify code by removing unnecessary Options.

Browse Source
This commit is contained in:
Dan Gohman
2017-09-25 16:22:36 -07:00
parent 56862c3da9
commit d1766f0ba4
1 changed files with 7 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lib/wasm/src/module_translator.rs
View File

@@ -39,9 +39,9 @@ pub fn translate_module(
} }
ref s => panic!("modules should begin properly: {:?}", s), ref s => panic!("modules should begin properly: {:?}", s),
} }
let mut functions: Option<Vec<SignatureIndex>> = None; let mut functions: Vec<SignatureIndex> = Vec::new();
let mut globals = Vec::new(); let mut globals = Vec::new();
let mut exports: Option<HashMap<FunctionIndex, String>> = None; let mut exports: HashMap<FunctionIndex, String> = HashMap::new();
let mut next_input = ParserInput::Default; let mut next_input = ParserInput::Default;
let mut function_index: FunctionIndex = 0; let mut function_index: FunctionIndex = 0;
let mut start_index: Option<FunctionIndex> = None; let mut start_index: Option<FunctionIndex> = None;
@@ -62,13 +62,7 @@ pub fn translate_module(
for import in imps { for import in imps {
match import { match import {
Import::Function { sig_index } => { Import::Function { sig_index } => {
functions = match functions { functions.push(sig_index as SignatureIndex);
None => Some(vec![sig_index as SignatureIndex]),
Some(mut funcs) => {
funcs.push(sig_index as SignatureIndex);
Some(funcs)
}
};
function_index += 1; function_index += 1;
} }
Import::Memory(mem) => { Import::Memory(mem) => {
@@ -93,10 +87,7 @@ pub fn translate_module(
ParserState::BeginSection { code: SectionCode::Function, .. } => { ParserState::BeginSection { code: SectionCode::Function, .. } => {
match parse_function_section(&mut parser, runtime) { match parse_function_section(&mut parser, runtime) {
Ok(funcs) => { Ok(funcs) => {
match functions { functions.extend(funcs);
None => functions = Some(funcs),
Some(ref mut imps) => imps.extend(funcs),
}
} }
Err(SectionParsingError::WrongSectionContent(s)) => { Err(SectionParsingError::WrongSectionContent(s)) => {
return Err(format!("wrong content in the function section: {}", s)) return Err(format!("wrong content in the function section: {}", s))
@@ -136,7 +127,7 @@ pub fn translate_module(
} }
ParserState::BeginSection { code: SectionCode::Export, .. } => { ParserState::BeginSection { code: SectionCode::Export, .. } => {
match parse_export_section(&mut parser) { match parse_export_section(&mut parser) {
Ok(exps) => exports = Some(exps), Ok(exps) => exports = exps,
Err(SectionParsingError::WrongSectionContent(s)) => { Err(SectionParsingError::WrongSectionContent(s)) => {
return Err(format!("wrong content in the export section: {}", s)) return Err(format!("wrong content in the export section: {}", s))
} }
@@ -190,11 +181,6 @@ pub fn translate_module(
}; };
} }
// At this point we've entered the code section // At this point we've entered the code section
// First we check that we have all that is necessary to translate a function.
let functions = match functions {
None => return Err(String::from("missing a function section")),
Some(functions) => functions,
};
let mut il_functions: Vec<Function> = Vec::new(); let mut il_functions: Vec<Function> = Vec::new();
let mut trans = FuncTranslator::new(); let mut trans = FuncTranslator::new();
runtime.begin_translation(); runtime.begin_translation();
@@ -208,10 +194,8 @@ pub fn translate_module(
// First we build the Function object with its name and signature // First we build the Function object with its name and signature
let mut func = Function::new(); let mut func = Function::new();
func.signature = runtime.get_signature(functions[function_index]).clone(); func.signature = runtime.get_signature(functions[function_index]).clone();
if let Some(ref exports) = exports { if let Some(name) = exports.get(&function_index) {
if let Some(name) = exports.get(&function_index) { func.name = FunctionName::new(name.clone());
func.name = FunctionName::new(name.clone());
}
} }
trans trans
.translate_from_reader(parser.create_binary_reader(), &mut func, runtime) .translate_from_reader(parser.create_binary_reader(), &mut func, runtime)