Unify JSEntryStub and JSConstructEntryStub, and some more code stub cleanups.

src/arm/code-stubs-arm.h

 // 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.
 
 #ifndef V8_ARM_CODE_STUBS_ARM_H_
 #define V8_ARM_CODE_STUBS_ARM_H_
 
 namespace v8 {
 namespace internal {
 
@@ skipping 53 matching lines @@
                              Register the_heap_number, Register scratch)
       : PlatformCodeStub(isolate) {
     minor_key_ = IntRegisterBits::encode(the_int.code()) |
                  HeapNumberRegisterBits::encode(the_heap_number.code()) |
                  ScratchRegisterBits::encode(scratch.code());
   }
 
   static void GenerateFixedRegStubsAheadOfTime(Isolate* isolate);
 
  private:
-  void Generate(MacroAssembler* masm);
-
   Register the_int() const {
     return Register::from_code(IntRegisterBits::decode(minor_key_));
   }
 
   Register the_heap_number() const {
     return Register::from_code(HeapNumberRegisterBits::decode(minor_key_));
   }
 
   Register scratch() const {
     return Register::from_code(ScratchRegisterBits::decode(minor_key_));
   }
 
   // Minor key encoding in 16 bits.
   class IntRegisterBits: public BitField<int, 0, 4> {};
   class HeapNumberRegisterBits: public BitField<int, 4, 4> {};
   class ScratchRegisterBits: public BitField<int, 8, 4> {};
 
-  DEFINE_CODE_STUB(WriteInt32ToHeapNumber, PlatformCodeStub);
+  DEFINE_PLATFORM_CODE_STUB(WriteInt32ToHeapNumber, PlatformCodeStub);
 };
 
 
 class RecordWriteStub: public PlatformCodeStub {
  public:
   RecordWriteStub(Isolate* isolate,
                   Register object,
                   Register value,
                   Register address,
                   RememberedSetAction remembered_set_action,
@@ skipping 134 matching lines @@
     friend class RecordWriteStub;
   };
 
   enum OnNoNeedToInformIncrementalMarker {
     kReturnOnNoNeedToInformIncrementalMarker,
     kUpdateRememberedSetOnNoNeedToInformIncrementalMarker
   };
 
   virtual inline Major MajorKey() const FINAL OVERRIDE { return RecordWrite; }
 
-  void Generate(MacroAssembler* masm);
+  virtual void Generate(MacroAssembler* masm) OVERRIDE;
   void GenerateIncremental(MacroAssembler* masm, Mode mode);
   void CheckNeedsToInformIncrementalMarker(
       MacroAssembler* masm,
       OnNoNeedToInformIncrementalMarker on_no_need,
       Mode mode);
   void InformIncrementalMarker(MacroAssembler* masm);
 
   void Activate(Code* code) {
     code->GetHeap()->incremental_marking()->ActivateGeneratedStub(code);
   }
@@ skipping 32 matching lines @@
 
 
 // Trampoline stub to call into native code. To call safely into native code
 // in the presence of compacting GC (which can move code objects) we need to
 // keep the code which called into native pinned in the memory. Currently the
 // simplest approach is to generate such stub early enough so it can never be
 // moved by GC
 class DirectCEntryStub: public PlatformCodeStub {
  public:
   explicit DirectCEntryStub(Isolate* isolate) : PlatformCodeStub(isolate) {}
-  void Generate(MacroAssembler* masm);
   void GenerateCall(MacroAssembler* masm, Register target);
 
  private:
   bool NeedsImmovableCode() { return true; }
 
-  DEFINE_CODE_STUB(DirectCEntry, PlatformCodeStub);
+  DEFINE_PLATFORM_CODE_STUB(DirectCEntry, PlatformCodeStub);
 };
 
 
 class NameDictionaryLookupStub: public PlatformCodeStub {
  public:
   enum LookupMode { POSITIVE_LOOKUP, NEGATIVE_LOOKUP };
 
   NameDictionaryLookupStub(Isolate* isolate, LookupMode mode)
       : PlatformCodeStub(isolate) {
     minor_key_ = LookupModeBits::encode(mode);
   }
 
-  void Generate(MacroAssembler* masm);
-
   static void GenerateNegativeLookup(MacroAssembler* masm,
                                      Label* miss,
                                      Label* done,
                                      Register receiver,
                                      Register properties,
                                      Handle<Name> name,
                                      Register scratch0);
 
   static void GeneratePositiveLookup(MacroAssembler* masm,
                                      Label* miss,
@@ skipping 14 matching lines @@
       NameDictionary::kCapacityIndex * kPointerSize;
 
   static const int kElementsStartOffset =
       NameDictionary::kHeaderSize +
       NameDictionary::kElementsStartIndex * kPointerSize;
 
   LookupMode mode() const { return LookupModeBits::decode(minor_key_); }
 
   class LookupModeBits: public BitField<LookupMode, 0, 1> {};
 
-  DEFINE_CODE_STUB(NameDictionaryLookup, PlatformCodeStub);
+  DEFINE_PLATFORM_CODE_STUB(NameDictionaryLookup, PlatformCodeStub);
 };
 
 } }  // namespace v8::internal
 
 #endif  // V8_ARM_CODE_STUBS_ARM_H_