Use jr as register jump instruction

Current assembler codes are inconsistent in the way of register jump
instruction usage; some use jr, some use j. Of course GNU as allows both
usages, but as can be expected from `Jump Register' the mnemonic `jr' is
more intuitive than `j'. For example, Linux doesn't have `j <reg>' usage
at all.

Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>

diff --git a/board/dbau1x00/lowlevel_init.S b/board/dbau1x00/lowlevel_init.S
index 14a78465f3659a0420bc18e42c3a5b85e2243315..27b51f73f045d81090a65f9792bb0c4eda43df86 100644 (file)
--- a/board/dbau1x00/lowlevel_init.S
+++ b/board/dbau1x00/lowlevel_init.S
@@ -586,5 +586,5 @@ noCacheJump:
        sw      t1, 0(t0)
        sync
 
-       j       ra
+       jr      ra
        nop

diff --git a/board/gth2/lowlevel_init.S b/board/gth2/lowlevel_init.S
index eea378a3b653e344b4b0398e8777ac3c222c9050..bf615c1bb12fffbbb79b75c0629aaab81dada1a9 100644 (file)
--- a/board/gth2/lowlevel_init.S
+++ b/board/gth2/lowlevel_init.S
@@ -450,7 +450,7 @@ mtc:        sw      zero, 0(t0)
        nop
        nop
 memtestend:
-       j       ra
+       jr      ra
        nop
 
 memhang:

diff --git a/board/incaip/lowlevel_init.S b/board/incaip/lowlevel_init.S
index b39f93d43f2593cf8fef56bdec221fb4e5721f22..08f7f211f71cda4d783eb29dec4cff6b3fa1988c 100644 (file)
--- a/board/incaip/lowlevel_init.S
+++ b/board/incaip/lowlevel_init.S
@@ -105,7 +105,7 @@ __ebu_init:
        li      t2, 0x684143FD
        sw      t2, EBU_BUSCON1(t1)
 3:
-       j       ra
+       jr      ra
        nop
 
        .end    ebu_init
@@ -170,7 +170,7 @@ __cgu_init:
        li      t2, 0x80000001
        sw      t2, CGU_MUXCR(t1)
 5:
-       j       ra
+       jr      ra
        nop
 
        .end    cgu_init
@@ -266,7 +266,7 @@ __sdram_init:
        li      t2, 0x00000001
        sw      t2, MC_CTRLENA(t1)
 
-       j       ra
+       jr      ra
        nop
 
        .end    sdram_init
@@ -298,7 +298,7 @@ lowlevel_init:
        nop
        move    ra, t0
 
-       j       ra
+       jr      ra
        nop
 
        .end    lowlevel_init

diff --git a/board/pb1x00/lowlevel_init.S b/board/pb1x00/lowlevel_init.S
index e851e2fed09c1e6a6a38cd91061daa6edc58d7f1..98bb394acbb1d336851b6c5a9324cf0604a3d017 100644 (file)
--- a/board/pb1x00/lowlevel_init.S
+++ b/board/pb1x00/lowlevel_init.S
@@ -388,5 +388,5 @@ skip_memsetup:
        */
        sync
 
-       j       ra
+       jr      ra
        nop

diff --git a/board/purple/lowlevel_init.S b/board/purple/lowlevel_init.S
index 668124a784d1ecd0fff12b50df518f96112c9798..b9d03fc15e4eb194f9bc7b677321f4a760af0045 100644 (file)
--- a/board/purple/lowlevel_init.S
+++ b/board/purple/lowlevel_init.S
@@ -33,5 +33,5 @@ lowlevel_init:
        li      t0, MC_IOGP
        li      t1, 0xf24
        sw      t1, 0(t0)
-       j       ra
+       jr      ra
        nop

diff --git a/board/qemu-mips/lowlevel_init.S b/board/qemu-mips/lowlevel_init.S
index 28166bcebaa5af4d4f0734e983e59352a90275a5..836e0271a1ce62eda3bdebffbb17156a06a3be1f 100644 (file)
--- a/board/qemu-mips/lowlevel_init.S
+++ b/board/qemu-mips/lowlevel_init.S
@@ -37,5 +37,5 @@ lowlevel_init:
        mtc0    zero, CP0_WIRED
        nop
 
-       j       ra
+       jr      ra
        nop

diff --git a/cpu/mips/cache.S b/cpu/mips/cache.S
index 89ada716c3adbe60b3ed912531fb9d23edfc4abc..f5939683208f03ccf985b0f0025a4cd70efd02c1 100644 (file)
--- a/cpu/mips/cache.S
+++ b/cpu/mips/cache.S
@@ -282,7 +282,7 @@ LEAF(dcache_disable)
        and     t0, t0, t1
        ori     t0, t0, CONF_CM_UNCACHED
        mtc0    t0, CP0_CONFIG
-       j       ra
+       jr      ra
        END(dcache_disable)
 
 #ifdef CFG_INIT_RAM_LOCK_MIPS
@@ -308,7 +308,7 @@ mips_cache_lock:
        move    a1, a2
        icacheop(a0,a1,a2,a3,0x1d)
 
-       j       ra
+       jr      ra
 
        .end    mips_cache_lock
 #endif /* CFG_INIT_RAM_LOCK_MIPS */

diff --git a/cpu/mips/incaip_wdt.S b/cpu/mips/incaip_wdt.S
index 71adaa19dead2da699688885034291cd894ae780..2ebcc911398fcb8e8bd4b5060cb4bd031b8044a4 100644 (file)
--- a/cpu/mips/incaip_wdt.S
+++ b/cpu/mips/incaip_wdt.S
@@ -68,5 +68,5 @@ disable_incaip_wdt:
        li      t1, WD_WRITE_ENDINIT
        sw      t1, WD_CON0(t0)         /* end command */
 
-       j       ra
+       jr      ra
        nop

diff --git a/cpu/mips/start.S b/cpu/mips/start.S
index baac2ceaf0fd70cc1803ea140bcd394b2328351e..6e1a78ceac44175b1401a136ad0005e4494115b2 100644 (file)
--- a/cpu/mips/start.S
+++ b/cpu/mips/start.S
@@ -286,7 +286,7 @@ reset:
        la      sp, 0(t0)
 
        la      t9, board_init_f
-       j       t9
+       jr      t9
        nop
 
 /*
@@ -342,7 +342,7 @@ relocate_code:
        /* Jump to where we've relocated ourselves.
         */
        addi    t0, a2, in_ram - _start
-       j       t0
+       jr      t0
        nop
 
        .gpword _GLOBAL_OFFSET_TABLE_   /* _GLOBAL_OFFSET_TABLE_ - _gp  */
@@ -387,7 +387,7 @@ in_ram:
 
        move    a0, a1
        la      t9, board_init_r
-       j       t9
+       jr      t9
        move    a1, a2          /* delay slot                   */
 
        .end    relocate_code