[v8-dev] MIPS: Introduce code stub constructors for stub keys. (issue 535373003 by [email protected])

Fri, 05 Sep 2014 02:25:27 -0700

Reviewers: danno, Yang, paul.l..., gergely.kis.imgtec, akos.palfi.imgtec, dusmil.imgtec, 

Description:
MIPS: Introduce code stub constructors for stub keys.

Port r23716 (9118048)

BUG=

Please review this at https://codereview.chromium.org/535373003/

SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge

Affected files (+28, -38 lines):
  M src/mips/code-stubs-mips.h
  M src/mips64/code-stubs-mips64.h


Index: src/mips/code-stubs-mips.h
diff --git a/src/mips/code-stubs-mips.h b/src/mips/code-stubs-mips.h
index 561f882290c4f8d2153bda4fe64ea33d58c099b3..ae653839564b922bd1275ec1d2c7cb485f8c9de6 100644 
--- a/src/mips/code-stubs-mips.h
+++ b/src/mips/code-stubs-mips.h
@@ -5,9 +5,6 @@
 #ifndef V8_MIPS_CODE_STUBS_ARM_H_
 #define V8_MIPS_CODE_STUBS_ARM_H_

-#include "src/code-stubs.h"
-
-
 namespace v8 {
 namespace internal {

@@ -65,24 +62,25 @@ class StoreRegistersStateStub: public PlatformCodeStub {
       : PlatformCodeStub(isolate) {}

   static void GenerateAheadOfTime(Isolate* isolate);
+
  private:
-  virtual inline Major MajorKey() const FINAL OVERRIDE;
-  uint32_t MinorKey() const { return 0; }
+    void Generate(MacroAssembler* masm);

-  void Generate(MacroAssembler* masm);
+  DEFINE_CODE_STUB(StoreRegistersState, PlatformCodeStub);
 };

+
 class RestoreRegistersStateStub: public PlatformCodeStub {
  public:
   explicit RestoreRegistersStateStub(Isolate* isolate)
       : PlatformCodeStub(isolate) {}

   static void GenerateAheadOfTime(Isolate* isolate);
- private:
-  virtual inline Major MajorKey() const FINAL OVERRIDE;
-  uint32_t MinorKey() const { return 0; }

+ private:
   void Generate(MacroAssembler* masm);
+
+  DEFINE_CODE_STUB(RestoreRegistersState, PlatformCodeStub);
 };
@@ -108,8 +106,6 @@ class WriteInt32ToHeapNumberStub : public PlatformCodeStub { 
   static void GenerateFixedRegStubsAheadOfTime(Isolate* isolate);

  private:
-  virtual inline Major MajorKey() const FINAL OVERRIDE;
-
   void Generate(MacroAssembler* masm);

   Register the_int() const {
@@ -134,7 +130,7 @@ class WriteInt32ToHeapNumberStub : public PlatformCodeStub { 
   class ScratchRegisterBits: public BitField<int, 8, 4> {};
   class SignRegisterBits: public BitField<int, 12, 4> {};

-  DISALLOW_COPY_AND_ASSIGN(WriteInt32ToHeapNumberStub);
+  DEFINE_CODE_STUB(WriteInt32ToHeapNumber, PlatformCodeStub);
 };


@@ -157,6 +153,9 @@ class RecordWriteStub: public PlatformCodeStub {
                  SaveFPRegsModeBits::encode(fp_mode);
   }

+  RecordWriteStub(uint32_t key, Isolate* isolate)
+ : PlatformCodeStub(key, isolate), regs_(object(), address(), value()) {} 
+
   enum Mode {
     STORE_BUFFER_ONLY,
     INCREMENTAL,
@@ -288,7 +287,7 @@ class RecordWriteStub: public PlatformCodeStub {
     kUpdateRememberedSetOnNoNeedToInformIncrementalMarker
   };

-  virtual inline Major MajorKey() const FINAL OVERRIDE;
+ virtual inline Major MajorKey() const FINAL OVERRIDE { return RecordWrite; } 

   void Generate(MacroAssembler* masm);
   void GenerateIncremental(MacroAssembler* masm, Mode mode);
@@ -347,11 +346,9 @@ class DirectCEntryStub: public PlatformCodeStub {
   void GenerateCall(MacroAssembler* masm, Register target);

  private:
-  virtual inline Major MajorKey() const FINAL OVERRIDE;
-
   bool NeedsImmovableCode() { return true; }

-  DISALLOW_COPY_AND_ASSIGN(DirectCEntryStub);
+  DEFINE_CODE_STUB(DirectCEntry, PlatformCodeStub);
 };
@@ -396,13 +393,11 @@ class NameDictionaryLookupStub: public PlatformCodeStub { 
       NameDictionary::kHeaderSize +
       NameDictionary::kElementsStartIndex * kPointerSize;

-  virtual inline Major MajorKey() const FINAL OVERRIDE;
-
   LookupMode mode() const { return LookupModeBits::decode(minor_key_); }

   class LookupModeBits: public BitField<LookupMode, 0, 1> {};

-  DISALLOW_COPY_AND_ASSIGN(NameDictionaryLookupStub);
+  DEFINE_CODE_STUB(NameDictionaryLookup, PlatformCodeStub);
 };


Index: src/mips64/code-stubs-mips64.h
diff --git a/src/mips64/code-stubs-mips64.h b/src/mips64/code-stubs-mips64.h
index fc93f415609cf14a23aa30b9d6d915286fc19ed4..b6a917d537e95bb25d9ec753417c485f90a1e651 100644 
--- a/src/mips64/code-stubs-mips64.h
+++ b/src/mips64/code-stubs-mips64.h
@@ -5,9 +5,6 @@
 #ifndef V8_MIPS_CODE_STUBS_ARM_H_
 #define V8_MIPS_CODE_STUBS_ARM_H_

-#include "src/code-stubs.h"
-
-
 namespace v8 {
 namespace internal {

@@ -66,24 +63,25 @@ class StoreRegistersStateStub: public PlatformCodeStub {
       : PlatformCodeStub(isolate) {}

   static void GenerateAheadOfTime(Isolate* isolate);
- private:
-  virtual inline Major MajorKey() const FINAL OVERRIDE;
-  uint32_t MinorKey() const { return 0; }

+ private:
   void Generate(MacroAssembler* masm);
+
+  DEFINE_CODE_STUB(StoreRegistersState, PlatformCodeStub);
 };

+
 class RestoreRegistersStateStub: public PlatformCodeStub {
  public:
   explicit RestoreRegistersStateStub(Isolate* isolate)
       : PlatformCodeStub(isolate) {}

   static void GenerateAheadOfTime(Isolate* isolate);
- private:
-  virtual inline Major MajorKey() const FINAL OVERRIDE;
-  uint32_t MinorKey() const { return 0; }

+ private:
   void Generate(MacroAssembler* masm);
+
+  DEFINE_CODE_STUB(RestoreRegistersState, PlatformCodeStub);
 };

 // This stub can convert a signed int32 to a heap number (double).  It does
@@ -108,8 +106,6 @@ class WriteInt32ToHeapNumberStub : public PlatformCodeStub { 
   static void GenerateFixedRegStubsAheadOfTime(Isolate* isolate);

  private:
-  virtual inline Major MajorKey() const FINAL OVERRIDE;
-
   void Generate(MacroAssembler* masm);

   Register the_int() const {
@@ -134,7 +130,7 @@ class WriteInt32ToHeapNumberStub : public PlatformCodeStub { 
   class ScratchRegisterBits: public BitField<int, 8, 4> {};
   class SignRegisterBits: public BitField<int, 12, 4> {};

-  DISALLOW_COPY_AND_ASSIGN(WriteInt32ToHeapNumberStub);
+  DEFINE_CODE_STUB(WriteInt32ToHeapNumber, PlatformCodeStub);
 };


@@ -157,6 +153,9 @@ class RecordWriteStub: public PlatformCodeStub {
                  SaveFPRegsModeBits::encode(fp_mode);
   }

+  RecordWriteStub(uint32_t key, Isolate* isolate)
+ : PlatformCodeStub(key, isolate), regs_(object(), address(), value()) {} 
+
   enum Mode {
     STORE_BUFFER_ONLY,
     INCREMENTAL,
@@ -288,7 +287,7 @@ class RecordWriteStub: public PlatformCodeStub {
     kUpdateRememberedSetOnNoNeedToInformIncrementalMarker
   };

-  virtual inline Major MajorKey() const FINAL OVERRIDE;
+ virtual inline Major MajorKey() const FINAL OVERRIDE { return RecordWrite; } 

   void Generate(MacroAssembler* masm);
   void GenerateIncremental(MacroAssembler* masm, Mode mode);
@@ -347,11 +346,9 @@ class DirectCEntryStub: public PlatformCodeStub {
   void GenerateCall(MacroAssembler* masm, Register target);

  private:
-  virtual inline Major MajorKey() const FINAL OVERRIDE;
-
   bool NeedsImmovableCode() { return true; }

-  DISALLOW_COPY_AND_ASSIGN(DirectCEntryStub);
+  DEFINE_CODE_STUB(DirectCEntry, PlatformCodeStub);
 };
@@ -396,13 +393,11 @@ class NameDictionaryLookupStub: public PlatformCodeStub { 
       NameDictionary::kHeaderSize +
       NameDictionary::kElementsStartIndex * kPointerSize;

-  virtual inline Major MajorKey() const FINAL OVERRIDE;
-
   LookupMode mode() const { return LookupModeBits::decode(minor_key_); }

   class LookupModeBits: public BitField<LookupMode, 0, 1> {};

-  DISALLOW_COPY_AND_ASSIGN(NameDictionaryLookupStub);
+  DEFINE_CODE_STUB(NameDictionaryLookup, PlatformCodeStub);
 };




--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
--- You received this message because you are subscribed to the Google Groups "v8-dev" group. 
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/d/optout.

Reply via email to