Module Name: src
Committed By: matt
Date: Thu May 9 15:03:41 UTC 2013
Modified Files:
src/common/lib/libc/arch/arm/quad: __aeabi_ldivmod.S __aeabi_uldivmod.S
Log Message:
Don't worry about divide by 0 for kernel or standalone
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/common/lib/libc/arch/arm/quad/__aeabi_ldivmod.S
cvs rdiff -u -r1.5 -r1.6 src/common/lib/libc/arch/arm/quad/__aeabi_uldivmod.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/arch/arm/quad/__aeabi_ldivmod.S
diff -u src/common/lib/libc/arch/arm/quad/__aeabi_ldivmod.S:1.6 src/common/lib/libc/arch/arm/quad/__aeabi_ldivmod.S:1.7
--- src/common/lib/libc/arch/arm/quad/__aeabi_ldivmod.S:1.6 Thu May 9 07:12:59 2013
+++ src/common/lib/libc/arch/arm/quad/__aeabi_ldivmod.S Thu May 9 15:03:40 2013
@@ -29,11 +29,13 @@
#include <machine/asm.h>
-RCSID("$NetBSD: __aeabi_ldivmod.S,v 1.6 2013/05/09 07:12:59 skrll Exp $")
+RCSID("$NetBSD: __aeabi_ldivmod.S,v 1.7 2013/05/09 15:03:40 matt Exp $")
ENTRY(__aeabi_ldivmod)
+#if !defined(_KERNEL) && !defined(_STANDALONE)
orrs ip, r2, r3
beq .Ldivbyzero
+#endif
push {r4-r5, sl, lr}
#define NEG r5
@@ -130,6 +132,7 @@ ENTRY(__aeabi_ldivmod)
pop {r4-r5, sl, lr}
RET
+#if !defined(_KERNEL) && !defined(_STANDALONE)
.Ldivbyzero:
push {r0-r1, ip, lr}
cmp AHI, #0
@@ -140,4 +143,5 @@ ENTRY(__aeabi_ldivmod)
bl PLT_SYM(__aeabi_ldiv0)
pop {r2-r3, ip, lr}
RET
+#endif
END(__aeabi_ldivmod)
Index: src/common/lib/libc/arch/arm/quad/__aeabi_uldivmod.S
diff -u src/common/lib/libc/arch/arm/quad/__aeabi_uldivmod.S:1.5 src/common/lib/libc/arch/arm/quad/__aeabi_uldivmod.S:1.6
--- src/common/lib/libc/arch/arm/quad/__aeabi_uldivmod.S:1.5 Wed May 8 05:13:56 2013
+++ src/common/lib/libc/arch/arm/quad/__aeabi_uldivmod.S Thu May 9 15:03:40 2013
@@ -29,7 +29,7 @@
#include <machine/asm.h>
-RCSID("$NetBSD: __aeabi_uldivmod.S,v 1.5 2013/05/08 05:13:56 matt Exp $")
+RCSID("$NetBSD: __aeabi_uldivmod.S,v 1.6 2013/05/09 15:03:40 matt Exp $")
/*
* typedef struct { unsigned long long quo, rem } ulldiv_t;
@@ -38,8 +38,10 @@ RCSID("$NetBSD: __aeabi_uldivmod.S,v 1.5
*/
ENTRY(__aeabi_uldivmod)
+#if !defined(_KERNEL) && !defined(_STANDALONE)
orrs ip, r2, r3
beq .Ldivbyzero
+#endif
push {r4,lr}
sub sp, sp, #16
@@ -54,6 +56,7 @@ ENTRY(__aeabi_uldivmod)
pop {r2-r4,lr}
RET
+#if !defined(_KERNEL) && !defined(_STANDALONE)
.Ldivbyzero:
push {r0-r1,ip,lr}
mvn r0, #0
@@ -61,4 +64,5 @@ ENTRY(__aeabi_uldivmod)
bl PLT_SYM(__aeabi_ldiv0)
pop {r2-r3,ip,lr}
RET
+#endif
END(__aeabi_uldivmod)
