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

Misc refactorings when looking at the wasm code;

Browse Source
This commit is contained in:
Benjamin Bouvier
2018-07-12 19:59:06 +02:00
committed by Dan Gohman
parent c068721964
commit 03159a9200
4 changed files with 28 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -94,10 +94,19 @@ pub fn translate_module<'data>(
ParserState::BeginSection {
code: SectionCode::Code,
..
} => {
// The code section begins
break;
}
} => loop {
match *parser.read() {
ParserState::BeginFunctionBody { .. } => {}
ParserState::EndSection => break,
ParserState::Error(e) => return Err(WasmError::from_binary_reader_error(e)),
ref s => panic!("wrong content in code section: {:?}", s),
}
let mut reader = parser.create_binary_reader();
let size = reader.bytes_remaining();
environ.define_function_body(reader
.read_bytes(size)
.map_err(WasmError::from_binary_reader_error)?)?;
},
ParserState::EndSection => {
next_input = ParserInput::Default;
}
@@ -119,31 +128,4 @@ pub fn translate_module<'data>(
_ => panic!("wrong content in the preamble"),
};
}
// At this point we've entered the code section
loop {
match *parser.read() {
ParserState::BeginFunctionBody { .. } => {}
ParserState::EndSection => break,
ParserState::Error(e) => return Err(WasmError::from_binary_reader_error(e)),
ref s => panic!("wrong content in code section: {:?}", s),
}
let mut reader = parser.create_binary_reader();
let size = reader.bytes_remaining();
environ.define_function_body(reader
.read_bytes(size)
.map_err(WasmError::from_binary_reader_error)?)?;
}
loop {
match *parser.read() {
ParserState::BeginSection {
code: SectionCode::Data,
..
} => {
parse_data_section(&mut parser, environ)?;
}
ParserState::EndWasm => break,
_ => (),
}
}
Ok(())
}