diff options
| author | Douglas Leung <douglas.leung@imgtec.com> | 2014-12-10 16:15:17 -0800 |
|---|---|---|
| committer | Douglas Leung <douglas.leung@imgtec.com> | 2015-01-12 16:32:25 -0800 |
| commit | c6d86725521841637bdd9564e71be3d9691db20f (patch) | |
| tree | 052359801333c2973fac4b2f63eccb3977110bd4 /runtime/entrypoints | |
| parent | 8fccea249b1a6f1469eeea42c2b2cca06ce1c70d (diff) | |
| download | art-c6d86725521841637bdd9564e71be3d9691db20f.zip art-c6d86725521841637bdd9564e71be3d9691db20f.tar.gz art-c6d86725521841637bdd9564e71be3d9691db20f.tar.bz2 | |
Fix refs_and_args callee save order for Mips32.
This patch fixes an ART crash while using the soft keyboard.
Change-Id: Ib2d651c460ce2707356986cd733bed23b0cabb21
Diffstat (limited to 'runtime/entrypoints')
| -rw-r--r-- | runtime/entrypoints/quick/quick_trampoline_entrypoints.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc b/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc index 4bec70a..90d4a37 100644 --- a/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc +++ b/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc @@ -126,7 +126,7 @@ class QuickArgumentVisitor { static constexpr size_t kNumQuickGprArgs = 3; // 3 arguments passed in GPRs. static constexpr size_t kNumQuickFprArgs = 0; // 0 arguments passed in FPRs. static constexpr size_t kQuickCalleeSaveFrame_RefAndArgs_Fpr1Offset = 0; // Offset of first FPR arg. - static constexpr size_t kQuickCalleeSaveFrame_RefAndArgs_Gpr1Offset = 4; // Offset of first GPR arg. + static constexpr size_t kQuickCalleeSaveFrame_RefAndArgs_Gpr1Offset = 16; // Offset of first GPR arg. static constexpr size_t kQuickCalleeSaveFrame_RefAndArgs_LrOffset = 60; // Offset of return address. static size_t GprIndexToGprOffset(uint32_t gpr_index) { return gpr_index * GetBytesPerGprSpillLocation(kRuntimeISA); |