[Patch, MIPS] Modify memcpy.S for mips32r6/mips64r6

[Joseph Myers]

On Tue, 23 Dec 2014, Steve Ellcey wrote:

> +#if !defined (R6_CODE)

Just #ifndef.

> @@ -339,22 +426,22 @@ L(aligned):
>  	PREFETCH_FOR_STORE (3, a0)
>  #endif
>  #if defined(RETURN_FIRST_PREFETCH) && defined(USE_PREFETCH)
> -# if PREFETCH_STORE_HINT == PREFETCH_HINT_PREPAREFORSTORE
> +#if PREFETCH_STORE_HINT == PREFETCH_HINT_PREPAREFORSTORE
>  	sltu    v1,t9,a0
>  	bgtz    v1,L(skip_set)
>  	nop
>  	PTR_ADDIU v0,a0,(PREFETCH_CHUNK*4)
>  L(skip_set):
> -# else
> +#else
>  	PTR_ADDIU v0,a0,(PREFETCH_CHUNK*1)
> -# endif
> +#endif
>  #endif
>  #if defined(RETURN_LAST_PREFETCH) && defined(USE_PREFETCH) \
>      && (PREFETCH_STORE_HINT != PREFETCH_HINT_PREPAREFORSTORE)
>  	PTR_ADDIU v0,a0,(PREFETCH_CHUNK*3)
> -# ifdef USE_DOUBLE
> +#ifdef USE_DOUBLE
>  	PTR_ADDIU v0,v0,32
> -# endif
> +#endif
>  #endif
>  L(loop16w):
>  	C_LD	t0,UNIT(0)(a1)

These indentation changes seem wrong.

> @@ -363,8 +450,12 @@ L(loop16w):
>  	bgtz	v1,L(skip_pref)
>  #endif
>  	C_LD	t1,UNIT(1)(a1)
> +#if defined(R6_CODE)

Just #ifdef.

> +#if defined(R6_CODE)

> +#if !defined(R6_CODE)

> +#if !defined (R6_CODE)

Likewise.

> @@ -523,15 +622,15 @@ L(ua_chk16w):
>  	PREFETCH_FOR_STORE (3, a0)
>  #endif
>  #if defined(RETURN_FIRST_PREFETCH) && defined(USE_PREFETCH)
> -# if (PREFETCH_STORE_HINT == PREFETCH_HINT_PREPAREFORSTORE)
> +#if (PREFETCH_STORE_HINT == PREFETCH_HINT_PREPAREFORSTORE)
>  	sltu    v1,t9,a0
>  	bgtz    v1,L(ua_skip_set)
>  	nop
>  	PTR_ADDIU v0,a0,(PREFETCH_CHUNK*4)
>  L(ua_skip_set):
> -# else
> +#else
>  	PTR_ADDIU v0,a0,(PREFETCH_CHUNK*1)
> -# endif
> +#endif
>  #endif

More wrong indentation changes.

-- 
Joseph S. Myers
joseph@codesourcery.com