Index: src/arm/assembler-arm.cc |
diff --git a/src/arm/assembler-arm.cc b/src/arm/assembler-arm.cc |
index 68fcc28400ce7ed29f0fda40e36dd3103a2fce3d..1bce63d729e481d338c27fa960ffaca26f730f43 100644 |
--- a/src/arm/assembler-arm.cc |
+++ b/src/arm/assembler-arm.cc |
@@ -80,7 +80,7 @@ static uint64_t CpuFeaturesImpliedByCompiler() { |
void CpuFeatures::Probe() { |
- unsigned standard_features = (OS::CpuFeaturesImpliedByPlatform() | |
+ unsigned standard_features = static_cast<unsigned>(OS::CpuFeaturesImpliedByPlatform() | |
danno
2012/07/10 09:37:13
80 col
Sigurður Ásgeirsson
2012/07/11 14:50:34
Done.
|
CpuFeaturesImpliedByCompiler()); |
ASSERT(supported_ == 0 || supported_ == standard_features); |
#ifdef DEBUG |
@@ -746,7 +746,7 @@ static bool fits_shifter(uint32_t imm32, |
} |
} |
} else if ((*instr & kCmpCmnMask) == kCmpCmnPattern) { |
- if (fits_shifter(-imm32, rotate_imm, immed_8, NULL)) { |
+ if (fits_shifter(-static_cast<int>(imm32), rotate_imm, immed_8, NULL)) { |
danno
2012/07/10 09:37:13
these seem to be unrelated changes, probably to ma
Sigurður Ásgeirsson
2012/07/11 14:50:34
Ah true, this was to compile under VC 2008.
Will m
|
*instr ^= kCmpCmnFlip; |
return true; |
} |
@@ -754,7 +754,7 @@ static bool fits_shifter(uint32_t imm32, |
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<int>(imm32), rotate_imm, immed_8, NULL)) { |
*instr ^= kAddSubFlip; |
return true; |
} |