nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1909566 - pixman: Adjust arm assembly for binutils change. a=dmeehan

Browse source 
A change in the latest version of binutils broke building pixman for arm.

The binutils change:
https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=226749d5a6ff0d5c607d6428d6c81e1e7e7a994b

This change was committed upstream in
865e6ce00b
and will be in the next release.

Original Revision: https://phabricator.services.mozilla.com/D217517

Differential Revision: https://phabricator.services.mozilla.com/D217540
This commit is contained in:
Mike Hommey 2024-07-24 21:34:20 +00:00
parent c531e96f7b
commit b2ed930788
1 changed files with 22 additions and 22 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

44
gfx/cairo/libpixman/src/pixman-arm-simd-asm.S
View file

@ -820,13 +820,13 @@ generate_composite_function \
.macro over_white_8888_8888_ca_1pixel_tail .macro over_white_8888_8888_ca_1pixel_tail
mvn TMP0, WK1 mvn TMP0, WK1
teq WK1, WK1, asr #32 teq WK1, WK1, asr #32
bne 01f bne 1f
bcc 03f bcc 3f
mov WK3, WK1 mov WK3, WK1
b 02f b 2f
01: over_white_8888_8888_ca_combine WK1, WK3 1: over_white_8888_8888_ca_combine WK1, WK3
02: pixst , 4, 3, DST 2: pixst , 4, 3, DST
03: 3:
.endm .endm
.macro over_white_8888_8888_ca_2pixels_head .macro over_white_8888_8888_ca_2pixels_head
@ -837,21 +837,21 @@ generate_composite_function \
pixld , 8, 3, DST pixld , 8, 3, DST
mvn TMP0, WK1 mvn TMP0, WK1
teq WK1, WK1, asr #32 teq WK1, WK1, asr #32
bne 01f bne 1f
movcs WK3, WK1 movcs WK3, WK1
bcs 02f bcs 2f
teq WK2, #0 teq WK2, #0
beq 05f beq 5f
b 02f b 2f
01: over_white_8888_8888_ca_combine WK1, WK3 1: over_white_8888_8888_ca_combine WK1, WK3
02: mvn TMP0, WK2 2: mvn TMP0, WK2
teq WK2, WK2, asr #32 teq WK2, WK2, asr #32
bne 03f bne 3f
movcs WK4, WK2 movcs WK4, WK2
b 04f b 4f
03: over_white_8888_8888_ca_combine WK2, WK4 3: over_white_8888_8888_ca_combine WK2, WK4
04: pixst , 8, 3, DST 4: pixst , 8, 3, DST
05: 5:
.endm .endm
.macro over_white_8888_8888_ca_process_head cond, numbytes, firstreg, unaligned_src, unaligned_mask, preload .macro over_white_8888_8888_ca_process_head cond, numbytes, firstreg, unaligned_src, unaligned_mask, preload
@ -1067,9 +1067,9 @@ generate_composite_function \
.if \offset != 0 .if \offset != 0
ldrb ORIG_W, [SRC, #\offset] ldrb ORIG_W, [SRC, #\offset]
.endif .endif
beq 01f beq 1f
teq STRIDE_M, #0xFF teq STRIDE_M, #0xFF
beq 02f beq 2f
.endif .endif
uxtb16 SCRATCH, \d /* rb_dest */ uxtb16 SCRATCH, \d /* rb_dest */
uxtb16 \d, \d, ror #8 /* ag_dest */ uxtb16 \d, \d, ror #8 /* ag_dest */
@ -1079,13 +1079,13 @@ generate_composite_function \
uxtab16 \d, \d, \d, ror #8 uxtab16 \d, \d, \d, ror #8
mov SCRATCH, SCRATCH, ror #8 mov SCRATCH, SCRATCH, ror #8
sel \d, SCRATCH, \d sel \d, SCRATCH, \d
b 02f b 2f
.if \offset == 0 .if \offset == 0
48: /* Last mov d,#0 of the set - used as part of shortcut for 48: /* Last mov d,#0 of the set - used as part of shortcut for
* source values all 0 */ * source values all 0 */
.endif .endif
01: mov \d, #0 1: mov \d, #0
02: 2:
.endm .endm
.macro in_reverse_8888_8888_tail numbytes, reg1, reg2, reg3, reg4 .macro in_reverse_8888_8888_tail numbytes, reg1, reg2, reg3, reg4