From: mru <mru@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Date: Mon, 12 Jan 2009 20:37:33 +0000 (+0000)
Subject: ARM: clean up pc-relative references in simple_idct_armv6.S
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/frescor/ffmpeg.git/commitdiff_plain/37c1734d1d7cef9232030908457deae46c9e99cd

ARM: clean up pc-relative references in simple_idct_armv6.S

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@16568 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
---

diff --git a/libavcodec/arm/simple_idct_armv6.S b/libavcodec/arm/simple_idct_armv6.S
index d276fdb57..0f8e2d0fd 100644
--- a/libavcodec/arm/simple_idct_armv6.S
+++ b/libavcodec/arm/simple_idct_armv6.S
@@ -60,12 +60,12 @@ w57:    .long W57
   Output in registers r4--r11
 */
         .macro idct_row shift
-        ldr    lr, [pc, #(w46-.-8)]  /* lr = W4 | (W6 << 16) */
+        ldr    lr, w46               /* lr = W4 | (W6 << 16) */
         mov    r1, #(1<<(\shift-1))
         smlad  r4, r2, ip, r1
         smlsd  r7, r2, ip, r1
-        ldr    ip, [pc, #(w13-.-8)]  /* ip = W1 | (W3 << 16) */
-        ldr    r10,[pc, #(w57-.-8)]  /* r10 = W5 | (W7 << 16) */
+        ldr    ip, w13               /* ip = W1 | (W3 << 16) */
+        ldr    r10,w57               /* r10 = W5 | (W7 << 16) */
         smlad  r5, r2, lr, r1
         smlsd  r6, r2, lr, r1
 
@@ -78,11 +78,11 @@ w57:    .long W57
         smlad  r8, lr, r10,r8        /* B0 += W5*row[5] + W7*row[7] */
         smusdx r10,r3, r1            /* r10 = B2 = W5*row[1] - W1*row[3] */
 
-        ldr    r3, [pc, #(w42n-.-8)] /* r3 = -W4 | (-W2 << 16) */
+        ldr    r3, w42n              /* r3 = -W4 | (-W2 << 16) */
         smlad  r10,lr, r2, r10       /* B2 += W7*row[5] + W3*row[7] */
         ldr    r2, [r0, #4]          /* r2 = row[6,4] */
         smlsdx r11,lr, ip, r11       /* B3 += W3*row[5] - W1*row[7] */
-        ldr    ip, [pc, #(w46-.-8)]  /* ip = W4 | (W6 << 16) */
+        ldr    ip, w46               /* ip = W4 | (W6 << 16) */
         smlad  r9, lr, r1, r9        /* B1 -= W1*row[5] + W5*row[7] */
 
         smlad  r5, r2, r3, r5        /* A1 += -W4*row[4] - W2*row[6] */
@@ -101,12 +101,12 @@ w57:    .long W57
   Output in registers r4--r11
 */
         .macro idct_row4 shift
-        ldr    lr, [pc, #(w46-.-8)]  /* lr = W4 | (W6 << 16) */
-        ldr    r10,[pc, #(w57-.-8)]  /* r10 = W5 | (W7 << 16) */
+        ldr    lr, w46               /* lr = W4 | (W6 << 16) */
+        ldr    r10,w57               /* r10 = W5 | (W7 << 16) */
         mov    r1, #(1<<(\shift-1))
         smlad  r4, r2, ip, r1
         smlsd  r7, r2, ip, r1
-        ldr    ip, [pc, #(w13-.-8)]  /* ip = W1 | (W3 << 16) */
+        ldr    ip, w13               /* ip = W1 | (W3 << 16) */
         smlad  r5, r2, lr, r1
         smlsd  r6, r2, lr, r1
         smusdx r11,r3, r10           /* r11 = B3 = W7*row[1] - W5*row[3] */
@@ -204,7 +204,7 @@ function idct_row_armv6
         cmpeq  lr, r2, lsr #16
         beq    1f
         str    r1, [sp, #-4]!
-        ldr    ip, [pc, #(w42-.-8)]  /* ip = W4 | (W2 << 16) */
+        ldr    ip, w42               /* ip = W4 | (W2 << 16) */
         cmp    lr, #0
         beq    2f
 
@@ -248,7 +248,7 @@ function idct_col_armv6
         stmfd  sp!, {r1, lr}
 
         ldr    r2, [r0]              /* r2 = row[2,0] */
-        ldr    ip, [pc, #(w42-.-8)]  /* ip = W4 | (W2 << 16) */
+        ldr    ip, w42               /* ip = W4 | (W2 << 16) */
         ldr    r3, [r0, #8]          /* r3 = row[3,1] */
         idct_row COL_SHIFT
         ldr    r1, [sp], #4
@@ -276,7 +276,7 @@ function idct_col_put_armv6
         stmfd  sp!, {r1, r2, lr}
 
         ldr    r2, [r0]              /* r2 = row[2,0] */
-        ldr    ip, [pc, #(w42-.-8)]  /* ip = W4 | (W2 << 16) */
+        ldr    ip, w42               /* ip = W4 | (W2 << 16) */
         ldr    r3, [r0, #8]          /* r3 = row[3,1] */
         idct_row COL_SHIFT
         ldmfd  sp!, {r1, r2}
@@ -306,7 +306,7 @@ function idct_col_add_armv6
         stmfd  sp!, {r1, r2, lr}
 
         ldr    r2, [r0]              /* r2 = row[2,0] */
-        ldr    ip, [pc, #(w42-.-8)]  /* ip = W4 | (W2 << 16) */
+        ldr    ip, w42               /* ip = W4 | (W2 << 16) */
         ldr    r3, [r0, #8]          /* r3 = row[3,1] */
         idct_row COL_SHIFT
         ldmfd  sp!, {r1, r2}