Module Name: src
Committed By: matt
Date: Fri Apr 29 22:14:35 UTC 2011
Modified Files:
src/sys/arch/mips/mips: db_interface.c
Log Message:
KNF cleanup.
To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 src/sys/arch/mips/mips/db_interface.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/mips/db_interface.c
diff -u src/sys/arch/mips/mips/db_interface.c:1.73 src/sys/arch/mips/mips/db_interface.c:1.74
--- src/sys/arch/mips/mips/db_interface.c:1.73 Thu Apr 14 17:43:07 2011
+++ src/sys/arch/mips/mips/db_interface.c Fri Apr 29 22:14:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.c,v 1.73 2011/04/14 17:43:07 matt Exp $ */
+/* $NetBSD: db_interface.c,v 1.74 2011/04/29 22:14:35 matt Exp $ */
/*
* Mach Operating System
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.73 2011/04/14 17:43:07 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.74 2011/04/29 22:14:35 matt Exp $");
#include "opt_multiprocessor.h"
#include "opt_cputype.h" /* which mips CPUs do we support? */
@@ -47,8 +47,8 @@
#include <mips/asm.h>
#include <mips/regnum.h>
#include <mips/cache.h>
+#include <mips/pcb.h>
#include <mips/pte.h>
-#include <mips/cpu.h>
#include <mips/locore.h>
#include <mips/mips_opcode.h>
#include <dev/cons.h>
@@ -521,7 +521,7 @@
if (!have_addr) {
db_printf("%-3s %-5s %-16s %4s %4s\n",
"#", "MODE", "ADDR", "MASK", "ASID");
- for (int i=0; i < ci->ci_cpuwatch_count; i++) {
+ for (u_int i=0; i < ci->ci_cpuwatch_count; i++) {
cwp = &ci->ci_cpuwatch_tab[i];
mode = cwp->cw_mode;
if ((mode & CPUWATCH_RWX) == 0)
@@ -532,9 +532,9 @@
str[3] = (mode & CPUWATCH_MASK) ? 'm' : '-';
str[4] = (mode & CPUWATCH_ASID) ? 'a' : 'g';
str[5] = '\0';
- db_printf("%2d: %s %16" PRIxREGISTER
- " %4" PRIxREGISTER " %4x\n",
- i, str, cwp->cw_addr, cwp->cw_mask, cwp->cw_asid);
+ db_printf("%2u: %s %16" PRIxREGISTER
+ " %4" PRIxREGISTER " %4x\n",
+ i, str, cwp->cw_addr, cwp->cw_mask, cwp->cw_asid);
}
db_flush_lex();
return;
@@ -629,13 +629,12 @@
const char *modif)
{
struct cpu_info * const ci = curcpu();
- cpu_watchpoint_t *cwp;
- int i, n;
- bool unwatch_all = !have_addr;
+ const bool unwatch_all = !have_addr;
+ int n;
n = 0;
- for (i=0; i < ci->ci_cpuwatch_count; i++) {
- cwp = &ci->ci_cpuwatch_tab[i];
+ for (u_int i=0; i < ci->ci_cpuwatch_count; i++) {
+ cpu_watchpoint_t * const cwp = &ci->ci_cpuwatch_tab[i];
if (unwatch_all || (cwp->cw_addr == (register_t)address)) {
cpuwatch_free(cwp);
n++;
@@ -643,8 +642,7 @@
}
if (n == 0)
db_printf("no watch found on address %#" PRIxREGISTER "\n",
- (register_t)address);
-
+ (register_t)address);
}
#endif /* (MIPS32 + MIPS32R2 + MIPS64 + MIPS64R2) > 0 */
