diff options
| author | Martin Storsjö <martin@martin.st> | 2014-01-07 12:13:11 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2014-01-07 19:29:56 +0200 |
| commit | 5dae4872357613a0b51120b54a4c5221e0ec3f69 (patch) | |
| tree | b8c2f1ff1362289dd8ee16722f25b9195beb6db3 /libavcodec | |
| parent | b7b932f5e3602bd34c3cc634b71c8bbbc0fb8dc0 (diff) | |
| download | ffmpeg-5dae4872357613a0b51120b54a4c5221e0ec3f69.tar.gz | |
arm: Allow overriding the alignment set in the function macro
The function macro always sets .align 2 before declaring the
function label (since 5c5e1ea3) and always sets the section to
.text (since 278caa6a).
The .align 5 before certain functions, added in fc252eba, were added
before .text and .align were added to the function macro and thus
became useless/unused when the function macro got them.
This restores the original intention, to align the loop entry
points.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/arm/dsputil_arm.S | 3 | ||||
| -rw-r--r-- | libavcodec/arm/hpeldsp_arm.S | 24 |
2 files changed, 9 insertions, 18 deletions
diff --git a/libavcodec/arm/dsputil_arm.S b/libavcodec/arm/dsputil_arm.S index f0029aee14..82fcf2ae91 100644 --- a/libavcodec/arm/dsputil_arm.S +++ b/libavcodec/arm/dsputil_arm.S @@ -22,9 +22,8 @@ #include "config.h" #include "libavutil/arm/asm.S" - .align 5 @ void ff_add_pixels_clamped_arm(int16_t *block, uint8_t *dest, int stride) -function ff_add_pixels_clamped_arm, export=1 +function ff_add_pixels_clamped_arm, export=1, align=5 push {r4-r10} mov r10, #8 1: diff --git a/libavcodec/arm/hpeldsp_arm.S b/libavcodec/arm/hpeldsp_arm.S index d4f97e3c13..5bacd8e359 100644 --- a/libavcodec/arm/hpeldsp_arm.S +++ b/libavcodec/arm/hpeldsp_arm.S @@ -89,8 +89,7 @@ .endm @ ---------------------------------------------------------------- - .align 5 -function ff_put_pixels16_arm, export=1 +function ff_put_pixels16_arm, export=1, align=5 @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) @ block = word aligned, pixles = unaligned pld [r1] @@ -141,8 +140,7 @@ function ff_put_pixels16_arm, export=1 endfunc @ ---------------------------------------------------------------- - .align 5 -function ff_put_pixels8_arm, export=1 +function ff_put_pixels8_arm, export=1, align=5 @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) @ block = word aligned, pixles = unaligned pld [r1] @@ -193,8 +191,7 @@ function ff_put_pixels8_arm, export=1 endfunc @ ---------------------------------------------------------------- - .align 5 -function ff_put_pixels8_x2_arm, export=1 +function ff_put_pixels8_x2_arm, export=1, align=5 @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) @ block = word aligned, pixles = unaligned pld [r1] @@ -252,8 +249,7 @@ function ff_put_pixels8_x2_arm, export=1 pop {r4-r10,pc} endfunc - .align 5 -function ff_put_no_rnd_pixels8_x2_arm, export=1 +function ff_put_no_rnd_pixels8_x2_arm, export=1, align=5 @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) @ block = word aligned, pixles = unaligned pld [r1] @@ -313,8 +309,7 @@ endfunc @ ---------------------------------------------------------------- - .align 5 -function ff_put_pixels8_y2_arm, export=1 +function ff_put_pixels8_y2_arm, export=1, align=5 @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) @ block = word aligned, pixles = unaligned pld [r1] @@ -411,8 +406,7 @@ function ff_put_pixels8_y2_arm, export=1 pop {r4-r11,pc} endfunc - .align 5 -function ff_put_no_rnd_pixels8_y2_arm, export=1 +function ff_put_no_rnd_pixels8_y2_arm, export=1, align=5 @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) @ block = word aligned, pixles = unaligned pld [r1] @@ -578,8 +572,7 @@ endfunc pop {r4-r11,pc} .endm - .align 5 -function ff_put_pixels8_xy2_arm, export=1 +function ff_put_pixels8_xy2_arm, export=1, align=5 @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) @ block = word aligned, pixles = unaligned pld [r1] @@ -594,8 +587,7 @@ function ff_put_pixels8_xy2_arm, export=1 4: RND_XY2_EXPAND 3, lsl endfunc - .align 5 -function ff_put_no_rnd_pixels8_xy2_arm, export=1 +function ff_put_no_rnd_pixels8_xy2_arm, export=1, align=5 @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) @ block = word aligned, pixles = unaligned pld [r1] |