From 08e05fa2e6e9ec65efe51603e76f05c1edd259cb Mon Sep 17 00:00:00 2001 From: niklas Date: Sun, 19 Jan 1997 13:53:09 +0000 Subject: [PATCH] From Gordon W Ross (NetBSD): Use db_regs_t instead of struct mc68020_saved_state --- sys/arch/amiga/amiga/trap.c | 6 +++--- sys/arch/m68k/include/db_machdep.h | 8 ++++---- sys/arch/m68k/m68k/db_interface.c | 8 ++++---- sys/arch/m68k/m68k/db_trace.c | 12 ++++++------ sys/arch/sun3/sun3/machdep.c | 5 ++--- sys/arch/sun3/sun3/trap.c | 7 +++---- 6 files changed, 22 insertions(+), 24 deletions(-) diff --git a/sys/arch/amiga/amiga/trap.c b/sys/arch/amiga/amiga/trap.c index cec9a854951..8e22cb712e3 100644 --- a/sys/arch/amiga/amiga/trap.c +++ b/sys/arch/amiga/amiga/trap.c @@ -1,5 +1,5 @@ -/* $OpenBSD: trap.c,v 1.9 1997/01/18 12:42:02 niklas Exp $ */ -/* $NetBSD: trap.c,v 1.52 1996/11/13 06:22:20 thorpej Exp $ */ +/* $OpenBSD: trap.c,v 1.10 1997/01/19 13:53:12 niklas Exp $ */ +/* $NetBSD: trap.c,v 1.53 1997/01/16 15:30:57 gwr Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -183,7 +183,7 @@ void trapmmufault __P((int, u_int, u_int, struct frame *, struct proc *, void trap __P((int, u_int, u_int, struct frame)); #ifdef DDB #include -int kdb_trap __P((int, struct mc68020_saved_state *)); +int kdb_trap __P((int, db_regs_t *)); #endif void syscall __P((register_t, struct frame)); void child_return __P((struct proc *, struct frame)); diff --git a/sys/arch/m68k/include/db_machdep.h b/sys/arch/m68k/include/db_machdep.h index 1374f5e5db3..607f4e7caf7 100644 --- a/sys/arch/m68k/include/db_machdep.h +++ b/sys/arch/m68k/include/db_machdep.h @@ -1,5 +1,5 @@ -/* $OpenBSD: db_machdep.h,v 1.2 1996/05/09 22:25:15 niklas Exp $ */ -/* $NetBSD: db_machdep.h,v 1.13 1996/04/29 20:50:08 leo Exp $ */ +/* $OpenBSD: db_machdep.h,v 1.3 1997/01/19 13:53:09 niklas Exp $ */ +/* $NetBSD: db_machdep.h,v 1.14 1997/01/15 23:11:46 gwr Exp $ */ /* * Mach Operating System @@ -107,8 +107,8 @@ db_regs_t ddb_regs; /* register state */ #ifdef _KERNEL -void kdb_kintr __P((struct mc68020_saved_state *)); -int kdb_trap __P((int, struct mc68020_saved_state *)); +void kdb_kintr __P((db_regs_t *)); +int kdb_trap __P((int, db_regs_t *)); #endif /* _KERNEL */ diff --git a/sys/arch/m68k/m68k/db_interface.c b/sys/arch/m68k/m68k/db_interface.c index a2775212f8b..d60392bddd0 100644 --- a/sys/arch/m68k/m68k/db_interface.c +++ b/sys/arch/m68k/m68k/db_interface.c @@ -1,5 +1,5 @@ -/* $OpenBSD: db_interface.c,v 1.7 1997/01/19 03:58:35 briggs Exp $ */ -/* $NetBSD: db_interface.c,v 1.22 1996/10/13 03:19:20 christos Exp $ */ +/* $OpenBSD: db_interface.c,v 1.8 1997/01/19 13:53:11 niklas Exp $ */ +/* $NetBSD: db_interface.c,v 1.23 1997/01/15 23:11:47 gwr Exp $ */ /* * Mach Operating System @@ -58,7 +58,7 @@ static void kdbprinttrap __P((int, int)); */ void kdb_kintr(regs) - register struct mc68020_saved_state *regs; + register db_regs_t *regs; { if (db_active == 0 && (boothowto & RB_KDB)) { printf("\n\nkernel: keyboard interrupt\n"); @@ -73,7 +73,7 @@ kdb_kintr(regs) int kdb_trap(type, regs) int type; - register struct mc68020_saved_state *regs; + register db_regs_t *regs; { switch (type) { diff --git a/sys/arch/m68k/m68k/db_trace.c b/sys/arch/m68k/m68k/db_trace.c index e9bf6b3b922..7ede3273c45 100644 --- a/sys/arch/m68k/m68k/db_trace.c +++ b/sys/arch/m68k/m68k/db_trace.c @@ -1,5 +1,5 @@ -/* $OpenBSD: db_trace.c,v 1.6 1997/01/13 11:51:13 niklas Exp $ */ -/* $NetBSD: db_trace.c,v 1.16 1996/04/29 20:50:29 leo Exp $ */ +/* $OpenBSD: db_trace.c,v 1.7 1997/01/19 13:53:11 niklas Exp $ */ +/* $NetBSD: db_trace.c,v 1.17 1997/01/15 23:11:48 gwr Exp $ */ /* * Mach Operating System @@ -112,7 +112,7 @@ struct stackpos { static void findentry __P((struct stackpos *)); static void findregs __P((struct stackpos *, db_addr_t)); static int nextframe __P((struct stackpos *, int)); -static void stacktop __P((struct mc68020_saved_state *, struct stackpos *)); +static void stacktop __P((db_regs_t *, struct stackpos *)); #define FR_SAVFP 0 @@ -122,7 +122,7 @@ static void stacktop __P((struct mc68020_saved_state *, struct stackpos *)); static void stacktop(regs, sp) - register struct mc68020_saved_state *regs; + register db_regs_t *regs; register struct stackpos *sp; { sp->k_regloc[0] = (int) ®s->d0; @@ -505,10 +505,10 @@ db_stack_trace_cmd(addr, have_addr, count, modif) * Only have user register state. */ register pcb_t t_pcb; - register struct mc68020_saved_state *user_regs; + register db_regs_t *user_regs; t_pcb = (pcb_t) get(&th->pcb, 0); - user_regs = (struct mc68020_saved_state *) + user_regs = (db_regs_t *) get(&t_pcb->user_regs, 0); stacktop(user_regs, &pos); diff --git a/sys/arch/sun3/sun3/machdep.c b/sys/arch/sun3/sun3/machdep.c index 3c17165695b..18d62dbb1d9 100644 --- a/sys/arch/sun3/sun3/machdep.c +++ b/sys/arch/sun3/sun3/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.13 1997/01/16 08:08:40 kstailey Exp $ */ +/* $OpenBSD: machdep.c,v 1.14 1997/01/19 13:53:14 niklas Exp $ */ /* $NetBSD: machdep.c,v 1.77 1996/10/13 03:47:51 christos Exp $ */ /* @@ -1094,8 +1094,7 @@ straytrap(frame) printf("unexpected trap; vector offset 0x%x from 0x%x\n", frame.tf_vector, frame.tf_pc); #ifdef DDB - /* XXX - Yuck! Make DDB use "struct trapframe" instead! */ - kdb_trap(-1, (struct mc68020_saved_state *) &frame); + kdb_trap(-1, (db_regs_t *) &frame); #endif } diff --git a/sys/arch/sun3/sun3/trap.c b/sys/arch/sun3/sun3/trap.c index 8de38c36249..d727923a19c 100644 --- a/sys/arch/sun3/sun3/trap.c +++ b/sys/arch/sun3/sun3/trap.c @@ -1,5 +1,5 @@ -/* $OpenBSD: trap.c,v 1.8 1997/01/16 04:04:34 kstailey Exp $ */ -/* $NetBSD: trap.c,v 1.62 1996/12/17 21:35:31 gwr Exp $ */ +/* $OpenBSD: trap.c,v 1.9 1997/01/19 13:53:13 niklas Exp $ */ +/* $NetBSD: trap.c,v 1.63 1997/01/16 15:41:40 gwr Exp $ */ /* * Copyright (c) 1994 Gordon W. Ross @@ -244,8 +244,7 @@ trap(type, code, v, frame) goto kgdb_cont; #endif #ifdef DDB - /* XXX - Yuck! Make DDB use "struct trapframe" instead! */ - (void) kdb_trap(type, (struct mc68020_saved_state *) &frame); + (void) kdb_trap(type, (db_regs_t *) &frame); #endif #ifdef KGDB kgdb_cont: -- 2.20.1