summaryrefslogtreecommitdiffstats
path: root/runtime/arch/arm/quick_entrypoints_arm.S
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2014-02-27 12:26:20 -0800
committerAndreas Gampe <agampe@google.com>2014-03-03 23:27:12 +0000
commit2da882315a61072664f7ce3c212307342e907207 (patch)
tree67d777be044f5b60e2f13ab7968b63c581904ea9 /runtime/arch/arm/quick_entrypoints_arm.S
parent762d4e5b9e777ae64c4ba581af9c84b78a5e96a6 (diff)
downloadandroid_art-2da882315a61072664f7ce3c212307342e907207.tar.gz
android_art-2da882315a61072664f7ce3c212307342e907207.tar.bz2
android_art-2da882315a61072664f7ce3c212307342e907207.zip
Initial changes towards Generic JNI option
Some initial changes that lead to an UNIMPLEMENTED. Works by not compiling for JNI right now and tracking native methods which have neither quick nor portable code. Uses new trampoline. Change-Id: I5448654044eb2717752fd7359f4ef8bd5c17be6e
Diffstat (limited to 'runtime/arch/arm/quick_entrypoints_arm.S')
-rw-r--r--runtime/arch/arm/quick_entrypoints_arm.S2
1 files changed, 2 insertions, 0 deletions
diff --git a/runtime/arch/arm/quick_entrypoints_arm.S b/runtime/arch/arm/quick_entrypoints_arm.S
index ed8bc13fc5..71dcd7f7a6 100644
--- a/runtime/arch/arm/quick_entrypoints_arm.S
+++ b/runtime/arch/arm/quick_entrypoints_arm.S
@@ -939,6 +939,8 @@ ENTRY art_quick_resolution_trampoline
DELIVER_PENDING_EXCEPTION
END art_quick_resolution_trampoline
+UNIMPLEMENTED art_quick_generic_jni_trampoline
+
.extern artQuickToInterpreterBridge
ENTRY art_quick_to_interpreter_bridge
SETUP_REF_AND_ARGS_CALLEE_SAVE_FRAME