arm: hpeldsp: prevent overreads in armv6 asm

Based on a patch by Russel King <rmk+libav@arm.linux.org.uk>

Janne Grunau committed 12 years ago

Commit cbddee11 parent 3741aa32 files · +19 −8Browse files

Unified · Split

2 files

libavcodec/arm/hpeldsp_armv6.S +12 −8
libavutil/arm/asm.S +7 −0

         uhadd8          r9,  r5,  r7
         eor             r11, r5,  r7
         and             r10, r10, r12
-        ldr_pre         r4,  r1,  r2
+        ldrc_pre        ne,  r4,  r1,  r2
         uadd8           r8,  r8,  r10
         and             r11, r11, r12
         uadd8           r9,  r9,  r11
-        ldr             r5,  [r1, #4]
+        it              ne
+        ldrne           r5,  [r1, #4]
         uhadd8          r10, r4,  r6
         eor             r6,  r4,  r6
         uhadd8          r11, r5,  r7
         eor             r7,  r5,  r7
         uadd8           r10, r10, r6
         and             r7,  r7,  r12
-        ldr_pre         r6,  r1,  r2
+        ldrc_pre        ne,  r6,  r1,  r2
         uadd8           r11, r11, r7
         strd_post       r8,  r9,  r0,  r2
-        ldr             r7,  [r1, #4]
+        it              ne
+        ldrne           r7,  [r1, #4]
         strd_post       r10, r11, r0,  r2
         bne             1b
 1:
         subs            r3,  r3,  #2
         uhadd8          r8,  r4,  r6
-        ldr_pre         r4,  r1,  r2
+        ldrc_pre        ne,  r4,  r1,  r2
         uhadd8          r9,  r5,  r7
-        ldr             r5,  [r1, #4]
+        it              ne
+        ldrne           r5,  [r1, #4]
         uhadd8          r12, r4,  r6
-        ldr_pre         r6,  r1,  r2
+        ldrc_pre        ne,  r6,  r1,  r2
         uhadd8          r14, r5,  r7
-        ldr             r7,  [r1, #4]
+        it              ne
+        ldrne           r7,  [r1, #4]
         stm             r0,  {r8,r9}
         add             r0,  r0,  r2
         stm             r0,  {r12,r14}

libavutil/arm/asm.S+7−0

@@ -216,6 +216,13 @@ T ldr \rt, [\rn] · 215 unmodified lines
216	T add \rn, \rn, \rm	216	T add \rn, \rn, \rm
217	.endm	217	.endm
218		218
		219	.macro ldrc_pre cc, rt, rn, rm:vararg
		220	A ldr\cc \rt, [\rn, \rm]!
		221	T itt \cc
		222	T add\cc \rn, \rn, \rm
		223	T ldr\cc \rt, [\rn]
		224	.endm
		225
219	.macro ldrd_reg rt, rt2, rn, rm	226	.macro ldrd_reg rt, rt2, rn, rm
220	A ldrd \rt, \rt2, [\rn, \rm]	227	A ldrd \rt, \rt2, [\rn, \rm]
221	T add \rt, \rn, \rm	228	T add \rt, \rn, \rm

arm: hpeldsp: prevent overreads in armv6 asm

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code