Deleted Added
full compact
exception.s (10609) exception.s (12827)
1/*-
2 * Copyright (c) 1990 The Regents of the University of California.
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 16 unchanged lines hidden (view full) ---

25 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 *
1/*-
2 * Copyright (c) 1990 The Regents of the University of California.
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 16 unchanged lines hidden (view full) ---

25 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 *
33 * $Id: exception.s,v 1.10 1995/08/15 19:23:33 bde Exp $
33 * $Id: exception.s,v 1.11 1995/09/07 21:36:17 davidg Exp $
34 */
35
36#include "npx.h" /* NNPX */
37#include "assym.s" /* system defines */
38#include <sys/errno.h> /* error return codes */
39#include <machine/spl.h> /* SWI_AST_MASK ... */
40#include <machine/psl.h> /* PSL_I */
41#include <machine/trap.h> /* trap codes */

--- 211 unchanged lines hidden (view full) ---

253 * Return via _doreti to handle ASTs.
254 */
255 pushl $0 /* cpl to restore */
256 subl $4,%esp
257 movb $1,_intr_nesting_level
258 MEXITCOUNT
259 jmp _doreti
260
34 */
35
36#include "npx.h" /* NNPX */
37#include "assym.s" /* system defines */
38#include <sys/errno.h> /* error return codes */
39#include <machine/spl.h> /* SWI_AST_MASK ... */
40#include <machine/psl.h> /* PSL_I */
41#include <machine/trap.h> /* trap codes */

--- 211 unchanged lines hidden (view full) ---

253 * Return via _doreti to handle ASTs.
254 */
255 pushl $0 /* cpl to restore */
256 subl $4,%esp
257 movb $1,_intr_nesting_level
258 MEXITCOUNT
259 jmp _doreti
260
261#ifdef COMPAT_LINUX
261#if defined(COMPAT_LINUX) || defined(LINUX)
262/*
263 * Call gate entry for Linux syscall (int 0x80)
264 */
265 SUPERALIGN_TEXT
266IDTVEC(linux_syscall)
267 subl $8,%esp /* skip over tf_trapno and tf_err */
268 pushal
269 pushl %ds

--- 8 unchanged lines hidden (view full) ---

278 /*
279 * Return via _doreti to handle ASTs.
280 */
281 pushl $0 /* cpl to restore */
282 subl $4,%esp
283 movb $1,_intr_nesting_level
284 MEXITCOUNT
285 jmp _doreti
262/*
263 * Call gate entry for Linux syscall (int 0x80)
264 */
265 SUPERALIGN_TEXT
266IDTVEC(linux_syscall)
267 subl $8,%esp /* skip over tf_trapno and tf_err */
268 pushal
269 pushl %ds

--- 8 unchanged lines hidden (view full) ---

278 /*
279 * Return via _doreti to handle ASTs.
280 */
281 pushl $0 /* cpl to restore */
282 subl $4,%esp
283 movb $1,_intr_nesting_level
284 MEXITCOUNT
285 jmp _doreti
286#endif /* COMPAT_LINUX */
286#endif /* COMPAT_LINUX || LINUX */
287
288/*
289 * Include what was once config+isa-dependent code.
290 * XXX it should be in a stand-alone file. It's still icu-dependent and
291 * belongs in i386/isa.
292 */
293#include "i386/isa/vector.s"
294

--- 12 unchanged lines hidden ---
287
288/*
289 * Include what was once config+isa-dependent code.
290 * XXX it should be in a stand-alone file. It's still icu-dependent and
291 * belongs in i386/isa.
292 */
293#include "i386/isa/vector.s"
294

--- 12 unchanged lines hidden ---