Cleanups: int -> intptr_t for "array" lengths, memory sizes.

runtime/vm/assembler.h

 // Copyright (c) 2012, 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.
 
 #ifndef VM_ASSEMBLER_H_
 #define VM_ASSEMBLER_H_
 
 #include "platform/assert.h"
 #include "vm/allocation.h"
 #include "vm/globals.h"
@@ skipping 33 matching lines @@
   const char* name_;
   const uword address_;
 };
 
 
 // Assembler fixups are positions in generated code that hold relocation
 // information that needs to be processed before finalizing the code
 // into executable memory.
 class AssemblerFixup : public ZoneAllocated {
  public:
-  virtual void Process(const MemoryRegion& region, int position) = 0;
+  virtual void Process(const MemoryRegion& region, intptr_t position) = 0;
 
   // It would be ideal if the destructor method could be made private,
   // but the g++ compiler complains when this is subclassed.
   virtual ~AssemblerFixup() { UNREACHABLE(); }
 
  private:
   AssemblerFixup* previous_;
-  int position_;
+  intptr_t position_;
 
   AssemblerFixup* previous() const { return previous_; }
   void set_previous(AssemblerFixup* previous) { previous_ = previous; }
 
-  int position() const { return position_; }
-  void set_position(int position) { position_ = position; }
+  intptr_t position() const { return position_; }
+  void set_position(intptr_t position) { position_ = position; }
 
   friend class AssemblerBuffer;
 };
 
 
 // Assembler buffers are used to emit binary code. They grow on demand.
 class AssemblerBuffer : public ValueObject {
  public:
   AssemblerBuffer();
   ~AssemblerBuffer();
 
   // Basic support for emitting, loading, and storing.
   template<typename T> void Emit(T value) {
     ASSERT(HasEnsuredCapacity());
     *reinterpret_cast<T*>(cursor_) = value;
     cursor_ += sizeof(T);
   }
 
   template<typename T> void Remit() {
     ASSERT(Size() >= static_cast<intptr_t>(sizeof(T)));
     cursor_ -= sizeof(T);
   }
 
-  template<typename T> T Load(int position) {
-    ASSERT(position >= 0 && position <= (Size() - static_cast<int>(sizeof(T))));
+  template<typename T> T Load(intptr_t position) {
+    ASSERT(position >= 0 &&
+           position <= (Size() - static_cast<intptr_t>(sizeof(T))));
     return *reinterpret_cast<T*>(contents_ + position);
   }
 
-  template<typename T> void Store(int position, T value) {
-    ASSERT(position >= 0 && position <= (Size() - static_cast<int>(sizeof(T))));
+  template<typename T> void Store(intptr_t position, T value) {
+    ASSERT(position >= 0 &&
+           position <= (Size() - static_cast<intptr_t>(sizeof(T))));
     *reinterpret_cast<T*>(contents_ + position) = value;
   }
 
-  const ZoneGrowableArray<int>& pointer_offsets() const {
+  const ZoneGrowableArray<intptr_t>& pointer_offsets() const {
 #if defined(DEBUG)
     ASSERT(fixups_processed_);
 #endif
     return *pointer_offsets_;
   }
 
   // Emit an object pointer directly in the code.
   void EmitObject(const Object& object);
 
   // Emit a fixup at the current location.
@@ skipping 54 matching lines @@
  private:
   // The limit is set to kMinimumGap bytes before the end of the data area.
   // This leaves enough space for the longest possible instruction and allows
   // for a single, fast space check per instruction.
   static const intptr_t kMinimumGap = 32;
 
   uword contents_;
   uword cursor_;
   uword limit_;
   AssemblerFixup* fixup_;
-  ZoneGrowableArray<int>* pointer_offsets_;
+  ZoneGrowableArray<intptr_t>* pointer_offsets_;
 #if defined(DEBUG)
   bool fixups_processed_;
 #endif
 
   uword cursor() const { return cursor_; }
   uword limit() const { return limit_; }
   intptr_t Capacity() const {
     ASSERT(limit_ >= contents_);
     return (limit_ - contents_) + kMinimumGap;
   }
@@ skipping 21 matching lines @@
 #include "vm/assembler_x64.h"
 #elif defined(TARGET_ARCH_ARM)
 #include "vm/assembler_arm.h"
 #elif defined(TARGET_ARCH_MIPS)
 #include "vm/assembler_mips.h"
 #else
 #error Unknown architecture.
 #endif
 
 #endif  // VM_ASSEMBLER_H_