diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2006-05-02 21:44:40 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2006-05-02 21:44:40 +0000 |
| commit | 20bc00acd08df5e54e47c4059a877bf36e60b16f (patch) | |
| tree | e7e19990e06d2a227593e6f268752aab449ae0ff /sys/arch/m88k | |
| parent | c748b89a682dccfe6acd9137914604bc89bf688a (diff) | |
Replace db_{disable,enable}_interrupts with expanded version of themselves,
having macros for this is not worth doing.
Diffstat (limited to 'sys/arch/m88k')
| -rw-r--r-- | sys/arch/m88k/include/db_machdep.h | 5 | ||||
| -rw-r--r-- | sys/arch/m88k/m88k/trap.c | 26 |
2 files changed, 14 insertions, 17 deletions
diff --git a/sys/arch/m88k/include/db_machdep.h b/sys/arch/m88k/include/db_machdep.h index e37c6697c6c..5090f386cb5 100644 --- a/sys/arch/m88k/include/db_machdep.h +++ b/sys/arch/m88k/include/db_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: db_machdep.h,v 1.7 2005/11/20 22:07:07 miod Exp $ */ +/* $OpenBSD: db_machdep.h,v 1.8 2006/05/02 21:44:37 miod Exp $ */ /* * Mach Operating System * Copyright (c) 1993-1991 Carnegie Mellon University @@ -109,9 +109,6 @@ int m88k_print_instruction(u_int, long); /* db_disasm.c */ #define DB_AOUT_SYMBOLS -#define db_enable_interrupt(psr) set_psr(((psr) = get_psr()) & ~PSR_IND) -#define db_disable_interrupt(psr) set_psr(psr) - #endif /* DDB */ #endif /* _LOCORE */ diff --git a/sys/arch/m88k/m88k/trap.c b/sys/arch/m88k/m88k/trap.c index 52ffff4ef31..3c429a116a1 100644 --- a/sys/arch/m88k/m88k/trap.c +++ b/sys/arch/m88k/m88k/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.29 2005/12/11 21:45:30 miod Exp $ */ +/* $OpenBSD: trap.c,v 1.30 2006/05/02 21:44:39 miod Exp $ */ /* * Copyright (c) 2004, Miodrag Vallat. * Copyright (c) 1998 Steve Murphree, Jr. @@ -238,16 +238,16 @@ m88100_trap(unsigned type, struct trapframe *frame) #if defined(DDB) case T_KDB_BREAK: s = splhigh(); - db_enable_interrupt(psr); + set_psr((psr = get_psr()) & ~PSR_IND); ddb_break_trap(T_KDB_BREAK, (db_regs_t*)frame); - db_disable_interrupt(psr); + set_psr(psr); splx(s); return; case T_KDB_ENTRY: s = splhigh(); - db_enable_interrupt(psr); + set_psr((psr = get_psr()) & ~PSR_IND); ddb_entry_trap(T_KDB_ENTRY, (db_regs_t*)frame); - db_disable_interrupt(psr); + set_psr(psr); splx(s); return; #endif /* DDB */ @@ -661,23 +661,23 @@ m88110_trap(unsigned type, struct trapframe *frame) #ifdef DDB case T_KDB_TRACE: s = splhigh(); - db_enable_interrupt(psr); + set_psr((psr = get_psr()) & ~PSR_IND); ddb_break_trap(T_KDB_TRACE, (db_regs_t*)frame); - db_disable_interrupt(psr); + set_psr(psr); splx(s); return; case T_KDB_BREAK: s = splhigh(); - db_enable_interrupt(psr); + set_psr((psr = get_psr()) & ~PSR_IND); ddb_break_trap(T_KDB_BREAK, (db_regs_t*)frame); - db_disable_interrupt(psr); + set_psr(psr); splx(s); return; case T_KDB_ENTRY: s = splhigh(); - db_enable_interrupt(psr); + set_psr((psr = get_psr()) & ~PSR_IND); ddb_entry_trap(T_KDB_ENTRY, (db_regs_t*)frame); - db_disable_interrupt(psr); + set_psr(psr); /* skip one instruction */ if (frame->tf_exip & 1) frame->tf_exip = frame->tf_enip; @@ -688,10 +688,10 @@ m88110_trap(unsigned type, struct trapframe *frame) #if 0 case T_ILLFLT: s = splhigh(); - db_enable_interrupt(psr); + set_psr((psr = get_psr()) & ~PSR_IND); ddb_error_trap(type == T_ILLFLT ? "unimplemented opcode" : "error fault", (db_regs_t*)frame); - db_disable_interrupt(psr); + set_psr(psr); splx(s); return; #endif /* 0 */ |