aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/arm
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2010-06-29 14:48:45 +0000
committerMåns Rullgård <mans@mansr.com>2010-06-29 14:48:45 +0000
commita4edc5a9df99bdbe1b56fa4f6656ce37dfb48f37 (patch)
tree11bafeca49b383268f5649fe7cada6c1c2bbb365 /libavcodec/arm
parent480cb7edd35463175820ac01a9b88222f8b57d14 (diff)
downloadffmpeg-a4edc5a9df99bdbe1b56fa4f6656ce37dfb48f37.tar.gz
ARM: add mov32 macro
Originally committed as revision 23888 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/arm')
-rw-r--r--libavcodec/arm/asm.S11
1 files changed, 11 insertions, 0 deletions
diff --git a/libavcodec/arm/asm.S b/libavcodec/arm/asm.S
index 9eea433acb..724e7a00ea 100644
--- a/libavcodec/arm/asm.S
+++ b/libavcodec/arm/asm.S
@@ -49,6 +49,17 @@ ELF .type \name, %function
\name:
.endm
+.macro mov32 rd, val
+#if HAVE_ARMV6T2
+ movw \rd, #(\val) & 0xffff
+ .if (\val) >> 16
+ movt \rd, #(\val) >> 16
+ .endif
+#else
+ ldr \rd, =\val
+#endif
+.endm
+
.macro movrel rd, val
#if HAVE_ARMV6T2 && !CONFIG_PIC
movw \rd, #:lower16:\val