diff options
| author | iximeow <me@iximeow.net> | 2020-02-23 01:17:02 -0800 |
|---|---|---|
| committer | iximeow <me@iximeow.net> | 2020-02-23 01:17:02 -0800 |
| commit | f4f2c1befecfc841b2a7f5906492b94b16560b9c (patch) | |
| tree | abdf7ab729c1e3400a913c430908afac70867b48 /src | |
| parent | 6265433ddbe9fb72ecd08204e3a26b39531ad9e7 (diff) | |
bring more armv7 tests back to the land of the living
Diffstat (limited to 'src')
| -rw-r--r-- | src/armv7.rs | 8 |
1 files changed, 4 insertions, 4 deletions
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, ]; |