Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "It's 2012. We're always WITH_JIT."

Browse Source
This commit is contained in:
Elliott Hughes
2012-11-07 09:57:15 -08:00
committed by Gerrit Code Review
parent 9d547d6934 be8b47f6ce
commit fec5f611fe
2 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/jni/Android.mk
View File

@@ -11,10 +11,6 @@ else
LOCAL_CFLAGS += -DPACKED="" LOCAL_CFLAGS += -DPACKED=""
endif endif
ifeq ($(WITH_JIT),true)
LOCAL_CFLAGS += -DWITH_JIT
endif
ifneq ($(USE_CUSTOM_RUNTIME_HEAP_MAX),) ifneq ($(USE_CUSTOM_RUNTIME_HEAP_MAX),)
LOCAL_CFLAGS += -DCUSTOM_RUNTIME_HEAP_MAX=$(USE_CUSTOM_RUNTIME_HEAP_MAX) LOCAL_CFLAGS += -DCUSTOM_RUNTIME_HEAP_MAX=$(USE_CUSTOM_RUNTIME_HEAP_MAX)
endif endif

8
core/jni/AndroidRuntime.cpp
View File

@@ -466,9 +466,7 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv)
kEMDefault, kEMDefault,
kEMIntPortable, kEMIntPortable,
kEMIntFast, kEMIntFast,
#if defined(WITH_JIT)
kEMJitCompiler, kEMJitCompiler,
#endif
} executionMode = kEMDefault; } executionMode = kEMDefault;
@@ -488,10 +486,8 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv)
executionMode = kEMIntPortable; executionMode = kEMIntPortable;
} else if (strcmp(propBuf, "int:fast") == 0) { } else if (strcmp(propBuf, "int:fast") == 0) {
executionMode = kEMIntFast; executionMode = kEMIntFast;
#if defined(WITH_JIT)
} else if (strcmp(propBuf, "int:jit") == 0) { } else if (strcmp(propBuf, "int:jit") == 0) {
executionMode = kEMJitCompiler; executionMode = kEMJitCompiler;
#endif
} }
property_get("dalvik.vm.stack-trace-file", stackTraceFileBuf, ""); property_get("dalvik.vm.stack-trace-file", stackTraceFileBuf, "");
@@ -640,7 +636,6 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv)
mOptions.add(opt); mOptions.add(opt);
} }
#if defined(WITH_JIT)
/* Force interpreter-only mode for selected opcodes. Eg "1-0a,3c,f1-ff" */ /* Force interpreter-only mode for selected opcodes. Eg "1-0a,3c,f1-ff" */
char jitOpBuf[sizeof("-Xjitop:") + PROPERTY_VALUE_MAX]; char jitOpBuf[sizeof("-Xjitop:") + PROPERTY_VALUE_MAX];
property_get("dalvik.vm.jit.op", propBuf, ""); property_get("dalvik.vm.jit.op", propBuf, "");
@@ -660,7 +655,6 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv)
opt.optionString = jitMethodBuf; opt.optionString = jitMethodBuf;
mOptions.add(opt); mOptions.add(opt);
} }
#endif
if (executionMode == kEMIntPortable) { if (executionMode == kEMIntPortable) {
opt.optionString = "-Xint:portable"; opt.optionString = "-Xint:portable";
@@ -668,11 +662,9 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv)
} else if (executionMode == kEMIntFast) { } else if (executionMode == kEMIntFast) {
opt.optionString = "-Xint:fast"; opt.optionString = "-Xint:fast";
mOptions.add(opt); mOptions.add(opt);
#if defined(WITH_JIT)
} else if (executionMode == kEMJitCompiler) { } else if (executionMode == kEMJitCompiler) {
opt.optionString = "-Xint:jit"; opt.optionString = "-Xint:jit";
mOptions.add(opt); mOptions.add(opt);
#endif
} }
if (checkDexSum) { if (checkDexSum) {