[src/trunk]: src/sys/arch/pmax/stand/common Fix botch on mips64 merge:

[tsutsui <tsutsui%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/306aaca4b834
branches:  trunk
changeset: 759032:306aaca4b834
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Thu Nov 25 14:05:27 2010 +0000

description:
Fix botch on mips64 merge:
 - use correct offsets to pass args to loaded kernel in __mips_o32 case

Now NetBSD/pmax kernel properly boots, but init(8) still doesn't start
on GXemul emulating R3000 3MAX.

diffstat:

 sys/arch/pmax/stand/common/startprog.S |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (24 lines):

diff -r 22589cf26751 -r 306aaca4b834 sys/arch/pmax/stand/common/startprog.S
--- a/sys/arch/pmax/stand/common/startprog.S    Thu Nov 25 13:51:26 2010 +0000
+++ b/sys/arch/pmax/stand/common/startprog.S    Thu Nov 25 14:05:27 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: startprog.S,v 1.5 2009/12/14 00:46:11 matt Exp $       */
+/*     $NetBSD: startprog.S,v 1.6 2010/11/25 14:05:27 tsutsui Exp $    */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -46,10 +46,10 @@
        move    a1,a3
 
 #ifdef __mips_o32
-       lw      a2,48(sp)               # load everything from old stack we need
-       lw      a3,52(sp)
-       lw      $8,56(sp)               # use a4/t0 in case N32/N64 kernel
-       lw      $9,60(sp)               # use a5/t1 in case N32/N64 kernel
+       lw      a2,CALLFRAME_SIZ+16(sp) # load everything from old stack we need
+       lw      a3,CALLFRAME_SIZ+20(sp)
+       lw      $8,CALLFRAME_SIZ+24(sp) # use a4/t0 in case N32/N64 kernel
+       lw      $9,CALLFRAME_SIZ+28(sp) # use a5/t1 in case N32/N64 kernel
 #else
        move    a2,a4
        move    a3,a5