Commit 5b2a27aa authored by danno@chromium.org's avatar danno@chromium.org

Fix compile errors in Visual C++ 2008.

R=danno@chromium.org
BUG=None
TEST=ARM compiles on VC 2008.

Review URL: https://chromiumcodereview.appspot.com/10690111
Patch from Sigurður Ásgeirsson <siggi@chromium.org>.

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@12039 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 2ce9624d
...@@ -80,8 +80,8 @@ static uint64_t CpuFeaturesImpliedByCompiler() { ...@@ -80,8 +80,8 @@ static uint64_t CpuFeaturesImpliedByCompiler() {
void CpuFeatures::Probe() { void CpuFeatures::Probe() {
unsigned standard_features = (OS::CpuFeaturesImpliedByPlatform() | unsigned standard_features = static_cast<unsigned>(
CpuFeaturesImpliedByCompiler()); OS::CpuFeaturesImpliedByPlatform() | CpuFeaturesImpliedByCompiler());
ASSERT(supported_ == 0 || supported_ == standard_features); ASSERT(supported_ == 0 || supported_ == standard_features);
#ifdef DEBUG #ifdef DEBUG
initialized_ = true; initialized_ = true;
...@@ -746,7 +746,7 @@ static bool fits_shifter(uint32_t imm32, ...@@ -746,7 +746,7 @@ static bool fits_shifter(uint32_t imm32,
} }
} }
} else if ((*instr & kCmpCmnMask) == kCmpCmnPattern) { } 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)) {
*instr ^= kCmpCmnFlip; *instr ^= kCmpCmnFlip;
return true; return true;
} }
...@@ -754,7 +754,7 @@ static bool fits_shifter(uint32_t imm32, ...@@ -754,7 +754,7 @@ static bool fits_shifter(uint32_t imm32,
Instr alu_insn = (*instr & kALUMask); Instr alu_insn = (*instr & kALUMask);
if (alu_insn == ADD || if (alu_insn == ADD ||
alu_insn == SUB) { 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; *instr ^= kAddSubFlip;
return true; return true;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment