| trap.c (211217) | trap.c (212632) |
|---|---|
| 1/* $OpenBSD: trap.c,v 1.19 1998/09/30 12:40:41 pefo Exp $ */ 2/* tracked to 1.23 */ 3/*- 4 * Copyright (c) 1988 University of Utah. 5 * Copyright (c) 1992, 1993 6 * The Regents of the University of California. All rights reserved. 7 * 8 * This code is derived from software contributed to Berkeley by --- 25 unchanged lines hidden (view full) --- 34 * SUCH DAMAGE. 35 * 36 * from: Utah Hdr: trap.c 1.32 91/04/06 37 * 38 * from: @(#)trap.c 8.5 (Berkeley) 1/11/94 39 * JNPR: trap.c,v 1.13.2.2 2007/08/29 10:03:49 girish 40 */ 41#include <sys/cdefs.h> | 1/* $OpenBSD: trap.c,v 1.19 1998/09/30 12:40:41 pefo Exp $ */ 2/* tracked to 1.23 */ 3/*- 4 * Copyright (c) 1988 University of Utah. 5 * Copyright (c) 1992, 1993 6 * The Regents of the University of California. All rights reserved. 7 * 8 * This code is derived from software contributed to Berkeley by --- 25 unchanged lines hidden (view full) --- 34 * SUCH DAMAGE. 35 * 36 * from: Utah Hdr: trap.c 1.32 91/04/06 37 * 38 * from: @(#)trap.c 8.5 (Berkeley) 1/11/94 39 * JNPR: trap.c,v 1.13.2.2 2007/08/29 10:03:49 girish 40 */ 41#include <sys/cdefs.h> |
| 42__FBSDID("$FreeBSD: head/sys/mips/mips/trap.c 211217 2010-08-12 10:09:28Z jchandra $"); | 42__FBSDID("$FreeBSD: head/sys/mips/mips/trap.c 212632 2010-09-15 05:10:50Z neel $"); |
| 43 44#include "opt_ddb.h" 45#include "opt_global.h" 46#include "opt_ktrace.h" 47 48#define NO_REG_DEFS 1 /* Prevent asm.h from including regdef.h */ 49#include <sys/param.h> 50#include <sys/systm.h> --- 248 unchanged lines hidden (view full) --- 299 } 300 301 /* 302 * Enable hardware interrupts if they were on before the trap. If it 303 * was off disable all so we don't accidently enable it when doing a 304 * return to userland. 305 */ 306 if (trapframe->sr & MIPS_SR_INT_IE) { | 43 44#include "opt_ddb.h" 45#include "opt_global.h" 46#include "opt_ktrace.h" 47 48#define NO_REG_DEFS 1 /* Prevent asm.h from including regdef.h */ 49#include <sys/param.h> 50#include <sys/systm.h> --- 248 unchanged lines hidden (view full) --- 299 } 300 301 /* 302 * Enable hardware interrupts if they were on before the trap. If it 303 * was off disable all so we don't accidently enable it when doing a 304 * return to userland. 305 */ 306 if (trapframe->sr & MIPS_SR_INT_IE) { |
| 307 set_intr_mask(~(trapframe->sr & MIPS_SR_INT_MASK)); | 307 set_intr_mask(trapframe->sr & MIPS_SR_INT_MASK); |
| 308 intr_enable(); 309 } else { 310 intr_disable(); 311 } 312 313#ifdef TRAP_DEBUG 314 if (trap_debug) { 315 static vm_offset_t last_badvaddr = 0; --- 1204 unchanged lines hidden --- | 308 intr_enable(); 309 } else { 310 intr_disable(); 311 } 312 313#ifdef TRAP_DEBUG 314 if (trap_debug) { 315 static vm_offset_t last_badvaddr = 0; --- 1204 unchanged lines hidden --- |