[src/trunk]: src/sys/arch/pc532/pc532 Const poisoning, fix shadow variable pr...

[simonb <simonb%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e4a62d463c49
branches:  trunk
changeset: 588179:e4a62d463c49
user:      simonb <simonb%NetBSD.org@localhost>
date:      Sat Feb 11 02:19:31 2006 +0000

description:
Const poisoning, fix shadow variable problem.

diffstat:

 sys/arch/pc532/pc532/db_disasm.c |  31 ++++++++++++++-----------------
 1 files changed, 14 insertions(+), 17 deletions(-)

diffs (69 lines):

diff -r 1c9d87b923cb -r e4a62d463c49 sys/arch/pc532/pc532/db_disasm.c
--- a/sys/arch/pc532/pc532/db_disasm.c  Sat Feb 11 02:19:06 2006 +0000
+++ b/sys/arch/pc532/pc532/db_disasm.c  Sat Feb 11 02:19:31 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: db_disasm.c,v 1.10 2005/12/11 12:18:31 christos Exp $  */
+/*     $NetBSD: db_disasm.c,v 1.11 2006/02/11 02:19:31 simonb Exp $    */
 
 /*
  * Mach Operating System
@@ -44,7 +44,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_disasm.c,v 1.10 2005/12/11 12:18:31 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_disasm.c,v 1.11 2006/02/11 02:19:31 simonb Exp $");
 
 #define STATIC static
 
@@ -884,11 +884,11 @@
 #define REG_NIL                (REG_FSR+2)
 
 struct regTable {
-    char *name;
+    const char *name;
 };
 
 STATIC
-struct regTable regTable[] = {
+const struct regTable regTable[] = {
   {"r0"},                      /* General Register 0 */
   {"r1"},                      /* General Register 1 */
   {"r2"},                      /* General Register 2 */
@@ -990,6 +990,7 @@
        db_addr_t loc;
 {
        int need_comma, i, mask, textlen;
+       const char *p;
 
        switch (operand->o_mode) {
 
@@ -1094,19 +1095,15 @@
                db_printf("]");
                break;
 
-             case AMODE_CINV:
-               {                       /* print cache invalidate flags */
-                       char *p;
-                       int i, need_comma = 0;
-
-                       for (i = 4, p = "AID"; i; i >>= 1, ++p)
-                           if (i & operand->o_disp0) {
-                                   if (need_comma)
-                                       db_printf(",");
-                                   db_printf("%c",*p);
-                                   need_comma = 1;
-                           }
-               }
+             case AMODE_CINV:  /* print cache invalidate flags */
+               need_comma = 0;
+               for (i = 4, p = "AID"; i; i >>= 1, ++p)
+                       if (i & operand->o_disp0) {
+                               if (need_comma)
+                                   db_printf(",");
+                               db_printf("%c",*p);
+                               need_comma = 1;
+                       }
                break;
 
              case AMODE_INVALID: