Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

-remove definition of "struct sigframe" -- haven't found a use of it

Browse Source 
(should fix build problems w/o COMPAT_16 reported by Markus W Kilbinger
  per PR port-mips/29041 and by Havard Eidnes)
-further shuffle COMPAT_* conditionals to allow COMPAT_ULTRIX
 w/o COMPAT_16
This commit is contained in:
drochner 2005-01-24 10:03:57 +00:00
parent a8921bf654
commit 50ed6c7cf3
4 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/arch/mips/conf/files.mips
View File

@ -1,4 +1,4 @@
# $NetBSD: files.mips,v 1.50 2004/03/04 20:17:01 drochner Exp $
# $NetBSD: files.mips,v 1.51 2005/01/24 10:03:57 drochner Exp $
#
defflag opt_cputype.h NOFPU
@ -61,7 +61,7 @@ file arch/mips/mips/procfs_machdep.c procfs
# Binary compatibility with previous NetBSD releases (COMPAT_XX)
file arch/mips/mips/compat_13_machdep.c compat_13 | compat_ultrix
file arch/mips/mips/compat_16_machdep.c compat_16
file arch/mips/mips/compat_16_machdep.c compat_16 | compat_ultrix
# Ultrix Binary Compatibility (COMPAT_ULTRIX)
include "compat/ultrix/files.ultrix"

16
sys/arch/mips/include/frame.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: frame.h,v 1.3 2003/10/29 23:40:42 christos Exp $ */
/* $NetBSD: frame.h,v 1.4 2005/01/24 10:03:57 drochner Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -41,16 +41,14 @@
#ifndef _LOCORE
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
#include "opt_compat_ultrix.h"
#endif
#include <sys/signal.h>
#include <sys/sa.h>
/*
* Signal frame
*/
struct sigframe {
struct sigcontext sf_sc; /* actual context */
};
/*
* Scheduler activations upcall frame. Pushed onto user stack before
* calling an SA upcall.
@ -67,7 +65,7 @@ struct saframe {
};
void *getframe(struct lwp *, int, int *);
#ifdef COMPAT_16
#if defined(COMPAT_16) || defined(COMPAT_ULTRIX)
void sendsig_sigcontext(const ksiginfo_t *, const sigset_t *);
#endif

7
sys/arch/mips/include/signal.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: signal.h,v 1.25 2005/01/20 21:14:18 drochner Exp $ */
/* $NetBSD: signal.h,v 1.26 2005/01/24 10:03:57 drochner Exp $ */
/*
* Copyright (c) 1992, 1993
@ -44,6 +44,7 @@
#ifdef _KERNEL
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
#include "opt_compat_ultrix.h"
#endif
#ifdef COMPAT_16
#define SIGTRAMP_VALID(vers) ((unsigned)(vers) <= 2)
@ -70,7 +71,7 @@ typedef int sig_atomic_t;
*
* sizeof(sigcontext) = 45 * sizeof(int) + 35 * sizeof(mips_reg_t)
*/
#if defined(_KERNEL) && defined(COMPAT_13)
#if defined(_KERNEL) && (defined(COMPAT_13) || defined(COMPAT_ULTRIX))
struct sigcontext13 {
int sc_onstack; /* sigstack state to restore */
int sc_mask; /* signal mask to restore (old style) */
@ -84,7 +85,7 @@ struct sigcontext13 {
};
#endif /* _KERNEL && COMPAT_13 */
#if defined(_LIBC) || (defined(_KERNEL) && (defined(COMPAT_16)))
#if defined(_LIBC) || (defined(_KERNEL) && (defined(COMPAT_16) || defined(COMPAT_ULTRIX)))
struct sigcontext {
int sc_onstack; /* sigstack state to restore */
int __sc_mask13; /* signal mask to restore (old style) */

14
sys/arch/mips/mips/compat_16_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: compat_16_machdep.c,v 1.3 2005/01/01 03:25:46 simonb Exp $ */
/* $NetBSD: compat_16_machdep.c,v 1.4 2005/01/24 10:03:58 drochner Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@ -52,7 +52,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: compat_16_machdep.c,v 1.3 2005/01/01 03:25:46 simonb Exp $");
__KERNEL_RCSID(0, "$NetBSD: compat_16_machdep.c,v 1.4 2005/01/24 10:03:58 drochner Exp $");
#include "opt_cputype.h"
#include "opt_compat_netbsd.h"
@ -82,7 +82,6 @@ int sigpid = 0;
#define SDB_FPSTATE 0x04
#endif
#ifdef COMPAT_16
/*
* Send a signal to process.
*/
@ -178,16 +177,14 @@ sendsig_sigcontext(const ksiginfo_t *ksi, const sigset_t *returnmask)
f->f_regs[_R_SP] = (int)scp;
switch (ps->sa_sigdesc[sig].sd_vers) {
#if 1 /* COMPAT_16 */
case 0: /* legacy on-stack sigtramp */
f->f_regs[_R_RA] = (int)p->p_sigctx.ps_sigcode;
break;
#endif /* COMPAT_16 */
#ifdef COMPAT_16
case 1:
f->f_regs[_R_RA] = (int)ps->sa_sigdesc[sig].sd_tramp;
break;
#endif
default:
/* Don't know what trampoline version; kill it. */
sigexit(l, SIGILL);
@ -205,6 +202,7 @@ sendsig_sigcontext(const ksiginfo_t *ksi, const sigset_t *returnmask)
#endif
}
#ifdef COMPAT_16 /* not needed if COMPAT_ULTRIX only */
/*
* System call to cleanup state after a signal
* has been taken. Reset signal mask and
@ -273,4 +271,4 @@ compat_16_sys___sigreturn14(struct lwp *l, void *v, register_t *retval)
return (EJUSTRETURN);
}
#endif
#endif /* COMPAT_16 */