diff options
| author | Bill Buzbee <buzbee@google.com> | 2010-01-13 16:13:48 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-01-13 16:13:48 -0800 |
| commit | 5f8a5fc4ee351a7e57a73b1ed0c4ebafe95bab32 (patch) | |
| tree | 6deb5efbbbba9ee492c0d6fcc753defddc883cad /vm/compiler/codegen | |
| parent | 31f10abfde97c5e044729ca279574178a4336b7b (diff) | |
| parent | e438a6a23bc0b44bf909e6838c6bb9649fe2e474 (diff) | |
| download | android_dalvik-5f8a5fc4ee351a7e57a73b1ed0c4ebafe95bab32.tar.gz android_dalvik-5f8a5fc4ee351a7e57a73b1ed0c4ebafe95bab32.tar.bz2 android_dalvik-5f8a5fc4ee351a7e57a73b1ed0c4ebafe95bab32.zip | |
Merge "Restore threshold to 200 as a temporary workaround"
Diffstat (limited to 'vm/compiler/codegen')
| -rw-r--r-- | vm/compiler/codegen/arm/armv5te-vfp/ArchVariant.c | 3 | ||||
| -rw-r--r-- | vm/compiler/codegen/arm/armv5te/ArchVariant.c | 3 | ||||
| -rw-r--r-- | vm/compiler/codegen/arm/armv7-a/ArchVariant.c | 4 |
3 files changed, 4 insertions, 6 deletions
diff --git a/vm/compiler/codegen/arm/armv5te-vfp/ArchVariant.c b/vm/compiler/codegen/arm/armv5te-vfp/ArchVariant.c index 8b97dc6cc..9a602f69b 100644 --- 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 a6d9c88c1..2d080e44d 100644 --- 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 326bec78e..c08d7b286 100644 --- 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 */ |