diff options
| author | Saleem Abdulrasool <compnerd@compnerd.org> | 2014-08-09 20:17:37 +0000 |
|---|---|---|
| committer | Saleem Abdulrasool <compnerd@compnerd.org> | 2014-08-09 20:17:37 +0000 |
| commit | 3a2883db4582a9a095fa02cc8f3636fab7e3cc7b (patch) | |
| tree | 8d8f30f036954b3b0b760f4c0116d4cee41fb0ab /lib/builtins/arm | |
| parent | 3e0aaee60577fbc875d7dfcdfb73ece388928f25 (diff) | |
builtins: correct __umodsi3, __udivsi3 on ARM
When building the builtins for a modern CPU (idiv support), __umodsi3 was
completely incorrect as it would behave as __udivmosi3, which takes a tertiary
parameter which is a pointer.
__udivsi3 was also incorrect, returning the remainder in r1. Although this
would not result in any crash or invalid behaviour as r1 is a caller saved
register in AAPCS, this is unnecessary. Simply perform the division ignoring
the remainder.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@215295 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/builtins/arm')
| -rw-r--r-- | lib/builtins/arm/udivsi3.S | 4 | ||||
| -rw-r--r-- | lib/builtins/arm/umodsi3.S | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/lib/builtins/arm/udivsi3.S b/lib/builtins/arm/udivsi3.S index bb5f8a069..34bd713fb 100644 --- a/lib/builtins/arm/udivsi3.S +++ b/lib/builtins/arm/udivsi3.S @@ -27,9 +27,7 @@ DEFINE_COMPILERRT_FUNCTION(__udivsi3) #if __ARM_ARCH_EXT_IDIV__ tst r1, r1 beq LOCAL_LABEL(divby0) - mov r3, r0 - udiv r0, r3, r1 - mls r1, r0, r1, r3 + udiv r0, r0, r1 bx lr #else cmp r1, #1 diff --git a/lib/builtins/arm/umodsi3.S b/lib/builtins/arm/umodsi3.S index eb1f441b5..b0c62d73c 100644 --- a/lib/builtins/arm/umodsi3.S +++ b/lib/builtins/arm/umodsi3.S @@ -25,10 +25,8 @@ DEFINE_COMPILERRT_FUNCTION(__umodsi3) #if __ARM_ARCH_EXT_IDIV__ tst r1, r1 beq LOCAL_LABEL(divby0) - mov r3, r0 - udiv r0, r3, r1 - mls r1, r0, r1, r3 - str r1, [r2] + udiv r2, r0, r1 + mls r0, r2, r1, r0 bx lr #else cmp r1, #1 |