diff options
| author | Ian Rogers <irogers@google.com> | 2014-02-11 16:30:46 -0800 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-02-11 17:02:21 -0800 |
| commit | 0177e53ea521ad58b70c305700dab32f1ac773b7 (patch) | |
| tree | db15627a19a04634cf84cecd15b813319d80d225 /runtime/entrypoints/interpreter | |
| parent | abaf927f29f6feceb3df3e6ced7d01970ba0dbe9 (diff) | |
| download | art-0177e53ea521ad58b70c305700dab32f1ac773b7.zip art-0177e53ea521ad58b70c305700dab32f1ac773b7.tar.gz art-0177e53ea521ad58b70c305700dab32f1ac773b7.tar.bz2 | |
Work in the direction of hard float quick ABIs.
Pass a shorty to ArtMethod::Invoke so that register setup can use it.
Document x86-64 ABI.
Add extra debug output for one JNI native method registration fails, namely a
dump of the Class and its dex file's location.
Add hack to get testing of OatMethod's without GC maps working in 64bit.
Change-Id: Ic06b68e18eac33637df2caf5e7e775ff95ae70f3
Diffstat (limited to 'runtime/entrypoints/interpreter')
| -rw-r--r-- | runtime/entrypoints/interpreter/interpreter_entrypoints.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/entrypoints/interpreter/interpreter_entrypoints.cc b/runtime/entrypoints/interpreter/interpreter_entrypoints.cc index 8a2ce51..2067a45 100644 --- a/runtime/entrypoints/interpreter/interpreter_entrypoints.cc +++ b/runtime/entrypoints/interpreter/interpreter_entrypoints.cc @@ -48,11 +48,11 @@ extern "C" void artInterpreterToCompiledCodeBridge(Thread* self, MethodHelper& m if (kUsePortableCompiler) { ArgArray arg_array(mh.GetShorty(), mh.GetShortyLength()); arg_array.BuildArgArrayFromFrame(shadow_frame, arg_offset); - method->Invoke(self, arg_array.GetArray(), arg_array.GetNumBytes(), result, mh.GetShorty()[0]); + method->Invoke(self, arg_array.GetArray(), arg_array.GetNumBytes(), result, mh.GetShorty()); } else { method->Invoke(self, shadow_frame->GetVRegArgs(arg_offset), (shadow_frame->NumberOfVRegs() - arg_offset) * sizeof(uint32_t), - result, mh.GetShorty()[0]); + result, mh.GetShorty()); } } |