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

src/x87/code-stubs-x87.h

 // Copyright 2011 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_X87_CODE_STUBS_X87_H_
 #define V8_X87_CODE_STUBS_X87_H_
 
 namespace v8 {
 namespace internal {
 
@@ skipping 48 matching lines @@
   enum LookupMode { POSITIVE_LOOKUP, NEGATIVE_LOOKUP };
 
   NameDictionaryLookupStub(Isolate* isolate, Register dictionary,
                            Register result, Register index, LookupMode mode)
       : PlatformCodeStub(isolate) {
     minor_key_ = DictionaryBits::encode(dictionary.code()) |
                  ResultBits::encode(result.code()) |
                  IndexBits::encode(index.code()) | LookupModeBits::encode(mode);
   }
 
-  void Generate(MacroAssembler* masm);
-
   static void GenerateNegativeLookup(MacroAssembler* masm,
                                      Label* miss,
                                      Label* done,
                                      Register properties,
                                      Handle<Name> name,
                                      Register r0);
 
   static void GeneratePositiveLookup(MacroAssembler* masm,
                                      Label* miss,
                                      Label* done,
@@ skipping 28 matching lines @@
     return Register::from_code(IndexBits::decode(minor_key_));
   }
 
   LookupMode mode() const { return LookupModeBits::decode(minor_key_); }
 
   class DictionaryBits: public BitField<int, 0, 3> {};
   class ResultBits: public BitField<int, 3, 3> {};
   class IndexBits: public BitField<int, 6, 3> {};
   class LookupModeBits: public BitField<LookupMode, 9, 1> {};
 
-  DEFINE_CODE_STUB(NameDictionaryLookup, PlatformCodeStub);
+  DEFINE_PLATFORM_CODE_STUB(NameDictionaryLookup, PlatformCodeStub);
 };
 
 
 class RecordWriteStub: public PlatformCodeStub {
  public:
   RecordWriteStub(Isolate* isolate,
                   Register object,
                   Register value,
                   Register address,
                   RememberedSetAction remembered_set_action)
@@ skipping 187 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 21 matching lines @@
 
   RegisterAllocation regs_;
 
   DISALLOW_COPY_AND_ASSIGN(RecordWriteStub);
 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_X87_CODE_STUBS_X87_H_