From dbcd7954f8d1efcceeb1cd2980417fc4659dbf58 Mon Sep 17 00:00:00 2001 From: Russell King Date: Mon, 27 Jun 2011 12:23:11 +0100 Subject: [PATCH] --- yaml --- r: 258197 b: refs/heads/master c: 108f6af0a82cf3b61f3ac6728e2241805a935b64 h: refs/heads/master i: 258195: eab6e2f42c2b863d75167113044873192cbe63f8 v: v3 --- [refs] | 2 +- trunk/arch/arm/mm/abort-lv4t.S | 6 +++--- trunk/arch/arm/mm/proc-arm6_7.S | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 651eee5b1c3f..e79f7473931c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e22c12f9146d50ee6b0cf97db46b3310409f64e6 +refs/heads/master: 108f6af0a82cf3b61f3ac6728e2241805a935b64 diff --git a/trunk/arch/arm/mm/abort-lv4t.S b/trunk/arch/arm/mm/abort-lv4t.S index 921aaab0c8c5..54b6d279371a 100644 --- a/trunk/arch/arm/mm/abort-lv4t.S +++ b/trunk/arch/arm/mm/abort-lv4t.S @@ -102,13 +102,13 @@ ENTRY(v4t_late_abort) tst r8, #1 << 21 @ check writeback bit beq do_DataAbort @ no writeback -> no fixup .data_arm_lateldrpostconst: - movs r9, r8, lsl #20 @ Get offset + movs r6, r8, lsl #20 @ Get offset beq do_DataAbort @ zero -> no fixup and r5, r8, #15 << 16 @ Extract 'n' from instruction ldr r7, [r2, r5, lsr #14] @ Get register 'Rn' tst r8, #1 << 23 @ Check U bit - subne r7, r7, r9, lsr #20 @ Undo increment - addeq r7, r7, r9, lsr #20 @ Undo decrement + subne r7, r7, r6, lsr #20 @ Undo increment + addeq r7, r7, r6, lsr #20 @ Undo decrement str r7, [r2, r5, lsr #14] @ Put register 'Rn' b do_DataAbort diff --git a/trunk/arch/arm/mm/proc-arm6_7.S b/trunk/arch/arm/mm/proc-arm6_7.S index 141906eae260..4d963114c66b 100644 --- a/trunk/arch/arm/mm/proc-arm6_7.S +++ b/trunk/arch/arm/mm/proc-arm6_7.S @@ -116,13 +116,13 @@ ENTRY(cpu_arm6_data_abort) tst r8, #1 << 21 @ check writeback bit beq do_DataAbort @ no writeback -> no fixup .data_arm_lateldrpostconst: - movs r9, r8, lsl #20 @ Get offset + movs r6, r8, lsl #20 @ Get offset beq do_DataAbort @ zero -> no fixup and r5, r8, #15 << 16 @ Extract 'n' from instruction ldr r7, [r2, r5, lsr #14] @ Get register 'Rn' tst r8, #1 << 23 @ Check U bit - subne r7, r7, r9, lsr #20 @ Undo increment - addeq r7, r7, r9, lsr #20 @ Undo decrement + subne r7, r7, r6, lsr #20 @ Undo increment + addeq r7, r7, r6, lsr #20 @ Undo decrement str r7, [r2, r5, lsr #14] @ Put register 'Rn' b do_DataAbort