PERFORCE change 136465 for review

[Kip Macy]

http://perforce.freebsd.org/chv.cgi?CH=136465

Change 136465 by kmacy at pandemonium:kmacy:xen31 on 2008/02/28 22:50:33

	augment logging at time of SIGBUS

Affected files ...

.. //depot/projects/xen31/sys/i386/i386/trap.c#11 edit

Differences ...

==== //depot/projects/xen31/sys/i386/i386/trap.c#11 (text+ko) ====

@@ -841,19 +841,21 @@
 			pteval = *(vtopte(va));
 		if (rv == KERN_PROTECTION_FAILURE) {
 			
-			CTR5(KTR_PMAP, "SIGBUS: p=%s va=0x%08x ftype=0x%x eip=0x%08x tf_err=0x%x *pte=%08x",
-			    p->p_comm, va, ftype, frame->tf_eip, (u_long)(pteval & 0xffffffff));
-			CTR4(KTR_PMAP,"\t pte=0x%08x map=%p pmap=%p err=0x%x",
-			    vtopte(va), map, &p->p_vmspace->vm_pmap, frame->tf_err);
-			log(LOG_ERR, "SIGBUS: p=%s va=0x%x ftype=0x%x eip=0x%x err=%d *pte=0x%016jx\n",
-			    p->p_comm, va, ftype, frame->tf_eip, frame->tf_err, pteval);
+			CTR6(KTR_PMAP, "SIGBUS: pmap=%p p=%s va=0x%08x eip=0x%08x *pde=0x%x *pte=%08x",
+			    &p->p_vmspace->vm_pmap, p->p_comm, va, frame->tf_eip,(u_long)PTD[va >> PDRSHIFT],
+			    (u_long)(pteval & 0xffffffff));
+			CTR4(KTR_PMAP,"\t pte=0x%08x map=%p pmap=%p err=0x%x ftype=0x%x",
+			    vtopte(va), map, frame->tf_err, ftype);
+			log(LOG_ERR, "SIGBUS: pmap=%p, p=%s va=0x%x ftype=0x%x eip=0x%x err=%d *pte=0x%016jx\n",
+			    &p->p_vmspace->vm_pmap, p->p_comm, va, ftype, frame->tf_eip, frame->tf_err, pteval);
 		} else {
-			CTR5(KTR_PMAP, "SIGSEGV: p=%s va=0x%08x ftype=0x%x eip=0x%08x tf_err=0x%x *pte=%08x",
-			    p->p_comm, va, ftype, frame->tf_eip, (u_long)(pteval & 0xffffffff));
-			CTR4(KTR_PMAP,"\t pte=0x%08x map=%p pmap=%p err=0x%x",
-			    vtopte(va), map, &p->p_vmspace->vm_pmap, frame->tf_err);
-			log(LOG_ERR, "SIGSEGV: p=%s va=0x%x ftype=0x%x eip=0x%x err=%d *pte=0x%016jx\n",
-			    p->p_comm, va, ftype, frame->tf_eip, frame->tf_err, pteval);
+			CTR6(KTR_PMAP, "SIGSEGV: pmap=%p, p=%s va=0x%08x eip=0x%08x *pde=0x%08x *pte=%08x",
+			    &p->p_vmspace->vm_pmap, p->p_comm, va,  frame->tf_eip, (u_long)PTD[va >> PDRSHIFT],
+			    (u_long)(pteval & 0xffffffff));
+			CTR4(KTR_PMAP,"\t pte=0x%08x map=%p err=0x%x ftype=0x%x",
+			    vtopte(va), map, frame->tf_err, ftype);
+			log(LOG_ERR, "SIGSEGV: pmap=%p p=%s va=0x%x ftype=0x%x eip=0x%x err=%d *pte=0x%016jx\n",
+			    &p->p_vmspace->vm_pmap, p->p_comm, va, ftype, frame->tf_eip, frame->tf_err, pteval);
 		}
 		
 	}