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

runtime/vm/simulator_arm.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 ARM instructions if we are not generating a native
 // ARM binary. This Simulator allows us to run and debug ARM 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 ARM HW platform.
@@ skipping 131 matching lines @@
     simd_value_t qregisters_[kNumberOfQRegisters];
   };
   bool fp_n_flag_;
   bool fp_z_flag_;
   bool fp_c_flag_;
   bool fp_v_flag_;
 
   // Simulator support.
   char* stack_;
   bool pc_modified_;
-  int icount_;
+  intptr_t icount_;
   static int32_t flag_stop_sim_at_;
   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 35 matching lines @@
   void DoDivision(Instr* instr);
 
   inline uint8_t ReadBU(uword addr);
   inline int8_t ReadB(uword addr);
   inline void WriteB(uword addr, uint8_t value);
 
   inline uint16_t ReadHU(uword addr, Instr* instr);
   inline int16_t ReadH(uword addr, Instr* instr);
   inline void WriteH(uword addr, uint16_t value, Instr* instr);
 
-  inline int ReadW(uword addr, Instr* instr);
-  inline void WriteW(uword addr, int value, Instr* instr);
+  inline intptr_t ReadW(uword addr, Instr* instr);
+  inline void WriteW(uword addr, intptr_t value, Instr* instr);
 
   // Synchronization primitives support.
   void ClearExclusive();
-  int ReadExclusiveW(uword addr, Instr* instr);
-  int WriteExclusiveW(uword addr, int value, Instr* instr);
+  intptr_t ReadExclusiveW(uword addr, Instr* instr);
+  intptr_t WriteExclusiveW(uword addr, intptr_t value, Instr* instr);
 
   // TODO(regis): Remove exclusive access support machinery if not needed.
   // In Dart, there is at most one thread per isolate.
   // We keep track of 16 exclusive access address tags across all isolates.
   // Since we cannot simulate a native context switch, which clears
   // the exclusive access state of the local monitor (using the CLREX
   // instruction), we associate the isolate requesting exclusive access to the
   // address tag. Multiple isolates requesting exclusive access (using the LDREX
   // instruction) to the same address will result in multiple address tags being
   // created for the same address, one per isolate.
@@ skipping 41 matching lines @@
   }
 
   friend class SimulatorDebugger;
   friend class SimulatorSetjmpBuffer;
   DISALLOW_COPY_AND_ASSIGN(Simulator);
 };
 
 }  // namespace dart
 
 #endif  // VM_SIMULATOR_ARM_H_