Warning police. Mostly useless format warnings. Switch Makefile for

kernel compiles to the warning flags that other ports also use.
This commit is contained in:
fvdl 2000-12-04 16:01:18 +00:00
parent 7433fb33e8
commit 2fb588e51d
12 changed files with 207 additions and 130 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.sparc64,v 1.31 2000/09/28 19:56:15 eeh Exp $
# $NetBSD: Makefile.sparc64,v 1.32 2000/12/04 16:01:18 fvdl Exp $
# Makefile for NetBSD
#
@ -64,8 +64,10 @@ SPARC64= $S/arch/sparc64
INCLUDES= -I. -I$S/arch -I$S -nostdinc
CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL ${SVR4}
CWARNFLAGS= -Wimplicit -Wunused -Wswitch -Wcomment -Wtrigraphs -Wchar-subscripts -Wparentheses -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith
#CWARNFLAGS= -Wimplicit -Wunused -Wswitch -Wcomment -Wtrigraphs -Wchar-subscripts -Wparentheses -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wno-main -Werror
#CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes
CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wno-main
CWARNFLAGS+= -Wno-uninitialized
CFLAGS= ${DEBUG} ${COPTS} ${CWARNFLAGS} -Wa,-Av9a -mno-fpu
.if defined(PROF)
# We need to run the compiler in medlow memory model.

View File

@ -1,4 +1,4 @@
/* $NetBSD: ebus.c,v 1.17 2000/07/27 14:17:10 mrg Exp $ */
/* $NetBSD: ebus.c,v 1.18 2000/12/04 16:01:18 fvdl Exp $ */
/*
* Copyright (c) 1999, 2000 Matthew R. Green
@ -330,7 +330,7 @@ ebus_find_ino(sc, ea)
hi = ea->ea_regs[i].hi & sc->sc_intmapmask.hi;
lo = ea->ea_regs[i].lo & sc->sc_intmapmask.lo;
DPRINTF(EDB_INTRMAP, ("; reg hi.lo %08x.08x masked to %08x.%08x", ea->ea_regs[i].hi, ea->ea_regs[i].lo, hi, lo));
DPRINTF(EDB_INTRMAP, ("; reg hi.lo %08x.%08x masked to %08x.%08x", ea->ea_regs[i].hi, ea->ea_regs[i].lo, hi, lo));
for (k = 0; k < sc->sc_nintmap; k++) {
DPRINTF(EDB_INTRMAP, ("; checking hi.lo %08x.%08x intr %x", sc->sc_intmap[k].hi, sc->sc_intmap[k].lo, sc->sc_intmap[k].intr));
if (hi == sc->sc_intmap[k].hi &&
@ -476,7 +476,7 @@ _ebus_bus_map(t, btype, offset, size, flags, vaddr, hp)
bus_addr_t hi, lo;
int i;
DPRINTF(EDB_BUSMAP, ("\n_ebus_bus_map: type %d off %016llx sz %x flags %d va %p", (int)t->type, (u_int64_t)offset, (int)size, (int)flags, vaddr));
DPRINTF(EDB_BUSMAP, ("\n_ebus_bus_map: type %d off %016llx sz %x flags %d va %p", (int)t->type, (unsigned long long)offset, (int)size, (int)flags, (void *)vaddr));
hi = offset >> 32UL;
lo = offset & 0xffffffff;
@ -494,7 +494,8 @@ _ebus_bus_map(t, btype, offset, size, flags, vaddr, hp)
sc->sc_range[i].phys_lo;
pciaddr += lo;
DPRINTF(EDB_BUSMAP, ("\n_ebus_bus_map: mapping paddr offset %qx pciaddr %qx\n",
offset, pciaddr));
(unsigned long long)offset,
(unsigned long long)pciaddr));
/* pass it onto the psycho */
return (bus_space_map2(sc->sc_bustag, t->type, pciaddr,
size, flags, vaddr, hp));
@ -522,7 +523,7 @@ ebus_bus_mmap(t, btype, paddr, flags, hp)
if (offset != paddr)
continue;
DPRINTF(EDB_BUSMAP, ("\n_ebus_bus_mmap: mapping paddr %qx\n", paddr));
DPRINTF(EDB_BUSMAP, ("\n_ebus_bus_mmap: mapping paddr %qx\n", (unsigned long long)paddr));
return (bus_space_mmap(sc->sc_bustag, 0, paddr,
flags, hp));
}

View File

