diff options
| author | novafacing <rowanbhart@gmail.com> | 2024-06-24 13:00:04 -0700 |
|---|---|---|
| committer | iximeow <me@iximeow.net> | 2024-06-25 14:09:39 -0700 |
| commit | 739317f268b4ed1a8f3e06af6c6fdf977219d4f9 (patch) | |
| tree | f5a0f76b7d18063a6d395af516e9b07aafb2bb02 /src/armv7/thumb.rs | |
| parent | 997c73be34576fa7cb8c67be5b363498dd82b45d (diff) | |
Bump yaxpeax-arch and bitvec, allow use of deprecated yaxpeax-arch traits, fix bitvec syntax changes
Diffstat (limited to 'src/armv7/thumb.rs')
| -rw-r--r-- | src/armv7/thumb.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/armv7/thumb.rs b/src/armv7/thumb.rs index 5f6abec..e18cb38 100644 --- a/src/armv7/thumb.rs +++ b/src/armv7/thumb.rs @@ -103,7 +103,7 @@ pub fn decode_into<T: Reader<<ARMv7 as Arch>::Address, <ARMv7 as Arch>::Word>>(d let word = u16::from_le_bytes(word_bytes); let instr = word; - let mut instr2 = bitarr![Lsb0, u16; 0u16; 16]; + let mut instr2 = bitarr![u16, Lsb0; 0u16; 16]; instr2[0..16].store(word); let opword = instr2[11..].load::<u16>(); @@ -120,7 +120,7 @@ pub fn decode_into<T: Reader<<ARMv7 as Arch>::Address, <ARMv7 as Arch>::Word>>(d words.next_n(&mut word_bytes)?; let lower = u16::from_le_bytes(word_bytes); - let mut lower2 = bitarr![Lsb0, u16; 0u16; 16]; + let mut lower2 = bitarr![u16, Lsb0; 0u16; 16]; lower2[0..16].store(lower); let op2 = &instr2[4..11]; @@ -4228,7 +4228,7 @@ pub fn decode_into<T: Reader<<ARMv7 as Arch>::Address, <ARMv7 as Arch>::Word>>(d Ok(()) } -fn decode_table_a6_30(decoder: &InstDecoder, inst: &mut Instruction, instr2: BitArray<Lsb0, [u16; 1]>, lower2: BitArray<Lsb0, [u16; 1]>) -> Result<(), DecodeError> { +fn decode_table_a6_30(decoder: &InstDecoder, inst: &mut Instruction, instr2: BitArray<[u16; 1], Lsb0>, lower2: BitArray<[u16; 1], Lsb0>) -> Result<(), DecodeError> { // implementation of table `A6-30 Coprocessor, Advanced SIMD, and Floating-point instructions` let op1 = instr2[4..10].load::<usize>(); if op1 & 0b11_1110 == 0b00_0000 { |