diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2003-12-21 15:17:33 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2003-12-21 15:17:33 +0000 |
| commit | f6069365e25d7c87b0ba0972073e95b3f31bae10 (patch) | |
| tree | eb13f9a0e772974240c43a03480ea2453c773851 | |
| parent | 784c40b5fe9be2b8cee78178303b18f260db13ac (diff) | |
Switch db_expr_t from int to long, per consistency with all other arches.
ok drahn@
| -rw-r--r-- | sys/arch/powerpc/ddb/db_disasm.c | 6 | ||||
| -rw-r--r-- | sys/arch/powerpc/include/db_machdep.h | 4 | ||||
| -rw-r--r-- | sys/arch/powerpc/powerpc/trap.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sys/arch/powerpc/ddb/db_disasm.c b/sys/arch/powerpc/ddb/db_disasm.c index bb95af723c7..0ceb8a12049 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.13 2003/10/15 01:06:13 drahn Exp $ */ +/* $OpenBSD: db_disasm.c,v 1.14 2003/12/21 15:17:29 miod Exp $ */ /* * Copyright (c) 1996, 2001, 2003 Dale Rahn. All rights reserved. * @@ -646,7 +646,7 @@ disasm_process_field(u_int32_t addr, instr_t instr, char **ppfmt, strlcat (disasm_buf, lbuf, bufsize); } else { snprintf(lbuf, sizeof (lbuf), - "0x%x (%s+0x%x)", LI, name, + "0x%x (%s+0x%lx)", LI, name, offset); strlcat (disasm_buf, lbuf, bufsize); } @@ -684,7 +684,7 @@ disasm_process_field(u_int32_t addr, instr_t instr, char **ppfmt, strlcat (disasm_buf, lbuf, bufsize); } else { snprintf(lbuf, sizeof (lbuf), - "0x%x (%s+0x%x)", BD, name, offset); + "0x%x (%s+0x%lx)", BD, name, offset); strlcat (disasm_buf, lbuf, bufsize); } } else { diff --git a/sys/arch/powerpc/include/db_machdep.h b/sys/arch/powerpc/include/db_machdep.h index e290e3beaea..f99cb963fe3 100644 --- a/sys/arch/powerpc/include/db_machdep.h +++ b/sys/arch/powerpc/include/db_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: db_machdep.h,v 1.18 2003/02/12 22:41:35 jason Exp $ */ +/* $OpenBSD: db_machdep.h,v 1.19 2003/12/21 15:17:30 miod Exp $ */ /* $NetBSD: db_machdep.h,v 1.13 1996/04/29 20:50:08 leo Exp $ */ /* @@ -44,7 +44,7 @@ #define DB_ELFSIZE 32 typedef vm_offset_t db_addr_t; /* address - unsigned */ -typedef int db_expr_t; /* expression - signed */ +typedef long db_expr_t; /* expression - signed */ struct powerpc_saved_state { struct trapframe tf; }; diff --git a/sys/arch/powerpc/powerpc/trap.c b/sys/arch/powerpc/powerpc/trap.c index 27ad280b4fb..848abe7413c 100644 --- a/sys/arch/powerpc/powerpc/trap.c +++ b/sys/arch/powerpc/powerpc/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.61 2003/10/15 02:43:09 drahn Exp $ */ +/* $OpenBSD: trap.c,v 1.62 2003/12/21 15:17:32 miod Exp $ */ /* $NetBSD: trap.c,v 1.3 1996/10/13 03:31:37 christos Exp $ */ /* @@ -556,7 +556,7 @@ mpc_print_pci_stat(); name = "0"; offset = frame->srr0; } - panic ("trap type %x at %x (%s+0x%x) lr %x", + panic ("trap type %x at %x (%s+0x%lx) lr %x", type, frame->srr0, name, offset, frame->lr); |