Enable constant pool support.

src/objects.cc

 // Copyright 2013 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <iomanip>
 #include <sstream>
 
 #include "src/v8.h"
 
 #include "src/accessors.h"
@@ skipping 11602 matching lines @@
   if ((name != NULL) && (name[0] != '\0')) {
     os << "name = " << name << "\n";
   }
   if (kind() == OPTIMIZED_FUNCTION) {
     os << "stack_slots = " << stack_slots() << "\n";
   }
 
   os << "Instructions (size = " << instruction_size() << ")\n";
   {
     Isolate* isolate = GetIsolate();
-    int decode_size = is_crankshafted()
-                          ? static_cast<int>(safepoint_table_offset())
-                          : instruction_size();
-    // If there might be a back edge table, stop before reaching it.
-    if (kind() == Code::FUNCTION) {
-      decode_size =
-          Min(decode_size, static_cast<int>(back_edge_table_offset()));
+    int size = instruction_size();
+    int safepoint_offset =
+        is_crankshafted() ? static_cast<int>(safepoint_table_offset()) : size;
+    int back_edge_offset = (kind() == Code::FUNCTION)
+                               ? static_cast<int>(back_edge_table_offset())
+                               : size;
+    int constant_offset =
+        FLAG_enable_embedded_constant_pool ? constant_pool_offset() : size;
+
+    // Stop before reaching any embedded tables
+    int code_size = Min(safepoint_offset, back_edge_offset);
+    byte* begin = instruction_start();
+    byte* end = begin + Min(code_size, constant_offset);
+    Disassembler::Decode(isolate, &os, begin, end, this);
+
+    if (constant_offset < code_size) {
+      int constant_size = code_size - constant_offset;
+      DCHECK((constant_size & kPointerAlignmentMask) == 0);
+      os << "\nConstant Pool (size = " << constant_size << ")\n";
+      Vector<char> buf = Vector<char>::New(50);
+      intptr_t* ptr = reinterpret_cast<intptr_t*>(begin + constant_offset);
+      for (int i = 0; i < constant_size; i += kPointerSize, ptr++) {
+        SNPrintF(buf, "%4d %08" V8PRIxPTR, i, *ptr);
+        os << static_cast<const void*>(ptr) << "  " << buf.start() << "\n";
+      }
     }
-    byte* begin = instruction_start();
-    byte* end = begin + decode_size;
-    Disassembler::Decode(isolate, &os, begin, end, this);
   }
   os << "\n";
 
   if (kind() == FUNCTION) {
     DeoptimizationOutputData* data =
         DeoptimizationOutputData::cast(this->deoptimization_data());
     data->DeoptimizationOutputDataPrint(os);
   } else if (kind() == OPTIMIZED_FUNCTION) {
     DeoptimizationInputData* data =
         DeoptimizationInputData::cast(this->deoptimization_data());
@@ skipping 61 matching lines @@
   }
 
   os << "RelocInfo (size = " << relocation_size() << ")\n";
   for (RelocIterator it(this); !it.done(); it.next()) {
     it.rinfo()->Print(GetIsolate(), os);
   }
   os << "\n";
 
 #ifdef OBJECT_PRINT
   if (FLAG_enable_ool_constant_pool) {
-    ConstantPoolArray* pool = constant_pool();
+    ConstantPoolArray* pool =
+        reinterpret_cast<ConstantPoolArray*>(constant_pool());
     if (pool->length()) {
       os << "Constant Pool\n";
       pool->Print(os);
       os << "\n";
     }
   }
 #endif
 }
 #endif  // ENABLE_DISASSEMBLER
 
@@ skipping 5443 matching lines @@
                                                CompilationInfo* info) {
   Handle<DependentCode> codes = DependentCode::InsertCompilationInfo(
       handle(cell->dependent_code(), info->isolate()),
       DependentCode::kPropertyCellChangedGroup, info->object_wrapper());
   if (*codes != cell->dependent_code()) cell->set_dependent_code(*codes);
   info->dependencies(DependentCode::kPropertyCellChangedGroup)->Add(
       cell, info->zone());
 }
 
 } }  // namespace v8::internal