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

src/assembler.h

 // 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 361 matching lines @@
     // Everything after runtime_entry (inclusive) is not GC'ed.
     RUNTIME_ENTRY,
     JS_RETURN,  // Marks start of the ExitJSFrame code.
     COMMENT,
     POSITION,            // See comment for kNoPosition above.
     STATEMENT_POSITION,  // See comment for kNoPosition above.
     DEBUG_BREAK_SLOT,    // Additional code inserted for debug break slot.
     EXTERNAL_REFERENCE,  // The address of an external C++ function.
     INTERNAL_REFERENCE,  // An address inside the same function.
 
-    // Marks constant and veneer pools. Only used on ARM and ARM64.
+    // ARCH1/ARCH2 use is architecture dependent.
     // They use a custom noncompact encoding.
-    CONST_POOL,
-    VENEER_POOL,
+    ARCH1,
+    ARCH2,
 
     DEOPT_REASON,  // Deoptimization reason index.
 
     // add more as needed
     // Pseudo-types
     NUMBER_OF_MODES,    // There are at most 15 modes with noncompact encoding.
     NONE32,             // never recorded 32-bit value
     NONE64,             // never recorded 64-bit value
     CODE_AGE_SEQUENCE,  // Not stored in RelocInfo array, used explictly by
                         // code aging.
 
-    // Encoded internal reference, used only on MIPS and MIPS64.
-    // Re-uses previous ARM-only encoding, to fit in RealRelocMode space.
-    INTERNAL_REFERENCE_ENCODED = CONST_POOL,
+#if V8_TARGET_ARCH_ARM || V8_TARGET_ARCH_ARM64
+    // Marks constant and veneer pools. Only used on ARM and ARM64.
+    CONST_POOL = ARCH1,

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

I strongly object using same enum values for entirely different semantics on
different platforms. This leads to ugly platform-dependent ifdefs whenever these
enum values are used, see debug.cc.

+    VENEER_POOL = ARCH2,
+#elif V8_TARGET_ARCH_PPC || V8_TARGET_ARCH_MIPS || V8_TARGET_ARCH_MIPS64
+    // Encoded internal reference, used only on PPC, MIPS and MIPS64.
+    INTERNAL_REFERENCE_ENCODED = ARCH1,
+#endif
 
     FIRST_REAL_RELOC_MODE = CODE_TARGET,
-    LAST_REAL_RELOC_MODE = VENEER_POOL,
+    LAST_REAL_RELOC_MODE = ARCH2,
     FIRST_PSEUDO_RELOC_MODE = CODE_AGE_SEQUENCE,
     LAST_PSEUDO_RELOC_MODE = CODE_AGE_SEQUENCE,
     LAST_CODE_ENUM = DEBUG_BREAK,
     LAST_GCED_ENUM = CELL,
     // Modes <= LAST_COMPACT_ENUM are guaranteed to have compact encoding.
     LAST_COMPACT_ENUM = CODE_TARGET_WITH_ID,
     LAST_STANDARD_NONCOMPACT_ENUM = INTERNAL_REFERENCE
   };
 
   RelocInfo() {}
@@ skipping 30 matching lines @@
   static inline bool IsGCRelocMode(Mode mode) {
     return mode <= LAST_GCED_ENUM;
   }
   static inline bool IsJSReturn(Mode mode) {
     return mode == JS_RETURN;
   }
   static inline bool IsComment(Mode mode) {
     return mode == COMMENT;
   }
   static inline bool IsConstPool(Mode mode) {
+#if V8_TARGET_ARCH_ARM || V8_TARGET_ARCH_ARM64
     return mode == CONST_POOL;
+#else
+    return false;
+#endif
   }
   static inline bool IsVeneerPool(Mode mode) {
+#if V8_TARGET_ARCH_ARM || V8_TARGET_ARCH_ARM64
     return mode == VENEER_POOL;
+#else
+    return false;
+#endif
   }
   static inline bool IsDeoptReason(Mode mode) {
     return mode == DEOPT_REASON;
   }
   static inline bool IsPosition(Mode mode) {
     return mode == POSITION || mode == STATEMENT_POSITION;
   }
   static inline bool IsStatementPosition(Mode mode) {
     return mode == STATEMENT_POSITION;
   }
   static inline bool IsExternalReference(Mode mode) {
     return mode == EXTERNAL_REFERENCE;
   }
   static inline bool IsInternalReference(Mode mode) {
     return mode == INTERNAL_REFERENCE;
   }
   static inline bool IsInternalReferenceEncoded(Mode mode) {
+#if V8_TARGET_ARCH_PPC || V8_TARGET_ARCH_MIPS || V8_TARGET_ARCH_MIPS64
     return mode == INTERNAL_REFERENCE_ENCODED;
+#else
+    return false;
+#endif
   }
   static inline bool IsDebugBreakSlot(Mode mode) {
     return mode == DEBUG_BREAK_SLOT;
   }
   static inline bool IsDebuggerStatement(Mode mode) {
     return mode == DEBUG_BREAK;
   }
   static inline bool IsNone(Mode mode) {
     return mode == NONE32 || mode == NONE64;
   }
