From: Peter Michael Green <plugwash@raspbian.org>
Date: Tue, 19 Mar 2019 01:46:21 +0000 (+0000)
Subject: Replace movw with mov and orr
X-Git-Tag: archive/raspbian/10.0.0+r36-3+rpi1~14
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5df427cc1b0d74d1e9014ba067bcc037325fa74d;p=android-platform-art.git

Replace movw with mov and orr


Gbp-Pq: Name replace-movw.patch
---

diff --git a/runtime/interpreter/mterp/out/mterp_arm.S b/runtime/interpreter/mterp/out/mterp_arm.S
index 7cc3b2c..ff914a8 100644
--- a/runtime/interpreter/mterp/out/mterp_arm.S
+++ b/runtime/interpreter/mterp/out/mterp_arm.S
@@ -7755,12 +7755,14 @@ d2l_doconv:
     lsl r2, r1, #1
     lsr r2, r2, #21
     @ end replacement of ubfx    r2, r1, #20, #11            @ grab the exponent
-    movw    r3, #0x43e
+    mov     r3, #0x03e
+    orr     r3, #0x400
     cmp     r2, r3                      @ MINLONG < x > MAXLONG?
     bhs     d2l_special_cases
     b       __aeabi_d2lz                @ tail call to convert double to long
 d2l_special_cases:
-    movw    r3, #0x7ff
+    mov     r3, #0x0ff
+    orr     r3, #0x700
     cmp     r2, r3
     beq     d2l_maybeNaN                @ NaN?
 d2l_notNaN: