Date: Wed, 3 Mar 2010 00:06:22 +0000 (UTC) From: Juli Mallett <jmallett@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r204612 - user/jmallett/octeon/sys/mips/mips Message-ID: <201003030006.o2306M3q083705@svn.freebsd.org>
index | next in thread | raw e-mail
Author: jmallett Date: Wed Mar 3 00:06:22 2010 New Revision: 204612 URL: http://svn.freebsd.org/changeset/base/204612 Log: Fix build with new <machine/asm.h>: spell START_FRAME as CALLFRAME_SIZ. Modified: user/jmallett/octeon/sys/mips/mips/exception.S user/jmallett/octeon/sys/mips/mips/locore.S user/jmallett/octeon/sys/mips/mips/machdep.c user/jmallett/octeon/sys/mips/mips/mpboot.S Modified: user/jmallett/octeon/sys/mips/mips/exception.S ============================================================================== --- user/jmallett/octeon/sys/mips/mips/exception.S Tue Mar 2 23:57:42 2010 (r204611) +++ user/jmallett/octeon/sys/mips/mips/exception.S Wed Mar 3 00:06:22 2010 (r204612) @@ -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: user/jmallett/octeon/sys/mips/mips/locore.S ============================================================================== --- user/jmallett/octeon/sys/mips/mips/locore.S Tue Mar 2 23:57:42 2010 (r204611) +++ user/jmallett/octeon/sys/mips/mips/locore.S Wed Mar 3 00:06:22 2010 (r204612) @@ -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) PTR_L a0, TD_PCB(sp) REG_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: user/jmallett/octeon/sys/mips/mips/machdep.c ============================================================================== --- user/jmallett/octeon/sys/mips/mips/machdep.c Tue Mar 2 23:57:42 2010 (r204611) +++ user/jmallett/octeon/sys/mips/mips/machdep.c Wed Mar 3 00:06:22 2010 (r204612) @@ -118,7 +118,7 @@ vm_offset_t kstack0; /* * Each entry in the pcpu_space[] array is laid out in the following manner: * struct pcpu for cpu 'n' pcpu_space[n] - * boot stack for cpu 'n' pcpu_space[n] + PAGE_SIZE * 2 - START_FRAME + * boot stack for cpu 'n' pcpu_space[n] + PAGE_SIZE * 2 - CALLFRAME_SIZ * * Note that the boot stack grows downwards and we assume that we never * use enough stack space to trample over the 'struct pcpu' that is at Modified: user/jmallett/octeon/sys/mips/mips/mpboot.S ============================================================================== --- user/jmallett/octeon/sys/mips/mips/mpboot.S Tue Mar 2 23:57:42 2010 (r204611) +++ user/jmallett/octeon/sys/mips/mips/mpboot.S Wed Mar 3 00:06:22 2010 (r204612) @@ -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)help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201003030006.o2306M3q083705>