[PATCH] D28971: [Bultin][ARM] Make aeabi_memset be Thumb1 compatible

[Weiming Zhao via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL292727: [Bultin][ARM] Make aeabi_memset be Thumb1 compatible and other asm (authored by weimingz).

Changed prior to commit:
  https://reviews.llvm.org/D28971?vs=85188&id=85243#toc

Repository:
  rL LLVM

https://reviews.llvm.org/D28971

Files:
  compiler-rt/trunk/lib/builtins/CMakeLists.txt
  compiler-rt/trunk/lib/builtins/arm/aeabi_idivmod.S
  compiler-rt/trunk/lib/builtins/arm/aeabi_memset.S
  compiler-rt/trunk/lib/builtins/arm/aeabi_uidivmod.S
  compiler-rt/trunk/lib/builtins/arm/comparesf2.S


Index: compiler-rt/trunk/lib/builtins/arm/aeabi_memset.S
===================================================================
--- compiler-rt/trunk/lib/builtins/arm/aeabi_memset.S
+++ compiler-rt/trunk/lib/builtins/arm/aeabi_memset.S
@@ -26,7 +26,7 @@
 
 DEFINE_COMPILERRT_FUNCTION(__aeabi_memclr)
         mov     r2, r1
-        mov     r1, #0
+        movs    r1, #0
         b       memset
 END_COMPILERRT_FUNCTION(__aeabi_memclr)
 
Index: compiler-rt/trunk/lib/builtins/arm/aeabi_idivmod.S
===================================================================
--- compiler-rt/trunk/lib/builtins/arm/aeabi_idivmod.S
+++ compiler-rt/trunk/lib/builtins/arm/aeabi_idivmod.S
@@ -26,7 +26,7 @@
         push    {r0, r1, lr}
         bl      SYMBOL_NAME(__divsi3)
         pop     {r1, r2, r3} // now r0 = quot, r1 = num, r2 = denom
-        muls    r2, r2, r0   // r2 = quot * denom
+        muls    r2, r0, r2   // r2 = quot * denom
         subs    r1, r1, r2
         JMP     (r3)
 #else
Index: compiler-rt/trunk/lib/builtins/arm/aeabi_uidivmod.S
===================================================================
--- compiler-rt/trunk/lib/builtins/arm/aeabi_uidivmod.S
+++ compiler-rt/trunk/lib/builtins/arm/aeabi_uidivmod.S
@@ -29,7 +29,7 @@
         push    {r0, r1, lr}
         bl      SYMBOL_NAME(__aeabi_uidiv)
         pop     {r1, r2, r3}
-        muls    r2, r2, r0 // r2 = quot * denom
+        muls    r2, r0, r2 // r2 = quot * denom
         subs    r1, r1, r2
         JMP     (r3)
 LOCAL_LABEL(case_denom_larger):
Index: compiler-rt/trunk/lib/builtins/arm/comparesf2.S
===================================================================
--- compiler-rt/trunk/lib/builtins/arm/comparesf2.S
+++ compiler-rt/trunk/lib/builtins/arm/comparesf2.S
@@ -69,7 +69,7 @@
     // the subsequent operations.
 #if __ARM_ARCH_ISA_THUMB == 1
     lsrs    r6,     r3, #1
-    orrs    r6,     r2, r6
+    orrs    r6,     r2
 #else
     orrs    r12,    r2, r3, lsr #1
 #endif
@@ -194,7 +194,7 @@
     lsls    r2,        r0, #1
     lsls    r3,        r1, #1
     lsrs    r6,        r3, #1
-    orrs    r6,        r2, r6
+    orrs    r6,        r2
     beq     1f
     movs    r6,        r0
     eors    r6,        r1
Index: compiler-rt/trunk/lib/builtins/CMakeLists.txt
===================================================================
--- compiler-rt/trunk/lib/builtins/CMakeLists.txt
+++ compiler-rt/trunk/lib/builtins/CMakeLists.txt
@@ -337,6 +337,7 @@
   arm/aeabi_idivmod.S
   arm/aeabi_memcmp.S
   arm/aeabi_memcpy.S
+  arm/aeabi_memset.S
   arm/aeabi_memmove.S
   arm/aeabi_uidivmod.S)
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D28971.85243.patch
Type: text/x-patch
Size: 2592 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170121/764f4576/attachment.bin>