@ -1,4 +1,4 @@
/* $NetBSD: psycho.c,v 1.26 2000/11/18 03:49:38 mrg Exp $ */
/* $NetBSD: psycho.c,v 1.27 2000/12/04 16:01:18 fvdl Exp $ */
/*
* Copyright (c) 1999, 2000 Matthew R. Green
@ -332,7 +332,7 @@ sabre_init(sc, ma, pba)
pp->pp_nregs = nregs;
break;
default:
panic("illegal simba funcion %d\n");
panic("illegal simba funcion %d\n", fn);
}
pp->pp_pcictl = &sc->sc_regs->psy_pcictl[0];
/* link us in .. */
@ -821,7 +821,8 @@ _psycho_bus_map(t, btype, offset, size, flags, vaddr, hp)
struct psycho_softc *sc = pp->pp_sc;
int i, ss;
DPRINTF(PDB_BUSMAP, ("_psycho_bus_map: type %d off %qx sz %qx flags %d va %p", t->type, offset, size, flags, vaddr));
DPRINTF(PDB_BUSMAP, ("_psycho_bus_map: type %d off %qx sz %qx flags %d va %p", t->type, (unsigned long long)offset, (unsigned long long)size, flags,
(void *)vaddr));
ss = get_childspace(t->type);
DPRINTF(PDB_BUSMAP, (" cspace %d", ss));
@ -836,7 +837,8 @@ _psycho_bus_map(t, btype, offset, size, flags, vaddr, hp)
paddr = pp->pp_range[i].phys_lo + offset;
paddr |= ((bus_addr_t)pp->pp_range[i].phys_hi<<32);
DPRINTF(PDB_BUSMAP, ("\n_psycho_bus_map: mapping paddr space %lx offset %lx paddr %qx\n",
(long)ss, (long)offset, paddr));
(long)ss, (long)offset,
(unsigned long long)paddr));
return (bus_space_map2(sc->sc_bustag, t->type, paddr,
size, flags, vaddr, hp));
}
@ -859,7 +861,7 @@ psycho_bus_mmap(t, btype, paddr, flags, hp)
ss = get_childspace(t->type);
DPRINTF(PDB_BUSMAP, ("_psycho_bus_mmap: type %d flags %d pa %qx\n", btype, flags, paddr));
DPRINTF(PDB_BUSMAP, ("_psycho_bus_mmap: type %d flags %d pa %qx\n", btype, flags, (unsigned long long)paddr));
for (i = 0; i < pp->pp_nrange; i++) {
bus_addr_t paddr;
@ -870,7 +872,8 @@ psycho_bus_mmap(t, btype, paddr, flags, hp)
paddr = pp->pp_range[i].phys_lo + offset;
paddr |= ((bus_addr_t)pp->pp_range[i].phys_hi<<32);
DPRINTF(PDB_BUSMAP, ("\n_psycho_bus_mmap: mapping paddr space %lx offset %lx paddr %qx\n",
(long)ss, (long)offset, paddr));
(long)ss, (long)offset,
(unsigned long long)paddr));
return (bus_space_mmap(sc->sc_bustag, 0, paddr,
flags, hp));
}
@ -958,7 +961,7 @@ psycho_intr_establish(t, ihandle, level, flags, handler, arg)
int64_t intrmap = 0;
int i;
DPRINTF(PDB_INTR, ("\npsycho: intr %lx: %lx\nHunting for IRQ...\n",
DPRINTF(PDB_INTR, ("\npsycho: intr %lx: %p\nHunting for IRQ...\n",
(long)ino, intrlev[ino]));
if ((ino & INTMAP_OBIO) == 0) {
/*
@ -977,7 +980,7 @@ psycho_intr_establish(t, ihandle, level, flags, handler, arg)
*/
i = INTPCIOBINOX(vec);
if (i > INTPCI_MAXOBINO)
panic("ino %d", vec);
panic("ino %ld", vec);
intrmapptr = &((&sc->sc_regs->scsi_int_map)[i]);
intrclrptr = &((&sc->sc_regs->scsi_clr_int)[i]);
@ -994,15 +997,17 @@ psycho_intr_establish(t, ihandle, level, flags, handler, arg)
* valid bit so so make sure only this bit is changed.
*/
intrmap = *intrmapptr;
DPRINTF(PDB_INTR, ("; read intrmap = %016qx", intrmap));
DPRINTF(PDB_INTR, ("; read intrmap = %016qx",
(unsigned long long)intrmap));
/* Enable the interrupt */
intrmap |= INTMAP_V;
DPRINTF(PDB_INTR, ("; addr of intrmapptr = %p", intrmapptr));
DPRINTF(PDB_INTR, ("; writing intrmap = %016qx\n", intrmap));
DPRINTF(PDB_INTR, ("; writing intrmap = %016qx\n",
(unsigned long long)intrmap));
*intrmapptr = intrmap;
DPRINTF(PDB_INTR, ("; reread intrmap = %016qx",
(intrmap = *intrmapptr)));
(unsigned long long)(intrmap = *intrmapptr)));
}
#ifdef NOT_DEBUG
if (psycho_debug & PDB_INTR) {

View File

@ -1,4 +1,4 @@
/* $NetBSD: clock.c,v 1.32 2000/09/17 19:23:37 eeh Exp $ */
/* $NetBSD: clock.c,v 1.33 2000/12/04 16:01:19 fvdl Exp $ */
/*
* Copyright (c) 1992, 1993
@ -273,7 +273,7 @@ sbus_wenable(handle, onoff)
/* We can panic now or take a datafault later... */
if (sbi->si_bh != newaddr)
panic("sbus_wenable: address %p changed to %p\n",
(vaddr_t)sbi->si_bh, (vaddr_t)newaddr);
(void *)sbi->si_bh, (void *)newaddr);
}
return (err);
}
@ -348,7 +348,7 @@ ebus_wenable(handle, onoff)
/* We can panic now or take a datafault later... */
if (ebi->ei_bh != newaddr)
panic("ebus_wenable: address %p changed to %p\n",
(vaddr_t)ebi->ei_bh, (vaddr_t)newaddr);
(void *)ebi->ei_bh, (void *)newaddr);
}
return (err);
}

View File

