Module Name:    src
Committed By:   palle
Date:           Mon May  5 19:04:47 UTC 2014

Modified Files:
        src/sys/arch/sparc64/sparc64: locore.s

Log Message:
sun4v: the trap base address should be assigned to %l1 so %tba is properly 
setup later in the code - now the kernel gets as far as printing the copyright 
disclaimer, kernel version and total and available memory before crashing


To generate a diff of this commit:
cvs rdiff -u -r1.357 -r1.358 src/sys/arch/sparc64/sparc64/locore.s

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/sparc64/sparc64/locore.s
diff -u src/sys/arch/sparc64/sparc64/locore.s:1.357 src/sys/arch/sparc64/sparc64/locore.s:1.358
--- src/sys/arch/sparc64/sparc64/locore.s:1.357	Mon Apr 21 17:34:38 2014
+++ src/sys/arch/sparc64/sparc64/locore.s	Mon May  5 19:04:47 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.357 2014/04/21 17:34:38 palle Exp $	*/
+/*	$NetBSD: locore.s,v 1.358 2014/05/05 19:04:47 palle Exp $	*/
 
 /*
  * Copyright (c) 2006-2010 Matthew R. Green
@@ -4372,10 +4372,10 @@ ENTRY_NOPROFILE(cpu_initialize)	/* for c
 	bne,pt	%icc, 6f
 	 nop
 	/* sun4v */
-	set	_C_LABEL(trapbase_sun4v), %o0
+	set	_C_LABEL(trapbase_sun4v), %l1
 	GET_MMFSA %o1
 	call	_C_LABEL(prom_set_trap_table_sun4v)	! Now we should be running 100% from our handlers
-	 nop
+	 mov	%l1, %o0
 	
 	ba	7f
 	 nop

Reply via email to