diff options
| author | 2016-07-29 22:04:46 -0700 | |
|---|---|---|
| committer | 2016-08-30 16:50:28 -0700 | |
| commit | 57eb0f58419e0e6773f69cf6e0c78e5fed0464cd (patch) | |
| tree | 5104bb1c1ad04f9f6a04fcac5d497d54ed0c97ab /compiler/optimizing/intrinsics_mips.cc | |
| parent | d7eabc2cc1a88c1f7f927da61246ae65aab0626c (diff) | |
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
Diffstat (limited to 'compiler/optimizing/intrinsics_mips.cc')
| -rw-r--r-- | compiler/optimizing/intrinsics_mips.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/compiler/optimizing/intrinsics_mips.cc b/compiler/optimizing/intrinsics_mips.cc index 6e5eb6622b..862a93f9d6 100644 --- a/compiler/optimizing/intrinsics_mips.cc +++ b/compiler/optimizing/intrinsics_mips.cc @@ -1901,7 +1901,7 @@ void IntrinsicCodeGeneratorMIPS::VisitStringCompareTo(HInvoke* invoke) { TR, QUICK_ENTRYPOINT_OFFSET(kMipsPointerSize, pStringCompareTo).Int32Value()); __ Jalr(T9); - __ Nop(); + __ NopIfNoReordering(); __ Bind(slow_path->GetExitLabel()); } @@ -2060,7 +2060,7 @@ static void GenerateStringIndexOf(HInvoke* invoke, TR, QUICK_ENTRYPOINT_OFFSET(kMipsPointerSize, pIndexOf).Int32Value()); __ Jalr(T9); - __ Nop(); + __ NopIfNoReordering(); if (slow_path != nullptr) { __ Bind(slow_path->GetExitLabel()); @@ -2146,7 +2146,7 @@ void IntrinsicCodeGeneratorMIPS::VisitStringNewStringFromBytes(HInvoke* invoke) TR, QUICK_ENTRYPOINT_OFFSET(kMipsPointerSize, pAllocStringFromBytes).Int32Value()); __ Jalr(T9); - __ Nop(); + __ NopIfNoReordering(); codegen_->RecordPcInfo(invoke, invoke->GetDexPc()); __ Bind(slow_path->GetExitLabel()); } @@ -2179,7 +2179,7 @@ void IntrinsicCodeGeneratorMIPS::VisitStringNewStringFromChars(HInvoke* invoke) TR, QUICK_ENTRYPOINT_OFFSET(kMipsPointerSize, pAllocStringFromChars).Int32Value()); __ Jalr(T9); - __ Nop(); + __ NopIfNoReordering(); codegen_->RecordPcInfo(invoke, invoke->GetDexPc()); } @@ -2208,7 +2208,7 @@ void IntrinsicCodeGeneratorMIPS::VisitStringNewStringFromString(HInvoke* invoke) TR, QUICK_ENTRYPOINT_OFFSET(kMipsPointerSize, pAllocStringFromString).Int32Value()); __ Jalr(T9); - __ Nop(); + __ NopIfNoReordering(); codegen_->RecordPcInfo(invoke, invoke->GetDexPc()); __ Bind(slow_path->GetExitLabel()); } |