Deleted Added
full compact
subr_trap.c (53045) subr_trap.c (55823)
1/*-
2 * Copyright (C) 1994, David Greenman
3 * Copyright (c) 1990, 1993
4 * The Regents of the University of California. All rights reserved.
5 *
6 * This code is derived from software contributed to Berkeley by
7 * the University of Utah, and William Jolitz.
8 *

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

30 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
31 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
32 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
33 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
34 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
35 * SUCH DAMAGE.
36 *
37 * from: @(#)trap.c 7.4 (Berkeley) 5/13/91
1/*-
2 * Copyright (C) 1994, David Greenman
3 * Copyright (c) 1990, 1993
4 * The Regents of the University of California. All rights reserved.
5 *
6 * This code is derived from software contributed to Berkeley by
7 * the University of Utah, and William Jolitz.
8 *

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

30 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
31 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
32 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
33 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
34 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
35 * SUCH DAMAGE.
36 *
37 * from: @(#)trap.c 7.4 (Berkeley) 5/13/91
38 * $FreeBSD: head/sys/kern/subr_trap.c 53045 1999-11-09 01:44:28Z alc $
38 * $FreeBSD: head/sys/kern/subr_trap.c 55823 2000-01-11 14:54:01Z yokota $
39 */
40
41/*
42 * 386 Trap and System call handling
43 */
44
45#include "opt_cpu.h"
46#include "opt_ddb.h"

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

85
86#ifdef POWERFAIL_NMI
87#include <sys/syslog.h>
88#include <machine/clock.h>
89#endif
90
91#include <machine/vm86.h>
92
39 */
40
41/*
42 * 386 Trap and System call handling
43 */
44
45#include "opt_cpu.h"
46#include "opt_ddb.h"

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

85
86#ifdef POWERFAIL_NMI
87#include <sys/syslog.h>
88#include <machine/clock.h>
89#endif
90
91#include <machine/vm86.h>
92
93#ifdef DDB
94 extern int in_Debugger, debugger_on_panic;
95#endif
93#include <ddb/ddb.h>
96
97#include "isa.h"
98#include "npx.h"
99
100int (*pmath_emulate) __P((struct trapframe *));
101
102extern void trap __P((struct trapframe frame));
103extern int trapwrite __P((unsigned addr));

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

895#endif
896 printf("\n");
897
898#ifdef KDB
899 if (kdb_trap(&psl))
900 return;
901#endif
902#ifdef DDB
94
95#include "isa.h"
96#include "npx.h"
97
98int (*pmath_emulate) __P((struct trapframe *));
99
100extern void trap __P((struct trapframe frame));
101extern int trapwrite __P((unsigned addr));

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

893#endif
894 printf("\n");
895
896#ifdef KDB
897 if (kdb_trap(&psl))
898 return;
899#endif
900#ifdef DDB
903 if ((debugger_on_panic || in_Debugger) && kdb_trap(type, 0, frame))
901 if ((debugger_on_panic || db_active) && kdb_trap(type, 0, frame))
904 return;
905#endif
906 printf("trap number = %d\n", type);
907 if (type <= MAX_TRAP_MSG)
908 panic(trap_msg[type]);
909 else
910 panic("unknown/reserved trap");
911}

--- 225 unchanged lines hidden ---
902 return;
903#endif
904 printf("trap number = %d\n", type);
905 if (type <= MAX_TRAP_MSG)
906 panic(trap_msg[type]);
907 else
908 panic("unknown/reserved trap");
909}

--- 225 unchanged lines hidden ---