| Index: runtime/vm/assembler_mips.cc
|
| ===================================================================
|
| --- runtime/vm/assembler_mips.cc (revision 28314)
|
| +++ runtime/vm/assembler_mips.cc (working copy)
|
| @@ -20,7 +20,7 @@
|
| DEFINE_FLAG(bool, print_stop_message, false, "Print stop message.");
|
| DECLARE_FLAG(bool, inline_alloc);
|
|
|
| -void Assembler::InitializeMemoryWithBreakpoints(uword data, int length) {
|
| +void Assembler::InitializeMemoryWithBreakpoints(uword data, intptr_t length) {
|
| ASSERT(Utils::IsAligned(data, 4));
|
| ASSERT(Utils::IsAligned(length, 4));
|
| const uword end = data + length;
|
| @@ -63,7 +63,7 @@
|
| }
|
|
|
|
|
| -static int DecodeBranchOffset(int32_t instr) {
|
| +static intptr_t DecodeBranchOffset(int32_t instr) {
|
| // Sign-extend, left-shift by 2.
|
| return (((instr & kBranchOffsetMask) << 16) >> 14);
|
| }
|
| @@ -84,7 +84,7 @@
|
| public:
|
| PatchFarJump() {}
|
|
|
| - void Process(const MemoryRegion& region, int position) {
|
| + void Process(const MemoryRegion& region, intptr_t position) {
|
| const int32_t high = region.Load<int32_t>(position);
|
| const int32_t low = region.Load<int32_t>(position + Instr::kInstrSize);
|
| const int32_t offset = DecodeLoadImmediate(low, high);
|
| @@ -191,7 +191,7 @@
|
| EmitIType(b, rs, rt, dest_off);
|
| }
|
| } else {
|
| - const int position = buffer_.Size();
|
| + const intptr_t position = buffer_.Size();
|
| if (use_far_branches()) {
|
| const uint32_t dest_off = label->position_;
|
| EmitFarBranch(b, rs, rt, dest_off);
|
| @@ -216,7 +216,7 @@
|
| EmitRegImmType(REGIMM, rs, b, dest_off);
|
| }
|
| } else {
|
| - const int position = buffer_.Size();
|
| + const intptr_t position = buffer_.Size();
|
| if (use_far_branches()) {
|
| const uint32_t dest_off = label->position_;
|
| EmitFarRegImmBranch(b, rs, dest_off);
|
| @@ -245,7 +245,7 @@
|
| dest_off);
|
| }
|
| } else {
|
| - const int position = buffer_.Size();
|
| + const intptr_t position = buffer_.Size();
|
| if (use_far_branches()) {
|
| const uint32_t dest_off = label->position_;
|
| EmitFarFpuBranch(kind, dest_off);
|
| @@ -278,7 +278,7 @@
|
|
|
| void Assembler::Bind(Label* label) {
|
| ASSERT(!label->IsBound());
|
| - int bound_pc = buffer_.Size();
|
| + intptr_t bound_pc = buffer_.Size();
|
|
|
| while (label->IsLinked()) {
|
| int32_t position = label->Position();
|
| @@ -472,7 +472,7 @@
|
| ASSERT(Isolate::Current() != Dart::vm_isolate());
|
| object_pool_ = GrowableObjectArray::New(Heap::kOld);
|
| }
|
| - for (int i = 0; i < object_pool_.Length(); i++) {
|
| + for (intptr_t i = 0; i < object_pool_.Length(); i++) {
|
| if (object_pool_.At(i) == obj.raw()) {
|
| return i;
|
| }
|
|
|