Merge branch 'master' of github.com:ret2lab/bincraft

Author: Anciety

sleighcraft/build.rs

@@ -18,7 +18,7 @@ use std::env;
 use std::fs;
 use std::path::{Path, PathBuf};
 
-const DECOMPILER_SOURCE_BASE_CXX: &[&'static str] = &[
+const DECOMPILER_SOURCE_BASE_CXX: &[&str] = &[
     "space.cc",
     "float.cc",
     "address.cc",
@@ -114,9 +114,9 @@ const SLEIGH_COMPILER_SOURCE_FLEX: [&'static str; 1] = [
 ];
 */
 
-const DECOMPILER_SOURCE_SLEIGH_YACC: &[&'static str] = &["pcodeparse.y", "grammar.y", "xml.y"];
+const DECOMPILER_SOURCE_SLEIGH_YACC: &[&str] = &["pcodeparse.y", "grammar.y", "xml.y"];
 
-const PROXIES: &[&'static str] = &[
+const PROXIES: &[&str] = &[
     "address_proxy.cc",
     "addrspace_proxy.cc",
     "cover_proxy.cc",
@@ -141,27 +141,23 @@ fn need_recompile(source: &Path) -> bool {
     let outdir = env::var("OUT_DIR").unwrap();
 
     let path = Path::new(&outdir).join(source);
-    let mut path = PathBuf::from(path);
+    let mut path = path;
     path.set_extension("o");
     let metadata = match fs::metadata(path) {
         Ok(m) => m,
         Err(_) => return true,
     };
     let object_mtime = FileTime::from_last_modification_time(&metadata);
 
-    let metadata = fs::metadata(source).expect(&format!("source code {:?} not found", source));
+    let metadata = fs::metadata(source).unwrap_or_else(|_| panic!("source code {:?} not found", source));
     let source_mtime = FileTime::from_last_modification_time(&metadata);
 
-    if source_mtime > object_mtime {
-        true
-    } else {
-        false
-    }
+    source_mtime > object_mtime
 }
 
 fn obj_path_from_src_path(src_path: &Path) -> PathBuf {
     let outdir = env::var("OUT_DIR").unwrap();
-    let mut path = PathBuf::from(Path::new(&outdir).join(src_path));
+    let mut path = Path::new(&outdir).join(src_path);
     path.set_extension("o");
     path
 }
@@ -180,7 +176,7 @@ fn prepare() -> CompileOptions {
     }
 
     for src in DECOMPILER_SOURCE_SLEIGH_YACC.iter() {
-        let name = src.split(".").next().unwrap();
+        let name = src.split('.').next().unwrap();
         let path = Path::new("src")
             .join("cpp")
             .join("gen")
@@ -207,7 +203,7 @@ fn prepare() -> CompileOptions {
         }
     }
 
-    CompileOptions { objects, sources }
+    CompileOptions { sources, objects }
 }
 
 fn main() {
@@ -216,7 +212,7 @@ fn main() {
 
     let mut target = cxx_build::bridge(sleigh_src_file);
 
-    for obj in compile_opts.objects.iter() {
+    for obj in &compile_opts.objects {
         target.object(obj);
     }
     let disasm_src_path= Path::new("src").join("cpp").join("bridge").join("disasm.cpp");

sleighcraft/src/sleigh.rs

@@ -932,52 +932,3 @@ pub fn arch(name: &str) -> Result<&str> {
         .ok_or(Error::ArchNotFound(name.to_string()))?;
     Ok(content)
 }
-
-// #[test]
-// fn test_custom_spec() {
-//     // let compiled = include_str!("../test/test.sla");
-//     // let mut sleigh = Sleigh::from_spec(compiled).unwrap();
-//     // let buf = [0x1, 0x2, 0x3, 0x4, 0x5, 0x6];
-//     // sleigh.decode(0, &buf, 1);
-//     // println!("{:?}", sleigh.pcode_emit)
-// }
-
-#[test]
-fn test_x86() {
-    let mut sleigh_builder = SleighBuilder::default();
-    let spec = arch("x86").unwrap();
-    let buf = [0x90, 0x32, 0x31];
-    let mut loader = PlainLoadImage::from_buf(&buf, 0);
-    sleigh_builder.loader(&mut loader);
-    sleigh_builder.spec(spec);
-    let mut asm_emit = CollectingAssemblyEmit::default();
-    let mut pcode_emit = CollectingPcodeEmit::default();
-    sleigh_builder.asm_emit(&mut asm_emit);
-    sleigh_builder.pcode_emit(&mut pcode_emit);
-    let mut sleigh = sleigh_builder.try_build().unwrap();
-
-    sleigh.decode(0).unwrap();
-
-    println!("{:?}", asm_emit.asms);
-    println!("{:?}", pcode_emit.pcode_asms);
-}
-
-#[test]
-fn test_x86_case_ignoring() {
-    let mut sleigh_builder = SleighBuilder::default();
-    let spec = arch("x86").unwrap();
-    let buf = [0x90, 0x32, 0x31];
-    let mut loader = PlainLoadImage::from_buf(&buf, 0);
-    sleigh_builder.loader(&mut loader);
-    sleigh_builder.spec(spec);
-    let mut asm_emit = CollectingAssemblyEmit::default();
-    let mut pcode_emit = CollectingPcodeEmit::default();
-    sleigh_builder.asm_emit(&mut asm_emit);
-    sleigh_builder.pcode_emit(&mut pcode_emit);
-    let mut sleigh = sleigh_builder.try_build().unwrap();
-
-    sleigh.decode(0).unwrap();
-
-    println!("{:?}", asm_emit.asms);
-    println!("{:?}", pcode_emit.pcode_asms);
-}

sleighcraft/tests/mod.rs

@@ -0,0 +1,50 @@
+use sleighcraft::prelude::*;
+
+// #[test]
+// fn test_custom_spec() {
+//     // let compiled = include_str!("../test/test.sla");
+//     // let mut sleigh = Sleigh::from_spec(compiled).unwrap();
+//     // let buf = [0x1, 0x2, 0x3, 0x4, 0x5, 0x6];
+//     // sleigh.decode(0, &buf, 1);
+//     // println!("{:?}", sleigh.pcode_emit)
+// }
+
+#[test]
+fn test_x86() {
+    let mut sleigh_builder = SleighBuilder::default();
+    let spec = arch("x86").unwrap();
+    let buf = [0x90, 0x32, 0x31];
+    let mut loader = PlainLoadImage::from_buf(&buf, 0);
+    sleigh_builder.loader(&mut loader);
+    sleigh_builder.spec(spec);
+    let mut asm_emit = CollectingAssemblyEmit::default();
+    let mut pcode_emit = CollectingPcodeEmit::default();
+    sleigh_builder.asm_emit(&mut asm_emit);
+    sleigh_builder.pcode_emit(&mut pcode_emit);
+    let mut sleigh = sleigh_builder.try_build().unwrap();
+
+    sleigh.decode(0).unwrap();
+
+    println!("{:?}", asm_emit.asms);
+    println!("{:?}", pcode_emit.pcode_asms);
+}
+
+#[test]
+fn test_x86_case_ignoring() {
+    let mut sleigh_builder = SleighBuilder::default();
+    let spec = arch("x86").unwrap();
+    let buf = [0x90, 0x32, 0x31];
+    let mut loader = PlainLoadImage::from_buf(&buf, 0);
+    sleigh_builder.loader(&mut loader);
+    sleigh_builder.spec(spec);
+    let mut asm_emit = CollectingAssemblyEmit::default();
+    let mut pcode_emit = CollectingPcodeEmit::default();
+    sleigh_builder.asm_emit(&mut asm_emit);
+    sleigh_builder.pcode_emit(&mut pcode_emit);
+    let mut sleigh = sleigh_builder.try_build().unwrap();
+
+    sleigh.decode(0).unwrap();
+
+    println!("{:?}", asm_emit.asms);
+    println!("{:?}", pcode_emit.pcode_asms);
+}