aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Cargo.toml1
-rw-r--r--src/armv7/thumb.rs17
-rw-r--r--src/armv8/a64.rs6
3 files changed, 8 insertions, 16 deletions
diff --git a/Cargo.toml b/Cargo.toml
index 376aebe..eec55db 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,6 +7,7 @@ license = "0BSD"
repository = "http://git.iximeow.net/yaxpeax-arm/"
description = "arm decoders for the yaxpeax project"
keywords = ["disassembler", "decoder", "armv7", "armv8"]
+edition = "2018"
[dependencies]
yaxpeax-arch = { version = "0.2.2", default-features = false, features = [] }
diff --git a/src/armv7/thumb.rs b/src/armv7/thumb.rs
index e721691..1545a36 100644
--- a/src/armv7/thumb.rs
+++ b/src/armv7/thumb.rs
@@ -1,18 +1,9 @@
-// use yaxpeax_arch::{Arch, AddressDiff, Decoder, LengthedInstruction};
use yaxpeax_arch::Arch;
-use armv7::ARMv7;
-use armv7::ConditionCode;
-use armv7::DecodeError;
-use armv7::CReg;
-use armv7::Reg;
-use armv7::Reader;
-use armv7::RegShift;
-use armv7::Operand;
-use armv7::Opcode;
-use armv7::Instruction;
-use armv7::InstDecoder;
-use armv7::StatusRegMask;
+use crate::armv7::{
+ ARMv7, ConditionCode, DecodeError, CReg, Reg, Reader, RegShift,
+ Operand, Opcode, Instruction, InstDecoder, StatusRegMask
+};
use bitvec::prelude::*;
diff --git a/src/armv8/a64.rs b/src/armv8/a64.rs
index dc7d399..caf486f 100644
--- a/src/armv8/a64.rs
+++ b/src/armv8/a64.rs
@@ -4605,7 +4605,7 @@ impl Decoder<ARMv8> for InstDecoder {
type OperandSizeTable = [Result<(SIMDSizeCode, SIMDSizeCode, SIMDSizeCode, SIMDSizeCode), DecodeError>; 8];
- use armv8::a64::SIMDSizeCode::*;
+ use crate::armv8::a64::SIMDSizeCode::*;
const TABLE_A: &'static OperandSizeTable = &[
Ok((D, B, D, B)), Ok((Q, B, Q, B)),
@@ -6086,7 +6086,7 @@ impl Decoder<ARMv8> for InstDecoder {
let q = (word >> 30) & 1;
type OperandSizeTable = [Result<(SIMDSizeCode, SIMDSizeCode, SIMDSizeCode, SIMDSizeCode), DecodeError>; 8];
- use armv8::a64::SIMDSizeCode::*;
+ use crate::armv8::a64::SIMDSizeCode::*;
const TABLE_A: &'static OperandSizeTable = &[
Ok((D, B, D, B)), Ok((Q, B, Q, B)),
@@ -6286,7 +6286,7 @@ impl Decoder<ARMv8> for InstDecoder {
type OperandSizeTable = [Result<(SIMDSizeCode, SIMDSizeCode, SIMDSizeCode, SIMDSizeCode), DecodeError>; 4];
- use armv8::a64::SIMDSizeCode::*;
+ use crate::armv8::a64::SIMDSizeCode::*;
const TABLE_A: &'static OperandSizeTable = &[
Ok((Q, B, Q, B)),