summaryrefslogtreecommitdiffstats
path: root/compiler/utils/arm/assembler_arm.cc
diff options
context:
space:
mode:
authorVladimir Marko <vmarko@google.com>2014-05-02 11:53:22 +0100
committerVladimir Marko <vmarko@google.com>2014-05-02 12:21:02 +0100
commit8194963098247be6bca9cc4a54dbfa65c73e8ccc (patch)
tree547cc708e06e6541676b17066023ae6f07b2049b /compiler/utils/arm/assembler_arm.cc
parent56a341a82ece9aa4f2a071629f3e1fd1adf988ae (diff)
downloadandroid_art-8194963098247be6bca9cc4a54dbfa65c73e8ccc.tar.gz
android_art-8194963098247be6bca9cc4a54dbfa65c73e8ccc.tar.bz2
android_art-8194963098247be6bca9cc4a54dbfa65c73e8ccc.zip
Replace CountOneBits and __builtin_popcount with POPCOUNT.
Clean up utils.h, make some functions constexpr. Change-Id: I2399100280cbce81c3c4f5765f0680c1ddcb5883
Diffstat (limited to 'compiler/utils/arm/assembler_arm.cc')
-rw-r--r--compiler/utils/arm/assembler_arm.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/utils/arm/assembler_arm.cc b/compiler/utils/arm/assembler_arm.cc
index effc38e4c4..5c839dd54e 100644
--- a/compiler/utils/arm/assembler_arm.cc
+++ b/compiler/utils/arm/assembler_arm.cc
@@ -1107,7 +1107,7 @@ int32_t ArmAssembler::EncodeBranchOffset(int offset, int32_t inst) {
// The offset is off by 8 due to the way the ARM CPUs read PC.
offset -= 8;
CHECK_ALIGNED(offset, 4);
- CHECK(IsInt(CountOneBits(kBranchOffsetMask), offset)) << offset;
+ CHECK(IsInt(POPCOUNT(kBranchOffsetMask), offset)) << offset;
// Properly preserve only the bits supported in the instruction.
offset >>= 2;