Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/lib/libkern/arch/i386 -don't use DEFS.h nor SYS.h in lib...
details: https://anonhg.NetBSD.org/src/rev/e240e0b5434b
branches: trunk
changeset: 476247:e240e0b5434b
user: drochner <drochner%NetBSD.org@localhost>
date: Fri Sep 10 15:39:04 1999 +0000
description:
-don't use DEFS.h nor SYS.h in libkern
-remove setjmp.S, it's not useful for libkern
diffstat:
sys/lib/libkern/arch/i386/DEFS.h | 3 -
sys/lib/libkern/arch/i386/SYS.h | 81 ---------------------------------
sys/lib/libkern/arch/i386/scanc.S | 4 +-
sys/lib/libkern/arch/i386/setjmp.S | 92 --------------------------------------
sys/lib/libkern/arch/i386/skpc.S | 4 +-
5 files changed, 4 insertions(+), 180 deletions(-)
diffs (224 lines):
diff -r 7afcfecf7384 -r e240e0b5434b sys/lib/libkern/arch/i386/DEFS.h
--- a/sys/lib/libkern/arch/i386/DEFS.h Fri Sep 10 14:05:40 1999 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/* $NetBSD: DEFS.h,v 1.5 1997/10/13 11:56:23 lukem Exp $ */
-
-#include <machine/asm.h>
diff -r 7afcfecf7384 -r e240e0b5434b sys/lib/libkern/arch/i386/SYS.h
--- a/sys/lib/libkern/arch/i386/SYS.h Fri Sep 10 14:05:40 1999 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-/*-
- * 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. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. 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: @(#)SYS.h 5.5 (Berkeley) 5/7/91
- * $NetBSD: SYS.h,v 1.9 1999/08/23 09:07:35 kleink Exp $
- */
-
-#include <machine/asm.h>
-#include <sys/syscall.h>
-
-#ifdef __STDC__
-#define SYSTRAP(x) movl $(SYS_ ## x),%eax; int $0x80
-#else
-#define SYSTRAP(x) movl $(SYS_/**/x),%eax; int $0x80
-#endif
-
-
-#define _SYSCALL_NOERROR(x,y) \
- ENTRY(x); \
- SYSTRAP(y)
-
-#define _SYSCALL(x,y) \
- .text; _ALIGN_TEXT; \
- 2: jmp PIC_PLT(cerror); \
- _SYSCALL_NOERROR(x,y); \
- jc 2b
-
-#define SYSCALL_NOERROR(x) \
- _SYSCALL_NOERROR(x,x)
-
-#define SYSCALL(x) \
- _SYSCALL(x,x)
-
-#define PSEUDO_NOERROR(x,y) \
- _SYSCALL_NOERROR(x,y); \
- ret
-
-#define PSEUDO(x,y) \
- _SYSCALL(x,y); \
- ret
-
-#define RSYSCALL_NOERROR(x) \
- PSEUDO_NOERROR(x,x)
-
-#define RSYSCALL(x) \
- PSEUDO(x,x)
-
-
- .globl cerror
diff -r 7afcfecf7384 -r e240e0b5434b sys/lib/libkern/arch/i386/scanc.S
--- a/sys/lib/libkern/arch/i386/scanc.S Fri Sep 10 14:05:40 1999 +0000
+++ b/sys/lib/libkern/arch/i386/scanc.S Fri Sep 10 15:39:04 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: scanc.S,v 1.7 1998/08/15 03:56:57 mycroft Exp $ */
+/* $NetBSD: scanc.S,v 1.8 1999/09/10 15:39:04 drochner Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include "DEFS.h"
+#include <machine/asm.h>
ENTRY(scanc)
movl 4(%esp),%ecx
diff -r 7afcfecf7384 -r e240e0b5434b sys/lib/libkern/arch/i386/setjmp.S
--- a/sys/lib/libkern/arch/i386/setjmp.S Fri Sep 10 14:05:40 1999 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,92 +0,0 @@
-/* $NetBSD: setjmp.S,v 1.5 1994/10/26 06:39:14 cgd Exp $ */
-
-/*-
- * 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. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. 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.
- *
- * @(#)setjmp.s 5.1 (Berkeley) 4/23/90
- */
-
-#if defined(LIBC_SCCS)
- .text
- .asciz "$NetBSD: setjmp.S,v 1.5 1994/10/26 06:39:14 cgd Exp $"
-#endif
-
-/*
- * C library -- _setjmp, _longjmp
- *
- * longjmp(a,v)
- * will generate a "return(v)" from the last call to
- * setjmp(a)
- * by restoring registers from the stack.
- * The previous signal state is restored.
- */
-
-#include "DEFS.h"
-#include "SYS.h"
-
-ENTRY(setjmp)
- pushl $0
- call PIC_PLT(_sigblock)
- popl %edx
- movl 4(%esp),%ecx
- movl 0(%esp),%edx
- movl %edx, 0(%ecx)
- movl %ebx, 4(%ecx)
- movl %esp, 8(%ecx)
- movl %ebp,12(%ecx)
- movl %esi,16(%ecx)
- movl %edi,20(%ecx)
- movl %eax,24(%ecx)
- xorl %eax,%eax
- ret
-
-ENTRY(longjmp)
- movl 4(%esp),%edx
- pushl 24(%edx)
- call PIC_PLT(_sigsetmask)
- popl %eax
- movl 4(%esp),%edx
- movl 8(%esp),%eax
- movl 0(%edx),%ecx
- movl 4(%edx),%ebx
- movl 8(%edx),%esp
- movl 12(%edx),%ebp
- movl 16(%edx),%esi
- movl 20(%edx),%edi
- testl %eax,%eax
- jnz 1f
- incl %eax
-1: movl %ecx,0(%esp)
- ret
diff -r 7afcfecf7384 -r e240e0b5434b sys/lib/libkern/arch/i386/skpc.S
--- a/sys/lib/libkern/arch/i386/skpc.S Fri Sep 10 14:05:40 1999 +0000
+++ b/sys/lib/libkern/arch/i386/skpc.S Fri Sep 10 15:39:04 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: skpc.S,v 1.4 1998/08/15 03:56:57 mycroft Exp $ */
+/* $NetBSD: skpc.S,v 1.5 1999/09/10 15:39:05 drochner Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include "DEFS.h"
+#include <machine/asm.h>
ENTRY(skpc)
pushl %edi
Home |
Main Index |
Thread Index |
Old Index