@ -1,4 +1,4 @@
/* $NetBSD: cpu.c,v 1.10 2000/06/29 07:37:57 mrg Exp $ */
/* $NetBSD: cpu.c,v 1.11 2000/12/04 16:01:19 fvdl Exp $ */
/*
* Copyright (c) 1996
@ -197,7 +197,7 @@ cpu_init(pa, cpu_num)
break;
default:
panic("cpu_start: stack size %x not a machine page size\n",
size);
(unsigned)size);
}
return (pte|TLB_L);
}

View File

@ -1,4 +1,4 @@
/* $NetBSD: db_interface.c,v 1.46 2000/11/21 16:34:53 chs Exp $ */
/* $NetBSD: db_interface.c,v 1.47 2000/12/04 16:01:19 fvdl Exp $ */
/*
* Mach Operating System
@ -184,7 +184,8 @@ kdb_trap(type, tf)
switch (type) {
case T_BREAKPOINT: /* breakpoint */
printf("kdb breakpoint at %p\n", tf->tf_pc);
printf("kdb breakpoint at %llx\n",
(unsigned long long)tf->tf_pc);
break;
case -1: /* keyboard interrupt */
printf("kdb tf=%p\n", tf);
@ -340,11 +341,11 @@ db_dump_dtlb(addr, have_addr, count, modif)
p = buf;
for (i=0; i<64;) {
#ifdef __arch64__
db_printf("%2d:%016.16lx %016.16lx ", i++, *p++, *p++);
db_printf("%2d:%016.16lx %016.16lx\n", i++, *p++, *p++);
db_printf("%2d:%16.16lx %16.16lx ", i++, *p++, *p++);
db_printf("%2d:%16.16lx %16.16lx\n", i++, *p++, *p++);
#else
db_printf("%2d:%016.16qx %016.16qx ", i++, *p++, *p++);
db_printf("%2d:%016.16qx %016.16qx\n", i++, *p++, *p++);
db_printf("%2d:%16.16qx %16.16qx ", i++, *p++, *p++);
db_printf("%2d:%16.16qx %16.16qx\n", i++, *p++, *p++);
#endif
}
} else {
@ -374,10 +375,10 @@ db_pload_cmd(addr, have_addr, count, modif)
while (count--) {
if (db_print_position() == 0) {
/* Always print the address. */
db_printf("%016.16lx:\t", addr);
db_printf("%16.16lx:\t", addr);
}
oldaddr=addr;
db_printf("%08.8lx\n", (long)ldxa(addr, ASI_PHYS_CACHED));
db_printf("%8.8lx\n", (long)ldxa(addr, ASI_PHYS_CACHED));
addr += 8;
if (db_print_position() != 0)
db_end_line();
@ -409,11 +410,11 @@ struct pmap* pm;
data1 = ldxa((vaddr_t)&ptbl[j], ASI_PHYS_CACHED);
if (data0 || data1) {
db_printf("%llx: %llx\t",
((u_int64_t)i<<STSHIFT)|(k<<PDSHIFT)|((j-1)<<PTSHIFT),
(u_long)(data0));
(unsigned long long)(((u_int64_t)i<<STSHIFT)|(k<<PDSHIFT)|((j-1)<<PTSHIFT)),
(unsigned long long)(data0));
db_printf("%llx: %llx\n",
((u_int64_t)i<<STSHIFT)|(k<<PDSHIFT)|(j<<PTSHIFT),
(u_long)(data1));
(unsigned long long)(((u_int64_t)i<<STSHIFT)|(k<<PDSHIFT)|(j<<PTSHIFT)),
(unsigned long long)(data1));
}
}
}
@ -446,22 +447,23 @@ db_pmap_kernel(addr, have_addr, count, modif)
db_printf("pmap_kernel(%p)->pm_segs[%lx][%lx][%lx]=>%qx\n",
(void *)addr, (u_long)va_to_seg(addr),
(u_long)va_to_dir(addr), (u_long)va_to_pte(addr),
(u_quad_t)data);
(unsigned long long)data);
} else {
db_printf("No mapping for %p\n", addr);
db_printf("No mapping for %p\n", (void *)addr);
}
return;
}
db_printf("pmap_kernel(%p) psegs %p phys %p\n",
kernel_pmap_, (long)kernel_pmap_.pm_segs, (long)kernel_pmap_.pm_physaddr);
db_printf("pmap_kernel(%p) psegs %p phys %llx\n",
&kernel_pmap_, kernel_pmap_.pm_segs,
(unsigned long long)kernel_pmap_.pm_physaddr);
if (full) {
db_dump_pmap(&kernel_pmap_);
} else {
for (j=i=0; i<STSZ; i++) {
long seg = (long)ldxa((vaddr_t)&kernel_pmap_.pm_segs[i], ASI_PHYS_CACHED);
if (seg)
db_printf("seg %ld => %p%c", i, seg, (j++%4)?'\t':'\n');
db_printf("seg %d => %lx%c", i, seg, (j++%4)?'\t':'\n');
}
}
}
@ -492,7 +494,7 @@ db_pmap_cmd(addr, have_addr, count, modif)
db_printf("pmap %p: ctx %x refs %d physaddr %llx psegs %p\n",
pm, pm->pm_ctx, pm->pm_refs,
(paddr_t)pm->pm_physaddr, pm->pm_segs);
(unsigned long long)pm->pm_physaddr, pm->pm_segs);
if (full) {
db_dump_pmap(pm);
@ -500,7 +502,7 @@ db_pmap_cmd(addr, have_addr, count, modif)
for (i=0; i<STSZ; i++) {
long seg = (long)ldxa((vaddr_t)&kernel_pmap_.pm_segs[i], ASI_PHYS_CACHED);
if (seg)
db_printf("seg %ld => %p%c", i, seg, (j++%4)?'\t':'\n');
db_printf("seg %d => %lx%c", i, seg, (j++%4)?'\t':'\n');
}
}
}
@ -571,7 +573,8 @@ db_page_cmd(addr, have_addr, count, modif)
return;
}
db_printf("pa %llx pg %p\n", addr, PHYS_TO_VM_PAGE(addr));
db_printf("pa %llx pg %p\n", (unsigned long long)addr,
PHYS_TO_VM_PAGE(addr));
}
@ -598,9 +601,9 @@ db_proc_cmd(addr, have_addr, count, modif)
p->p_wchan, p->p_priority, p->p_usrpri);
db_printf("thread @ %p = %p tf:%p ", &p->p_thread, p->p_thread,
p->p_md.md_tf);
db_printf("maxsaddr:%p ssiz:%dpg or %pB\n",
db_printf("maxsaddr:%p ssiz:%dpg or %llxB\n",
p->p_vmspace->vm_maxsaddr, p->p_vmspace->vm_ssize,
ctob(p->p_vmspace->vm_ssize));
(unsigned long long)ctob(p->p_vmspace->vm_ssize));
db_printf("profile timer: %ld sec %ld usec\n",
p->p_stats->p_timer[ITIMER_PROF].it_value.tv_sec,
p->p_stats->p_timer[ITIMER_PROF].it_value.tv_usec);
@ -645,14 +648,15 @@ db_dump_pcb(addr, have_addr, count, modif)
if (have_addr)
pcb = (struct pcb*) addr;
db_printf("pcb@%x sp:%p pc:%p cwp:%d pil:%d nsaved:%x onfault:%p\nlastcall:%s\nfull windows:\n",
pcb, pcb->pcb_sp, pcb->pcb_pc, pcb->pcb_cwp,
pcb->pcb_pil, pcb->pcb_nsaved, pcb->pcb_onfault,
db_printf("pcb@%p sp:%llx pc:%llx cwp:%d pil:%d nsaved:%x onfault:%p\nlastcall:%s\nfull windows:\n",
pcb, (unsigned long long)pcb->pcb_sp,
(unsigned long long)pcb->pcb_pc, pcb->pcb_cwp,
pcb->pcb_pil, pcb->pcb_nsaved, (void *)pcb->pcb_onfault,
(pcb->lastcall)?pcb->lastcall:"Null");
for (i=0; i<pcb->pcb_nsaved; i++) {
db_printf("win %d: at %p:%p local, in\n", i,
pcb->pcb_rw[i+1].rw_in[6]);
db_printf("win %d: at %llx local, in\n", i,
(unsigned long long)pcb->pcb_rw[i+1].rw_in[6]);
db_printf("%16lx %16lx %16lx %16lx\n",
pcb->pcb_rw[i].rw_local[0],
pcb->pcb_rw[i].rw_local[1],
@ -702,11 +706,11 @@ db_setpcb(addr, have_addr, count, modif)
switchtoctx(p->p_vmspace->vm_map.pmap->pm_ctx);
return;
}
db_printf("PID %d has a null context.\n", addr);
db_printf("PID %ld has a null context.\n", addr);
return;
}
}
db_printf("PID %d not found.\n", addr);
db_printf("PID %ld not found.\n", addr);
}
static void
@ -714,11 +718,11 @@ db_print_trace_entry(te, i)
struct traptrace *te;
int i;
{
db_printf("%d:%d p:%d tt:%x:%lx:%p %p:%p ", i,
db_printf("%d:%d p:%d tt:%d:%llx:%llx %llx:%llx ", i,
(int)te->tl, (int)te->pid,
(int)te->tt, (u_long)te->tstate,
(u_long)te->tfault, (u_long)te->tsp,
(u_long)te->tpc);
(int)te->tt, (unsigned long long)te->tstate,
(unsigned long long)te->tfault, (unsigned long long)te->tsp,
(unsigned long long)te->tpc);
db_printsym((u_long)te->tpc, DB_STGY_PROC, db_printf);
db_printf(": ");
if ((te->tpc && !(te->tpc&0x3)) &&

View File

@ -1,4 +1,4 @@
/* $NetBSD: db_trace.c,v 1.19 2000/09/28 19:56:14 eeh Exp $ */
/* $NetBSD: db_trace.c,v 1.20 2000/12/04 16:01:19 fvdl Exp $ */
/*
* Mach Operating System
@ -178,7 +178,7 @@ db_dump_window(addr, have_addr, count, modif)
else frame = (u_int64_t)((struct frame32 *)(u_long)frame)->fr_fp;
}
db_printf("Window %x ", addr);
db_printf("Window %lx ", addr);
db_print_window(frame);
}
@ -189,16 +189,28 @@ u_int64_t frame;
if (frame & 1) {
struct frame64* f = (struct frame64*)(u_long)(frame + BIAS);
db_printf("frame64 %x locals, ins:\n", f);
db_printf("frame64 %p locals, ins:\n", f);
if (INKERNEL(f)) {
db_printf("%llx %llx %llx %llx ",
f->fr_local[0], f->fr_local[1], f->fr_local[2], f->fr_local[3]);
(unsigned long long)f->fr_local[0],
(unsigned long long)f->fr_local[1],
(unsigned long long)f->fr_local[2],
(unsigned long long)f->fr_local[3]);
db_printf("%llx %llx %llx %llx\n",
f->fr_local[4], f->fr_local[5], f->fr_local[6], f->fr_local[7]);
(unsigned long long)f->fr_local[4],
(unsigned long long)f->fr_local[5],
(unsigned long long)f->fr_local[6],
(unsigned long long)f->fr_local[7]);
db_printf("%llx %llx %llx %llx ",
f->fr_arg[0], f->fr_arg[1], f->fr_arg[2], f->fr_arg[3]);
(unsigned long long)f->fr_arg[0],
(unsigned long long)f->fr_arg[1],
(unsigned long long)f->fr_arg[2],
(unsigned long long)f->fr_arg[3]);
db_printf("%llx %llx %llx=sp %llx=pc:",
f->fr_arg[4], f->fr_arg[5], f->fr_fp, f->fr_pc);
(unsigned long long)f->fr_arg[4],
(unsigned long long)f->fr_arg[5],
(unsigned long long)f->fr_fp,
(unsigned long long)f->fr_pc);
/* Sometimes this don't work. Dunno why. */
db_printsym(f->fr_pc, DB_STGY_PROC, db_printf);
db_printf("\n");
@ -208,19 +220,25 @@ u_int64_t frame;
if (copyin(f, &fr, sizeof(fr))) return;
f = &fr;
db_printf("%llx %llx %llx %llx ",
f->fr_local[0], f->fr_local[1], f->fr_local[2], f->fr_local[3]);
(unsigned long long)f->fr_local[0], (unsigned long long)f->fr_local[1], (unsigned long long)f->fr_local[2], (unsigned long long)f->fr_local[3]);
db_printf("%llx %llx %llx %llx\n",
f->fr_local[4], f->fr_local[5], f->fr_local[6], f->fr_local[7]);
(unsigned long long)f->fr_local[4], (unsigned long long)f->fr_local[5], (unsigned long long)f->fr_local[6], (unsigned long long)f->fr_local[7]);
db_printf("%llx %llx %llx %llx ",
f->fr_arg[0], f->fr_arg[1], f->fr_arg[2], f->fr_arg[3]);
(unsigned long long)f->fr_arg[0],
(unsigned long long)f->fr_arg[1],
(unsigned long long)f->fr_arg[2],
(unsigned long long)f->fr_arg[3]);
db_printf("%llx %llx %llx=sp %llx=pc",
f->fr_arg[4], f->fr_arg[5], f->fr_fp, f->fr_pc);
(unsigned long long)f->fr_arg[4],
(unsigned long long)f->fr_arg[5],
(unsigned long long)f->fr_fp,
(unsigned long long)f->fr_pc);
db_printf("\n");
}
} else {
struct frame32* f = (struct frame32*)(u_long)frame;
db_printf("frame %x locals, ins:\n", f);
db_printf("frame %p locals, ins:\n", f);
if (INKERNEL(f)) {
db_printf("%8x %8x %8x %8x %8x %8x %8x %8x\n",
f->fr_local[0], f->fr_local[1], f->fr_local[2], f->fr_local[3],
@ -277,7 +295,8 @@ db_dump_stack(addr, have_addr, count, modif)
oldframe = 0;
for (i=0; i<count && frame; i++) {
if (oldframe == frame) {
db_printf("WARNING: stack loop at %p\n", (long) frame);
db_printf("WARNING: stack loop at %llx\n",
(unsigned long long) frame);
break;
}
oldframe = frame;
@ -330,35 +349,54 @@ db_dump_trap(addr, have_addr, count, modif)
if (have_addr)
tf = (struct trapframe64 *)addr;
db_printf("Trapframe %p:\ttstate: %p\tpc: %p\tnpc: %p\n",
tf, (long)tf->tf_tstate, (long)tf->tf_pc, (long)tf->tf_npc);
db_printf("y: %x\tpil: %d\toldpil: %d\tfault: %p\tkstack: %p\ttt: %x\tGlobals:\n",
(int)tf->tf_y, (int)tf->tf_pil, (int)tf->tf_oldpil, (long)tf->tf_fault,
(long)tf->tf_kstack, (int)tf->tf_tt);
db_printf("Trapframe %p:\ttstate: %llx\tpc: %llx\tnpc: %llx\n",
tf, (unsigned long long)tf->tf_tstate,
(unsigned long long)tf->tf_pc,
(unsigned long long)tf->tf_npc);
db_printf("y: %x\tpil: %d\toldpil: %d\tfault: %llx\tkstack: %llx\ttt: %x\tGlobals:\n",
(int)tf->tf_y, (int)tf->tf_pil, (int)tf->tf_oldpil,
(unsigned long long)tf->tf_fault,
(unsigned long long)tf->tf_kstack, (int)tf->tf_tt);
db_printf("%016llx %016llx %016llx %016llx\n",
(int64_t)tf->tf_global[0], (int64_t)tf->tf_global[1],
(int64_t)tf->tf_global[2], (int64_t)tf->tf_global[3]);
(unsigned long long)tf->tf_global[0],
(unsigned long long)tf->tf_global[1],
(unsigned long long)tf->tf_global[2],
(unsigned long long)tf->tf_global[3]);
db_printf("%016llx %016llx %016llx %016llx\nouts:\n",
(int64_t)tf->tf_global[4], (int64_t)tf->tf_global[5],
(int64_t)tf->tf_global[6], (int64_t)tf->tf_global[7]);
(unsigned long long)tf->tf_global[4],
(unsigned long long)tf->tf_global[5],
(unsigned long long)tf->tf_global[6],
(unsigned long long)tf->tf_global[7]);
db_printf("%016llx %016llx %016llx %016llx\n",
(int64_t)tf->tf_out[0], (int64_t)tf->tf_out[1],
(int64_t)tf->tf_out[2], (int64_t)tf->tf_out[3]);
(unsigned long long)tf->tf_out[0],
(unsigned long long)tf->tf_out[1],
(unsigned long long)tf->tf_out[2],
(unsigned long long)tf->tf_out[3]);
db_printf("%016llx %016llx %016llx %016llx\nlocals:\n",
(int64_t)tf->tf_out[4], (int64_t)tf->tf_out[5],
(int64_t)tf->tf_out[6], (int64_t)tf->tf_out[7]);
(unsigned long long)tf->tf_out[4],
(unsigned long long)tf->tf_out[5],
(unsigned long long)tf->tf_out[6],
(unsigned long long)tf->tf_out[7]);
db_printf("%016llx %016llx %016llx %016llx\n",
(int64_t)tf->tf_local[0], (int64_t)tf->tf_local[1],
(int64_t)tf->tf_local[2], (int64_t)tf->tf_local[3]);
(unsigned long long)tf->tf_local[0],
(unsigned long long)tf->tf_local[1],
(unsigned long long)tf->tf_local[2],
(unsigned long long)tf->tf_local[3]);
db_printf("%016llx %016llx %016llx %016llx\nins:\n",
(int64_t)tf->tf_local[4], (int64_t)tf->tf_local[5],
(int64_t)tf->tf_local[6], (int64_t)tf->tf_local[7]);
(unsigned long long)tf->tf_local[4],
(unsigned long long)tf->tf_local[5],
(unsigned long long)tf->tf_local[6],
(unsigned long long)tf->tf_local[7]);
db_printf("%016llx %016llx %016llx %016llx\n",
(int64_t)tf->tf_in[0], (int64_t)tf->tf_in[1],
(int64_t)tf->tf_in[2], (int64_t)tf->tf_in[3]);
(unsigned long long)tf->tf_in[0],
(unsigned long long)tf->tf_in[1],
(unsigned long long)tf->tf_in[2],
(unsigned long long)tf->tf_in[3]);
db_printf("%016llx %016llx %016llx %016llx\n",
(int64_t)tf->tf_in[4], (int64_t)tf->tf_in[5],
(int64_t)tf->tf_in[6], (int64_t)tf->tf_in[7]);
(unsigned long long)tf->tf_in[4],
(unsigned long long)tf->tf_in[5],
(unsigned long long)tf->tf_in[6],
(unsigned long long)tf->tf_in[7]);
#if 0
if (tf == curproc->p_md.md_tf) {
struct rwindow32 *kstack = (struct rwindow32 *)(((caddr_t)tf)+CCFSZ);

View File

@ -1,4 +1,4 @@
/* $NetBSD: emul.c,v 1.6 2000/04/06 12:49:00 mrg Exp $ */
/* $NetBSD: emul.c,v 1.7 2000/12/04 16:01:19 fvdl Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@ -309,7 +309,7 @@ fixalign(p, tf)
"w*hd"[op.bits.sz], op.bits.fl ? 'f' : REGNAME(code.i_op3.i_rd),
REGNAME(code.i_op3.i_rs1));
if (code.i_loadstore.i_i)
uprintf("0x%x\n", rs2);
uprintf("0x%llx\n", (unsigned long long)rs2);
else
uprintf("%c%d\n", REGNAME(code.i_asi.i_rs2));
#endif

View File

@ -1,4 +1,4 @@
/* $NetBSD: intr.c,v 1.35 2000/12/03 14:49:50 fvdl Exp $ */
/* $NetBSD: intr.c,v 1.36 2000/12/04 16:01:19 fvdl Exp $ */
/*
* Copyright (c) 1992, 1993
@ -156,6 +156,7 @@ softnet(fp)
} while (0)
#include <net/netisr_dispatch.h>
#undef DONETISR
return (1);
}
/*

View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.90 2000/09/28 19:56:14 eeh Exp $ */
/* $NetBSD: machdep.c,v 1.91 2000/12/04 16:01:19 fvdl Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@ -1007,15 +1007,26 @@ void
trapdump(tf)
struct trapframe64* tf;
{
printf("TRAPFRAME: tstate=%x:%x pc=%x:%x npc=%x:%x y=%x\n",
tf->tf_tstate, tf->tf_pc, tf->tf_npc, tf->tf_y);
printf("%%g1-7: %x:%x %x:%x %x:%x %x:%x %x:%x %x:%x %x:%x\n",
tf->tf_global[1], tf->tf_global[2], tf->tf_global[3],
tf->tf_global[4], tf->tf_global[5], tf->tf_global[6],
tf->tf_global[7]);
printf("%%o0-7: %x:%x %x:%x %x:%x %x:%x\n %x:%x %x:%x %x:%x %x:%x\n",
tf->tf_out[0], tf->tf_out[1], tf->tf_out[2], tf->tf_out[3],
tf->tf_out[4], tf->tf_out[5], tf->tf_out[6], tf->tf_out[7]);
printf("TRAPFRAME: tstate=%llx pc=%llx npc=%llx y=%x\n",
(unsigned long long)tf->tf_tstate, (unsigned long long)tf->tf_pc,
(unsigned long long)tf->tf_npc, (unsigned)tf->tf_y);
printf("%%g1-7: %llx %llx %llx %llx %llx %llx %llx\n",
(unsigned long long)tf->tf_global[1],
(unsigned long long)tf->tf_global[2],
(unsigned long long)tf->tf_global[3],
(unsigned long long)tf->tf_global[4],
(unsigned long long)tf->tf_global[5],
(unsigned long long)tf->tf_global[6],
(unsigned long long)tf->tf_global[7]);
printf("%%o0-7: %llx %llx %llx %llx\n %llx %llx %llx %llx\n",
(unsigned long long)tf->tf_out[0],
(unsigned long long)tf->tf_out[1],
(unsigned long long)tf->tf_out[2],
(unsigned long long)tf->tf_out[3],
(unsigned long long)tf->tf_out[4],
(unsigned long long)tf->tf_out[5],
(unsigned long long)tf->tf_out[6],
(unsigned long long)tf->tf_out[7]);
}
/*
* get the fp and dump the stack as best we can. don't leave the
@ -1034,14 +1045,20 @@ stackdump()
if( ((long)fp) & 1 ) {
fp64 = (struct frame64*)(((char*)fp)+BIAS);
/* 64-bit frame */
printf("%x(%llx, %llx, %llx, %llx, %llx, %llx, %llx) fp = %p\n",
fp64->fr_pc, fp64->fr_arg[0], fp64->fr_arg[1], fp64->fr_arg[2],
fp64->fr_arg[3], fp64->fr_arg[4], fp64->fr_arg[5], fp64->fr_arg[6],
fp64->fr_fp);
printf("%llx(%llx, %llx, %llx, %llx, %llx, %llx, %llx) fp = %llx\n",
(unsigned long long)fp64->fr_pc,
(unsigned long long)fp64->fr_arg[0],
(unsigned long long)fp64->fr_arg[1],
(unsigned long long)fp64->fr_arg[2],
(unsigned long long)fp64->fr_arg[3],
(unsigned long long)fp64->fr_arg[4],
(unsigned long long)fp64->fr_arg[5],
(unsigned long long)fp64->fr_arg[6],
(unsigned long long)fp64->fr_fp);
fp = (struct frame32 *)(u_long)fp64->fr_fp;
} else {
/* 32-bit frame */
printf(" pc = %x args = (%x, %x, %x, %x, %x, %x, %x) fp = %p\n",
printf(" pc = %x args = (%x, %x, %x, %x, %x, %x, %x) fp = %x\n",
fp->fr_pc, fp->fr_arg[0], fp->fr_arg[1], fp->fr_arg[2],
fp->fr_arg[3], fp->fr_arg[4], fp->fr_arg[5], fp->fr_arg[6],
fp->fr_fp);

View File

@ -1,4 +1,4 @@
/* $NetBSD: pmap.c,v 1.80 2000/12/01 17:17:29 eeh Exp $ */
/* $NetBSD: pmap.c,v 1.81 2000/12/04 16:01:19 fvdl Exp $ */
#undef NO_VCACHE /* Don't forget the locked TLB in dostart */
#define HWREF
/*
@ -3709,7 +3709,8 @@ pmap_remove_pv(pmap, va, pa)
* may be called at interrupt time).
*/
if (!IS_VM_PHYSADDR(pa)) {
printf("pmap_remove_pv(): %p not managed\n", pa);
printf("pmap_remove_pv(): %llx not managed\n",
(unsigned long long)pa);
pv_check();
return;
}
@ -3887,7 +3888,7 @@ vm_page_free1(mem)
{
if (mem->flags != (PG_CLEAN|PG_FAKE)) {
printf("Freeing invalid page %p\n", mem);
printf("pa = %llx\n", (paddr_t)VM_PAGE_TO_PHYS(mem));
printf("pa = %llx\n", (unsigned long long)VM_PAGE_TO_PHYS(mem));
Debugger();
return;
}
@ -3914,8 +3915,9 @@ db_dump_pv(addr, have_addr, count, modif)
}
for (pv = pa_to_pvh(addr); pv; pv = pv->pv_next)
db_printf("pv@%p: next=%p pmap=%p va=0x%x\n",
pv, pv->pv_next, pv->pv_pmap, pv->pv_va);
db_printf("pv@%p: next=%p pmap=%p va=0x%llx\n",
pv, pv->pv_next, pv->pv_pmap,
(unsigned long long)pv->pv_va);
}

View File

@ -1,4 +1,4 @@
/* $NetBSD: trap.c,v 1.55 2000/12/02 03:57:26 mrg Exp $ */
/* $NetBSD: trap.c,v 1.56 2000/12/04 16:01:20 fvdl Exp $ */
/*
* Copyright (c) 1996
@ -670,7 +670,7 @@ badtrap:
case T_INST_EXCEPT:
case T_TEXTFAULT:
/* This is not an MMU issue!!!! */
printf("trap: textfault at %p!! sending SIGILL due to trap %d: %s\n",
printf("trap: textfault at %lx!! sending SIGILL due to trap %d: %s\n",
pc, type, type < N_TRAP_TYPES ? trap_type[type] : T);
#ifdef DDB
Debugger();
@ -755,7 +755,7 @@ badtrap:
}
#define fmt64(x) (int)((x)>>32), (int)((x))
printf("Alignment error: dsfsr=%08x:%08x dsfar=%x:%x isfsr=%08x:%08x pc=%p\n",
printf("Alignment error: dsfsr=%08x:%08x dsfar=%x:%x isfsr=%08x:%08x pc=%lx\n",
fmt64(dsfsr), fmt64(dsfar), fmt64(isfsr), pc);
}
@ -1274,7 +1274,7 @@ data_access_error(type, sfva, sfsr, afva, afsr, tf)
*/
if ((afsr) != 0 ||
(type == T_DATAFAULT && !(sfsr & SFSR_FV))) {
printf("data memory error type %x sfsr=%p sfva=%p afsr=%p afva=%p tf=%p\n",
printf("data memory error type %x sfsr=%lx sfva=%lx afsr=%lx afva=%lx tf=%p\n",
type, sfsr, sfva, afsr, afva, tf);
if (tstate & (PSTATE_PRIV<<TSTATE_PSTATE_SHIFT))
panic("trap: memory error");
@ -1403,10 +1403,13 @@ kfault:
(long)p->p_addr->u_pcb.pcb_onfault : 0;
if (!onfault) {
extern int trap_trace_dis;
char buf[768];
trap_trace_dis = 1; /* Disable traptrace for printf */
bitmask_snprintf(sfsr, SFSR_BITS, buf, sizeof buf);
(void) splhigh();
printf("data fault: pc=%lx addr=%lx sfsr=%%qb\n",
(u_long)pc, (long)sfva, (long)sfsr, SFSR_BITS);
printf("data fault: pc=%lx addr=%lx sfsr=%s\n",
(u_long)pc, (long)sfva, buf);
DEBUGGER(type, tf);
panic("kernel fault");
/* NOTREACHED */
@ -1546,8 +1549,7 @@ text_access_fault(type, pc, tf)
extern int trap_trace_dis;
trap_trace_dis = 1; /* Disable traptrace for printf */
(void) splhigh();
printf("text fault: pc=%x\n",
pc);
printf("text fault: pc=%llx\n", (unsigned long long)pc);
DEBUGGER(type, tf);
panic("kernel fault");
/* NOTREACHED */
@ -1597,6 +1599,7 @@ text_access_error(type, pc, sfsr, afva, afsr, tf)
#if DEBUG
static int lastdouble;
#endif
char buf[768];
#if DEBUG
if (tf->tf_pc == tf->tf_npc) {
@ -1612,19 +1615,22 @@ text_access_error(type, pc, sfsr, afva, afsr, tf)
Debugger();
}
write_user_windows();
if ((trapdebug&TDB_NSAVED && cpcb->pcb_nsaved) || trapdebug&(TDB_TXTFLT|TDB_FOLLOW))
printf("%ld text_access_error(%lx, %lx, %lx, %p)=%lx @ %lx %%qb\n",
if ((trapdebug&TDB_NSAVED && cpcb->pcb_nsaved) || trapdebug&(TDB_TXTFLT|TDB_FOLLOW)) {
bitmask_snprintf(sfsr, SFSR_BITS, buf, sizeof buf);
printf("%ld text_access_error(%lx, %lx, %lx, %p)=%lx @ %lx %s\n",
(long)curproc?curproc->p_pid:-1,
(long)type, pc, (long)afva, tf, (long)tf->tf_tstate,
(long)tf->tf_pc, (long)sfsr, SFSR_BITS);
(long)tf->tf_pc, buf);
}
if (trapdebug & TDB_FRAME) {
print_trapframe(tf);
}
if ((trapdebug & TDB_TL) && tl()) {
printf("%ld tl %ld text_access_error(%lx, %lx, %lx, %p)=%lx @ %lx %%qb\n",
bitmask_snprintf(sfsr, SFSR_BITS, buf, sizeof buf);
printf("%ld tl %ld text_access_error(%lx, %lx, %lx, %p)=%lx @ %lx %s\n",
(long)curproc?curproc->p_pid:-1, (long)tl(),
(long)type, (long)pc, (long)afva, tf,
(long)tf->tf_tstate, (long)tf->tf_pc, (long)sfsr, SFSR_BITS);
(long)tf->tf_tstate, (long)tf->tf_pc, buf);
Debugger();
}
if (trapdebug&TDB_STOPCALL) {
@ -1643,7 +1649,7 @@ text_access_error(type, pc, sfsr, afva, afsr, tf)
trap_trace_dis++; /* Disable traptrace for printf */
printf("text_access_error: memory error...\n");
printf("text memory error type %d sfsr=%p sfva=%p afsr=%p afva=%p tf=%p\n",
printf("text memory error type %d sfsr=%lx sfva=%lx afsr=%lx afva=%lx tf=%p\n",
type, sfsr, pc, afsr, afva, tf);
trap_trace_dis--; /* Reenable traptrace for printf */
@ -1677,8 +1683,9 @@ text_access_error(type, pc, sfsr, afva, afsr, tf)
if (tstate & (PSTATE_PRIV<<TSTATE_PSTATE_SHIFT)) {
extern int trap_trace_dis;
trap_trace_dis = 1; /* Disable traptrace for printf */
bitmask_snprintf(sfsr, SFSR_BITS, buf, sizeof buf);
(void) splhigh();
printf("text error: pc=%lx sfsr=%%qb\n", pc, (long)sfsr, SFSR_BITS);
printf("text error: pc=%lx sfsr=%s\n", pc, buf);
DEBUGGER(type, tf);
panic("kernel fault");
/* NOTREACHED */
@ -1713,9 +1720,9 @@ text_access_error(type, pc, sfsr, afva, afsr, tf)
if (tstate & TSTATE_PRIV) {
extern int trap_trace_dis;
trap_trace_dis = 1; /* Disable traptrace for printf */
bitmask_snprintf(sfsr, SFSR_BITS, buf, sizeof buf);
(void) splhigh();
printf("text error: pc=%lx sfsr=%%qb\n",
pc, sfsr, SFSR_BITS);
printf("text error: pc=%lx sfsr=%s\n", pc, buf);
DEBUGGER(type, tf);
panic("kernel fault");
/* NOTREACHED */