From f4f2c1befecfc841b2a7f5906492b94b16560b9c Mon Sep 17 00:00:00 2001
From: iximeow <me@iximeow.net>
Date: Sun, 23 Feb 2020 01:17:02 -0800
Subject: bring more armv7 tests back to the land of the living

---
 src/armv7.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/armv7.rs b/src/armv7.rs
index 3a1509e..20f0189 100644
--- a/src/armv7.rs
+++ b/src/armv7.rs
@@ -497,7 +497,7 @@ impl RegShift {
         }
     }
 
-    fn from(data: u16) -> Self {
+    pub fn from_raw(data: u16) -> Self {
         RegShift { data }
     }
 }
@@ -1620,7 +1620,7 @@ impl Decoder<Instruction> for InstDecoder {
                                 inst.operands = [
                                     Operand::Reg(Reg::from_u8(Rd)),
                                     Operand::Reg(Reg::from_u8(Rn)),
-                                    Operand::RegShift(RegShift::from(shift_spec)),
+                                    Operand::RegShift(RegShift::from_raw(shift_spec)),
                                     Operand::Nothing
                                 ];
                             }
@@ -1647,7 +1647,7 @@ impl Decoder<Instruction> for InstDecoder {
                                 inst.operands = [
                                     Operand::Reg(Reg::from_u8(Rd)),
                                     Operand::Reg(Reg::from_u8(Rn)),
-                                    Operand::RegShift(RegShift::from(shift_spec)),
+                                    Operand::RegShift(RegShift::from_raw(shift_spec)),
                                     Operand::Nothing,
                                 ];
                             }
@@ -1867,7 +1867,7 @@ impl Decoder<Instruction> for InstDecoder {
                     };
                     inst.operands = [
                         Operand::Reg(Reg::from_u8(Rt)),
-                        Operand::RegDerefRegShift(RegShift::from(shift)),
+                        Operand::RegDerefRegShift(RegShift::from_raw(shift)),
                         Operand::Nothing,
                         Operand::Nothing,
                     ];
-- 
cgit v1.1