summaryrefslogtreecommitdiffstats
path: root/runtime/jni_internal.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/jni_internal.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/jni_internal.h')
-rw-r--r--runtime/jni_internal.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/jni_internal.h b/runtime/jni_internal.h
index cd3c5cb..6eb1aad 100644
--- a/runtime/jni_internal.h
+++ b/runtime/jni_internal.h
@@ -57,7 +57,7 @@ void RegisterNativeMethods(JNIEnv* env, const char* jni_class_name, const JNINat
JValue InvokeWithJValues(const ScopedObjectAccess&, jobject obj, jmethodID mid, jvalue* args)
SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
void InvokeWithArgArray(const ScopedObjectAccess& soa, mirror::ArtMethod* method,
- ArgArray *arg_array, JValue* result, char result_type)
+ ArgArray *arg_array, JValue* result, const char* shorty)
SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
int ThrowNewException(JNIEnv* env, jclass exception_class, const char* msg, jobject cause);