Instead of having two expansions of shrximm (one in SelectOp, one in Asmgen), move the most efficient expansion to Asmgen.

git-svn-id: https://yquem.inria.fr/compcert/svn/compcert/trunk@2504 fca1b0fc-160b-0410-b1d3-a4f43f01ea2e

1 files changed, 6 insertions, 4 deletions

diff --git a/arm/Asmgen.v b/arm/Asmgen.v
index fcc50617..2513a5e8 100644
--- a/arm/Asmgen.v
+++ b/arm/Asmgen.v
@@ -376,10 +376,12 @@ Definition transl_op
       OK (Pmov r (transl_shift s r1) :: k)
   | Oshrximm n, a1 :: nil =>
       do r <- ireg_of res; do r1 <- ireg_of a1;
-      OK (Pcmp r1 (SOimm Int.zero) ::
-          addimm IR14 r1 (Int.sub (Int.shl Int.one n) Int.one)
-             (Pmovc TCge IR14 (SOreg r1) ::
-              Pmov r (SOasrimm IR14 n) :: k))
+      if Int.eq n Int.zero then
+        OK (Pmov r (SOreg r1) :: k)
+      else
+        OK (Pmov IR14 (SOasrimm r1 (Int.repr 31)) ::
+            Padd IR14 r1 (SOlsrimm IR14 (Int.sub Int.iwordsize n)) ::
+            Pmov r (SOasrimm IR14 n) :: k)
   | Onegf, a1 :: nil =>
       do r <- freg_of res; do r1 <- freg_of a1;
       OK (Pfnegd r r1 :: k)