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

src/debug.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/api.h"
 #include "src/arguments.h"
 #include "src/bootstrapper.h"
 #include "src/code-stubs.h"
@@ skipping 1627 matching lines @@
 // Figure out how many bytes of "pc_offset" correspond to actual code by
 // subtracting off the bytes that correspond to constant/veneer pools.  See
 // Assembler::CheckConstPool() and Assembler::CheckVeneerPool(). Note that this
 // is only useful for architectures using constant pools or veneer pools.
 static int ComputeCodeOffsetFromPcOffset(Code *code, int pc_offset) {
   DCHECK_EQ(code->kind(), Code::FUNCTION);
   DCHECK(!code->has_debug_break_slots());
   DCHECK_LE(0, pc_offset);
   DCHECK_LT(pc_offset, code->instruction_end() - code->instruction_start());
 
+  int code_offset = pc_offset;
+#if V8_TARGET_ARCH_ARM || V8_TARGET_ARCH_ARM64

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

Strongly objecting platform-dependent code here.

   int mask = RelocInfo::ModeMask(RelocInfo::CONST_POOL) |
              RelocInfo::ModeMask(RelocInfo::VENEER_POOL);
   byte *pc = code->instruction_start() + pc_offset;
-  int code_offset = pc_offset;
   for (RelocIterator it(code, mask); !it.done(); it.next()) {
     RelocInfo* info = it.rinfo();
     if (info->pc() >= pc) break;
     DCHECK(RelocInfo::IsConstPool(info->rmode()));
     code_offset -= static_cast<int>(info->data());
     DCHECK_LE(0, code_offset);
   }
+#endif
 
   return code_offset;
 }
 
 
 // The inverse of ComputeCodeOffsetFromPcOffset.
 static int ComputePcOffsetFromCodeOffset(Code *code, int code_offset) {
   DCHECK_EQ(code->kind(), Code::FUNCTION);
 
+#if V8_TARGET_ARCH_ARM || V8_TARGET_ARCH_ARM64

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

Ditto.

   int mask = RelocInfo::ModeMask(RelocInfo::DEBUG_BREAK_SLOT) |
              RelocInfo::ModeMask(RelocInfo::CONST_POOL) |
              RelocInfo::ModeMask(RelocInfo::VENEER_POOL);
+#else
+  int mask = RelocInfo::ModeMask(RelocInfo::DEBUG_BREAK_SLOT);
+#endif
   int reloc = 0;
   for (RelocIterator it(code, mask); !it.done(); it.next()) {
     RelocInfo* info = it.rinfo();
     if (info->pc() - code->instruction_start() - reloc >= code_offset) break;
     if (RelocInfo::IsDebugBreakSlot(info->rmode())) {
       reloc += Assembler::kDebugBreakSlotLength;
     } else {
       DCHECK(RelocInfo::IsConstPool(info->rmode()));
       reloc += static_cast<int>(info->data());
     }
@@ skipping 1700 matching lines @@
   logger_->DebugEvent("Put", message.text());
 }
 
 
 void LockingCommandMessageQueue::Clear() {
   base::LockGuard<base::Mutex> lock_guard(&mutex_);
   queue_.Clear();
 }
 
 } }  // namespace v8::internal