Refactor set/isa parsing into a utility function.

cranelift/src/compile.rs

@@ -2,18 +2,12 @@
 //!
 //! Reads IR files into Cretonne IL and compiles it.
 
-use cton_reader::{parse_options, Location, parse_functions};
+use cton_reader::parse_functions;
 use std::path::PathBuf;
 use cretonne::Context;
-use cretonne::settings::{self, FlagsOrIsa};
-use cretonne::isa::{self, TargetIsa};
+use cretonne::settings::FlagsOrIsa;
 use std::path::Path;
-use utils::{pretty_error, read_to_string};
-
-enum OwnedFlagsOrIsa {
-    Flags(settings::Flags),
-    Isa(Box<TargetIsa>),
-}
+use utils::{pretty_error, read_to_string, parse_sets_and_isa};
 
 pub fn run(
     files: Vec<String>,
@@ -21,33 +15,12 @@ pub fn run(
     flag_set: Vec<String>,
     flag_isa: String,
 ) -> Result<(), String> {
-    let mut flag_builder = settings::builder();
-    parse_options(
-        flag_set.iter().map(|x| x.as_str()),
-        &mut flag_builder,
-        &Location { line_number: 0 },
-    ).map_err(|err| err.to_string())?;
-
-    let mut words = flag_isa.trim().split_whitespace();
-    // Look for `isa foo`.
-    let owned_fisa = if let Some(isa_name) = words.next() {
-        let isa_builder = isa::lookup(isa_name).map_err(|err| match err {
-            isa::LookupError::Unknown => format!("unknown ISA '{}'", isa_name),
-            isa::LookupError::Unsupported => format!("support for ISA '{}' not enabled", isa_name),
-        })?;
-        OwnedFlagsOrIsa::Isa(isa_builder.finish(settings::Flags::new(&flag_builder)))
-    } else {
-        OwnedFlagsOrIsa::Flags(settings::Flags::new(&flag_builder))
-    };
-    let fisa = match owned_fisa {
-        OwnedFlagsOrIsa::Flags(ref flags) => FlagsOrIsa::from(flags),
-        OwnedFlagsOrIsa::Isa(ref isa) => FlagsOrIsa::from(&**isa),
-    };
+    let parsed = parse_sets_and_isa(flag_set, flag_isa)?;
 
     for filename in files {
         let path = Path::new(&filename);
         let name = String::from(path.as_os_str().to_string_lossy());
-        handle_module(flag_print, path.to_path_buf(), name, &fisa)?;
+        handle_module(flag_print, path.to_path_buf(), name, parsed.as_fisa())?;
     }
     Ok(())
 }
@@ -56,7 +29,7 @@ fn handle_module(
     flag_print: bool,
     path: PathBuf,
     name: String,
-    fisa: &FlagsOrIsa,
+    fisa: FlagsOrIsa,
 ) -> Result<(), String> {
     let buffer = read_to_string(&path).map_err(
         |e| format!("{}: {}", name, e),