diff options
| author | Elliott Hughes <enh@google.com> | 2013-03-01 10:45:01 -0800 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2013-03-01 10:45:01 -0800 |
| commit | 095469786603fe53b26ab78091ab33535f94b423 (patch) | |
| tree | eae531a918e55b4b3e9676bd94e11ffd48469477 /vm/compiler/codegen/arm | |
| parent | 1319ed83a94fd506e54a43d6cef8b6bb2295c525 (diff) | |
| download | android_dalvik-095469786603fe53b26ab78091ab33535f94b423.tar.gz android_dalvik-095469786603fe53b26ab78091ab33535f94b423.tar.bz2 android_dalvik-095469786603fe53b26ab78091ab33535f94b423.zip | |
Fix -Xjitthreshold (for real this time).
My previous "fix" (c89d83e1c05979b68037ad15413fa4460a88e36f) had the
conditions reversed, so you _had_ to use -Xjitthreshold to get a non-zero
threshold, but when you did, you'd get the default instead of what you
asked for!
This was spotted by the jank tests.
Bug: 8285558
Bug: https://code.google.com/p/android/issues/detail?id=52017
Change-Id: I28270f2573d46929eb10d30789fecf7d5a8cea75
Diffstat (limited to 'vm/compiler/codegen/arm')
4 files changed, 4 insertions, 4 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; |