Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 8 Apr 2015 04:37:12 +0000 (UTC)
From:      Justin Hibbits <jhibbits@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r281262 - head/sys/powerpc/powerpc
Message-ID:  <201504080437.t384bCTB069317@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jhibbits
Date: Wed Apr  8 04:37:11 2015
New Revision: 281262
URL: https://svnweb.freebsd.org/changeset/base/281262

Log:
  Clean up printtrap a little.
  
  * Sort exceptions
  * Add printing of ESR on book-e, and only print DSISR on AIM

Modified:
  head/sys/powerpc/powerpc/trap.c

Modified: head/sys/powerpc/powerpc/trap.c
==============================================================================
--- head/sys/powerpc/powerpc/trap.c	Wed Apr  8 04:35:26 2015	(r281261)
+++ head/sys/powerpc/powerpc/trap.c	Wed Apr  8 04:37:11 2015	(r281262)
@@ -407,19 +407,25 @@ printtrap(u_int vector, struct trapframe
 	printf("\n");
 	printf("   exception       = 0x%x (%s)\n", vector, trapname(vector));
 	switch (vector) {
-	case EXC_DTMISS:
 	case EXC_DSE:
 	case EXC_DSI:
+	case EXC_DTMISS:
 		printf("   virtual address = 0x%" PRIxPTR "\n", frame->dar);
+#ifdef AIM
 		printf("   dsisr           = 0x%" PRIxPTR "\n",
 		    frame->cpu.aim.dsisr);
+#endif
 		break;
-	case EXC_ITMISS:
 	case EXC_ISE:
 	case EXC_ISI:
+	case EXC_ITMISS:
 		printf("   virtual address = 0x%" PRIxPTR "\n", frame->srr0);
 		break;
 	}
+#ifdef BOOKE
+	printf("   esr             = 0x%" PRIxPTR "\n",
+	    frame->cpu.booke.esr);
+#endif
 	printf("   srr0            = 0x%" PRIxPTR "\n", frame->srr0);
 	printf("   srr1            = 0x%" PRIxPTR "\n", frame->srr1);
 	printf("   lr              = 0x%" PRIxPTR "\n", frame->lr);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504080437.t384bCTB069317>