[src/trunk]: src/sys/arch/sh5 Format string fixes.

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

details:   https://anonhg.NetBSD.org/src/rev/083a510f138c
branches:  trunk
changeset: 538649:083a510f138c
user:      scw <scw%NetBSD.org@localhost>
date:      Thu Oct 24 13:48:44 2002 +0000

description:
Format string fixes.

diffstat:

 sys/arch/sh5/dev/femi.c      |  6 +++---
 sys/arch/sh5/dev/pbridge.c   |  4 ++--
 sys/arch/sh5/sh5/bus_space.c |  4 ++--
 sys/arch/sh5/sh5/db_disasm.c |  7 ++++---
 sys/arch/sh5/sh5/pmap.c      |  6 +++---
 sys/arch/sh5/sh5/trap.c      |  4 ++--
 6 files changed, 16 insertions(+), 15 deletions(-)

diffs (129 lines):

diff -r 402f8bc0fa1f -r 083a510f138c sys/arch/sh5/dev/femi.c
--- a/sys/arch/sh5/dev/femi.c   Thu Oct 24 12:54:14 2002 +0000
+++ b/sys/arch/sh5/dev/femi.c   Thu Oct 24 13:48:44 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: femi.c,v 1.6 2002/10/02 15:52:36 thorpej Exp $ */
+/*     $NetBSD: femi.c,v 1.7 2002/10/24 13:48:44 scw Exp $     */
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -122,7 +122,7 @@
        printf(": Flash/External Memory Interface, Version 0x%x\n",
            (int)SUPERHYWAY_VCR_MOD_VERS(vcr));
 
-       printf("%s: Base Address: 0x%lx, Length: 0x%lx\n",
+       printf("%s: Base Address: 0x%x, Length: 0x%x\n",
            sc->sc_dev.dv_xname, sc->sc_base, sc->sc_top - sc->sc_base);
 
        config_search(femisubmatch, self, NULL);
@@ -133,7 +133,7 @@
 {
        struct femi_attach_args *fa = arg;
 
-       printf(" offset 0x%lx", fa->fa_offset - fa->_fa_base);
+       printf(" offset 0x%x", fa->fa_offset - fa->_fa_base);
 
        return (UNCONF);
 }
diff -r 402f8bc0fa1f -r 083a510f138c sys/arch/sh5/dev/pbridge.c
--- a/sys/arch/sh5/dev/pbridge.c        Thu Oct 24 12:54:14 2002 +0000
+++ b/sys/arch/sh5/dev/pbridge.c        Thu Oct 24 13:48:44 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pbridge.c,v 1.6 2002/10/02 15:52:36 thorpej Exp $      */
+/*     $NetBSD: pbridge.c,v 1.7 2002/10/24 13:48:44 scw Exp $  */
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -156,7 +156,7 @@
        if (cp)
                printf("%s at %s", pa->pa_name, cp);
 
-       printf(" offset 0x%lx", pa->pa_offset - pa->_pa_base);
+       printf(" offset 0x%x", pa->pa_offset - pa->_pa_base);
 
        if (pa->pa_ipl != -1)
                printf(" ipl %d", pa->pa_ipl);
diff -r 402f8bc0fa1f -r 083a510f138c sys/arch/sh5/sh5/bus_space.c
--- a/sys/arch/sh5/sh5/bus_space.c      Thu Oct 24 12:54:14 2002 +0000
+++ b/sys/arch/sh5/sh5/bus_space.c      Thu Oct 24 13:48:44 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bus_space.c,v 1.3 2002/09/04 14:39:56 scw Exp $        */
+/*     $NetBSD: bus_space.c,v 1.4 2002/10/24 13:56:45 scw Exp $        */
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -219,7 +219,7 @@
 
                if ((addr + size) >
                    (bootmapping[i].bm_start + bootmapping[i].bm_size)) {
-                       panic("bus_space_map: bootmap overlap: %lx:%lx",
+                       panic("bus_space_map: bootmap overlap: %x:%x",
                            addr, size);
                        /*NOTREACHED*/
                }
diff -r 402f8bc0fa1f -r 083a510f138c sys/arch/sh5/sh5/db_disasm.c
--- a/sys/arch/sh5/sh5/db_disasm.c      Thu Oct 24 12:54:14 2002 +0000
+++ b/sys/arch/sh5/sh5/db_disasm.c      Thu Oct 24 13:48:44 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: db_disasm.c,v 1.8 2002/09/19 10:03:11 scw Exp $        */
+/*     $NetBSD: db_disasm.c,v 1.9 2002/10/24 13:56:45 scw Exp $        */
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -1472,7 +1472,8 @@
                                        if (diff)
                                                sprintf(extra_info,
                                                    "%s <%s+0x%x>",
-                                                   accmovi_str, symname, diff);
+                                                   accmovi_str, symname,
+                                                   (int)diff);
                                        else
                                                sprintf(extra_info, "%s <%s>",
                                                    accmovi_str, symname);
@@ -1499,7 +1500,7 @@
                        sprintf(ops, "0x%lx", loc);
                else {
                        if (diff)
-                               sprintf(ops, "%s+0x%x", symname, diff);
+                               sprintf(ops, "%s+0x%x", symname, (int) diff);
                        else
                                strcpy(ops, symname);
                }
diff -r 402f8bc0fa1f -r 083a510f138c sys/arch/sh5/sh5/pmap.c
--- a/sys/arch/sh5/sh5/pmap.c   Thu Oct 24 12:54:14 2002 +0000
+++ b/sys/arch/sh5/sh5/pmap.c   Thu Oct 24 13:48:44 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.22 2002/10/23 13:24:28 scw Exp $    */
+/*     $NetBSD: pmap.c,v 1.23 2002/10/24 13:56:45 scw Exp $    */
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -2340,8 +2340,8 @@
                        continue;
                }
 
-               PMPRINTF(("pmap_protect: protecting VA 0x%lx, PA 0x%x\n",
-                   va, pvo->pvo_ptel & SH5_PTEL_PPN_MASK));
+               PMPRINTF(("pmap_protect: protecting VA 0x%lx, PA 0x%lx\n",
+                   va, (paddr_t)(pvo->pvo_ptel & SH5_PTEL_PPN_MASK)));
 
                pvo->pvo_ptel &= ~clrbits;
                pvo->pvo_vaddr &= ~PVO_WRITABLE;
diff -r 402f8bc0fa1f -r 083a510f138c sys/arch/sh5/sh5/trap.c
--- a/sys/arch/sh5/sh5/trap.c   Thu Oct 24 12:54:14 2002 +0000
+++ b/sys/arch/sh5/sh5/trap.c   Thu Oct 24 13:48:44 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: trap.c,v 1.14 2002/09/28 11:04:26 scw Exp $    */
+/*     $NetBSD: trap.c,v 1.15 2002/10/24 13:56:46 scw Exp $    */
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -540,7 +540,7 @@
        printf("KCR0=0x%lx, KCR1=0x%lx\n\n", (intptr_t)kcr0, (intptr_t)kcr1);
 
        printf("Exc Scratch Area:\n");
-       printf("  CRIT: 0x%08x%08x\n", (u_int)excf.es_critical);
+       printf("  CRIT: 0x%x\n", (u_int)excf.es_critical);
        printf("    R0: 0x%08x%08x\n",
            (u_int)(excf.es_r[0] >> 32), (u_int)excf.es_r[0]);
        printf("    R1: 0x%08x%08x\n",