Author: imp
Date: Wed Mar 3 02:46:36 2010
New Revision: 204617
URL: http://svn.freebsd.org/changeset/base/204617
Log:
Spell START_FRAME CALLFRAME_SIZ now.
Modified:
head/sys/mips/mips/exception.S
head/sys/mips/mips/locore.S
head/sys/mips/mips/mpboot.S
Modified: head/sys/mips/mips/exception.S
==============================================================================
--- head/sys/mips/mips/exception.S Wed Mar 3 02:44:20 2010
(r204616)
+++ head/sys/mips/mips/exception.S Wed Mar 3 02:46:36 2010
(r204617)
@@ -1058,7 +1058,7 @@ sys_stk_chk:
nop
# stack overflow
- PTR_LA a0, _C_LABEL(_start) - START_FRAME - 8 # set sp to a valid
place
+ PTR_LA a0, _C_LABEL(_start) - CALLFRAME_SIZ - 8 # set sp to a valid
place
sw sp, 24(a0)
move sp, a0
PTR_LA a0, 1f
@@ -1072,7 +1072,7 @@ sys_stk_chk:
jalr k0
mfc0 a3, COP_0_BAD_VADDR
- PTR_LA sp, _C_LABEL(_start) - START_FRAME # set sp to a valid place
+ PTR_LA sp, _C_LABEL(_start) - CALLFRAME_SIZ # set sp to a valid place
#if !defined(SMP) && defined(DDB)
PTR_LA a0, 2f
Modified: head/sys/mips/mips/locore.S
==============================================================================
--- head/sys/mips/mips/locore.S Wed Mar 3 02:44:20 2010 (r204616)
+++ head/sys/mips/mips/locore.S Wed Mar 3 02:46:36 2010 (r204617)
@@ -166,10 +166,10 @@ VECTOR(_locore, unknown)
* Initialize stack and call machine startup.
*/
PTR_LA sp, _C_LABEL(pcpu_space)
- addiu sp, (NBPG * 2) - START_FRAME
+ addiu sp, (NBPG * 2) - CALLFRAME_SIZ
- sw zero, START_FRAME - 4(sp) # Zero out old ra for debugger
- sw zero, START_FRAME - 8(sp) # Zero out old fp for debugger
+ sw zero, CALLFRAME_SIZ - 4(sp) # Zero out old ra for debugger
+ sw zero, CALLFRAME_SIZ - 8(sp) # Zero out old fp for debugger
PTR_LA gp, _C_LABEL(_gp)
@@ -181,10 +181,10 @@ VECTOR(_locore, unknown)
lw a0, TD_PCB(sp)
li t0, ~7
and a0, a0, t0
- subu sp, a0, START_FRAME
+ subu sp, a0, CALLFRAME_SIZ
jal _C_LABEL(mi_startup) # mi_startup(frame)
- sw zero, START_FRAME - 8(sp) # Zero out old fp for debugger
+ sw zero, CALLFRAME_SIZ - 8(sp) # Zero out old fp for debugger
PANIC("Startup failed!")
Modified: head/sys/mips/mips/mpboot.S
==============================================================================
--- head/sys/mips/mips/mpboot.S Wed Mar 3 02:44:20 2010 (r204616)
+++ head/sys/mips/mips/mpboot.S Wed Mar 3 02:46:36 2010 (r204617)
@@ -53,13 +53,13 @@ GLOBAL(mpentry)
* Initialize stack and call machine startup
*/
PTR_LA sp, _C_LABEL(pcpu_space)
- addiu sp, (NBPG * 2) - START_FRAME
+ addiu sp, (NBPG * 2) - CALLFRAME_SIZ
sll t0, s0, PAGE_SHIFT + 1
addu sp, sp, t0
/* Zero out old ra and old fp for debugger */
- sw zero, START_FRAME - 4(sp)
- sw zero, START_FRAME - 8(sp)
+ sw zero, CALLFRAME_SIZ - 4(sp)
+ sw zero, CALLFRAME_SIZ - 8(sp)
PTR_LA gp, _C_LABEL(_gp)
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
