diff options
| author |   mpi <mpi@openbsd.org> | 2016-03-09 08:58:50 +0000 |
|---|---|---|
| committer | mpi <mpi@openbsd.org> | 2016-03-09 08:58:50 +0000 |
| commit | fc26f94277d652f771d349051b2a135f10eb7278 (patch) | |
| tree | 23aa16010813944833078de61a2ee9fe17613e2e | |
| parent | Add a comment to the vcpu state enum to remind people there is a matching (diff) | |
| download | wireguard-openbsd-fc26f94277d652f771d349051b2a135f10eb7278.tar.xz wireguard-openbsd-fc26f94277d652f771d349051b2a135f10eb7278.zip | |
Convert DDB_REGS -> &ddb_regs, inputs and ok naddy@
Put addresses instead of registers inside db_regs[] to match what other
archs do and to get rid of db_setf_regs().
| -rw-r--r-- | sys/arch/m88k/m88k/db_interface.c | 8 | ||||
| -rw-r--r-- | sys/arch/m88k/m88k/db_trace.c | 22 |
2 files changed, 7 insertions, 23 deletions
diff --git a/sys/arch/m88k/m88k/db_interface.c b/sys/arch/m88k/m88k/db_interface.c index 3014d8bd790..ea607fd1fa5 100644 --- a/sys/arch/m88k/m88k/db_interface.c +++ b/sys/arch/m88k/m88k/db_interface.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_interface.c,v 1.20 2014/05/31 11:19:06 miod Exp $ */ +/* $OpenBSD: db_interface.c,v 1.21 2016/03/09 08:58:50 mpi Exp $ */ /* * Mach Operating System * Copyright (c) 1993-1991 Carnegie Mellon University @@ -363,7 +363,7 @@ m88k_db_registers(addr, have_addr, count, modif) db_expr_t count; char *modif; { - m88k_db_print_frame((db_expr_t)DDB_REGS, TRUE, 0, modif); + m88k_db_print_frame((db_expr_t)&ddb_regs, TRUE, 0, modif); } /* @@ -557,7 +557,7 @@ m88k_db_where(addr, have_addr, count, modif) db_expr_t offset; db_addr_t l; - l = PC_REGS(DDB_REGS); /* clear low bits */ + l = PC_REGS(&ddb_regs); /* clear low bits */ db_find_xtrn_sym_and_offset(l, &name, &offset); if (name && (u_int)offset <= db_maxoff) @@ -585,7 +585,7 @@ m88k_db_frame_search(addr, have_addr, count, modif) if (have_addr) addr &= ~3; /* round to word */ else - addr = (DDB_REGS->r[31]); + addr = (ddb_regs.r[31]); /* walk back up stack until 8k boundry, looking for 0 */ while (addr & ((8 * 1024) - 1)) { diff --git a/sys/arch/m88k/m88k/db_trace.c b/sys/arch/m88k/m88k/db_trace.c index af89d30e8a9..bb6d19d0d55 100644 --- a/sys/arch/m88k/m88k/db_trace.c +++ b/sys/arch/m88k/m88k/db_trace.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_trace.c,v 1.14 2016/03/01 11:56:00 mpi Exp $ */ +/* $OpenBSD: db_trace.c,v 1.15 2016/03/09 08:58:50 mpi Exp $ */ /* * Mach Operating System * Copyright (c) 1993-1991 Carnegie Mellon University @@ -80,23 +80,7 @@ extern label_t *db_recover; * m88k trace/register state interface for ddb. */ -/* lifted from mips */ -static int -db_setf_regs(struct db_variable *vp, - db_expr_t *valuep, - int op) /* read/write */ -{ - int *regp = (int *) ((char *) DDB_REGS + (int) (vp->valuep)); - - if (op == DB_VAR_GET) - *valuep = *regp; - else if (op == DB_VAR_SET) - *regp = *valuep; - - return (0); /* silence warning */ -} - -#define N(s, x) {s, (long *)&(((db_regs_t *) 0)->x), db_setf_regs} +#define N(s, x) {s, (long *)&ddb_regs.x, FCN_NULL} struct db_variable db_regs[] = { N("r1", r[1]), N("r2", r[2]), N("r3", r[3]), N("r4", r[4]), @@ -864,7 +848,7 @@ db_stack_trace_print(db_expr_t addr, switch (style) { case Default: - regs = DDB_REGS; + regs = &ddb_regs; break; case Frame: regs = arg.frame; |