diff options
Diffstat (limited to 'sys/i386')
| -rw-r--r-- | sys/i386/i386/trap.c | 15 | ||||
| -rw-r--r-- | sys/i386/include/db_machdep.h | 14 |
2 files changed, 13 insertions, 16 deletions
diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c index c272fe4..bc984c6 100644 --- a/sys/i386/i386/trap.c +++ b/sys/i386/i386/trap.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $Id: trap.c,v 1.31 1994/08/27 16:14:13 davidg Exp $ + * $Id: trap.c,v 1.32 1994/08/28 16:16:33 bde Exp $ */ /* @@ -62,7 +62,6 @@ #include <machine/cpu.h> #include <machine/psl.h> #include <machine/reg.h> -#include <machine/eflags.h> #include <machine/trap.h> #include "isa.h" @@ -470,17 +469,17 @@ trap_fatal(frame) } printf("instruction pointer = 0x%x\n", frame->tf_eip); printf("processor eflags = "); - if (frame->tf_eflags & EFL_TF) + if (frame->tf_eflags & PSL_T) printf("trace/trap, "); - if (frame->tf_eflags & EFL_IF) + if (frame->tf_eflags & PSL_I) printf("interrupt enabled, "); - if (frame->tf_eflags & EFL_NT) + if (frame->tf_eflags & PSL_NT) printf("nested task, "); - if (frame->tf_eflags & EFL_RF) + if (frame->tf_eflags & PSL_RF) printf("resume, "); - if (frame->tf_eflags & EFL_VM) + if (frame->tf_eflags & PSL_VM) printf("vm86, "); - printf("IOPL = %d\n", (frame->tf_eflags & EFL_IOPL) >> 12); + printf("IOPL = %d\n", (frame->tf_eflags & PSL_IOPL) >> 12); printf("current process = "); if (curproc) { printf("%d (%s)\n", diff --git a/sys/i386/include/db_machdep.h b/sys/i386/include/db_machdep.h index a3f4064..8145d3a 100644 --- a/sys/i386/include/db_machdep.h +++ b/sys/i386/include/db_machdep.h @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. * - * $Id: db_machdep.h,v 1.2 1993/10/16 14:39:10 rgrimes Exp $ + * $Id: db_machdep.h,v 1.3 1993/11/07 17:42:50 wollman Exp $ */ #ifndef _I386_DB_MACHDEP_H_ @@ -33,7 +33,6 @@ * Machine-dependent defines for new kernel debugger. */ - /* #include <mach/i386/vm_types.h> */ /* #include <mach/i386/vm_param.h> */ #include <vm/vm_prot.h> @@ -41,14 +40,13 @@ #include <vm/vm_inherit.h> #include <vm/lock.h> /* #include <i386/thread.h> */ /* for thread_status */ -#include <machine/frame.h> /* for struct trapframe */ +#include <machine/frame.h> /* for struct trapframe */ /* #include <i386/eflags.h> */ -#include <machine/eflags.h> /* from Mach... */ +#include <machine/psl.h> /* #include <i386/trap.h> */ #include <machine/trap.h> #define i386_saved_state trapframe -/* end of mangling */ typedef vm_offset_t db_addr_t; /* address - unsigned */ typedef int db_expr_t; /* expression - signed */ @@ -65,12 +63,12 @@ extern db_regs_t ddb_regs; /* register state */ #define FIXUP_PC_AFTER_BREAK ddb_regs.tf_eip -= 1; -#define db_clear_single_step(regs) ((regs)->tf_eflags &= ~EFL_TF) -#define db_set_single_step(regs) ((regs)->tf_eflags |= EFL_TF) +#define db_clear_single_step(regs) ((regs)->tf_eflags &= ~PSL_T) +#define db_set_single_step(regs) ((regs)->tf_eflags |= PSL_T) /* #define IS_BREAKPOINT_TRAP(type, code) ((type) == T_INT3) */ /* #define IS_WATCHPOINT_TRAP(type, code) ((type) == T_WATCHPOINT) */ -/* using the 386bsd values, rather than the Mach ones: */ +/* using the FreeBSD values, rather than the Mach ones: */ #define IS_BREAKPOINT_TRAP(type, code) ((type) == T_BPTFLT) #define IS_WATCHPOINT_TRAP(type, code) ((type) == T_KDBTRAP) |
