Index: src/mips/assembler-mips.cc |
diff --git a/src/mips/assembler-mips.cc b/src/mips/assembler-mips.cc |
index a77d796584fcdc52d0c6cf85801a913f1cf3e87a..22f1e1b866d87de0b2a3d0b36150c41e086c4c7b 100644 |
--- a/src/mips/assembler-mips.cc |
+++ b/src/mips/assembler-mips.cc |
@@ -583,7 +583,7 @@ bool Assembler::IsNop(Instr instr, unsigned int type) { |
int32_t Assembler::GetBranchOffset(Instr instr) { |
ASSERT(IsBranch(instr)); |
- return ((int16_t)(instr & kImm16Mask)) << 2; |
+ return (static_cast<int16_t>(instr & kImm16Mask)) << 2; |
} |
@@ -716,7 +716,7 @@ void Assembler::target_at_put(int32_t pos, int32_t target_pos) { |
Instr instr_lui = instr_at(pos + 0 * Assembler::kInstrSize); |
Instr instr_ori = instr_at(pos + 1 * Assembler::kInstrSize); |
ASSERT(IsOri(instr_ori)); |
- uint32_t imm = (uint32_t)buffer_ + target_pos; |
+ uint32_t imm = reinterpret_cast<uint32_t>(buffer_) + target_pos; |
ASSERT((imm & 3) == 0); |
instr_lui &= ~kImm16Mask; |
@@ -727,7 +727,7 @@ void Assembler::target_at_put(int32_t pos, int32_t target_pos) { |
instr_at_put(pos + 1 * Assembler::kInstrSize, |
instr_ori | (imm & kImm16Mask)); |
} else { |
- uint32_t imm28 = (uint32_t)buffer_ + target_pos; |
+ uint32_t imm28 = reinterpret_cast<uint32_t>(buffer_) + target_pos; |
imm28 &= kImm28Mask; |
ASSERT((imm28 & 3) == 0); |
@@ -979,7 +979,7 @@ uint32_t Assembler::jump_address(Label* L) { |
} |
} |
- uint32_t imm = (uint32_t)buffer_ + target_pos; |
+ uint32_t imm = reinterpret_cast<uint32_t>(buffer_) + target_pos; |
ASSERT((imm & 3) == 0); |
return imm; |
@@ -1114,7 +1114,8 @@ void Assembler::j(int32_t target) { |
#if DEBUG |
// Get pc of delay slot. |
uint32_t ipc = reinterpret_cast<uint32_t>(pc_ + 1 * kInstrSize); |
- bool in_range = ((uint32_t)(ipc^target) >> (kImm26Bits+kImmFieldShift)) == 0; |
+ bool in_range = (ipc ^ static_cast<uint32_t>(target) >> |
+ (kImm26Bits + kImmFieldShift)) == 0; |
ASSERT(in_range && ((target & 3) == 0)); |
#endif |
GenInstrJump(J, target >> 2); |
@@ -1135,7 +1136,8 @@ void Assembler::jal(int32_t target) { |
#ifdef DEBUG |
// Get pc of delay slot. |
uint32_t ipc = reinterpret_cast<uint32_t>(pc_ + 1 * kInstrSize); |
- bool in_range = ((uint32_t)(ipc^target) >> (kImm26Bits+kImmFieldShift)) == 0; |
+ bool in_range = (ipc ^ static_cast<uint32_t>(target) >> |
+ (kImm26Bits + kImmFieldShift)) == 0; |
ASSERT(in_range && ((target & 3) == 0)); |
#endif |
positions_recorder()->WriteRecordedPositions(); |
@@ -1154,8 +1156,8 @@ void Assembler::jalr(Register rs, Register rd) { |
void Assembler::j_or_jr(int32_t target, Register rs) { |
// Get pc of delay slot. |
uint32_t ipc = reinterpret_cast<uint32_t>(pc_ + 1 * kInstrSize); |
- bool in_range = ((uint32_t)(ipc^target) >> (kImm26Bits+kImmFieldShift)) == 0; |
- |
+ bool in_range = (ipc ^ static_cast<uint32_t>(target) >> |
+ (kImm26Bits + kImmFieldShift)) == 0; |
if (in_range) { |
j(target); |
} else { |
@@ -1167,8 +1169,8 @@ void Assembler::j_or_jr(int32_t target, Register rs) { |
void Assembler::jal_or_jalr(int32_t target, Register rs) { |
// Get pc of delay slot. |
uint32_t ipc = reinterpret_cast<uint32_t>(pc_ + 1 * kInstrSize); |
- bool in_range = ((uint32_t)(ipc^target) >> (kImm26Bits+kImmFieldShift)) == 0; |
- |
+ bool in_range = (ipc ^ static_cast<uint32_t>(target) >> |
+ (kImm26Bits+kImmFieldShift)) == 0; |
if (in_range) { |
jal(target); |
} else { |
@@ -1927,7 +1929,7 @@ int Assembler::RelocateInternalReference(byte* pc, intptr_t pc_delta) { |
return 2; // Number of instructions patched. |
} else { |
uint32_t imm28 = (instr & static_cast<int32_t>(kImm26Mask)) << 2; |
- if ((int32_t)imm28 == kEndOfJumpChain) { |
+ if (static_cast<int32_t>(imm28) == kEndOfJumpChain) { |
return 0; // Number of instructions patched. |
} |
imm28 += pc_delta; |
@@ -2177,9 +2179,10 @@ void Assembler::set_target_address_at(Address pc, Address target) { |
Instr instr3 = instr_at(pc + 2 * kInstrSize); |
uint32_t ipc = reinterpret_cast<uint32_t>(pc + 3 * kInstrSize); |
- bool in_range = |
- ((uint32_t)(ipc ^ itarget) >> (kImm26Bits + kImmFieldShift)) == 0; |
- uint32_t target_field = (uint32_t)(itarget & kJumpAddrMask) >> kImmFieldShift; |
+ bool in_range = (ipc ^ static_cast<uint32_t>(itarget) >> |
+ (kImm26Bits + kImmFieldShift)) == 0; |
+ uint32_t target_field = |
+ static_cast<uint32_t>(itarget & kJumpAddrMask) >>kImmFieldShift; |
bool patched_jump = false; |
#ifndef ALLOW_JAL_IN_BOUNDARY_REGION |