From owner-svn-src-head@FreeBSD.ORG  Wed Apr  8 04:37:12 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id AF4115B3;
 Wed,  8 Apr 2015 04:37:12 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9AE503CD;
 Wed,  8 Apr 2015 04:37:12 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t384bCfC069318;
 Wed, 8 Apr 2015 04:37:12 GMT (envelope-from jhibbits@FreeBSD.org)
Received: (from jhibbits@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t384bCTB069317;
 Wed, 8 Apr 2015 04:37:12 GMT (envelope-from jhibbits@FreeBSD.org)
Message-Id: <201504080437.t384bCTB069317@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: jhibbits set sender to
 jhibbits@FreeBSD.org using -f
From: Justin Hibbits <jhibbits@FreeBSD.org>
Date: Wed, 8 Apr 2015 04:37:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r281262 - head/sys/powerpc/powerpc
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 08 Apr 2015 04:37:12 -0000

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);