diff options
-rw-r--r-- | Cargo.toml | 13 | ||||
-rw-r--r-- | src/lib.rs | 6 | ||||
-rw-r--r-- | test/test.rs | 4 |
3 files changed, 17 insertions, 6 deletions
@@ -1,6 +1,6 @@ [package] -name = "x86-rs" +name = "yaxpeax-x86" version = "0.0.1" authors = [ "iximeow <me@iximeow.net>" ] repository = "x86-rs" @@ -19,3 +19,14 @@ A rust x86-64 decoder [[test]] name = "test" path = "test/test.rs" + +[[bench]] +name = "bench" +path = "test/bench.rs" + +[features] +default = [] + +# This enables some capstone benchmarks over the same +# instruction bytes used to bench this code. +capstone_bench = [] @@ -21,7 +21,7 @@ impl RegSpec { } fn gp_from_parts(num: u8, extended: bool, width: u8, rex: bool) -> RegSpec { - println!("from_parts width: {}, num: {}, extended: {}", width, num, extended); +// println!("from_parts width: {}, num: {}, extended: {}", width, num, extended); RegSpec { num: num + if extended { 0b1000 } else { 0 }, bank: width_to_gp_reg_bank(width, rex) @@ -1962,7 +1962,7 @@ pub fn decode_one<'a, 'b, T: IntoIterator<Item=&'a u8>>(bytes: T, instr: &'b mut Some(()) }, Err(reason) => { - panic!("Decode error on operand: {:?}", reason); +// panic!("Decode error on operand: {:?}", reason); // println!("Invalid instruction: {}", reason); // return Instruction::invalid() None @@ -1970,7 +1970,7 @@ pub fn decode_one<'a, 'b, T: IntoIterator<Item=&'a u8>>(bytes: T, instr: &'b mut } } Err(reason) => { - panic!("Decode error on opcode: {:?}", reason); +// panic!("Decode error on opcode: {:?}", reason); // println!("Invalid instruction: {}", reason); // return Instruction::invalid() None diff --git a/test/test.rs b/test/test.rs index 956faf1..8a0b6cb 100644 --- a/test/test.rs +++ b/test/test.rs @@ -1,6 +1,6 @@ -extern crate x86_rs; +extern crate yaxpeax_x86; -use x86_rs::{Instruction, Opcode, decode_one}; +use yaxpeax_x86::{Instruction, Opcode, decode_one}; fn decode(bytes: &[u8]) -> Option<Instruction> { let mut instr = Instruction::invalid(); |