Browse Source

ARM: enable UAL syntax in asm.S

This enables UAL syntax for all asm files instead of only those
which happen to be incompatible with the old, deprecated syntax.

Signed-off-by: Mans Rullgard <mans@mansr.com>
tags/n0.8
Mans Rullgard 14 years ago
parent
commit
371266daa3
5 changed files with 3 additions and 6 deletions
  1. +2
    -0
      libavcodec/arm/asm.S
  2. +0
    -1
      libavcodec/arm/dsputil_vfp.S
  3. +0
    -2
      libavcodec/arm/fmtconvert_vfp.S
  4. +1
    -1
      libavcodec/arm/mpegvideo_armv5te_s.S
  5. +0
    -2
      libavcodec/arm/vp8_armv6.S

+ 2
- 0
libavcodec/arm/asm.S View File

@@ -26,6 +26,8 @@
# define ELF @ # define ELF @
#endif #endif


.syntax unified

.macro require8 val=1 .macro require8 val=1
ELF .eabi_attribute 24, \val ELF .eabi_attribute 24, \val
.endm .endm


+ 0
- 1
libavcodec/arm/dsputil_vfp.S View File

@@ -21,7 +21,6 @@
#include "config.h" #include "config.h"
#include "asm.S" #include "asm.S"


.syntax unified
/* /*
* VFP is a floating point coprocessor used in some ARM cores. VFP11 has 1 cycle * VFP is a floating point coprocessor used in some ARM cores. VFP11 has 1 cycle
* throughput for almost all the instructions (except for double precision * throughput for almost all the instructions (except for double precision


+ 0
- 2
libavcodec/arm/fmtconvert_vfp.S View File

@@ -21,8 +21,6 @@
#include "config.h" #include "config.h"
#include "asm.S" #include "asm.S"


.syntax unified

/** /**
* ARM VFP optimized float to int16 conversion. * ARM VFP optimized float to int16 conversion.
* Assume that len is a positive number and is multiple of 8, destination * Assume that len is a positive number and is multiple of 8, destination


+ 1
- 1
libavcodec/arm/mpegvideo_armv5te_s.S View File

@@ -95,7 +95,7 @@ function ff_dct_unquantize_h263_armv5te, export=1
strh lr, [r0], #2 strh lr, [r0], #2


subs r3, r3, #8 subs r3, r3, #8
ldrgtd r4, [r0, #0] /* load data early to avoid load/use pipeline stall */
ldrdgt r4, [r0, #0] /* load data early to avoid load/use pipeline stall */
bgt 1b bgt 1b


adds r3, r3, #2 adds r3, r3, #2


+ 0
- 2
libavcodec/arm/vp8_armv6.S View File

@@ -20,8 +20,6 @@


#include "asm.S" #include "asm.S"


.syntax unified

.macro rac_get_prob h, bs, buf, cw, pr, t0, t1 .macro rac_get_prob h, bs, buf, cw, pr, t0, t1
adds \bs, \bs, \t0 adds \bs, \bs, \t0
lsl \cw, \cw, \t0 lsl \cw, \cw, \t0


Loading…
Cancel
Save