Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/mips/mips ANSIfy, KNF.
details: https://anonhg.NetBSD.org/src/rev/ab5b776935e3
branches: trunk
changeset: 514271:ab5b776935e3
user: simonb <simonb%NetBSD.org@localhost>
date: Mon Aug 27 06:18:08 2001 +0000
description:
ANSIfy, KNF.
diffstat:
sys/arch/mips/mips/db_interface.c | 108 +++++++++++++++----------------------
1 files changed, 44 insertions(+), 64 deletions(-)
diffs (285 lines):
diff -r f84b74805329 -r ab5b776935e3 sys/arch/mips/mips/db_interface.c
--- a/sys/arch/mips/mips/db_interface.c Mon Aug 27 04:53:27 2001 +0000
+++ b/sys/arch/mips/mips/db_interface.c Mon Aug 27 06:18:08 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.c,v 1.36 2001/05/30 15:24:33 lukem Exp $ */
+/* $NetBSD: db_interface.c,v 1.37 2001/08/27 06:18:08 simonb Exp $ */
/*
* Mach Operating System
@@ -58,38 +58,40 @@
int db_active = 0;
mips_reg_t kdbaux[11]; /* XXX struct switchframe: better inside curpcb? XXX */
-void db_tlbdump_cmd __P((db_expr_t, int, db_expr_t, char *));
-void db_kvtophys_cmd __P((db_expr_t, int, db_expr_t, char *));
+void db_tlbdump_cmd(db_expr_t, int, db_expr_t, char *);
+void db_kvtophys_cmd(db_expr_t, int, db_expr_t, char *);
-static void kdbpoke_4 __P((vaddr_t addr, int newval));
-static void kdbpoke_2 __P((vaddr_t addr, short newval));
-static void kdbpoke_1 __P((vaddr_t addr, char newval));
-static short kdbpeek_2 __P((vaddr_t addr));
-static char kdbpeek_1 __P((vaddr_t addr));
-extern vaddr_t MachEmulateBranch __P((struct frame *, vaddr_t, unsigned, int));
+static void kdbpoke_4(vaddr_t addr, int newval);
+static void kdbpoke_2(vaddr_t addr, short newval);
+static void kdbpoke_1(vaddr_t addr, char newval);
+static short kdbpeek_2(vaddr_t addr);
+static char kdbpeek_1(vaddr_t addr);
+extern vaddr_t MachEmulateBranch(struct frame *, vaddr_t, unsigned, int);
-extern paddr_t kvtophys __P((vaddr_t));
+extern paddr_t kvtophys(vaddr_t);
#ifdef DDB_TRACE
int
-kdbpeek(addr)
- vaddr_t addr;
+kdbpeek(vaddr_t addr)
{
+
if (addr == 0 || (addr & 3))
return 0;
return *(int *)addr;
}
#endif
+
static short
-kdbpeek_2(addr)
- vaddr_t addr;
+kdbpeek_2(vaddr_t addr)
{
+
return *(short *)addr;
}
+
static char
-kdbpeek_1(addr)
- vaddr_t addr;
+kdbpeek_1(vaddr_t addr)
{
+
return *(char *)addr;
}
@@ -101,6 +103,7 @@
static void
kdbpoke_4(vaddr_t addr, int newval)
{
+
*(int*) addr = newval;
wbflush();
}
@@ -108,6 +111,7 @@
static void
kdbpoke_2(vaddr_t addr, short newval)
{
+
*(short*) addr = newval;
wbflush();
}
@@ -124,9 +128,9 @@
* Received keyboard interrupt sequence.
*/
void
-kdb_kbd_trap(tf)
- int *tf;
+kdb_kbd_trap(int *tf)
{
+
if (db_active == 0 && (boothowto & RB_KDB)) {
printf("\n\nkernel: keyboard interrupt\n");
ddb_trap(-1, tf);
@@ -136,10 +140,9 @@
#ifndef KGDB
int
-kdb_trap(type, tfp)
- int type;
- mips_reg_t *tfp; /* struct trapframe */
+kdb_trap(int type, mips_reg_t /* struct trapframe */ *tfp)
{
+
struct frame *f = (struct frame *)&ddb_regs;
#ifdef notyet
@@ -208,16 +211,15 @@
}
void
-cpu_Debugger()
+cpu_Debugger(void)
{
+
asm("break");
}
#endif /* !KGDB */
void
-db_set_ddb_regs(type, tfp)
- int type;
- mips_reg_t *tfp;
+db_set_ddb_regs(int type, mips_reg_t *tfp)
{
struct frame *f = (struct frame *)&ddb_regs;
@@ -267,11 +269,9 @@
* Read bytes from kernel address space for debugger.
*/
void
-db_read_bytes(addr, size, data)
- vaddr_t addr;
- size_t size;
- char *data;
+db_read_bytes(vaddr_t addr, size_t size, char *data)
{
+
while (size >= 4)
*((int*)data)++ = kdbpeek(addr), addr += 4, size -= 4;
while (size >= 2)
@@ -284,13 +284,11 @@
* Write bytes to kernel address space for debugger.
*/
void
-db_write_bytes(addr, size, data)
- vaddr_t addr;
- size_t size;
- char *data;
+db_write_bytes(vaddr_t addr, size_t size, char *data)
{
vaddr_t p = addr;
size_t n = size;
+
#ifdef DEBUG_DDB
printf("db_write_bytes(%lx, %d, %p, val %x)\n", addr, size, data,
(addr &3 ) == 0? *(u_int*)addr: -1);
@@ -325,12 +323,9 @@
#ifndef KGDB
void
-db_tlbdump_cmd(addr, have_addr, count, modif)
- db_expr_t addr;
- int have_addr;
- db_expr_t count;
- char *modif;
+db_tlbdump_cmd(db_expr_t addr, int have_addr, db_expr_t count, char *modif)
{
+
#ifdef MIPS1
if (!CPUISMIPS3) {
struct mips1_tlb {
@@ -338,7 +333,7 @@
u_int32_t tlb_lo;
} tlb;
int i;
- void mips1_TLBRead __P((int, struct mips1_tlb *));
+ void mips1_TLBRead(int, struct mips1_tlb *);
for (i = 0; i < mips_num_tlb_entries; i++) {
mips1_TLBRead(i, &tlb);
@@ -380,12 +375,9 @@
}
void
-db_kvtophys_cmd(addr, have_addr, count, modif)
- db_expr_t addr;
- int have_addr;
- db_expr_t count;
- char *modif;
+db_kvtophys_cmd(db_expr_t addr, int have_addr, db_expr_t count, char *modif)
{
+
if (!have_addr)
return;
if (MIPS_KSEG2_START <= addr) {
@@ -404,15 +396,13 @@
{ "tlb", db_tlbdump_cmd, 0, 0 },
{ (char *)0, }
};
-
#endif /* !KGDB */
/*
* Determine whether the instruction involves a delay slot.
*/
boolean_t
-inst_branch(inst)
- int inst;
+inst_branch(int inst)
{
InstFmt i;
int delay;
@@ -455,8 +445,7 @@
* Determine whether the instruction calls a function.
*/
boolean_t
-inst_call(inst)
- int inst;
+inst_call(int inst)
{
boolean_t call;
InstFmt i;
@@ -479,8 +468,7 @@
* This lets the ddb "next" command to work (also need inst_trap_return()).
*/
boolean_t
-inst_return(inst)
- int inst;
+inst_return(int inst)
{
InstFmt i;
@@ -494,8 +482,7 @@
* Determine whether the instruction makes a jump.
*/
boolean_t
-inst_unconditional_flow_transfer(inst)
- int inst;
+inst_unconditional_flow_transfer(int inst)
{
InstFmt i;
boolean_t jump;
@@ -510,8 +497,7 @@
* Determine whether the instruction is a load/store as appropriate.
*/
boolean_t
-inst_load(inst)
- int inst;
+inst_load(int inst)
{
InstFmt i;
@@ -538,8 +524,7 @@
}
boolean_t
-inst_store(inst)
- int inst;
+inst_store(int inst)
{
InstFmt i;
@@ -567,10 +552,7 @@
* MachEmulateBranch() runs analysis for branch delay slot.
*/
db_addr_t
-branch_taken(inst, pc, regs)
- int inst;
- db_addr_t pc;
- db_regs_t *regs;
+branch_taken(int inst, db_addr_t pc, db_regs_t *regs)
{
vaddr_t ra;
unsigned fpucsr;
@@ -584,9 +566,7 @@
* Return the next pc of an arbitrary instruction.
*/
db_addr_t
-next_instr_address(pc, bd)
- db_addr_t pc;
- boolean_t bd;
+next_instr_address(db_addr_t pc, boolean_t bd)
{
unsigned ins;
Home |
Main Index |
Thread Index |
Old Index