diff options
| -rw-r--r-- | libexec/ld.so/sh/Makefile.inc | 5 | ||||
| -rw-r--r-- | libexec/ld.so/sh/sdivsi3.S | 69 | ||||
| -rw-r--r-- | libexec/ld.so/sh/udivsi3.S | 83 |
3 files changed, 2 insertions, 155 deletions
diff --git a/libexec/ld.so/sh/Makefile.inc b/libexec/ld.so/sh/Makefile.inc index bcbda7d47f9..4dd3fecefd3 100644 --- a/libexec/ld.so/sh/Makefile.inc +++ b/libexec/ld.so/sh/Makefile.inc @@ -1,10 +1,9 @@ -# $OpenBSD: Makefile.inc,v 1.3 2007/03/03 19:40:53 drahn Exp $ +# $OpenBSD: Makefile.inc,v 1.4 2008/04/03 00:13:33 drahn Exp $ CFLAGS += -fpic CFLAGS+=-m4-nofpu AFLAGS += -D_STANDALONE AFLAGS += -I${.CURDIR}/../../lib/libc/arch/sh -SRCS+= udivsi3.S sdivsi3.S ELF_LDFLAGS+=-z nocombreloc LIBCSRCDIR=${.CURDIR}/../../lib/libc -#LDADD= `$(CC) -print-libgcc-file-name` +LDADD= `$(CC) -print-libgcc-file-name` diff --git a/libexec/ld.so/sh/sdivsi3.S b/libexec/ld.so/sh/sdivsi3.S deleted file mode 100644 index f7ef27a34c5..00000000000 --- a/libexec/ld.so/sh/sdivsi3.S +++ /dev/null @@ -1,69 +0,0 @@ -/* $OpenBSD: sdivsi3.S,v 1.1 2006/11/10 07:44:58 drahn Exp $ */ -/* $NetBSD: sdivsi3.S,v 1.8 2006/05/22 20:56:44 uwe Exp $ */ - -/* copied from libkern with raise code removed */ - -/*- - * Copyright (c) 1990 The Regents of the University of California. - * All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * William Jolitz. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * from: @(#)udivsi3.s 5.1 (Berkeley) 5/15/90 - */ - -#include <machine/asm.h> - -/* r0 <= r4 / r5 */ -NENTRY(__sdivsi3) - mov r4, r0 - mov r5, r1 - - tst r1, r1 - bt div_by_zero - - mov #0, r2 - div0s r2, r0 - subc r3, r3 - subc r2, r0 - div0s r1, r3 -#define DIVSTEP rotcl r0; div1 r1, r3 - /* repeat 32 times */ - DIVSTEP; DIVSTEP; DIVSTEP; DIVSTEP; DIVSTEP; DIVSTEP; DIVSTEP; DIVSTEP; - DIVSTEP; DIVSTEP; DIVSTEP; DIVSTEP; DIVSTEP; DIVSTEP; DIVSTEP; DIVSTEP; - DIVSTEP; DIVSTEP; DIVSTEP; DIVSTEP; DIVSTEP; DIVSTEP; DIVSTEP; DIVSTEP; - DIVSTEP; DIVSTEP; DIVSTEP; DIVSTEP; DIVSTEP; DIVSTEP; DIVSTEP; DIVSTEP; -#undef DIVSTEP - rotcl r0 - - rts - addc r2, r0 - -div_by_zero: - rts - mov #0, r0 diff --git a/libexec/ld.so/sh/udivsi3.S b/libexec/ld.so/sh/udivsi3.S deleted file mode 100644 index a11ad8ce1a1..00000000000 --- a/libexec/ld.so/sh/udivsi3.S +++ /dev/null @@ -1,83 +0,0 @@ -/* $OpenBSD: udivsi3.S,v 1.1 2006/11/10 07:44:58 drahn Exp $ */ -/* $NetBSD: udivsi3.S,v 1.7 2006/05/22 20:56:44 uwe Exp $ */ - -/* copied from libkern with raise code removed */ - -/*- - * Copyright (c) 1990 The Regents of the University of California. - * All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * William Jolitz. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * from: @(#)udivsi3.s 5.1 (Berkeley) 5/15/90 - */ - -#include <machine/asm.h> - -/* - * IMPORTANT: This function is special. - * - * This function is an auxiliary function that is referenced by the - * code generated by gcc for integer division. But gcc does NOT treat - * a call to this function as an ordinary function call w.r.t. the set - * of register this call clobbers. See the definition of "udivsi3_i1" - * in gcc/config/sh/sh.md. - * - * Any call to this function MUST NOT clobber any registers besides r4 - * and r0, where the result is returned. At the time of the call the - * r4 contains the first argument, so we are only left with r0, and we - * cannot do anything meaningful using only one register. The - * consequences are: - * - * . this function cannot have _PROF_PROLOGUE - * . this function cannot be called via PLT - */ - - -/* r0 <= r4 / r5 */ -NENTRY(__udivsi3) - tst r5, r5 - bt div_by_zero - - mov #0, r0 - div0u -#define DIVSTEP rotcl r4; div1 r5, r0 - /* repeat 32 times */ - DIVSTEP; DIVSTEP; DIVSTEP; DIVSTEP; DIVSTEP; DIVSTEP; DIVSTEP; DIVSTEP; - DIVSTEP; DIVSTEP; DIVSTEP; DIVSTEP; DIVSTEP; DIVSTEP; DIVSTEP; DIVSTEP; - DIVSTEP; DIVSTEP; DIVSTEP; DIVSTEP; DIVSTEP; DIVSTEP; DIVSTEP; DIVSTEP; - DIVSTEP; DIVSTEP; DIVSTEP; DIVSTEP; DIVSTEP; DIVSTEP; DIVSTEP; DIVSTEP; -#undef DIVSTEP - rotcl r4 - - rts - mov r4, r0 - -div_by_zero: - rts - mov #0, r0 |