Add support for extended constant pool arrays.

src/arm/assembler-arm.cc

 // Copyright (c) 1994-2006 Sun Microsystems Inc.
 // All Rights Reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions
 // are met:
 //
 // - Redistributions of source code must retain the above copyright notice,
 // this list of conditions and the following disclaimer.
 //
@@ skipping 3536 matching lines @@
     } else if (IsCodePtrEntry(rmode)) {
       count_of_code_ptr_++;
     } else {
       ASSERT(IsHeapPtrEntry(rmode));
       count_of_heap_ptr_++;
     }
   }
 
   // Check if we still have room for another entry given Arm's ldr and vldr
   // immediate offset range.
-  if (!(is_uint12(ConstantPoolArray::SizeFor(count_of_64bit_,
-                                             count_of_code_ptr_,
-                                             count_of_heap_ptr_,
-                                             count_of_32bit_))) &&
-        is_uint10(ConstantPoolArray::SizeFor(count_of_64bit_, 0, 0, 0))) {
+  // TODO(rmcilroy): Avoid creating a new object here when we support
+  //                 extended constant pools.
+  ConstantPoolArray::NumberOfEntries total(count_of_64bit_,
+                                           count_of_code_ptr_,
+                                           count_of_heap_ptr_,
+                                           count_of_32bit_);
+  ConstantPoolArray::NumberOfEntries int64_counts(count_of_64bit_, 0, 0, 0);
+  if (!(is_uint12(ConstantPoolArray::SizeFor(total)) &&
+        is_uint10(ConstantPoolArray::SizeFor(int64_counts)))) {
     assm->set_constant_pool_full();
   }
 }
 
 
 void ConstantPoolBuilder::Relocate(int pc_delta) {
   for (std::vector<RelocInfo>::iterator rinfo = entries_.begin();
        rinfo != entries_.end(); rinfo++) {
     ASSERT(rinfo->rmode() != RelocInfo::JS_RETURN);
     rinfo->set_pc(rinfo->pc() + pc_delta);
   }
 }
 
 
 Handle<ConstantPoolArray> ConstantPoolBuilder::New(Isolate* isolate) {
   if (IsEmpty()) {
     return isolate->factory()->empty_constant_pool_array();
   } else {
-    return isolate->factory()->NewConstantPoolArray(count_of_64bit_,
-                                                    count_of_code_ptr_,
-                                                    count_of_heap_ptr_,
-                                                    count_of_32bit_);
+    ConstantPoolArray::NumberOfEntries small(count_of_64bit_,
+                                             count_of_code_ptr_,
+                                             count_of_heap_ptr_,
+                                             count_of_32bit_);
+    return isolate->factory()->NewConstantPoolArray(small);
   }
 }
 
 
 void ConstantPoolBuilder::Populate(Assembler* assm,
                                    ConstantPoolArray* constant_pool) {
-  ASSERT(constant_pool->count_of_int64_entries() == count_of_64bit_);
-  ASSERT(constant_pool->count_of_code_ptr_entries() == count_of_code_ptr_);
-  ASSERT(constant_pool->count_of_heap_ptr_entries() == count_of_heap_ptr_);
-  ASSERT(constant_pool->count_of_int32_entries() == count_of_32bit_);
+  ConstantPoolArray::LayoutSection section = ConstantPoolArray::SMALL_SECTION;
+  ASSERT(count_of_64bit_ ==
+      constant_pool->number_of_entries(ConstantPoolArray::INT64, section));
+  ASSERT(count_of_code_ptr_ ==
+      constant_pool->number_of_entries(ConstantPoolArray::CODE_PTR, section));
+  ASSERT(count_of_heap_ptr_ ==
+      constant_pool->number_of_entries(ConstantPoolArray::HEAP_PTR, section));
+  ASSERT(count_of_32bit_ ==
+      constant_pool->number_of_entries(ConstantPoolArray::INT32, section));
   ASSERT(entries_.size() == merged_indexes_.size());
 
   int index_64bit = 0;
   int index_code_ptr = count_of_64bit_;
   int index_heap_ptr = count_of_64bit_ + count_of_code_ptr_;
   int index_32bit = count_of_64bit_ + count_of_code_ptr_ + count_of_heap_ptr_;
 
   size_t i;
   std::vector<RelocInfo>::const_iterator rinfo;
   for (rinfo = entries_.begin(), i = 0; rinfo != entries_.end(); rinfo++, i++) {
     RelocInfo::Mode rmode = rinfo->rmode();
 
     // Update constant pool if necessary and get the entry's offset.
     int offset;
     if (merged_indexes_[i] == -1) {
       if (Is64BitEntry(rmode)) {
         offset = constant_pool->OffsetOfElementAt(index_64bit) - kHeapObjectTag;
         constant_pool->set(index_64bit++, rinfo->data64());
       } else if (Is32BitEntry(rmode)) {
         offset = constant_pool->OffsetOfElementAt(index_32bit) - kHeapObjectTag;
         constant_pool->set(index_32bit++, static_cast<int32_t>(rinfo->data()));
       } else if (IsCodePtrEntry(rmode)) {
         offset = constant_pool->OffsetOfElementAt(index_code_ptr) -
             kHeapObjectTag;
         constant_pool->set(index_code_ptr++,
-                           reinterpret_cast<Object *>(rinfo->data()));
+                           reinterpret_cast<Address>(rinfo->data()));
       } else {
         ASSERT(IsHeapPtrEntry(rmode));
         offset = constant_pool->OffsetOfElementAt(index_heap_ptr) -
             kHeapObjectTag;
         constant_pool->set(index_heap_ptr++,
                            reinterpret_cast<Object *>(rinfo->data()));
       }
       merged_indexes_[i] = offset;  // Stash offset for merged entries.
     } else {
       size_t merged_index = static_cast<size_t>(merged_indexes_[i]);
@@ skipping 23 matching lines @@
   ASSERT((index_64bit == count_of_64bit_) &&
          (index_code_ptr == (index_64bit + count_of_code_ptr_)) &&
          (index_heap_ptr == (index_code_ptr + count_of_heap_ptr_)) &&
          (index_32bit == (index_heap_ptr + count_of_32bit_)));
 }
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_ARM