diff options
| author |   jsg <jsg@openbsd.org> | 2014-12-30 08:12:52 +0000 |
|---|---|---|
| committer | jsg <jsg@openbsd.org> | 2014-12-30 08:12:52 +0000 |
| commit | 7bc65dc79d97a897e81f6c6ad3b8a8a8aae728be (patch) | |
| tree | e1bd93ed8fa72738d95ee4b3bc81d1c2fbc70acd /sys/lib/libkern/arch/arm/divsi3.S | |
| parent | Rework disklabel reading taskq to plug holes pointed out by jsing@. (diff) | |
| download | wireguard-openbsd-7bc65dc79d97a897e81f6c6ad3b8a8a8aae728be.tar.xz wireguard-openbsd-7bc65dc79d97a897e81f6c6ad3b8a8a8aae728be.zip | |
unifdef __APCS_26__ we don't run on anything with a 26 bit program counter.
This codepath was removed in the NetBSD code this is derived from back
in 2003 and was removed in Bitrig earlier this year. No binary change.
Diffstat (limited to 'sys/lib/libkern/arch/arm/divsi3.S')
| -rw-r--r-- | sys/lib/libkern/arch/arm/divsi3.S | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/sys/lib/libkern/arch/arm/divsi3.S b/sys/lib/libkern/arch/arm/divsi3.S index 1917e18e9c6..7a8fa816651 100644 --- a/sys/lib/libkern/arch/arm/divsi3.S +++ b/sys/lib/libkern/arch/arm/divsi3.S @@ -1,4 +1,4 @@ -/* $OpenBSD: divsi3.S,v 1.2 2004/02/01 05:47:10 drahn Exp $ */ +/* $OpenBSD: divsi3.S,v 1.3 2014/12/30 08:12:52 jsg Exp $ */ /* $NetBSD: divsi3.S,v 1.2 2001/11/13 20:06:40 chris Exp $ */ /* @@ -28,11 +28,7 @@ ENTRY(__umodsi3) bl L_udivide add sp, sp, #4 /* unalign stack */ mov r0, r1 -#ifdef __APCS_26__ - ldmfd sp!, {pc}^ -#else /* APCS-32 */ ldmfd sp!, {pc} -#endif ENTRY(__modsi3) stmfd sp!, {lr} @@ -40,11 +36,7 @@ ENTRY(__modsi3) bl L_divide add sp, sp, #4 /* unalign stack */ mov r0, r1 -#ifdef __APCS_26__ - ldmfd sp!, {pc}^ -#else ldmfd sp!, {pc} -#endif L_overflow: #if !defined(_KERNEL) && !defined(_STANDALONE) @@ -55,11 +47,7 @@ L_overflow: /* XXX should cause a fatal error */ mvn r0, #0 #endif -#ifdef __APCS_26__ - movs pc, lr -#else mov pc, lr -#endif ENTRY(__udivsi3) L_udivide: /* r0 = r0 / r1; r1 = r0 % r1 */ @@ -81,11 +69,7 @@ L_udivide: /* r0 = r0 / r1; r1 = r0 % r1 */ L_divide_l0: /* r0 == 1 */ mov r0, r1 mov r1, #0 -#ifdef __APCS_26__ - movs pc, lr -#else mov pc, lr -#endif ENTRY(__divsi3) L_divide: /* r0 = r0 / r1; r1 = r0 % r1 */ @@ -389,11 +373,7 @@ L_divide_b0: movs ip, ip, lsl #1 bicmi r0, r0, #0x80000000 /* Fix incase we divided 0x80000000 */ rsbmi r0, r0, #0 -#ifdef __APCS_26__ - movs pc, lr -#else mov pc, lr -#endif L_udivide_l1: tst ip, #0x10000000 @@ -404,8 +384,4 @@ L_udivide_l1: subhs r1, r1, r0 addhs r3, r3, r2 mov r0, r3 -#ifdef __APCS_26__ - movs pc, lr -#else mov pc, lr -#endif |