Izumi Tsutsui wrote:

> In article <20050226000629.GA1174@thoreau.thistledown.com.au>
> simonb@wasabisystems.com wrote:
> 
> > > ../../../../arch/mips/mips/mips3_subr.S
> > > ../../../../arch/mips/mips/mipsX_subr.S: Assembler messages:
> > > ../../../../arch/mips/mips/mipsX_subr.S:1403: Warning: \
> > > Macro instruction expanded into multiple instructions in a branch delay slot
>  :
> > As others have noticed this should be fixed.  I've add a nop to both
> > cases and committed this.
> 
> Hmm, mips/locore.S also has the same warning:
> ---
> #   compile  COLT/locore.o
> /usr/tools/mipsel/bin/mipsel--netbsd-gcc -mips2 -mno-abicalls \
> -x assembler-with-cpp -traditional-cpp -D_LOCORE -Dcobalt \
> -I. -I../../../../arch -I../../../.. -nostdinc -DMIPS3 -DLKM \
> -DDIAGNOSTIC -DMAXUSERS=32 -D_KERNEL -D_KERNEL_OPT -c \
> ../../../../arch/mips/mips/locore.S
> ../../../../arch/mips/mips/locore.S: Assembler messages:
> ../../../../arch/mips/mips/locore.S:254: Warning: \
> Macro instruction expanded into multiple instructions in a branch delay slot
> ---
> 249		.globl	cpu_switch_queuescan
> 250	cpu_switch_queuescan:
> 251		lw	t0, _C_LABEL(sched_whichqs)	# look for 
> 252		li	t2, -1				# t2 = lowest bit set
> 253		bne	t0, zero, 1f
> 254		lw	t3, _C_LABEL(mips_locoresw) + MIPSX_CPU_IDLE
> 255		nop					# for r2000/r3000
> 256		jal	ra, t3
> 257		nop
> ---

Fortunately this one is also safe.  I've fixed this too.

Thanks!
Simon.
--
Simon Burge                            <simonb@wasabisystems.com>
NetBSD Support and Service:         http://www.wasabisystems.com/