Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/lgpl3/gmp/dist/mpn port forward our changes:
details: https://anonhg.NetBSD.org/src/rev/27789d1cf063
branches: trunk
changeset: 791722:27789d1cf063
user: mrg <mrg%NetBSD.org@localhost>
date: Fri Nov 29 08:02:28 2013 +0000
description:
port forward our changes:
- allow working on thumb-missing platforms
- fix some minor issues
diffstat:
external/lgpl3/gmp/dist/mpn/arm/aorscnd_n.asm | 5 ++++-
external/lgpl3/gmp/dist/mpn/arm/aorslsh1_n.asm | 5 ++++-
external/lgpl3/gmp/dist/mpn/arm/bdiv_dbm1c.asm | 5 ++++-
external/lgpl3/gmp/dist/mpn/arm/com.asm | 6 +++++-
external/lgpl3/gmp/dist/mpn/arm/copyd.asm | 6 +++++-
external/lgpl3/gmp/dist/mpn/arm/copyi.asm | 6 +++++-
external/lgpl3/gmp/dist/mpn/arm/logops_n.asm | 5 ++++-
external/lgpl3/gmp/dist/mpn/arm/lshift.asm | 5 ++++-
external/lgpl3/gmp/dist/mpn/arm/lshiftc.asm | 5 ++++-
external/lgpl3/gmp/dist/mpn/arm/mod_34lsub1.asm | 10 ++++++++--
external/lgpl3/gmp/dist/mpn/arm/mode1o.asm | 5 ++++-
external/lgpl3/gmp/dist/mpn/arm/rsh1aors_n.asm | 5 ++++-
external/lgpl3/gmp/dist/mpn/arm/rshift.asm | 5 ++++-
external/lgpl3/gmp/dist/mpn/arm/udiv.asm | 5 ++++-
external/lgpl3/gmp/dist/mpn/generic/get_d.c | 2 +-
15 files changed, 64 insertions(+), 16 deletions(-)
diffs (211 lines):
diff -r f810783e10c6 -r 27789d1cf063 external/lgpl3/gmp/dist/mpn/arm/aorscnd_n.asm
--- a/external/lgpl3/gmp/dist/mpn/arm/aorscnd_n.asm Fri Nov 29 07:57:10 2013 +0000
+++ b/external/lgpl3/gmp/dist/mpn/arm/aorscnd_n.asm Fri Nov 29 08:02:28 2013 +0000
@@ -117,5 +117,8 @@
L(end): RETVAL
pop {r4-r11}
- bx r14
+ifdef(`ARM_THUMB_MODE',
+` bx r14
+',` mov pc, r14
+')
EPILOGUE()
diff -r f810783e10c6 -r 27789d1cf063 external/lgpl3/gmp/dist/mpn/arm/aorslsh1_n.asm
--- a/external/lgpl3/gmp/dist/mpn/arm/aorslsh1_n.asm Fri Nov 29 07:57:10 2013 +0000
+++ b/external/lgpl3/gmp/dist/mpn/arm/aorslsh1_n.asm Fri Nov 29 08:02:28 2013 +0000
@@ -151,5 +151,8 @@
REVCY(r12)
L(rt0): RETVAL( r14)
pop {r4-r10r11, r14}
- bx r14
+ifdef(`ARM_THUMB_MODE',
+` bx r14
+',` mov pc, r14
+')
EPILOGUE()
diff -r f810783e10c6 -r 27789d1cf063 external/lgpl3/gmp/dist/mpn/arm/bdiv_dbm1c.asm
--- a/external/lgpl3/gmp/dist/mpn/arm/bdiv_dbm1c.asm Fri Nov 29 07:57:10 2013 +0000
+++ b/external/lgpl3/gmp/dist/mpn/arm/bdiv_dbm1c.asm Fri Nov 29 08:02:28 2013 +0000
@@ -97,5 +97,8 @@
str r5, [qp]
sbc r0, r5, r12
pop {r4, r5, r6, r7, r8}
- bx lr
+ifdef(`ARM_THUMB_MODE',
+` bx lr
+',` mov pc, lr
+')
EPILOGUE()
diff -r f810783e10c6 -r 27789d1cf063 external/lgpl3/gmp/dist/mpn/arm/com.asm
--- a/external/lgpl3/gmp/dist/mpn/arm/com.asm Fri Nov 29 07:57:10 2013 +0000
+++ b/external/lgpl3/gmp/dist/mpn/arm/com.asm Fri Nov 29 08:02:28 2013 +0000
@@ -59,5 +59,9 @@
bne L(top)
ldmfd sp!, { r7, r8, r9 } C restore regs from stack
-L(rtn): bx lr
+L(rtn):
+ifdef(`ARM_THUMB_MODE',
+` bx lr
+',` mov pc, lr
+')
EPILOGUE()
diff -r f810783e10c6 -r 27789d1cf063 external/lgpl3/gmp/dist/mpn/arm/copyd.asm
--- a/external/lgpl3/gmp/dist/mpn/arm/copyd.asm Fri Nov 29 07:57:10 2013 +0000
+++ b/external/lgpl3/gmp/dist/mpn/arm/copyd.asm Fri Nov 29 08:02:28 2013 +0000
@@ -57,5 +57,9 @@
bne L(top)
ldmfd sp!, { r7, r8, r9 } C restore regs from stack
-L(rtn): bx lr
+L(rtn):
+ifdef(`ARM_THUMB_MODE',
+` bx lr
+',` mov pc, lr
+')
EPILOGUE()
diff -r f810783e10c6 -r 27789d1cf063 external/lgpl3/gmp/dist/mpn/arm/copyi.asm
--- a/external/lgpl3/gmp/dist/mpn/arm/copyi.asm Fri Nov 29 07:57:10 2013 +0000
+++ b/external/lgpl3/gmp/dist/mpn/arm/copyi.asm Fri Nov 29 08:02:28 2013 +0000
@@ -52,5 +52,9 @@
bne L(top)
ldmfd sp!, { r7, r8, r9 } C restore regs from stack
-L(rtn): bx lr
+L(rtn):
+ifdef(`ARM_THUMB_MODE',
+` bx lr
+',` mov pc, lr
+')
EPILOGUE()
diff -r f810783e10c6 -r 27789d1cf063 external/lgpl3/gmp/dist/mpn/arm/logops_n.asm
--- a/external/lgpl3/gmp/dist/mpn/arm/logops_n.asm Fri Nov 29 07:57:10 2013 +0000
+++ b/external/lgpl3/gmp/dist/mpn/arm/logops_n.asm Fri Nov 29 08:02:28 2013 +0000
@@ -123,5 +123,8 @@
pop { r4, r5, r6, r7 } C popping r8-r10 here strangely fails
L(rtn): pop { r8, r9, r10 }
- bx r14
+ifdef(`ARM_THUMB_MODE',
+` bx r14
+',` mov pc, r14
+')
EPILOGUE()
diff -r f810783e10c6 -r 27789d1cf063 external/lgpl3/gmp/dist/mpn/arm/lshift.asm
--- a/external/lgpl3/gmp/dist/mpn/arm/lshift.asm Fri Nov 29 07:57:10 2013 +0000
+++ b/external/lgpl3/gmp/dist/mpn/arm/lshift.asm Fri Nov 29 08:02:28 2013 +0000
@@ -72,5 +72,8 @@
L(1): str r7, [rp, #-4]
lsr r0, r4, tnc
pop {r4, r6, r7, r8}
- bx r14
+ifdef(`ARM_THUMB_MODE',
+` bx r14
+',` mov pc, r14
+')
EPILOGUE()
diff -r f810783e10c6 -r 27789d1cf063 external/lgpl3/gmp/dist/mpn/arm/lshiftc.asm
--- a/external/lgpl3/gmp/dist/mpn/arm/lshiftc.asm Fri Nov 29 07:57:10 2013 +0000
+++ b/external/lgpl3/gmp/dist/mpn/arm/lshiftc.asm Fri Nov 29 08:02:28 2013 +0000
@@ -79,5 +79,8 @@
str r7, [rp, #-4]
lsr r0, r4, tnc
pop {r4, r6, r7, r8}
- bx r14
+ifdef(`ARM_THUMB_MODE',
+` bx r14
+',` mov pc, r14
+')
EPILOGUE()
diff -r f810783e10c6 -r 27789d1cf063 external/lgpl3/gmp/dist/mpn/arm/mod_34lsub1.asm
--- a/external/lgpl3/gmp/dist/mpn/arm/mod_34lsub1.asm Fri Nov 29 07:57:10 2013 +0000
+++ b/external/lgpl3/gmp/dist/mpn/arm/mod_34lsub1.asm Fri Nov 29 08:02:28 2013 +0000
@@ -94,7 +94,10 @@
add r0, r0, r12, lsr #8
pop { r4, r5, r6, r7 }
- bx lr
+ifdef(`ARM_THUMB_MODE',
+` bx lr
+',` mov pc, lr
+')
L(le2): cmn n, #1
bne L(1)
@@ -105,5 +108,8 @@
bic r0, r2, #0xff000000
add r0, r0, r2, lsr #24
pop { r4, r5, r6, r7 }
- bx lr
+ifdef(`ARM_THUMB_MODE',
+` bx lr
+',` mov pc, lr
+')
EPILOGUE()
diff -r f810783e10c6 -r 27789d1cf063 external/lgpl3/gmp/dist/mpn/arm/mode1o.asm
--- a/external/lgpl3/gmp/dist/mpn/arm/mode1o.asm Fri Nov 29 07:57:10 2013 +0000
+++ b/external/lgpl3/gmp/dist/mpn/arm/mode1o.asm Fri Nov 29 08:02:28 2013 +0000
@@ -68,5 +68,8 @@
addcc r0, r0, #1
ldmfd sp!, {r4, r5}
- bx r14
+ifdef(`ARM_THUMB_MODE',
+` bx r14
+',` mov pc, r14
+')
EPILOGUE()
diff -r f810783e10c6 -r 27789d1cf063 external/lgpl3/gmp/dist/mpn/arm/rsh1aors_n.asm
--- a/external/lgpl3/gmp/dist/mpn/arm/rsh1aors_n.asm Fri Nov 29 07:57:10 2013 +0000
+++ b/external/lgpl3/gmp/dist/mpn/arm/rsh1aors_n.asm Fri Nov 29 08:02:28 2013 +0000
@@ -108,5 +108,8 @@
str r4, [rp, #0]
mov r0, r11
pop {r4-r11}
- bx r14
+ifdef(`ARM_THUMB_MODE',
+` bx r14
+',` mov pc, r14
+')
EPILOGUE()
diff -r f810783e10c6 -r 27789d1cf063 external/lgpl3/gmp/dist/mpn/arm/rshift.asm
--- a/external/lgpl3/gmp/dist/mpn/arm/rshift.asm Fri Nov 29 07:57:10 2013 +0000
+++ b/external/lgpl3/gmp/dist/mpn/arm/rshift.asm Fri Nov 29 08:02:28 2013 +0000
@@ -70,5 +70,8 @@
L(1): str r7, [rp], #4
lsl r0, r4, tnc
pop {r4, r6, r7, r8}
- bx r14
+ifdef(`ARM_THUMB_MODE',
+` bx r14
+',` mov pc, r14
+')
EPILOGUE()
diff -r f810783e10c6 -r 27789d1cf063 external/lgpl3/gmp/dist/mpn/arm/udiv.asm
--- a/external/lgpl3/gmp/dist/mpn/arm/udiv.asm Fri Nov 29 07:57:10 2013 +0000
+++ b/external/lgpl3/gmp/dist/mpn/arm/udiv.asm Fri Nov 29 08:02:28 2013 +0000
@@ -50,7 +50,10 @@
str n1, [rem_ptr] C store remainder
adc r0, n0, n0 C quotient: add last carry from divstep
- bx lr
+ifdef(`ARM_THUMB_MODE',
+` bx lr
+',` mov pc, lr
+')
L(_large_divisor):
stmfd sp!, { r8, lr }
diff -r f810783e10c6 -r 27789d1cf063 external/lgpl3/gmp/dist/mpn/generic/get_d.c
--- a/external/lgpl3/gmp/dist/mpn/generic/get_d.c Fri Nov 29 07:57:10 2013 +0000
+++ b/external/lgpl3/gmp/dist/mpn/generic/get_d.c Fri Nov 29 08:02:28 2013 +0000
@@ -209,7 +209,7 @@
x <<= GMP_NAIL_BITS;
mhi |= x >> nbits >> 11;
- mlo = x << GMP_LIMB_BITS - nbits - 11;
+ mlo = x << (GMP_LIMB_BITS - nbits - 11);
nbits = nbits + 11 - GMP_NAIL_BITS;
}
else
Home |
Main Index |
Thread Index |
Old Index