Index: src/mips64/assembler-mips64.cc |
diff --git a/src/mips64/assembler-mips64.cc b/src/mips64/assembler-mips64.cc |
index 49e4dd218b06f05d0723aaf788de0b106c5ff233..f3fd3cf022a3f234b7c463619fe83cda8f117fa7 100644 |
--- a/src/mips64/assembler-mips64.cc |
+++ b/src/mips64/assembler-mips64.cc |
@@ -211,14 +211,13 @@ |
} |
-MemOperand::MemOperand(Register rm, int32_t offset) : Operand(rm) { |
+MemOperand::MemOperand(Register rm, int64_t offset) : Operand(rm) { |
offset_ = offset; |
} |
-MemOperand::MemOperand(Register rm, int32_t unit, int32_t multiplier, |
- OffsetAddend offset_addend) |
- : Operand(rm) { |
+MemOperand::MemOperand(Register rm, int64_t unit, int64_t multiplier, |
+ OffsetAddend offset_addend) : Operand(rm) { |
offset_ = unit * multiplier + offset_addend; |
} |
@@ -291,8 +290,7 @@ |
desc->buffer = buffer_; |
desc->buffer_size = buffer_size_; |
desc->instr_size = pc_offset(); |
- desc->reloc_size = |
- static_cast<int>((buffer_ + buffer_size_) - reloc_info_writer.pos()); |
+ desc->reloc_size = (buffer_ + buffer_size_) - reloc_info_writer.pos(); |
desc->origin = this; |
} |
@@ -743,7 +741,7 @@ |
DCHECK((imm28 & 3) == 0); |
instr &= ~kImm26Mask; |
- uint32_t imm26 = static_cast<uint32_t>(imm28 >> 2); |
+ uint32_t imm26 = imm28 >> 2; |
DCHECK(is_uint26(imm26)); |
instr_at_put(pos, instr | (imm26 & kImm26Mask)); |
@@ -1387,7 +1385,7 @@ |
DCHECK(in_range && ((target & 3) == 0)); |
} |
#endif |
- GenInstrJump(J, static_cast<uint32_t>(target >> 2) & kImm26Mask); |
+ GenInstrJump(J, (target >> 2) & kImm26Mask); |
} |
@@ -1416,7 +1414,7 @@ |
} |
#endif |
positions_recorder()->WriteRecordedPositions(); |
- GenInstrJump(JAL, static_cast<uint32_t>(target >> 2) & kImm26Mask); |
+ GenInstrJump(JAL, (target >> 2) & kImm26Mask); |
} |
@@ -2903,8 +2901,7 @@ |
desc.buffer = NewArray<byte>(desc.buffer_size); |
desc.instr_size = pc_offset(); |
- desc.reloc_size = |
- static_cast<int>((buffer_ + buffer_size_) - reloc_info_writer.pos()); |
+ desc.reloc_size = (buffer_ + buffer_size_) - reloc_info_writer.pos(); |
// Copy the data. |
intptr_t pc_delta = desc.buffer - buffer_; |