Contribution of PowerPC port (continuation of 422063005) - serialize.cc cleanup

src/serialize.cc

 // Copyright 2012 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 "src/v8.h"
 
 #include "src/accessors.h"
 #include "src/api.h"
 #include "src/base/platform/platform.h"
 #include "src/bootstrapper.h"
@@ skipping 784 matching lines @@
     DCHECK(space_number == CODE_SPACE || space_number == LO_SPACE);
   } else {
     DCHECK(space_number != CODE_SPACE);
   }
 #endif
 
   if (obj->IsCode()) {
     // Turn internal references encoded as offsets back to absolute addresses.
     Code* code = Code::cast(obj);
     Address entry = code->entry();
-    int mode_mask = RelocInfo::ModeMask(RelocInfo::INTERNAL_REFERENCE);
+    int mode_mask = RelocInfo::kInternalReferenceMask;
     for (RelocIterator it(code, mode_mask); !it.done(); it.next()) {
       RelocInfo* rinfo = it.rinfo();
       intptr_t offset =
           reinterpret_cast<intptr_t>(rinfo->target_internal_reference());
       DCHECK(0 <= offset && offset <= code->instruction_size());
-      rinfo->set_target_internal_reference(entry + offset);
+      rinfo->set_target_internal_reference(entry + offset, SKIP_ICACHE_FLUSH);

[Yang, 2015/03/09 08:03:56]

Why do we need this flag? Is there any call site where it's not
SKIP_ICACHE_FLUSH?

     }
   }
 }
 
 
 // We know the space requirements before deserialization and can
 // pre-allocate that reserved space. During deserialization, all we need
 // to do is to bump up the pointer for each space in the reserved
 // space. This is also used for fixing back references.
 // We may have to split up the pre-allocation into several chunks
@@ skipping 1124 matching lines @@
 
 Address Serializer::ObjectSerializer::PrepareCode() {
   // To make snapshots reproducible, we make a copy of the code object
   // and wipe all pointers in the copy, which we then serialize.
   Code* original = Code::cast(object_);
   Code* code = serializer_->CopyCode(original);
   // Code age headers are not serializable.
   code->MakeYoung(serializer_->isolate());
   Address entry = original->entry();
   int mode_mask = RelocInfo::kCodeTargetMask |
+                  RelocInfo::kInternalReferenceMask |
                   RelocInfo::ModeMask(RelocInfo::EMBEDDED_OBJECT) |
                   RelocInfo::ModeMask(RelocInfo::EXTERNAL_REFERENCE) |
-                  RelocInfo::ModeMask(RelocInfo::RUNTIME_ENTRY) |
-                  RelocInfo::ModeMask(RelocInfo::INTERNAL_REFERENCE);
+                  RelocInfo::ModeMask(RelocInfo::RUNTIME_ENTRY);
   for (RelocIterator it(code, mode_mask); !it.done(); it.next()) {
     RelocInfo* rinfo = it.rinfo();
-    if (RelocInfo::IsInternalReference(rinfo->rmode())) {
+    if (RelocInfo::ModeMask(rinfo->rmode()) &
+        RelocInfo::kInternalReferenceMask) {

[Yang, 2015/03/09 08:03:56]

Can we simply change the implementation of IsInternalReference?

       // Convert internal references to relative offsets.
       Address target = rinfo->target_internal_reference();
       intptr_t offset = target - entry;
       DCHECK(0 <= offset && offset <= original->instruction_size());
-      rinfo->set_target_internal_reference(reinterpret_cast<Address>(offset));
+      rinfo->set_target_internal_reference(reinterpret_cast<Address>(offset),

[Yang, 2015/03/09 08:03:56]

Afaict Assembler::set_target_internal_reference doesn't work for
INTERNAL_REFERENCE_ENCODED. Where does PPC use INTERNAL_REFERENCE_ENCODED? If it
really does, this would cause assertion failure.

+                                           SKIP_ICACHE_FLUSH);
     } else if (!(FLAG_enable_ool_constant_pool && rinfo->IsInConstantPool())) {
       rinfo->WipeOut();
     }
   }
   // We need to wipe out the header fields *after* wiping out the
   // relocations, because some of these fields are needed for the latter.
   code->WipeOutHeader();
   return code->address();
 }
 
@@ skipping 583 matching lines @@
   DisallowHeapAllocation no_gc;
   SerializedCodeData* scd = new SerializedCodeData(cached_data);
   SanityCheckResult r = scd->SanityCheck(isolate, source);
   if (r == CHECK_SUCCESS) return scd;
   cached_data->Reject();
   source->GetIsolate()->counters()->code_cache_reject_reason()->AddSample(r);
   delete scd;
   return NULL;
 }
 } }  // namespace v8::internal