# HG changeset patch # User mru # Date 1231792653 0 # Node ID 636dc45f4779e76676f4d6c22dd0825275e5f45d # Parent 0b9dff3a1ce2b1761b1f09987b958c7b8696108a ARM: clean up pc-relative references in simple_idct_armv6.S diff -r 0b9dff3a1ce2 -r 636dc45f4779 arm/simple_idct_armv6.S --- a/arm/simple_idct_armv6.S Mon Jan 12 20:37:29 2009 +0000 +++ b/arm/simple_idct_armv6.S Mon Jan 12 20:37:33 2009 +0000 @@ -60,12 +60,12 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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}