am 6e2d46fd: am 03a938bc: Merge "Fix -Xjitthreshold (for real this time)."

* commit '6e2d46fd7488331181502a878959336966ac3776':
  Fix -Xjitthreshold (for real this time).

diff --git a/vm/compiler/codegen/arm/armv5te-vfp/ArchVariant.cpp b/vm/compiler/codegen/arm/armv5te-vfp/ArchVariant.cpp
index bc827be..713ecfa 100644 (file)
--- 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 50ba537..25d650e 100644 (file)
--- 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 857960f..40ee040 100644 (file)
--- 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 857960f..40ee040 100644 (file)
--- 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 a5252c1..d720f85 100644 (file)
--- 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 6670bda..e7dd8af 100644 (file)
--- 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;