From 5900bf731518799d5a9bfb598a44d7a21155fa54 Mon Sep 17 00:00:00 2001
From: Marcin Bukat <marcin.bukat@gmail.com>
Date: Mon, 3 Mar 2014 13:21:32 +0100
Subject: ingenic: Tweak a few details in crt0.S

1) Avoid load/store delay slot by reorganizing instructions
   in copy loops
2) Fix off-by-one error in cache initialization code.
   This was harmless as it simply set line0 twice, now it sets
   every cacheline only once.
3) Fix off-by-word error in .bss clearing loop.
   The addiu in branch delay slot even if calculated is not seen
   by the branch instruction itself, so the code did one word
   too much in clearing.
4) Fix off-by-word error in deadbeefing stack.
   See above.

Change-Id: Iabb09a55979de7aa2e2b9234273683fc7e9762c5
---
 firmware/target/mips/ingenic_jz47xx/crt0.S | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

(limited to 'firmware')

diff --git a/firmware/target/mips/ingenic_jz47xx/crt0.S b/firmware/target/mips/ingenic_jz47xx/crt0.S
index 7035c5ab0b..16751ba0f6 100644
--- a/firmware/target/mips/ingenic_jz47xx/crt0.S
+++ b/firmware/target/mips/ingenic_jz47xx/crt0.S
@@ -60,10 +60,10 @@
     la     t2, _bootend
 _relocate_loop:
     lw     t3, 0(t0)
-    sw     t3, 0(t1)
     addiu  t1, 4
-    bne    t1, t2, _relocate_loop
     addiu  t0, 4
+    bne    t1, t2, _relocate_loop
+    sw     t3, 0(t1)
 #endif
 
 _start:
@@ -104,8 +104,8 @@ _start:
 _cache_loop:
     cache   0x8, 0(t0)       # index store icache tag
     cache   0x9, 0(t0)       # index store dcache tag
-    bne     t0, t1, _cache_loop
     addiu   t0, t0, 0x20     # 32 bytes per cache line
+    bne     t0, t1, _cache_loop
     nop
 
     /*
@@ -131,11 +131,11 @@ _cache_loop:
     la     t2, _iramend
 _iram_loop:
     lw     t3, 0(t0)
-    sw     t3, 0(t1)
     addiu  t1, 4
-    bne    t1, t2, _iram_loop
     addiu  t0, 4
-    
+    bne    t1, t2, _iram_loop
+    sw     t3, 0(t1)
+   
     /*
       ----------------------------------------------------
        Clear BSS section
@@ -144,9 +144,9 @@ _iram_loop:
     la     t0, _edata
     la     t1, _end
 _bss_loop:
-    sw     zero, 0(t0)
+    addiu  t1, -4
     bne    t0, t1, _bss_loop
-    addiu  t0, 4
+    sw     zero, 0(t1)
 
     /*
       ----------------------------------------------------
@@ -155,12 +155,13 @@ _bss_loop:
     */
     la      sp, stackend
     la      t0, stackbegin
-    li      t1, 0xDEADBEEF
+    move    t1, sp
+    li      t2, 0xDEADBEEF
     
-_stack_loop:    
-    sw      t1, 0(t0)
-    bne     t0, sp, _stack_loop
-    addiu   t0, t0, 4
+_stack_loop:
+    addiu   t1, -4
+    bne     t0, t1, _stack_loop
+    sw      t2, 0(t1)
 
     /*
       ----------------------------------------------------
-- 
cgit v1.2.3