Avoiding the assumption that the pc pointer of RelocInfo points to the word c...

src/serialize.cc

 // Copyright 2006-2008 the V8 project authors. 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.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 568 matching lines @@
       1,
       "Builtins::builtin_passed_function");
   Add(ExternalReference::the_hole_value_location().address(),
       UNCLASSIFIED,
       2,
       "Factory::the_hole_value().location()");
   Add(ExternalReference::address_of_stack_guard_limit().address(),
       UNCLASSIFIED,
       3,
       "StackGuard::address_of_limit()");
+  Add(ExternalReference::address_of_regexp_stack_limit().address(),
+      UNCLASSIFIED,
+      4,
+      "StackGuard::address_of_limit()");

[Mads Ager (chromium), 2009/01/13 14:26:10]

RegexpStackGuard?

[olehougaard, 2009/01/13 14:35:22]

Fixed.

   Add(ExternalReference::debug_break().address(),
       UNCLASSIFIED,
-      4,
+      5,
       "Debug::Break()");
   Add(ExternalReference::new_space_start().address(),
       UNCLASSIFIED,
-      5,
+      6,
       "Heap::NewSpaceStart()");
   Add(ExternalReference::heap_always_allocate_scope_depth().address(),
       UNCLASSIFIED,
-      6,
+      7,
       "Heap::always_allocate_scope_depth()");
   Add(ExternalReference::new_space_allocation_limit_address().address(),
       UNCLASSIFIED,
-      7,
+      8,
       "Heap::NewSpaceAllocationLimitAddress()");
   Add(ExternalReference::new_space_allocation_top_address().address(),
       UNCLASSIFIED,
-      8,
+      9,
       "Heap::NewSpaceAllocationTopAddress()");
   Add(ExternalReference::debug_step_in_fp_address().address(),
       UNCLASSIFIED,
-      9,
+      10,
       "Debug::step_in_fp_addr()");
 }
 
 
 ExternalReferenceEncoder::ExternalReferenceEncoder()
     : encodings_(Match) {
   ExternalReferenceTable* external_references =
       ExternalReferenceTable::instance();
   for (int i = 0; i < external_references->size(); ++i) {
     Put(external_references->address(i), i);
@@ skipping 175 matching lines @@
       CHECK(*p == NULL ? code == 0 : code != 0);
       offsets_.Add(reinterpret_cast<Address>(p) - obj_address_);
       addresses_.Add(reinterpret_cast<Address>(code));
     }
   }
 
   virtual void VisitRuntimeEntry(RelocInfo* rinfo) {
     Address target = rinfo->target_address();
     uint32_t encoding = reference_encoder_->Encode(target);
     CHECK(target == NULL ? encoding == 0 : encoding != 0);
-    offsets_.Add(reinterpret_cast<Address>(rinfo->pc()) - obj_address_);
+    offsets_.Add(rinfo->target_address_address() - obj_address_);
     addresses_.Add(reinterpret_cast<Address>(encoding));
   }
 
   void Update(Address start_address) {
     for (int i = 0; i < offsets_.length(); i++) {
       Address* p = reinterpret_cast<Address*>(start_address + offsets_[i]);
       *p = addresses_[i];
     }
   }
 
@@ skipping 444 matching lines @@
 
 void Deserializer::VisitExternalReferences(Address* start, Address* end) {
   for (Address* p = start; p < end; ++p) {
     uint32_t code = reinterpret_cast<uint32_t>(*p);
     *p = reference_decoder_->Decode(code);
   }
 }
 
 
 void Deserializer::VisitRuntimeEntry(RelocInfo* rinfo) {
-  uint32_t* pc = reinterpret_cast<uint32_t*>(rinfo->pc());
+  uint32_t* pc = reinterpret_cast<uint32_t*>(rinfo->target_address_address());
   uint32_t encoding = *pc;
   Address target = reference_decoder_->Decode(encoding);
   rinfo->set_target_address(target);
 }
 
 
 void Deserializer::GetFlags() {
   reader_.ExpectC('F');
   int argc = reader_.GetInt() + 1;
   char** argv = NewArray<char*>(argc);
@@ skipping 232 matching lines @@
         ASSERT(index < large_objects_.length());
       }
       return large_objects_[index];  // s.page_offset() is ignored.
   }
   UNREACHABLE();
   return NULL;
 }
 
 
 } }  // namespace v8::internal