Re: [PATCH -sfr.git] MIPS: zboot: indent the nop instruction in delay slot

["Maciej W. Rozycki" <macro@linux-mips.org>]

On Thu, 29 Oct 2009, Wu Zhangjin wrote:

> diff --git a/arch/mips/boot/compressed/head.S 
> b/arch/mips/boot/compressed/head.S
> index e23f25e..29080f4 100644
> --- a/arch/mips/boot/compressed/head.S
> +++ b/arch/mips/boot/compressed/head.S
> @@ -38,7 +38,7 @@ start:
>       PTR_LA  ra, 2f
>       PTR_LA  k0, decompress_kernel
>       jr      k0
> -     nop
> +      nop
>  2:
>       move    a0, s0
>       move    a1, s1
> @@ -46,7 +46,7 @@ start:
>       move    a3, s3
>       PTR_LI  k0, KERNEL_ENTRY
>       jr      k0
> -     nop
> +      nop
>  3:
>       b 3b
>       END(start)

 This piece of code looks unsafe to me.  I'm not sure which tree this is 
against and certainly I don't have a local copy of the file, but based on 
the manual delay slot scheduling this is built with .set noreorder in 
effect and as such the function lacks a delay slot fill for the trailing 
branch (which is also ill-formatted).

  Maciej