Skip to contentSkip to conversation

ARM: use the same branch insn on all architectures

PATCH New Wolfgang Denk 2 participants 3 messages Oct 23, 2010 – Oct 26, 2010 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: use the same branch insn on all architectures

For the "fixloop" implementation in start.S a number of different instructions was used. Unify code so all architectures use "blo" here because it is more robust in case of incorrect alignments.

Cc Albert ARIBAUD <[email protected]>
Cc Minkyu Kang <[email protected]>
Cc Sandeep Paulraj <[email protected]>
Cc Prafulla Wadaskar <[email protected]>
Cc Stefano Babic <[email protected]>
Cc Marek Vasut <[email protected]>
---
 arch/arm/cpu/arm1136/start.S   |    2 +-
 arch/arm/cpu/arm1176/start.S   |    2 +-
 arch/arm/cpu/arm720t/start.S   |    2 +-
 arch/arm/cpu/arm920t/start.S   |    2 +-
 arch/arm/cpu/arm925t/start.S   |    2 +-
 arch/arm/cpu/arm946es/start.S  |    2 +-
 arch/arm/cpu/arm_intcm/start.S |    2 +-
 arch/arm/cpu/ixp/start.S       |    2 +-
 arch/arm/cpu/lh7a40x/start.S   |    2 +-
 arch/arm/cpu/s3c44b0/start.S   |    2 +-
 arch/arm/cpu/sa1100/start.S    |    2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)
arch/arm/cpu/arm1136/start.S +1 -1
index 29ed065..e30e398 100644
@@ -262,7 +262,7 @@ fixnext:
 	str	r1, [r0]
 	add	r2, r2, #8	/* each rel.dyn entry is 8 bytes */
 	cmp	r2, r3
-	ble	fixloop
+	blo	fixloop
 #endif
 #endif	/* #ifndef CONFIG_SKIP_RELOCATE_UBOOT */
 
arch/arm/cpu/arm1176/start.S +1 -1
index 24e5bf4..8b2117b 100644
@@ -305,7 +305,7 @@ fixloop:
 	str	r4, [r2]
 	add	r2, r2, #4
 	cmp	r2, r3
-	bne	fixloop
+	blo	fixloop
 #endif
 #endif	/* #ifndef CONFIG_SKIP_RELOCATE_UBOOT */
 
arch/arm/cpu/arm720t/start.S +1 -1
index d93911f..1f52d58 100644
@@ -222,7 +222,7 @@ fixloop:
 	str	r4, [r2]
 	add	r2, r2, #4
 	cmp	r2, r3
-	bne	fixloop
+	blo	fixloop
 #endif
 #endif	/* #ifndef CONFIG_SKIP_RELOCATE_UBOOT */
 
arch/arm/cpu/arm920t/start.S +1 -1
index 343a760..af7cc59 100644
@@ -267,7 +267,7 @@ fixloop:
 	str	r4, [r2]
 	add	r2, r2, #4
 	cmp	r2, r3
-	bne	fixloop
+	blo	fixloop
 #endif
 #endif	/* #ifndef CONFIG_SKIP_RELOCATE_UBOOT */
 
arch/arm/cpu/arm925t/start.S +1 -1
index cf18a01..ef876e0 100644
@@ -259,7 +259,7 @@ fixloop:
 	str	r4, [r2]
 	add	r2, r2, #4
 	cmp	r2, r3
-	bne	fixloop
+	blo	fixloop
 #endif
 #endif	/* #ifndef CONFIG_SKIP_RELOCATE_UBOOT */
 
arch/arm/cpu/arm946es/start.S +1 -1
index 077886f..1bc5306 100644
@@ -228,7 +228,7 @@ fixloop:
 	str	r4, [r2]
 	add	r2, r2, #4
 	cmp	r2, r3
-	bne	fixloop
+	blo	fixloop
 #endif
 #endif	/* #ifndef CONFIG_SKIP_RELOCATE_UBOOT */
 
arch/arm/cpu/arm_intcm/start.S +1 -1
index 07356cb..5fc4a69 100644
@@ -226,7 +226,7 @@ fixloop:
 	str	r4, [r2]
 	add	r2, r2, #4
 	cmp	r2, r3
-	bne	fixloop
+	blo	fixloop
 #endif
 #endif	/* #ifndef CONFIG_SKIP_RELOCATE_UBOOT */
 
arch/arm/cpu/ixp/start.S +1 -1
index 836c33b..4e169e2 100644
@@ -351,7 +351,7 @@ fixloop:
 	str	r4, [r2]
 	add	r2, r2, #4
 	cmp	r2, r3
