[x264-devel] commit: Compile fixes for pre-ARMv6T2 and/or PIC (David Conrad )

[Måns Rullgård]

git at videolan.org (git version control) writes:

> x264 | branch: master | David Conrad <lessen42 at gmail.com> | Wed Sep  2 16:14:59 2009 -0700| [e390cbf993d180b1db413746272e232ac3068dad] | committer: Jason Garrett-Glaser 
>
> Compile fixes for pre-ARMv6T2 and/or PIC
>
> +.macro movconst rd, val
> +#ifdef HAVE_ARMV6T2
> +    movw        \rd, #:lower16:\val
> +.if \val >> 16
> +    movt        \rd, #:upper16:\val
> +.endif
> +#else
> +    ldr         \rd, =\val
> +#endif
> +.endm
> +
> @@ -1209,9 +1203,8 @@ function x264_pixel_ssim_end4_neon, export=1
>      vshl.s32    q2,  q2,  #6
>      vadd.s32    q1,  q8,  q8
>
> -    mov         r3, #416        // ssim_c1= .01*.01*255*255*64
> -    movw        ip, #39355      // ssim_c2= .03*.03*255*255*64*63 - 3<<16
> -    movt        ip, #3
> +    mov         r3, #416        // ssim_c1 = .01*.01*255*255*64
> +    movconst    ip, 235963      // ssim_c2 = .03*.03*255*255*64*63
>      vdup.32     q14, r3
>      vdup.32     q15, ip
>
> diff --git a/common/arm/predict-a.S b/common/arm/predict-a.S
> index 46e687b..8ff61a2 100644
> --- a/common/arm/predict-a.S
> +++ b/common/arm/predict-a.S
> @@ -102,7 +102,7 @@ function x264_predict_4x4_ddr_armv6, export=1
>      add     r4, r4, r3, lsl #8
>      add     r5, r5, r4, lsl #8
>      add     r6, r6, r5, lsl #8
> -    ldr     ip, pb_1
> +    ldr     ip, =0x01010101

Why not use movconst here?

> +    # arm-gcc-4.2 produces incorrect output with -ffast-math
> +    # and it doesn't save any speed anyway on 4.4, so disable it
> +    CFLAGS="-O4 -fno-fast-math $CFLAGS"

Details?

-- 
Måns Rullgård
mans at mansr.com