| commit | 57eb0f58419e0e6773f69cf6e0c78e5fed0464cd | [log] [tgz] |
|---|---|---|
| author | Alexey Frunze <Alexey.Frunze@imgtec.com> | Fri Jul 29 22:04:46 2016 -0700 |
| committer | Alexey Frunze <Alexey.Frunze@imgtec.com> | Tue Aug 30 16:50:28 2016 -0700 |
| tree | 5104bb1c1ad04f9f6a04fcac5d497d54ed0c97ab | |
| parent | d7eabc2cc1a88c1f7f927da61246ae65aab0626c [diff] [blame] |
MIPS32: Fill branch delay slots Test: booted MIPS32 in QEMU Test: test-art-host-gtest Test: test-art-target-gtest Test: test-art-target-run-test-optimizing on CI20 Change-Id: I727e80753395ab99fff004cb5d2e0a06409150d7
diff --git a/compiler/trampolines/trampoline_compiler.cc b/compiler/trampolines/trampoline_compiler.cc index 55835e7..70f290d 100644 --- a/compiler/trampolines/trampoline_compiler.cc +++ b/compiler/trampolines/trampoline_compiler.cc
@@ -152,7 +152,7 @@ __ LoadFromOffset(kLoadWord, T9, S1, offset.Int32Value()); } __ Jr(T9); - __ Nop(); + __ NopIfNoReordering(); __ Break(); __ FinalizeCode();