diff options
| author | Elliott Hughes <enh@google.com> | 2013-03-01 11:14:57 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-03-01 11:14:57 -0800 |
| commit | 6e2d46fd7488331181502a878959336966ac3776 (patch) | |
| tree | eae531a918e55b4b3e9676bd94e11ffd48469477 /vm/compiler | |
| parent | 4ff70bc357048e57f3425a4363bfcf7f25906282 (diff) | |
| parent | 03a938bca80d83378844f7923bc2f8c6e6ec64a7 (diff) | |
| download | android_dalvik-6e2d46fd7488331181502a878959336966ac3776.tar.gz android_dalvik-6e2d46fd7488331181502a878959336966ac3776.tar.bz2 android_dalvik-6e2d46fd7488331181502a878959336966ac3776.zip | |
am 03a938bc: Merge "Fix -Xjitthreshold (for real this time)."
* commit '03a938bca80d83378844f7923bc2f8c6e6ec64a7':
Fix -Xjitthreshold (for real this time).
Diffstat (limited to 'vm/compiler')
6 files changed, 6 insertions, 6 deletions
diff --git a/vm/compiler/codegen/arm/armv5te-vfp/ArchVariant.cpp b/vm/compiler/codegen/arm/armv5te-vfp/ArchVariant.cpp index bc827beac..713ecfa10 100644 --- a/vm/compiler/codegen/arm/armv5te-vfp/ArchVariant.cpp +++ b/vm/compiler/codegen/arm/armv5te-vfp/ArchVariant.cpp @@ -52,7 +52,7 @@ bool dvmCompilerArchVariantInit(void) /* Target-specific configuration */ gDvmJit.jitTableSize = 1 << 9; // 512 gDvmJit.jitTableMask = gDvmJit.jitTableSize - 1; - if (gDvmJit.threshold != 0) { + if (gDvmJit.threshold == 0) { gDvmJit.threshold = 200; } gDvmJit.codeCacheSize = 512*1024; diff --git a/vm/compiler/codegen/arm/armv5te/ArchVariant.cpp b/vm/compiler/codegen/arm/armv5te/ArchVariant.cpp index 50ba53730..25d650e6d 100644 --- a/vm/compiler/codegen/arm/armv5te/ArchVariant.cpp +++ b/vm/compiler/codegen/arm/armv5te/ArchVariant.cpp @@ -52,7 +52,7 @@ bool dvmCompilerArchVariantInit(void) /* Target-specific configuration */ gDvmJit.jitTableSize = 1 << 9; // 512 gDvmJit.jitTableMask = gDvmJit.jitTableSize - 1; - if (gDvmJit.threshold != 0) { + if (gDvmJit.threshold == 0) { gDvmJit.threshold = 200; } gDvmJit.codeCacheSize = 512*1024; diff --git a/vm/compiler/codegen/arm/armv7-a-neon/ArchVariant.cpp b/vm/compiler/codegen/arm/armv7-a-neon/ArchVariant.cpp index 857960f7e..40ee04072 100644 --- a/vm/compiler/codegen/arm/armv7-a-neon/ArchVariant.cpp +++ b/vm/compiler/codegen/arm/armv7-a-neon/ArchVariant.cpp @@ -47,7 +47,7 @@ bool dvmCompilerArchVariantInit(void) /* Target-specific configuration */ gDvmJit.jitTableSize = 1 << 12; // 4096 gDvmJit.jitTableMask = gDvmJit.jitTableSize - 1; - if (gDvmJit.threshold != 0) { + if (gDvmJit.threshold == 0) { gDvmJit.threshold = 40; } gDvmJit.codeCacheSize = 1024*1024; diff --git a/vm/compiler/codegen/arm/armv7-a/ArchVariant.cpp b/vm/compiler/codegen/arm/armv7-a/ArchVariant.cpp index 857960f7e..40ee04072 100644 --- a/vm/compiler/codegen/arm/armv7-a/ArchVariant.cpp +++ b/vm/compiler/codegen/arm/armv7-a/ArchVariant.cpp @@ -47,7 +47,7 @@ bool dvmCompilerArchVariantInit(void) /* Target-specific configuration */ gDvmJit.jitTableSize = 1 << 12; // 4096 gDvmJit.jitTableMask = gDvmJit.jitTableSize - 1; - if (gDvmJit.threshold != 0) { + if (gDvmJit.threshold == 0) { gDvmJit.threshold = 40; } gDvmJit.codeCacheSize = 1024*1024; diff --git a/vm/compiler/codegen/mips/mips/ArchVariant.cpp b/vm/compiler/codegen/mips/mips/ArchVariant.cpp index a5252c1ce..d720f85af 100644 --- a/vm/compiler/codegen/mips/mips/ArchVariant.cpp +++ b/vm/compiler/codegen/mips/mips/ArchVariant.cpp @@ -52,7 +52,7 @@ bool dvmCompilerArchVariantInit(void) /* Target-specific configuration */ gDvmJit.jitTableSize = 1 << 9; // 512 gDvmJit.jitTableMask = gDvmJit.jitTableSize - 1; - if (gDvmJit.threshold != 0) { + if (gDvmJit.threshold == 0) { gDvmJit.threshold = 200; } gDvmJit.codeCacheSize = 512*1024; diff --git a/vm/compiler/codegen/x86/CodegenInterface.cpp b/vm/compiler/codegen/x86/CodegenInterface.cpp index 6670bda6d..e7dd8afc0 100644 --- a/vm/compiler/codegen/x86/CodegenInterface.cpp +++ b/vm/compiler/codegen/x86/CodegenInterface.cpp @@ -64,7 +64,7 @@ bool dvmCompilerArchInit() { /* Target-specific configuration */ gDvmJit.jitTableSize = 1 << 12; gDvmJit.jitTableMask = gDvmJit.jitTableSize - 1; - if (gDvmJit.threshold != 0) { + if (gDvmJit.threshold == 0) { gDvmJit.threshold = 255; } gDvmJit.codeCacheSize = 512*1024; |