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>
This commit is contained in:
committed by
Wolfgang Denk
parent
7ce6370982
commit
43c509254f
@@ -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 */
|
||||
|
||||
@@ -68,5 +68,5 @@ disable_incaip_wdt:
|
||||
li t1, WD_WRITE_ENDINIT
|
||||
sw t1, WD_CON0(t0) /* end command */
|
||||
|
||||
j ra
|
||||
jr ra
|
||||
nop
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user