Date: Mon, 28 Jan 2008 20:01:12 GMT From: Warner Losh <imp@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 134316 for review Message-ID: <200801282001.m0SK1Ccd016603@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=134316 Change 134316 by imp@imp_lighthouse on 2008/01/28 20:00:24 Minor nits. Also question the need for the YAMON and CFE sections here. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/locore.S#14 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/locore.S#14 (text+ko) ==== @@ -120,13 +120,13 @@ * preserved (namely, clearing interrupt bits), and set * bits we want to explicitly set. */ - mfc0 t2, MIPS_COP_0_STATUS + mfc0 t2, COP_0_STATUS_REG and t2, t0 or t2, t1 - mtc0 t2, MIPS_COP_0_STATUS + mtc0 t2, COP_0_STATUS_REG COP0_SYNC /* Extra nops for the FPU to spin up. */ - mfc0 t2, MIPS_COP_0_STATUS + mfc0 t2, COP_0_STATUS_REG /* Read and store the PrID FPU ID for CPU identification. */ mfc0 t0, MIPS_COP_0_PRID @@ -143,19 +143,23 @@ */ li t1, 0x0 #endif - sw t0, cpu_id - sw t1, fpu_id + sw t0, _C_LABEL(cpu_id) + sw t1, _C_LABEL(fpu_id) /* * Initialize stack and call machine startup. */ - la sp, topstack - START_FRAME + la sp, _C_LABEL(topstack) - START_FRAME la gp, _C_LABEL(_gp) sw zero, START_FRAME - 4(sp) # Zero out old ra for debugger + /*xxximp + * now that we pass a0...a3 to the platform_init routine, do we need + * to stash this stuff here? + */ #ifdef YAMON /* Save YAMON boot environment pointer */ - sw a2, fenvp + sw a2, _C_LABEL(fenvp) #endif #ifdef CFE /* @@ -163,8 +167,8 @@ */ li t1, 0x43464531 bne a3, t1, no_cfe /* Check for "CFE1" signature */ - sw a0, cfe_handle /* Firmware data segment */ - sw a2, cfe_vector /* Firmware entry vector */ + sw a0, _C_LABEL(cfe_handle)/* Firmware data segment */ + sw a2, _C_LABEL(cfe_vector)/* Firmware entry vector */ no_cfe: #endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200801282001.m0SK1Ccd016603>