summaryrefslogtreecommitdiff
path: root/sys/arch/powerpc/ddb
diff options
context:
space:
mode:
authorDale Rahn <drahn@cvs.openbsd.org>2003-10-15 01:06:14 +0000
committerDale Rahn <drahn@cvs.openbsd.org>2003-10-15 01:06:14 +0000
commit242070e1d75db081140939a928fdcf8fdbd93c76 (patch)
tree2d340dada0d4cd6bc0d278aecb31b6386e400b2e /sys/arch/powerpc/ddb
parentdaaa211269aea7a6b2c4c09a0b149a40f11a24e7 (diff)
Housecleaning, no binary change.
Diffstat (limited to 'sys/arch/powerpc/ddb')
-rw-r--r--sys/arch/powerpc/ddb/db_disasm.c5
-rw-r--r--sys/arch/powerpc/ddb/db_memrw.c14
-rw-r--r--sys/arch/powerpc/ddb/db_trace.c16
3 files changed, 18 insertions, 17 deletions
diff --git a/sys/arch/powerpc/ddb/db_disasm.c b/sys/arch/powerpc/ddb/db_disasm.c
index 49cf1ef3496..bb95af723c7 100644
--- a/sys/arch/powerpc/ddb/db_disasm.c
+++ b/sys/arch/powerpc/ddb/db_disasm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: db_disasm.c,v 1.12 2003/05/09 21:36:05 drahn Exp $ */
+/* $OpenBSD: db_disasm.c,v 1.13 2003/10/15 01:06:13 drahn Exp $ */
/*
* Copyright (c) 1996, 2001, 2003 Dale Rahn. All rights reserved.
*
@@ -229,6 +229,7 @@ const struct opcode opcodes[] = {
{ "", 0x0, 0x0, "" }
};
+
/* 13 * 4 = 4c */
const struct opcode opcodes_13[] = {
/* 0x13 << 2 */
@@ -391,6 +392,7 @@ const struct opcode opcodes_3a[] = {
{ "lwa", 0xfc000003, 0xe8000002, " %{D},${ds}${A}" },
{ "", 0x0, 0x0, "" }
};
+
/* 3b * 4 = ec */
const struct opcode opcodes_3b[] = {
{ "fdivs", 0xfc00003e, 0xec000024, "%{RC} f%{D},f%{A},f%{B}" },
@@ -406,6 +408,7 @@ const struct opcode opcodes_3b[] = {
{ "fnmadds", 0xfc00003e, 0xec00003e, "%{RC} f%{D},f%{A},f%{C},f%{B}" },
{ "", 0x0, 0x0, "" }
};
+
/* 3e * 4 = f8 */
const struct opcode opcodes_3e[] = {
{ "std", 0xfc000003, 0xf8000000, " %{D},${ds}${A}" },
diff --git a/sys/arch/powerpc/ddb/db_memrw.c b/sys/arch/powerpc/ddb/db_memrw.c
index f5ec5b691b8..cf1a18e71a2 100644
--- a/sys/arch/powerpc/ddb/db_memrw.c
+++ b/sys/arch/powerpc/ddb/db_memrw.c
@@ -1,5 +1,5 @@
/* $NetBSD: db_memrw.c,v 1.4 2001/05/18 20:38:27 matt Exp $ */
-/* $OpenBSD: db_memrw.c,v 1.4 2003/02/26 21:54:44 drahn Exp $ */
+/* $OpenBSD: db_memrw.c,v 1.5 2003/10/15 01:06:13 drahn Exp $ */
/*
* Mach Operating System
@@ -55,10 +55,10 @@
void
db_read_bytes(addr, size, data)
vaddr_t addr;
- register size_t size;
- register char *data;
+ size_t size;
+ char *data;
{
- register char *src = (char *)addr;
+ char *src = (char *)addr;
faultbuf env;
faultbuf *old_onfault = curpcb->pcb_onfault;
if (setfault(&env)) {
@@ -85,10 +85,10 @@ db_read_bytes(addr, size, data)
void
db_write_bytes(addr, size, data)
vaddr_t addr;
- register size_t size;
- register char *data;
+ size_t size;
+ char *data;
{
- register char *dst = (char *)addr;
+ char *dst = (char *)addr;
faultbuf env;
faultbuf *old_onfault = curpcb->pcb_onfault;
diff --git a/sys/arch/powerpc/ddb/db_trace.c b/sys/arch/powerpc/ddb/db_trace.c
index a84d4a9f688..73bff090fa5 100644
--- a/sys/arch/powerpc/ddb/db_trace.c
+++ b/sys/arch/powerpc/ddb/db_trace.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: db_trace.c,v 1.3 2003/02/26 21:54:44 drahn Exp $ */
+/* $OpenBSD: db_trace.c,v 1.4 2003/10/15 01:06:13 drahn Exp $ */
/* $NetBSD: db_trace.c,v 1.15 1996/02/22 23:23:41 gwr Exp $ */
/*
@@ -41,6 +41,8 @@
#include <ddb/db_interface.h>
#include <ddb/db_output.h>
+int db_read32(u_int32_t paddr, u_int32_t *value);
+
db_regs_t ddb_regs;
struct db_variable db_regs[] = {
@@ -83,6 +85,7 @@ struct db_variable db_regs[] = {
{ "iar", (long *)&(DDB_REGS->tf.srr0), FCN_NULL },
{ "msr", (long *)&(DDB_REGS->tf.srr1), FCN_NULL },
};
+
struct db_variable *db_eregs = db_regs + sizeof(db_regs)/sizeof(db_regs[0]);
extern label_t *db_recover;
@@ -96,8 +99,6 @@ db_save_regs(struct trapframe *frame)
bcopy(frame, &(ddb_regs.tf), sizeof (struct trapframe));
}
-int db_read32(u_int32_t paddr, u_int32_t *value);
-
int
db_read32(u_int32_t paddr, u_int32_t *value)
{
@@ -138,16 +139,13 @@ db_dumpframe(u_int32_t pframe, int (*pr)(const char *, ...))
return nextframe;
}
+
/*
* Frame tracing.
*/
void
-db_stack_trace_print(addr, have_addr, count, modif, pr)
- db_expr_t addr;
- int have_addr;
- db_expr_t count;
- char *modif;
- int (*pr)(const char *, ...);
+db_stack_trace_print(db_expr_t addr, int have_addr, db_expr_t count,
+ char *modif, int (*pr)(const char *, ...))
{
if (count == 0 || count == -1)