summaryrefslogtreecommitdiffstats
path: root/runtime/mirror/art_method.h
diff options
context:
space:
mode:
authorIan Rogers <irogers@google.com>2014-02-11 16:30:46 -0800
committerIan Rogers <irogers@google.com>2014-02-11 17:02:21 -0800
commit0177e53ea521ad58b70c305700dab32f1ac773b7 (patch)
treedb15627a19a04634cf84cecd15b813319d80d225 /runtime/mirror/art_method.h
parentabaf927f29f6feceb3df3e6ced7d01970ba0dbe9 (diff)
downloadart-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/mirror/art_method.h')
-rw-r--r--runtime/mirror/art_method.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/mirror/art_method.h b/runtime/mirror/art_method.h
index bfa7cbe..bf0d416 100644
--- a/runtime/mirror/art_method.h
+++ b/runtime/mirror/art_method.h
@@ -207,8 +207,8 @@ class MANAGED ArtMethod : public Object {
// Find the method that this method overrides
ArtMethod* FindOverriddenMethod() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
- void Invoke(Thread* self, uint32_t* args, uint32_t args_size, JValue* result, char result_type)
- SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
+ void Invoke(Thread* self, uint32_t* args, uint32_t args_size, JValue* result,
+ const char* shorty) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
EntryPointFromInterpreter* GetEntryPointFromInterpreter() {
return GetFieldPtr<EntryPointFromInterpreter*>(