diff options
| author | Andreas Gampe <agampe@google.com> | 2014-12-17 18:43:01 -0800 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2014-12-29 10:52:02 -0800 |
| commit | 1cc7dbabd03e0a6c09d68161417a21bd6f9df371 (patch) | |
| tree | 8557bdff971e366909351af95a7c8ead82792986 /runtime/interpreter | |
| parent | 5e0a9849d4e353c3726095b65ab07cefce40a636 (diff) | |
| download | art-1cc7dbabd03e0a6c09d68161417a21bd6f9df371.zip art-1cc7dbabd03e0a6c09d68161417a21bd6f9df371.tar.gz art-1cc7dbabd03e0a6c09d68161417a21bd6f9df371.tar.bz2 | |
ART: Reorder entrypoint argument order
Shuffle the ArtMethod* referrer backwards for easier removal.
Clean up ARM & MIPS assembly code.
Change some macros to make future changes easier.
Change-Id: Ie2862b68bd6e519438e83eecd9e1611df51d7945
Diffstat (limited to 'runtime/interpreter')
| -rw-r--r-- | runtime/interpreter/interpreter_goto_table_impl.cc | 2 | ||||
| -rw-r--r-- | runtime/interpreter/interpreter_switch_impl.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/runtime/interpreter/interpreter_goto_table_impl.cc b/runtime/interpreter/interpreter_goto_table_impl.cc index c610263..8fcbf90 100644 --- a/runtime/interpreter/interpreter_goto_table_impl.cc +++ b/runtime/interpreter/interpreter_goto_table_impl.cc @@ -543,7 +543,7 @@ JValue ExecuteGotoImpl(Thread* self, const DexFile::CodeItem* code_item, ShadowF HANDLE_INSTRUCTION_START(NEW_ARRAY) { int32_t length = shadow_frame.GetVReg(inst->VRegB_22c(inst_data)); Object* obj = AllocArrayFromCode<do_access_check, true>( - inst->VRegC_22c(), shadow_frame.GetMethod(), length, self, + inst->VRegC_22c(), length, shadow_frame.GetMethod(), self, Runtime::Current()->GetHeap()->GetCurrentAllocator()); if (UNLIKELY(obj == NULL)) { HANDLE_PENDING_EXCEPTION(); diff --git a/runtime/interpreter/interpreter_switch_impl.cc b/runtime/interpreter/interpreter_switch_impl.cc index 8bbc694..38665c7 100644 --- a/runtime/interpreter/interpreter_switch_impl.cc +++ b/runtime/interpreter/interpreter_switch_impl.cc @@ -455,7 +455,7 @@ JValue ExecuteSwitchImpl(Thread* self, const DexFile::CodeItem* code_item, PREAMBLE(); int32_t length = shadow_frame.GetVReg(inst->VRegB_22c(inst_data)); Object* obj = AllocArrayFromCode<do_access_check, true>( - inst->VRegC_22c(), shadow_frame.GetMethod(), length, self, + inst->VRegC_22c(), length, shadow_frame.GetMethod(), self, Runtime::Current()->GetHeap()->GetCurrentAllocator()); if (UNLIKELY(obj == NULL)) { HANDLE_PENDING_EXCEPTION(); |