summaryrefslogtreecommitdiffstats
path: root/vm/compiler/codegen/arm/CalloutHelper.h
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2011-02-16 14:30:45 -0800
committerElliott Hughes <enh@google.com>2011-02-16 14:35:49 -0800
commit69ee8f605ad4139c8b9a39821fd7a4cadb9d9337 (patch)
treeb18fac11b7271edf686ce6503758716131848e42 /vm/compiler/codegen/arm/CalloutHelper.h
parent856993fd8ceeb64e2f36f2e18b8a97109cff8420 (diff)
downloadandroid_dalvik-69ee8f605ad4139c8b9a39821fd7a4cadb9d9337.tar.gz
android_dalvik-69ee8f605ad4139c8b9a39821fd7a4cadb9d9337.tar.bz2
android_dalvik-69ee8f605ad4139c8b9a39821fd7a4cadb9d9337.zip
Ensure we always call inline natives.
Even though execute-inline is now a mandatory optimization, you can't be sure the inline natives will be invoked that way. There's reflection and JNI, for example, and there's the special case of String.equals that might be invoked as Object.equals. This patch adds a regular native method corresponding to each inline native, so that a corresponding libcore patch can drop its implementations. (For example, despite the fact that we all believed last week that the Java implementation of String.equals is never used, that turned out not to be true: every HashMap lookup will have used it. This pair of patches brings reality in line with our existing belief.) Change-Id: I19e64c23bea83e91696206ca40ce4e3faf853040
Diffstat (limited to 'vm/compiler/codegen/arm/CalloutHelper.h')
-rw-r--r--vm/compiler/codegen/arm/CalloutHelper.h17
1 files changed, 0 insertions, 17 deletions
diff --git a/vm/compiler/codegen/arm/CalloutHelper.h b/vm/compiler/codegen/arm/CalloutHelper.h
index c432f820f..414f8c5c3 100644
--- a/vm/compiler/codegen/arm/CalloutHelper.h
+++ b/vm/compiler/codegen/arm/CalloutHelper.h
@@ -109,23 +109,6 @@ Object* dvmAllocObject(ClassObject* clazz, int flags); // OP_NEW_INSTANCE
/*
* Functions declared in gDvmInlineOpsTable[] are used for
* OP_EXECUTE_INLINE & OP_EXECUTE_INLINE_RANGE.
- *
- * org_apache_harmony_dalvik_NativeTestTarget_emptyInlineMethod
- * javaLangString_charAt
- * javaLangString_compareTo
- * javaLangString_equals
- * javaLangString_indexOf_I
- * javaLangString_indexOf_II
- * javaLangString_length
- * javaLangMath_abs_int
- * javaLangMath_abs_long
- * javaLangMath_abs_float
- * javaLangMath_abs_double
- * javaLangMath_min_int
- * javaLangMath_max_int
- * javaLangMath_sqrt
- * javaLangMath_cos
- * javaLangMath_sin
*/
double sqrt(double x); // INLINE_MATH_SQRT