@@ skipping 91 matching lines @@
   // should return the end of the instructions to be patched, allowing the
   // deserializer to deserialize the instructions as raw bytes and put them in
   // place, ready to be patched with the target.
   INLINE(int target_address_size());
 
   // Read the reference in the instruction this relocation
   // applies to; can only be called if rmode_ is EXTERNAL_REFERENCE.
   INLINE(Address target_external_reference());
 
   // Read/modify the reference in the instruction this relocation
-  // applies to; can only be called if rmode_ is INTERNAL_REFERENCE.
+  // applies to; can only be called if rmode_ is in kInternalReferenceMask.
   INLINE(Address target_internal_reference());
-  INLINE(void set_target_internal_reference(Address target));
+  INLINE(void set_target_internal_reference(
+      Address target,
+      ICacheFlushMode icache_flush_mode = FLUSH_ICACHE_IF_NEEDED));
 
   // Read/modify the address of a call instruction. This is used to relocate
   // the break points where straight-line code is patched with a call
   // instruction.
   INLINE(Address call_address());
   INLINE(void set_call_address(Address target));
   INLINE(Object* call_object());
   INLINE(void set_call_object(Object* target));
   INLINE(Object** call_object_address());
 
@@ skipping 28 matching lines @@
 #endif  // ENABLE_DISASSEMBLER
 #ifdef VERIFY_HEAP
   void Verify(Isolate* isolate);
 #endif
 
   static const int kCodeTargetMask = (1 << (LAST_CODE_ENUM + 1)) - 1;
   static const int kPositionMask = 1 << POSITION | 1 << STATEMENT_POSITION;
   static const int kDataMask =
       (1 << CODE_TARGET_WITH_ID) | kPositionMask | (1 << COMMENT);
   static const int kApplyMask;  // Modes affected by apply. Depends on arch.
+  static const int kInternalReferenceMask;
 
  private:
   // On ARM, note that pc_ is the address of the constant pool entry
   // to be relocated and not the address of the instruction
   // referencing the constant pool entry (except when rmode_ ==
   // comment).
   byte* pc_;
   Mode rmode_;
   union {
     intptr_t data_;
@@ skipping 51 matching lines @@
   // On ia32 and arm this is 1 + 4 + 1 + 1 + 1 + 4 = 12.
   // On x64 this is 1 + 4 + 1 + 1 + 1 + 8 == 16;
   // Here we use the maximum of the two.
   static const int kMaxSize = 16;
 
  private:
   inline uint32_t WriteVariableLengthPCJump(uint32_t pc_delta);
   inline void WriteTaggedPC(uint32_t pc_delta, int tag);
   inline void WriteExtraTaggedPC(uint32_t pc_delta, int extra_tag);
   inline void WriteExtraTaggedIntData(int data_delta, int top_tag);
-  inline void WriteExtraTaggedPoolData(int data, int pool_type);
+  inline void WriteExtraTaggedArchData(int data, int pool_type);
   inline void WriteExtraTaggedData(intptr_t data_delta, int top_tag);
   inline void WriteTaggedData(intptr_t data_delta, int tag);
   inline void WriteExtraTag(int extra_tag, int top_tag);
   inline void WritePosition(int pc_delta, int pos_delta, RelocInfo::Mode rmode);
 
   void FlushPosition();
 
   byte* pos_;
   byte* last_pc_;
   int last_id_;
@@ skipping 38 matching lines @@
   // Advance* moves the position before/after reading.
   // *Read* reads from current byte(s) into rinfo_.
   // *Get* just reads and returns info on current byte.
   void Advance(int bytes = 1) { pos_ -= bytes; }
   int AdvanceGetTag();
   int GetExtraTag();
   int GetTopTag();
   void ReadTaggedPC();
   void AdvanceReadPC();
   void AdvanceReadId();
-  void AdvanceReadPoolData();
+  void AdvanceReadArchData();
   void AdvanceReadPosition();
   void AdvanceReadData();
   void AdvanceReadVariableLengthPCJump();
   int GetLocatableTypeTag();
   void ReadTaggedId();
   void ReadTaggedPosition();
   void ReadTaggedData();
 
   // If the given mode is wanted, set it in rinfo_ and return true.
   // Else return false. Used for efficiently skipping unwanted modes.
@@ skipping 28 matching lines @@
 // all external references in the code so that they can be bound to the correct
 // addresses when deserializing a heap.
 class ExternalReference BASE_EMBEDDED {
  public:
   // Used in the simulator to support different native api calls.
   enum Type {
     // Builtin call.
     // Object* f(v8::internal::Arguments).
     BUILTIN_CALL,  // default
 
+
     // Builtin that takes float arguments and returns an int.
     // int f(double, double).
     BUILTIN_COMPARE_CALL,
 
     // Builtin call that returns floating point.
     // double f(double, double).
     BUILTIN_FP_FP_CALL,
 
     // Builtin call that returns floating point.
     // double f(double).
@@ skipping 342 matching lines @@
   NullCallWrapper() { }
   virtual ~NullCallWrapper() { }
   virtual void BeforeCall(int call_size) const { }
   virtual void AfterCall() const { }
 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_ASSEMBLER_H_