From 97fdfc942bc40b393cc542bfdcea605cefb48136 Mon Sep 17 00:00:00 2001
From: Jeppe Johansen <jeppe@j-software.dk>
Date: Sun, 28 Dec 2014 00:13:06 +0000
Subject: [PATCH] Fix encoding of shifterops for ARM dataprocessing
 instructions.

git-svn-id: branches/laksen/armiw@29348 -
---
 compiler/arm/aasmcpu.pas | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/arm/aasmcpu.pas b/compiler/arm/aasmcpu.pas
index 9ce03d5476..492dd8c89e 100644
--- a/compiler/arm/aasmcpu.pas
+++ b/compiler/arm/aasmcpu.pas
@@ -2558,7 +2558,7 @@ implementation
                 if (op+1<opercnt) and (oper[op+1]^.typ=top_shifterop) then
                   with oper[op+1]^.shifterop^ do
                     begin
-                      bytes:=bytes or (shiftimm shl 7);
+                      bytes:=bytes or ((shiftimm and $1F) shl 7);
                       if shiftmode<>SM_RRX then
                         bytes:=bytes or (ord(shiftmode) - ord(SM_LSL)) shl 5
                       else