Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/sparc64 Fix compilation problems in DEBUG code.



details:   https://anonhg.NetBSD.org/src/rev/1945175c6a13
branches:  trunk
changeset: 533221:1945175c6a13
user:      eeh <eeh%NetBSD.org@localhost>
date:      Mon Jun 24 18:48:13 2002 +0000

description:
Fix compilation problems in DEBUG code.

diffstat:

 sys/arch/sparc64/dev/iommu.c    |  6 +++---
 sys/arch/sparc64/sparc64/pmap.c |  4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (45 lines):

diff -r e88821c8bb61 -r 1945175c6a13 sys/arch/sparc64/dev/iommu.c
--- a/sys/arch/sparc64/dev/iommu.c      Mon Jun 24 18:22:37 2002 +0000
+++ b/sys/arch/sparc64/dev/iommu.c      Mon Jun 24 18:48:13 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: iommu.c,v 1.55 2002/06/20 18:26:23 eeh Exp $   */
+/*     $NetBSD: iommu.c,v 1.56 2002/06/24 18:48:13 eeh Exp $   */
 
 /*
  * Copyright (c) 2001, 2002 Eduardo Horvath
@@ -921,7 +921,7 @@
                     "BUS_DMASYNC_POSTREAD\n", (void *)(u_long)va, (u_long)len));
 #ifdef DIAGNOSTIC
                if (va < is->is_dvmabase || va >= is->is_dvmaend)
-                       panic("iommu_dvmamap_sync: invalid dva %p", va);
+                       panic("iommu_dvmamap_sync: invalid dva %lx", va);
 #endif
                tte = is->is_tsb[IOTSBSLOT(va, is->is_tsbsize)];
 
@@ -948,7 +948,7 @@
        if (ops & BUS_DMASYNC_PREWRITE) {
 #ifdef DIAGNOSTIC
                if (va < is->is_dvmabase || va >= is->is_dvmaend)
-                       panic("iommu_dvmamap_sync: invalid dva %p", va);
+                       panic("iommu_dvmamap_sync: invalid dva %lx", va);
 #endif
                tte = is->is_tsb[IOTSBSLOT(va, is->is_tsbsize)];
 
diff -r e88821c8bb61 -r 1945175c6a13 sys/arch/sparc64/sparc64/pmap.c
--- a/sys/arch/sparc64/sparc64/pmap.c   Mon Jun 24 18:22:37 2002 +0000
+++ b/sys/arch/sparc64/sparc64/pmap.c   Mon Jun 24 18:48:13 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.123 2002/06/21 02:57:29 eeh Exp $   */
+/*     $NetBSD: pmap.c,v 1.124 2002/06/24 18:48:15 eeh Exp $   */
 #undef NO_VCACHE /* Don't forget the locked TLB in dostart */
 #define        HWREF
 /*
@@ -2520,7 +2520,7 @@
                pa = (pseg_get(pm, va)&TLB_PA_MASK)+(va&PGOFSET);
 #ifdef DEBUG
                if (pmapdebug & PDB_EXTRACT) {
-                       npa = ldxa((vaddr_t)&pm->pm_segs[va_to_seg(va)], ASI_PHYS_CACHED);
+                       paddr_t npa = ldxa((vaddr_t)&pm->pm_segs[va_to_seg(va)], ASI_PHYS_CACHED);
                        printf("pmap_extract: va=%p segs[%ld]=%llx", (void *)(u_long)va, (long)va_to_seg(va), (unsigned long long)npa);
                        if (npa) {
                                npa = (paddr_t)ldxa((vaddr_t)&((paddr_t*)(u_long)npa)[va_to_dir(va)], ASI_PHYS_CACHED);



Home | Main Index | Thread Index | Old Index