From 693e21378ecec332254d48642cd7b751cabeb6da Mon Sep 17 00:00:00 2001 From: iximeow Date: Thu, 28 Nov 2019 02:22:02 -0800 Subject: update msp430 to revised decoder trait --- test/test.rs | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'test') diff --git a/test/test.rs b/test/test.rs index 48cf90b..5a59df4 100644 --- a/test/test.rs +++ b/test/test.rs @@ -1,28 +1,26 @@ extern crate yaxpeax_arch; extern crate yaxpeax_msp430_mc; -use yaxpeax_arch::Decodable; -use yaxpeax_msp430_mc::{Instruction, Opcode}; +use yaxpeax_arch::{Arch, Decoder}; +use yaxpeax_msp430_mc::{Opcode, MSP430}; #[test] fn test_decode() { + let decoder = ::Decoder::default(); + let data = [0x02, 0x12]; - let mut instr = Instruction::blank(); - instr.decode_into(data.iter().map(|x| *x)); + let instr = decoder.decode(data.iter().cloned()).unwrap(); assert!(instr.opcode == Opcode::PUSH); let data = [0xb1, 0x92, 0x8d, 0x49]; - let mut instr = Instruction::blank(); - instr.decode_into(data.iter().map(|x| *x)); + let instr = decoder.decode(data.iter().cloned()).unwrap(); assert!(instr.opcode == Opcode::CMP); let data = [0x12, 0x00, 0x3f, 0x40]; - let mut instr = Instruction::blank(); - instr.decode_into(data.iter().map(|x| *x)); + let instr = decoder.decode(data.iter().cloned()).unwrap(); assert!(instr.opcode == Opcode::RRC); let data = [0x20, 0x0e]; - let mut instr = Instruction::blank(); - instr.decode_into(data.iter().map(|x| *x)); + let instr = decoder.decode(data.iter().cloned()).unwrap(); assert!(instr.opcode == Opcode::PUSH); } -- cgit v1.1