diff options
| author | Elliott Hughes <enh@google.com> | 2013-03-01 19:17:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-03-01 19:17:00 +0000 |
| commit | 36ba3589cf5b20acc1f9d9bf7f88390fa6f8129a (patch) | |
| tree | 4bc3f519b90e0a2f331d287632af5af10a32dfbd /vm/compiler/codegen/arm | |
| parent | 949e13c9c9d14c3749279e9a8af19bccbeca509f (diff) | |
| parent | 6e2d46fd7488331181502a878959336966ac3776 (diff) | |
| download | android_dalvik-36ba3589cf5b20acc1f9d9bf7f88390fa6f8129a.tar.gz android_dalvik-36ba3589cf5b20acc1f9d9bf7f88390fa6f8129a.tar.bz2 android_dalvik-36ba3589cf5b20acc1f9d9bf7f88390fa6f8129a.zip | |
am 6e2d46fd: am 03a938bc: Merge "Fix -Xjitthreshold (for real this time)."
* commit '6e2d46fd7488331181502a878959336966ac3776':
Fix -Xjitthreshold (for real this time).
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; |