Restore threshold to 200 as a temporary workaround

Also, fix blocking mode initialization.

diff --git a/vm/compiler/codegen/arm/armv5te-vfp/ArchVariant.c b/vm/compiler/codegen/arm/armv5te-vfp/ArchVariant.c
index 8b97dc6..9a602f6 100644 (file)
--- a/vm/compiler/codegen/arm/armv5te-vfp/ArchVariant.c
+++ b/vm/compiler/codegen/arm/armv5te-vfp/ArchVariant.c
@@ -54,9 +54,8 @@ bool dvmCompilerArchVariantInit(void)
     gDvmJit.threshold = 200;
 
 #if defined(WITH_SELF_VERIFICATION)
-    /* Force into blocking, translate everything mode */
+    /* Force into blocking mode */
     gDvmJit.blockingMode = true;
-    gDvmJit.threshold = 1;
 #endif
 
     /* Codegen-specific assumptions */

diff --git a/vm/compiler/codegen/arm/armv5te/ArchVariant.c b/vm/compiler/codegen/arm/armv5te/ArchVariant.c
index a6d9c88..2d080e4 100644 (file)
--- a/vm/compiler/codegen/arm/armv5te/ArchVariant.c
+++ b/vm/compiler/codegen/arm/armv5te/ArchVariant.c
@@ -54,9 +54,8 @@ bool dvmCompilerArchVariantInit(void)
     gDvmJit.threshold = 200;
 
 #if defined(WITH_SELF_VERIFICATION)
-    /* Force into blocking, translate everything mode */
+    /* Force into blocking mode */
     gDvmJit.blockingMode = true;
-    gDvmJit.threshold = 1;
 #endif
 
     /* Codegen-specific assumptions */

diff --git a/vm/compiler/codegen/arm/armv7-a/ArchVariant.c b/vm/compiler/codegen/arm/armv7-a/ArchVariant.c
index 326bec7..c08d7b2 100644 (file)
--- a/vm/compiler/codegen/arm/armv7-a/ArchVariant.c
+++ b/vm/compiler/codegen/arm/armv7-a/ArchVariant.c
@@ -47,12 +47,12 @@ bool dvmCompilerArchVariantInit(void)
     /* Target-specific configuration */
     gDvmJit.jitTableSize = 1 << 12; // 4096
     gDvmJit.jitTableMask = gDvmJit.jitTableSize - 1;
-    gDvmJit.threshold = 40;
+    gDvmJit.threshold = 200;
 
 #if defined(WITH_SELF_VERIFICATION)
     /* Force into blocking, translate everything mode */
     gDvmJit.blockingMode = true;
-    gDvmJit.threshold = 1;
+    gDvmJit.threshold = 5;
 #endif
 
     /* Codegen-specific assumptions */