diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2015-06-13 00:18:37 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-13 00:18:37 +0000 |
| commit | 61e4ec36e8f3435a63c45ad91858ecb5ce50ad72 (patch) | |
| tree | 651198c34778a644e3237ca283fd7723a5177ccb /runtime | |
| parent | 4998374789fc62c147027eef022c74a97949ac6e (diff) | |
| parent | 9ad40fda952e854c4b571df36e46c834e209cd4c (diff) | |
| download | art-61e4ec36e8f3435a63c45ad91858ecb5ce50ad72.zip art-61e4ec36e8f3435a63c45ad91858ecb5ce50ad72.tar.gz art-61e4ec36e8f3435a63c45ad91858ecb5ce50ad72.tar.bz2 | |
Merge "Change mips64 lwu to ld for loading caller ArtMethod*" into mnc-dev
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/arch/mips64/quick_entrypoints_mips64.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/arch/mips64/quick_entrypoints_mips64.S b/runtime/arch/mips64/quick_entrypoints_mips64.S index bdd8a30..7f68c6f 100644 --- a/runtime/arch/mips64/quick_entrypoints_mips64.S +++ b/runtime/arch/mips64/quick_entrypoints_mips64.S @@ -529,7 +529,7 @@ END art_quick_throw_no_such_method .extern \cxx_name ENTRY \c_name SETUP_REFS_AND_ARGS_CALLEE_SAVE_FRAME # save callee saves in case allocation triggers GC - lwu $a2, FRAME_SIZE_REFS_AND_ARGS_CALLEE_SAVE($sp) # pass caller Method* + ld $a2, FRAME_SIZE_REFS_AND_ARGS_CALLEE_SAVE($sp) # pass caller Method* move $a3, rSELF # pass Thread::Current jal \cxx_name # (method_idx, this, caller, Thread*, $sp) move $a4, $sp # pass $sp |