From: Jonathan Gray Subject: remove libkern SYS.h To: tech@openbsd.org Date: Fri, 8 May 2026 18:02:40 +1000 libkern SYS.h was included in some setjmp.S files miod removed in 2008 the mips64 one has clearly never been used as it has i386 code --- sys/lib/libkern/arch/i386/SYS.h Tue Jun 3 09:28:08 2003 +++ /dev/null Fri May 8 17:58:28 2026 @@ -1,45 +0,0 @@ -/* $OpenBSD: SYS.h,v 1.3 2003/06/02 23:28:08 millert 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. 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 - */ - -#include -#include - -#define SYSCALL(x) .text; .align 2; 2: jmp PIC_PLT(cerror); ENTRY(x); movl $(SYS_/**/x),%eax; int $0x80; jc 2b -#define RSYSCALL(x) SYSCALL(x); ret -#define PSEUDO(x,y) ENTRY(x); movl $(SYS_/**/y),%eax; int $0x80; ret -#define CALL(x,y) call PIC_PLT(_/**/y); addl $4*x,%esp - - .globl cerror --- sys/lib/libkern/arch/mips64/SYS.h Tue Jan 20 13:18:59 2015 +++ /dev/null Fri May 8 17:58:28 2026 @@ -1,44 +0,0 @@ -/* $OpenBSD: SYS.h,v 1.2 2015/01/19 15:30:52 krw 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. 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 - */ - -#include -#include - -#define SYSCALL(x) .text; .align 2; 2: jmp PIC_PLT(cerror); ENTRY(x); movl $(SYS_/**/x),%eax; int $0x80; jc 2b -#define RSYSCALL(x) SYSCALL(x); ret -#define PSEUDO(x,y) ENTRY(x); movl $(SYS_/**/y),%eax; int $0x80; ret -#define CALL(x,y) call PIC_PLT(_/**/y); addl $4*x,%esp - - .globl cerror --- sys/lib/libkern/arch/sparc64/SYS.h Tue Jun 3 09:28:09 2003 +++ /dev/null Fri May 8 17:58:28 2026 @@ -1,107 +0,0 @@ -/* $OpenBSD: SYS.h,v 1.3 2003/06/02 23:28:09 millert Exp $ */ -/* $NetBSD: SYS.h,v 1.2 1999/02/15 04:54:36 hubertf Exp $ */ -/*- - * Copyright (c) 1992, 1993 - * The Regents of the University of California. All rights reserved. - * - * This software was developed by the Computer Systems Engineering group - * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and - * contributed to Berkeley. - * - * 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. - * - * @(#)SYS.h 8.1 (Berkeley) 6/4/93 - * - * from: Header: SYS.h,v 1.2 92/07/03 18:57:00 torek Exp - * $Id: SYS.h,v 1.3 2003/06/02 23:28:09 millert Exp $ - */ - -#include -#include -#include - -#ifdef __STDC__ -#define _CAT(x,y) x##y -#else -#define _CAT(x,y) x/**/y -#endif - -/* - * ERROR branches to cerror. This is done with a macro so that I can - * change it to be position independent later, if need be. - */ -#ifdef PIC -#define ERROR() \ - PIC_PROLOGUE(%g1,%g2); \ - ld [%g1+cerror],%g2; jmp %g2; nop -#else -#define ERROR() \ - sethi %hi(cerror),%g1; or %lo(cerror),%g1,%g1; jmp %g1; nop -#endif - -/* - * SYSCALL is used when further action must be taken before returning. - * Note that it adds a `nop' over what we could do, if we only knew what - * came at label 1.... - */ -#define SYSCALL(x) \ - ENTRY(x); mov _CAT(SYS_,x),%g1; t ST_SYSCALL; bcc 1f; nop; ERROR(); 1: - -/* - * RSYSCALL is used when the system call should just return. Here - * we use the SYSCALL_G2RFLAG to put the `success' return address in %g2 - * and avoid a branch. - */ -#define RSYSCALL(x) \ - ENTRY(x); mov (_CAT(SYS_,x))|SYSCALL_G2RFLAG,%g1; add %o7,8,%g2; \ - t ST_SYSCALL; ERROR() - -/* - * PSEUDO(x,y) is like RSYSCALL(y) except that the name is x. - */ -#define PSEUDO(x,y) \ - ENTRY(x); mov (_CAT(SYS_,y))|SYSCALL_G2RFLAG,%g1; add %o7,8,%g2; \ - t ST_SYSCALL; ERROR() - -/* - * SYSCALL_NOERROR is like SYSCALL, except it's used for syscalls - * that never fail. - * - * XXX - This should be optimized. - */ -#define SYSCALL_NOERROR(x) \ - ENTRY(x); mov _CAT(SYS_,x),%g1; t ST_SYSCALL - -/* - * RSYSCALL_NOERROR is like RSYSCALL, except it's used for syscalls - * that never fail. - * - * XXX - This should be optimized. - */ -#define RSYSCALL_NOERROR(x) \ - ENTRY(x); mov (_CAT(SYS_,x))|SYSCALL_G2RFLAG,%g1; add %o7,8,%g2; \ - t ST_SYSCALL - - .globl cerror