From a00a54539d9124d8b376ee9cbeab355d99c9d163 Mon Sep 17 00:00:00 2001
From: iximeow <me@iximeow.net>
Date: Fri, 11 Sep 2026 15:57:22 +0000
Subject: fix {s,u}xt{h,b}[16] using an immediate to describe their rotates

---
 src/armv7/display.rs | 10 ++++++++++
 src/armv7/thumb.rs   |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'src/armv7')

diff --git a/src/armv7/display.rs b/src/armv7/display.rs
index 1398ce6..2d2a77c 100644
--- a/src/armv7/display.rs
+++ b/src/armv7/display.rs
@@ -357,6 +357,13 @@ impl<T: DisplaySink> crate::armv7::OperandVisitor for DisplayingOperandVisitor<'
         Ok(())
     }
 
+    fn visit_rotate(&mut self, amt: u8) -> Result<Self::Ok, Self::Error> {
+        self.emit_shift_type(ShiftStyle::ROR)?;
+        self.f.write_char(' ')?;
+        self.f.write_prefixed_u16(amt as u16)?;
+        Ok(())
+    }
+
     fn visit_apsr(&mut self) -> Result<Self::Ok, Self::Error> {
         self.f.span_start_register();
         self.f.write_fixed_size("apsr")?;
@@ -1437,6 +1444,9 @@ impl super::Operand {
             Operand::StatusRegMask(mask) => {
                 visitor.visit_status_reg_mask(mask)
             }
+            Operand::Ror(amt) => {
+                visitor.visit_rotate(amt)
+            }
             Operand::APSR => {
                 visitor.visit_apsr()
             },
diff --git a/src/armv7/thumb.rs b/src/armv7/thumb.rs
index 4340e95..1d9d96a 100644
--- a/src/armv7/thumb.rs
+++ b/src/armv7/thumb.rs
@@ -2860,7 +2860,7 @@ pub fn decode_into<T: Reader<<ARMv7 as Arch>::Address, <ARMv7 as Arch>::Word>>(d
                                         Operand::Reg(Reg::from_u8(rd)),
                                         Operand::Reg(Reg::from_u8(rm)),
                                         if rotate != 0 {
-                                            Operand::Imm32(rotate as u32)
+                                            Operand::Ror(rotate as u8)
                                         } else {
                                             Operand::Nothing
                                         },
@@ -2886,7 +2886,7 @@ pub fn decode_into<T: Reader<<ARMv7 as Arch>::Address, <ARMv7 as Arch>::Word>>(d
                                         Operand::Reg(Reg::from_u8(rn)),
                                         Operand::Reg(Reg::from_u8(rm)),
                                         if rotate != 0 {
-                                            Operand::Imm32(rotate as u32)
+                                            Operand::Ror(rotate as u8)
                                         } else {
                                             Operand::Nothing
                                         },
-- 
cgit v1.1