From: Peter Michael Green <plugwash@raspbian.org>
Date: Sat, 23 Jan 2021 11:12:59 +0000 (+0000)
Subject: Update filename in replace-movw.patch and apply it.
X-Git-Tag: archive/raspbian/10.0.0+r36-3+rpi1~7
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=bc83df1edf8c6253230b00a67c2ad412416a6393;p=android-platform-art.git

Update filename in replace-movw.patch and apply it.
---

diff --git a/debian/patches/replace-movw.patch b/debian/patches/replace-movw.patch
index d30924c..bdf20f1 100644
--- a/debian/patches/replace-movw.patch
+++ b/debian/patches/replace-movw.patch
@@ -1,8 +1,8 @@
 Description: Replace movw with mov and orr
 Author: Peter Michael Green <plugwash@raspbian.org>
 
---- android-platform-art-8.1.0+r23.orig/runtime/interpreter/mterp/out/mterp_arm.S
-+++ android-platform-art-8.1.0+r23/runtime/interpreter/mterp/out/mterp_arm.S
+--- android-platform-art-8.1.0+r23.orig/runtime/interpreter/mterp/arm/floating_point.S
++++ android-platform-art-8.1.0+r23/runtime/interpreter/mterp/arm/floating_point.S
 @@ -7755,12 +7755,14 @@ d2l_doconv:
      lsl r2, r1, #1
      lsr r2, r2, #21
diff --git a/runtime/interpreter/mterp/arm/floating_point.S b/runtime/interpreter/mterp/arm/floating_point.S
index f2b7b3b..2f78fa9 100644
--- a/runtime/interpreter/mterp/arm/floating_point.S
+++ b/runtime/interpreter/mterp/arm/floating_point.S
@@ -353,12 +353,14 @@ d2l_doconv:
     lsl r2, r1, #(32-(11)-(20))
     lsr r2, r2, #((32-(11))
     @ 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: