| Index: src/arm/assembler-arm.cc
|
| ===================================================================
|
| --- src/arm/assembler-arm.cc (revision 11193)
|
| +++ src/arm/assembler-arm.cc (working copy)
|
| @@ -47,8 +47,8 @@
|
| #ifdef DEBUG
|
| bool CpuFeatures::initialized_ = false;
|
| #endif
|
| -unsigned CpuFeatures::supported_ = 0;
|
| -unsigned CpuFeatures::found_by_runtime_probing_ = 0;
|
| +uint64_t CpuFeatures::supported_ = 0;
|
| +uint64_t CpuFeatures::found_by_runtime_probing_ = 0;
|
|
|
|
|
| // Get the CPU features enabled by the build. For cross compilation the
|
| @@ -80,7 +80,7 @@
|
|
|
|
|
| void CpuFeatures::Probe() {
|
| - unsigned standard_features = (OS::CpuFeaturesImpliedByPlatform() |
|
| + uint64_t standard_features = (OS::CpuFeaturesImpliedByPlatform() |
|
| CpuFeaturesImpliedByCompiler());
|
| ASSERT(supported_ == 0 || supported_ == standard_features);
|
| #ifdef DEBUG
|
| @@ -746,7 +746,8 @@
|
| }
|
| }
|
| } else if ((*instr & kCmpCmnMask) == kCmpCmnPattern) {
|
| - if (fits_shifter(-imm32, rotate_imm, immed_8, NULL)) {
|
| + if (fits_shifter(-static_cast<int32_t>(imm32), rotate_imm,
|
| + immed_8, NULL)) {
|
| *instr ^= kCmpCmnFlip;
|
| return true;
|
| }
|
| @@ -754,7 +755,8 @@
|
| Instr alu_insn = (*instr & kALUMask);
|
| if (alu_insn == ADD ||
|
| alu_insn == SUB) {
|
| - if (fits_shifter(-imm32, rotate_imm, immed_8, NULL)) {
|
| + if (fits_shifter(-static_cast<int32_t>(imm32), rotate_imm,
|
| + immed_8, NULL)) {
|
| *instr ^= kAddSubFlip;
|
| return true;
|
| }
|
|
|