diff options
| author | imp <imp@FreeBSD.org> | 2010-03-03 02:46:36 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2010-03-03 02:46:36 +0000 |
| commit | e901048f7a904e924f01096cc6dd1e754aba05a5 (patch) | |
| tree | a00d7db47a2651f2f388ff209aba9a3d1f0e33be | |
| parent | ea9ee1ed47ce2b2ffee2c266413f1eca32ee0115 (diff) | |
| download | FreeBSD-src-e901048f7a904e924f01096cc6dd1e754aba05a5.zip FreeBSD-src-e901048f7a904e924f01096cc6dd1e754aba05a5.tar.gz | |
Spell START_FRAME CALLFRAME_SIZ now.
| -rw-r--r-- | sys/mips/mips/exception.S | 4 | ||||
| -rw-r--r-- | sys/mips/mips/locore.S | 10 | ||||
| -rw-r--r-- | sys/mips/mips/mpboot.S | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/sys/mips/mips/exception.S b/sys/mips/mips/exception.S index eff484a..02edcde 100644 --- a/sys/mips/mips/exception.S +++ b/sys/mips/mips/exception.S @@ -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 diff --git a/sys/mips/mips/locore.S b/sys/mips/mips/locore.S index 1365e8e..1574d75 100644 --- a/sys/mips/mips/locore.S +++ b/sys/mips/mips/locore.S @@ -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!") diff --git a/sys/mips/mips/mpboot.S b/sys/mips/mips/mpboot.S index 6828847..ce2982d 100644 --- a/sys/mips/mips/mpboot.S +++ b/sys/mips/mips/mpboot.S @@ -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) |
