summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/alpha/alpha/db_disasm.c6
-rw-r--r--sys/arch/alpha/alpha/db_interface.c4
-rw-r--r--sys/arch/alpha/alpha/db_trace.c4
3 files changed, 7 insertions, 7 deletions
diff --git a/sys/arch/alpha/alpha/db_disasm.c b/sys/arch/alpha/alpha/db_disasm.c
index f5b787e27f9..dd2595dc6b1 100644
--- a/sys/arch/alpha/alpha/db_disasm.c
+++ b/sys/arch/alpha/alpha/db_disasm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: db_disasm.c,v 1.22 2008/10/04 15:34:45 martynas Exp $ */
+/* $OpenBSD: db_disasm.c,v 1.23 2016/04/27 11:03:24 mpi Exp $ */
/* $NetBSD: db_disasm.c,v 1.8 2000/05/25 19:57:30 jhawk Exp $ */
/*
@@ -1052,7 +1052,7 @@ loadstore_address:
if (i.mem_format.opcode == op_ldah)
signed_immediate <<= 16;
db_printf(" <0x%lx>", signed_immediate +
- db_register_value(DDB_REGS, i.mem_format.rb));
+ db_register_value(&ddb_regs, i.mem_format.rb));
}
break;
case op_br:
@@ -1098,7 +1098,7 @@ branch_displacement:
db_printf(",");
db_printf("%s=0x%lx",
name_of_register[regnum[ireg]],
- db_register_value(DDB_REGS, regnum[ireg]));
+ db_register_value(&ddb_regs, regnum[ireg]));
}
db_printf(">");
}
diff --git a/sys/arch/alpha/alpha/db_interface.c b/sys/arch/alpha/alpha/db_interface.c
index 0c61db9967f..80b91dd1786 100644
--- a/sys/arch/alpha/alpha/db_interface.c
+++ b/sys/arch/alpha/alpha/db_interface.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: db_interface.c,v 1.21 2014/07/13 12:11:01 jasper Exp $ */
+/* $OpenBSD: db_interface.c,v 1.22 2016/04/27 11:03:24 mpi Exp $ */
/* $NetBSD: db_interface.c,v 1.8 1999/10/12 17:08:57 jdolecek Exp $ */
/*
@@ -496,7 +496,7 @@ next_instr_address(pc, branch)
{
if (!branch)
return (pc + sizeof(int));
- return (branch_taken(*(u_int *)pc, pc, getreg_val, DDB_REGS));
+ return (branch_taken(*(u_int *)pc, pc, getreg_val, &ddb_regs));
}
#if defined(MULTIPROCESSOR)
diff --git a/sys/arch/alpha/alpha/db_trace.c b/sys/arch/alpha/alpha/db_trace.c
index 2bf9ee0fc25..dcaf2fff473 100644
--- a/sys/arch/alpha/alpha/db_trace.c
+++ b/sys/arch/alpha/alpha/db_trace.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: db_trace.c,v 1.16 2014/01/30 20:11:14 miod Exp $ */
+/* $OpenBSD: db_trace.c,v 1.17 2016/04/27 11:03:24 mpi Exp $ */
/*
* Copyright (c) 1997 Niklas Hallqvist. All rights reserved.
@@ -195,7 +195,7 @@ db_stack_trace_print(addr, have_addr, count, modif, pr)
(*pr)("alpha trace requires a trap frame... giving up.\n");
return;
}
- regs = DDB_REGS;
+ regs = &ddb_regs;
trapframe:
/* remember where various registers are stored */
for (i = 0; i < 31; i++)