svn commit: r205341 - in projects/ppc64/sys/powerpc: aim powerpc

[Nathan Whitehorn]

Author: nwhitehorn
Date: Fri Mar 19 17:48:34 2010
New Revision: 205341
URL: http://svn.freebsd.org/changeset/base/205341

Log:
  Miscellaneous cleanups and debugging improvements.

Modified:
  projects/ppc64/sys/powerpc/aim/mmu_oea64.c
  projects/ppc64/sys/powerpc/aim/slb.c
  projects/ppc64/sys/powerpc/powerpc/db_trace.c

Modified: projects/ppc64/sys/powerpc/aim/mmu_oea64.c
==============================================================================
--- projects/ppc64/sys/powerpc/aim/mmu_oea64.c	Fri Mar 19 17:48:04 2010	(r205340)
+++ projects/ppc64/sys/powerpc/aim/mmu_oea64.c	Fri Mar 19 17:48:34 2010	(r205341)
@@ -1261,6 +1261,7 @@ moea64_bootstrap(mmu_t mmup, vm_offset_t
 	 */
 	pa = moea64_bootstrap_alloc(DPCPU_SIZE, PAGE_SIZE);
 	dpcpu = (void *)virtual_avail;
+	va = virtual_avail;
 	virtual_avail += DPCPU_SIZE;
 	while (va < virtual_avail) {
 		moea64_kenter(mmup, va, pa);

Modified: projects/ppc64/sys/powerpc/aim/slb.c
==============================================================================
--- projects/ppc64/sys/powerpc/aim/slb.c	Fri Mar 19 17:48:04 2010	(r205340)
+++ projects/ppc64/sys/powerpc/aim/slb.c	Fri Mar 19 17:48:34 2010	(r205341)
@@ -284,10 +284,7 @@ slb_zone_init(void *dummy)
 struct slb *
 slb_alloc_user_cache(void)
 {
-	struct slb *tmp;
-	tmp = uma_zalloc(slb_cache_zone, M_NOWAIT | M_ZERO);
-	bzero(tmp,64*sizeof(struct slb));
-	return (tmp);
+	return (uma_zalloc(slb_cache_zone, M_ZERO));
 }
 
 void

Modified: projects/ppc64/sys/powerpc/powerpc/db_trace.c
==============================================================================
--- projects/ppc64/sys/powerpc/powerpc/db_trace.c	Fri Mar 19 17:48:04 2010	(r205340)
+++ projects/ppc64/sys/powerpc/powerpc/db_trace.c	Fri Mar 19 17:48:34 2010	(r205341)
@@ -229,6 +229,15 @@ db_backtrace(struct thread *td, db_addr_
 				    tf->cpu.aim.dar,
 				    (uint32_t)tf->cpu.aim.dsisr);
 				goto print_trap;
+#ifdef __powerpc64__
+			case EXC_DSE:
+				db_printf("DSE trap @ %#zx by ",
+				    tf->cpu.aim.dar);
+				goto print_trap;
+			case EXC_ISE:
+				db_printf("ISE trap @ %#zx by ", tf->srr0);
+				goto print_trap;
+#endif
 			case EXC_ISI: trapstr = "ISI"; break;
 			case EXC_PGM: trapstr = "PGM"; break;
 			case EXC_SC: trapstr = "SC"; break;