Last cleanup int -> intptr_t. Also removed a hack.

runtime/vm/simulator_mips.h

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 // Declares a Simulator for MIPS instructions if we are not generating a native
 // MIPS binary. This Simulator allows us to run and debug MIPS code generation
 // on regular desktop machines.
 // Dart calls into generated code by "calling" the InvokeDartCode stub,
 // which will start execution in the Simulator or forwards to the real entry
 // on a MIPS HW platform.
@@ skipping 128 matching lines @@
   int32_t hi_reg_;
   int32_t lo_reg_;
 
   int32_t registers_[kNumberOfCpuRegisters];
   int32_t fregisters_[kNumberOfFRegisters];
   int32_t fcsr_;
   uword pc_;
 
   // Simulator support.
   char* stack_;
-  int icount_;
+  intptr_t icount_;
   bool delay_slot_;
   SimulatorSetjmpBuffer* last_setjmp_buffer_;
   uword top_exit_frame_info_;
 
   // Registered breakpoints.
   Instr* break_pc_;
   int32_t break_instr_;
 
   // Illegal memory access support.
   static bool IsIllegalAddress(uword addr) {
@@ skipping 13 matching lines @@
                     bool addition);
 
   void set_pc(uword value) { pc_ = value; }
 
   void Format(Instr* instr, const char* format);
 
   inline int8_t ReadB(uword addr);
   inline uint8_t ReadBU(uword addr);
   inline int16_t ReadH(uword addr, Instr* instr);
   inline uint16_t ReadHU(uword addr, Instr *instr);
-  inline int ReadW(uword addr, Instr* instr);
+  inline intptr_t ReadW(uword addr, Instr* instr);
 
   inline void WriteB(uword addr, uint8_t value);
   inline void WriteH(uword addr, uint16_t value, Instr* isntr);
-  inline void WriteW(uword addr, int value, Instr* instr);
+  inline void WriteW(uword addr, intptr_t value, Instr* instr);
 
   inline double ReadD(uword addr, Instr* instr);
   inline void WriteD(uword addr, double value, Instr* instr);
 
   void DoBranch(Instr* instr, bool taken, bool likely);
   void DoBreak(Instr *instr);
 
   void DecodeSpecial(Instr* instr);
   void DecodeSpecial2(Instr* instr);
   void DecodeRegImm(Instr* instr);
@@ skipping 12 matching lines @@
   }
 
   friend class SimulatorDebugger;
   friend class SimulatorSetjmpBuffer;
   DISALLOW_COPY_AND_ASSIGN(Simulator);
 };
 
 }  // namespace dart
 
 #endif  // VM_SIMULATOR_MIPS_H_