Module Name:    src
Committed By:   tsutsui
Date:           Mon Mar 28 14:40:01 UTC 2011

Modified Files:
        src/sys/arch/pmax/pmax: locore_machdep.S

Log Message:
Use CALLFRAME_SP(sp) instead of CALLFRAME_S0(sp) to save s0.
At least PROM's _getenv() on 3MIN doesn't preserve CALLFRAME_S0(s0)
and prom_findcons() returns bogus console after mips64 merge.

XXX: I wonder if it's safe to use CALLFRAME_S0(sp) (== 0(sp)) on O32/O64..


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/pmax/pmax/locore_machdep.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/pmax/pmax/locore_machdep.S
diff -u src/sys/arch/pmax/pmax/locore_machdep.S:1.24 src/sys/arch/pmax/pmax/locore_machdep.S:1.25
--- src/sys/arch/pmax/pmax/locore_machdep.S:1.24	Sun Feb 20 07:50:25 2011
+++ src/sys/arch/pmax/pmax/locore_machdep.S	Mon Mar 28 14:40:00 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore_machdep.S,v 1.24 2011/02/20 07:50:25 matt Exp $	*/
+/*	$NetBSD: locore_machdep.S,v 1.25 2011/03/28 14:40:00 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -168,7 +168,7 @@
 NESTED(promcall, CALLFRAME_SIZ, ra)
 	PTR_SUBU sp, CALLFRAME_SIZ
 	REG_S	ra, CALLFRAME_RA(sp)
-	REG_S	s0, CALLFRAME_S0(sp)
+	REG_S	s0, CALLFRAME_SP(sp)
 
 	move	s0, t8			/* save MIPS_CURLWP */
 
@@ -183,7 +183,7 @@
 	move	t8, s0			/* restore MIPS_CURLWP */
 
 	REG_L	ra, CALLFRAME_RA(sp)
-	REG_L	s0, CALLFRAME_S0(sp)
+	REG_L	s0, CALLFRAME_SP(sp)
 
 	jr	ra
 	 PTR_ADDU sp, CALLFRAME_SIZ

Reply via email to