summaryrefslogtreecommitdiff
path: root/arch/mips/cpu/mips64
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2013-01-16 03:05:01 (GMT)
committerDaniel Schwierzeck <daniel.schwierzeck@gmail.com>2013-01-22 20:09:34 (GMT)
commit14fdd1a8bfd97de46042cda6086347b0d66461d4 (patch)
tree6fac1fbe6edbeef3aeda7e874b28ca30829118d6 /arch/mips/cpu/mips64
parent0ef48d4c89788056982772d32d6e97d2b6457abc (diff)
downloadu-boot-fsl-qoriq-14fdd1a8bfd97de46042cda6086347b0d66461d4.tar.xz
MIPS: start{, 64}.S: fill branch delay slots with NOP instructions
The romReserved and romExcHandle handlers are accessed by a branch instruction however the delay slots of those instructions are not filled. Because the start.S uses the 'noreorder' directive, the assembler will not fill the delay slots either, and leads to the following assembly code: 0000056c <romReserved>: 56c: 1000ffff b 56c <romReserved> 00000570 <romExcHandle>: 570: 1000ffff b 570 <romExcHandle> In the resulting code, the second branch instruction is placed into the delay slot of the first branch instruction, which is not allowed on the MIPS architecture. Signed-off-by: Gabor Juhos <juhosg@openwrt.org> Cc: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>
Diffstat (limited to 'arch/mips/cpu/mips64')
-rw-r--r--arch/mips/cpu/mips64/start.S1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/cpu/mips64/start.S b/arch/mips/cpu/mips64/start.S
index 2b8d531..bc7e41e 100644
--- a/arch/mips/cpu/mips64/start.S
+++ b/arch/mips/cpu/mips64/start.S
@@ -259,3 +259,4 @@ in_ram:
/* Exception handlers */
romReserved:
b romReserved
+ nop