-	bne	fixloop
+	blo	fixloop
 #endif
 #endif	/* #ifndef CONFIG_SKIP_RELOCATE_UBOOT */
 
arch/arm/cpu/lh7a40x/start.S +1 -1
index d944860..77c96bd 100644
@@ -240,7 +240,7 @@ fixloop:
 	str	r4, [r2]
 	add	r2, r2, #4
 	cmp	r2, r3
-	bne	fixloop
+	blo	fixloop
 #endif
 #endif	/* #ifndef CONFIG_SKIP_RELOCATE_UBOOT */
 
arch/arm/cpu/s3c44b0/start.S +1 -1
index 20091b2..21550fc 100644
@@ -212,7 +212,7 @@ fixloop:
 	str	r4, [r2]
 	add	r2, r2, #4
 	cmp	r2, r3
-	bne	fixloop
+	blo	fixloop
 #endif
 /*
 	now copy to sram the interrupt vector
arch/arm/cpu/sa1100/start.S +1 -1
index 8eabb66..6bb84c8 100644
@@ -216,7 +216,7 @@ fixloop:
 	str	r4, [r2]
 	add	r2, r2, #4
 	cmp	r2, r3
-	bne	fixloop
+	blo	fixloop
 #endif
 #endif	/* #ifndef CONFIG_SKIP_RELOCATE_UBOOT */
 
Signature · 1 line
1.7.2.3
#1 lore raw

PATCH 1/1 ARM: use the same branch insn on all architectures

Hello Wolfgang,

Quoted 11 lines · Wolfgang Denk

For the "fixloop" implementation in start.S a number of different instructions was used. Unify code so all architectures use "blo" here because it is more robust in case of incorrect alignments.

Cc Albert ARIBAUD <[email protected]>
Cc Minkyu Kang <[email protected]>
Cc Sandeep Paulraj <[email protected]>
Cc Prafulla Wadaskar <[email protected]>
Cc Stefano Babic <[email protected]>
Cc Marek Vasut <[email protected]>
Quoted 13 lines
---
 arch/arm/cpu/arm1136/start.S   |    2 +-
 arch/arm/cpu/arm1176/start.S   |    2 +-
 arch/arm/cpu/arm720t/start.S   |    2 +-
 arch/arm/cpu/arm920t/start.S   |    2 +-
 arch/arm/cpu/arm925t/start.S   |    2 +-
 arch/arm/cpu/arm946es/start.S  |    2 +-
 arch/arm/cpu/arm_intcm/start.S |    2 +-
 arch/arm/cpu/ixp/start.S       |    2 +-
 arch/arm/cpu/lh7a40x/start.S   |    2 +-
 arch/arm/cpu/s3c44b0/start.S   |    2 +-
 arch/arm/cpu/sa1100/start.S    |    2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

bye,
Heiko

Signature · 2 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
author Applied
#2 lore raw

PATCH 1/1 ARM: use the same branch insn on all architectures

In reply to Wolfgang Denk
Quoted 11 lines · In message <[email protected]> you wrote:

For the "fixloop" implementation in start.S a number of different instructions was used. Unify code so all architectures use "blo" here because it is more robust in case of incorrect alignments.

Cc Albert ARIBAUD <[email protected]>
Cc Minkyu Kang <[email protected]>
Cc Sandeep Paulraj <[email protected]>
Cc Prafulla Wadaskar <[email protected]>
Cc Stefano Babic <[email protected]>
Cc Marek Vasut <[email protected]>
Quoted 13 lines
---
 arch/arm/cpu/arm1136/start.S   |    2 +-
 arch/arm/cpu/arm1176/start.S   |    2 +-
 arch/arm/cpu/arm720t/start.S   |    2 +-
 arch/arm/cpu/arm920t/start.S   |    2 +-
 arch/arm/cpu/arm925t/start.S   |    2 +-
 arch/arm/cpu/arm946es/start.S  |    2 +-
 arch/arm/cpu/arm_intcm/start.S |    2 +-
 arch/arm/cpu/ixp/start.S       |    2 +-
 arch/arm/cpu/lh7a40x/start.S   |    2 +-
 arch/arm/cpu/s3c44b0/start.S   |    2 +-
 arch/arm/cpu/sa1100/start.S    |    2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

Applied.

Best regards,

Wolfgang Denk

Signature · 7 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
The Buddha, the Godhead, resides quite as comfortably in the circuits
of a digital computer or the gears of a cycle transmission as he does
at the top of a mountain or in the petals of a flower.
            - R.  Pirsig, "Zen and the Art of Motorcycle Maintenance"