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

Apply conditional compilation of isa targets

Browse Source
This commit is contained in:
Aleksey Kuznetsov
2017-07-29 20:05:45 +05:00
committed by Jakob Stoklund Olesen
parent c057e005ce
commit 5fa991e325
4 changed files with 55 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/reader/src/parser.rs
View File

@@ -621,8 +621,6 @@ impl<'a> Parser<'a> {
&self.loc)?;
}
"isa" => {
last_set_loc = None;
seen_isa = true;
let loc = self.loc;
// Grab the whole line so the lexer won't go looking for tokens on the
// following lines.
@@ -633,9 +631,16 @@ impl<'a> Parser<'a> {
Some(w) => w,
};
let mut isa_builder = match isa::lookup(isa_name) {
None => return err!(loc, "unknown ISA '{}'", isa_name),
Some(b) => b,
Err(isa::LookupError::Unknown) => {
return err!(loc, "unknown ISA '{}'", isa_name)
}
Err(isa::LookupError::Unsupported) => {
continue;
}
Ok(b) => b,
};
last_set_loc = None;
seen_isa = true;
// Apply the ISA-specific settings to `isa_builder`.
isaspec::parse_options(words, &mut isa_builder, &self.loc)?;
@@ -1939,6 +1944,7 @@ mod tests {
}
#[test]
#[cfg(build_riscv)]
fn isa_spec() {
assert!(parse_test("isa
function %foo() {}")