Date: Fri, 2 Apr 2010 05:49:14 +0000 (UTC) From: Juli Mallett <jmallett@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r206075 - user/jmallett/octeon/sys/mips/mips Message-ID: <201004020549.o325nEPL065178@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jmallett Date: Fri Apr 2 05:49:14 2010 New Revision: 206075 URL: http://svn.freebsd.org/changeset/base/206075 Log: o) Adjust format for PTEs. o) Fix O32 build of trap.c with TRAP_DEBUG. Modified: user/jmallett/octeon/sys/mips/mips/pmap.c user/jmallett/octeon/sys/mips/mips/trap.c Modified: user/jmallett/octeon/sys/mips/mips/pmap.c ============================================================================== --- user/jmallett/octeon/sys/mips/mips/pmap.c Fri Apr 2 05:43:11 2010 (r206074) +++ user/jmallett/octeon/sys/mips/mips/pmap.c Fri Apr 2 05:49:14 2010 (r206075) @@ -2030,7 +2030,7 @@ validate: if (origpte & PTE_M) { KASSERT((origpte & PTE_RW), ("pmap_enter: modified page not writable:" - " va: %p, pte: 0x%lx", (void *)va, origpte)); + " va: %p, pte: 0x%x", (void *)va, origpte)); if (page_is_managed(opa)) vm_page_dirty(om); } @@ -2724,7 +2724,7 @@ pmap_remove_pages(pmap_t pmap) m = PHYS_TO_VM_PAGE(mips_tlbpfn_to_paddr(tpte)); KASSERT(m < &vm_page_array[vm_page_array_size], - ("pmap_remove_pages: bad tpte %lx", tpte)); + ("pmap_remove_pages: bad tpte %x", tpte)); pv->pv_pmap->pm_stats.resident_count--; Modified: user/jmallett/octeon/sys/mips/mips/trap.c ============================================================================== --- user/jmallett/octeon/sys/mips/mips/trap.c Fri Apr 2 05:43:11 2010 (r206074) +++ user/jmallett/octeon/sys/mips/mips/trap.c Fri Apr 2 05:49:14 2010 (r206075) @@ -330,7 +330,7 @@ trap(struct trapframe *trapframe) #ifdef SMP printf("cpuid = %d\n", PCPU_GET(cpuid)); #endif - pid = Mips_TLBGetPID(); + pid = mips_rd_entryhi() & VMTLB_PID; printf("badaddr = %#jx, pc = %#jx, ra = %#jx, sp = %#jx, sr = %jx, pid = %d, ASID = %u\n", (intmax_t)trapframe->badvaddr, (intmax_t)trapframe->pc, (intmax_t)trapframe->ra, (intmax_t)trapframe->sp, (intmax_t)trapframe->sr, @@ -355,7 +355,7 @@ trap(struct trapframe *trapframe) ((type & ~T_USER) != T_SYSCALL)) { if (++count == 3) { trap_frame_dump(trapframe); - panic("too many faults at %x\n", last_badvaddr); + panic("too many faults at %p\n", (void *)last_badvaddr); } } else { last_badvaddr = this_badvaddr; @@ -738,7 +738,7 @@ dofault: } #ifdef TRAP_DEBUG for (i = 0; i < nargs; i++) { - printf("args[%d] = %#llx\n", i, args[i]); + printf("args[%d] = %#jx\n", i, (intmax_t)args[i]); } #endif #ifdef KTRACE @@ -1349,7 +1349,7 @@ log_illegal_instruction(const char *msg, if (!(pc & 3) && useracc((caddr_t)(intptr_t)pc, sizeof(int) * 4, VM_PROT_READ)) { /* dump page table entry for faulting instruction */ - log(LOG_ERR, "Page table info for pc address %#jx: pde = %p, pte = %#lx\n", + log(LOG_ERR, "Page table info for pc address %#jx: pde = %p, pte = %#x\n", (intmax_t)pc, (void *)(intptr_t)*pdep, ptep ? *ptep : 0); addr = (unsigned int *)(intptr_t)pc; @@ -1358,7 +1358,7 @@ log_illegal_instruction(const char *msg, log(LOG_ERR, "%08x %08x %08x %08x\n", addr[0], addr[1], addr[2], addr[3]); } else { - log(LOG_ERR, "pc address %#jx is inaccessible, pde = %p, pte = %#lx\n", + log(LOG_ERR, "pc address %#jx is inaccessible, pde = %p, pte = %#x\n", (intmax_t)pc, (void *)(intptr_t)*pdep, ptep ? *ptep : 0); } } @@ -1413,7 +1413,7 @@ log_bad_page_fault(char *msg, struct tra (trap_type != T_BUS_ERR_IFETCH) && useracc((caddr_t)(intptr_t)pc, sizeof(int) * 4, VM_PROT_READ)) { /* dump page table entry for faulting instruction */ - log(LOG_ERR, "Page table info for pc address %#jx: pde = %p, pte = %#lx\n", + log(LOG_ERR, "Page table info for pc address %#jx: pde = %p, pte = %#x\n", (intmax_t)pc, (void *)(intptr_t)*pdep, ptep ? *ptep : 0); addr = (unsigned int *)(intptr_t)pc; @@ -1422,7 +1422,7 @@ log_bad_page_fault(char *msg, struct tra log(LOG_ERR, "%08x %08x %08x %08x\n", addr[0], addr[1], addr[2], addr[3]); } else { - log(LOG_ERR, "pc address %#jx is inaccessible, pde = %p, pte = %#lx\n", + log(LOG_ERR, "pc address %#jx is inaccessible, pde = %p, pte = %#x\n", (intmax_t)pc, (void *)(intptr_t)*pdep, ptep ? *ptep : 0); } /* panic("Bad trap");*/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201004020549.o325nEPL065178>