diff options
author | Vladimir Marko <vmarko@google.com> | 2015-05-27 14:07:08 +0100 |
---|---|---|
committer | Vladimir Marko <vmarko@google.com> | 2015-05-27 14:33:18 +0100 |
commit | e0cc299fd258b6ce6f19a201ca9fce09910f6e42 (patch) | |
tree | 7580dd20b540fbe60966ae47a0dc449dbc7ab280 /runtime/arch | |
parent | 2b3f42e084d1a6c991a19f3b591772ccbdcc05df (diff) | |
download | art-e0cc299fd258b6ce6f19a201ca9fce09910f6e42.tar.gz art-e0cc299fd258b6ce6f19a201ca9fce09910f6e42.tar.bz2 art-e0cc299fd258b6ce6f19a201ca9fce09910f6e42.zip |
ART: Use kBadFprBase on mips64 and arm64.
Fix incorrect usage of kBadGprBase to avoid misleading and
ambiguous data in crash investigations.
Bug: 21266656
(cherry picked from commit 5b09ea0af468d9232cf725ac7f7e73c145892c5c)
Change-Id: Ia4fc60a5d61471c7a6c8fd0545a897ace43d90be
Diffstat (limited to 'runtime/arch')
-rw-r--r-- | runtime/arch/arm64/context_arm64.cc | 2 | ||||
-rw-r--r-- | runtime/arch/mips/context_mips.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/runtime/arch/arm64/context_arm64.cc b/runtime/arch/arm64/context_arm64.cc index 9c7bb555a4..cb5b9e1fa9 100644 --- a/runtime/arch/arm64/context_arm64.cc +++ b/runtime/arch/arm64/context_arm64.cc @@ -133,7 +133,7 @@ void Arm64Context::DoLongJump() { gprs[i] = gprs_[i] != nullptr ? *gprs_[i] : Arm64Context::kBadGprBase + i; } for (size_t i = 0; i < kNumberOfDRegisters; ++i) { - fprs[i] = fprs_[i] != nullptr ? *fprs_[i] : Arm64Context::kBadGprBase + i; + fprs[i] = fprs_[i] != nullptr ? *fprs_[i] : Arm64Context::kBadFprBase + i; } DCHECK_EQ(reinterpret_cast<uintptr_t>(Thread::Current()), gprs[TR]); art_quick_do_long_jump(gprs, fprs); diff --git a/runtime/arch/mips/context_mips.cc b/runtime/arch/mips/context_mips.cc index f0c893a285..24892e95bb 100644 --- a/runtime/arch/mips/context_mips.cc +++ b/runtime/arch/mips/context_mips.cc @@ -87,7 +87,7 @@ void MipsContext::DoLongJump() { gprs[i] = gprs_[i] != nullptr ? *gprs_[i] : MipsContext::kBadGprBase + i; } for (size_t i = 0; i < kNumberOfFRegisters; ++i) { - fprs[i] = fprs_[i] != nullptr ? *fprs_[i] : MipsContext::kBadGprBase + i; + fprs[i] = fprs_[i] != nullptr ? *fprs_[i] : MipsContext::kBadFprBase + i; } art_quick_do_long_jump(gprs, fprs); } |