]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
mips/cache: Add missing nop's in delay slots
authorDaniel Kiper <daniel.kiper@oracle.com>
Fri, 15 May 2020 12:30:07 +0000 (14:30 +0200)
committerDaniel Kiper <daniel.kiper@oracle.com>
Fri, 15 May 2020 12:30:07 +0000 (14:30 +0200)
Lack of them causes random instructions to be executed before the
jump really happens.

Signed-off-by: Vladimir Serbinenko <phcoder@google.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
grub-core/kern/mips/cache.S

index fa6897e1434f565ddd177b3a4eb2df5cf44fb173..fa331eca1bede6828e1929252a662275f7fa6ef4 100644 (file)
@@ -7,6 +7,7 @@
 FUNCTION (grub_arch_sync_caches)
 #include "cache_flush.S"
        j $ra
+        nop
 
 FUNCTION (grub_arch_sync_dma_caches)
        move $t2, $a0
@@ -66,3 +67,4 @@ FUNCTION (grub_arch_sync_dma_caches)
        sync_op
 
        jr $ra
+        nop