[v8-dev] [v8] r23409 committed - Minor-key-ify new LoadICTrampolineStub....

Tue, 26 Aug 2014 07:57:08 -0700 

Revision: 23409
Author:   [email protected]
Date:     Tue Aug 26 14:56:35 2014 UTC
Log:      Minor-key-ify new LoadICTrampolineStub.

[email protected]

Review URL: https://codereview.chromium.org/500423002
https://code.google.com/p/v8/source/detail?r=23409

Modified:
 /branches/bleeding_edge/src/arm/code-stubs-arm.cc
 /branches/bleeding_edge/src/arm64/code-stubs-arm64.cc
 /branches/bleeding_edge/src/code-stubs.h
 /branches/bleeding_edge/src/ia32/code-stubs-ia32.cc
 /branches/bleeding_edge/src/x64/code-stubs-x64.cc

=======================================
--- /branches/bleeding_edge/src/arm/code-stubs-arm.cc Tue Aug 26 14:12:47 2014 UTC +++ /branches/bleeding_edge/src/arm/code-stubs-arm.cc Tue Aug 26 14:56:35 2014 UTC 
@@ -4594,7 +4594,7 @@

 void LoadICTrampolineStub::Generate(MacroAssembler* masm) {
EmitLoadTypeFeedbackVector(masm, FullVectorLoadConvention::VectorRegister()); 
-  VectorLoadStub stub(isolate(), state_);
+  VectorLoadStub stub(isolate(), state());
   __ Jump(stub.GetCode(), RelocInfo::CODE_TARGET);
 }

=======================================
--- /branches/bleeding_edge/src/arm64/code-stubs-arm64.cc Tue Aug 26 14:12:47 2014 UTC +++ /branches/bleeding_edge/src/arm64/code-stubs-arm64.cc Tue Aug 26 14:56:35 2014 UTC 
@@ -4602,7 +4602,7 @@

 void LoadICTrampolineStub::Generate(MacroAssembler* masm) {
EmitLoadTypeFeedbackVector(masm, FullVectorLoadConvention::VectorRegister()); 
-  VectorLoadStub stub(isolate(), state_);
+  VectorLoadStub stub(isolate(), state());
   __ Jump(stub.GetCode(), RelocInfo::CODE_TARGET);
 }

=======================================
--- /branches/bleeding_edge/src/code-stubs.h    Tue Aug 26 14:12:47 2014 UTC
+++ /branches/bleeding_edge/src/code-stubs.h    Tue Aug 26 14:56:35 2014 UTC
@@ -1944,7 +1944,9 @@
 class LoadICTrampolineStub : public PlatformCodeStub {
  public:
   LoadICTrampolineStub(Isolate* isolate, const LoadIC::State& state)
-      : PlatformCodeStub(isolate), state_(state) {}
+      : PlatformCodeStub(isolate) {
+    minor_key_ = state.GetExtraICState();
+  }
virtual Code::Kind GetCodeKind() const V8_OVERRIDE { return Code::LOAD_IC; } 

@@ -1953,17 +1955,18 @@
   }

   virtual ExtraICState GetExtraICState() const V8_FINAL V8_OVERRIDE {
-    return state_.GetExtraICState();
+    return static_cast<ExtraICState>(minor_key_);
   }
+
+  virtual Major MajorKey() const V8_OVERRIDE { return LoadICTrampoline; }

  private:
-  Major MajorKey() const { return LoadICTrampoline; }
-  uint32_t MinorKey() const { return GetExtraICState(); }
+  LoadIC::State state() const {
+    return LoadIC::State(static_cast<ExtraICState>(minor_key_));
+  }

   virtual void Generate(MacroAssembler* masm);

-  const LoadIC::State state_;
-
   DISALLOW_COPY_AND_ASSIGN(LoadICTrampolineStub);
 };

@@ -1976,10 +1979,10 @@
   virtual Code::Kind GetCodeKind() const V8_OVERRIDE {
     return Code::KEYED_LOAD_IC;
   }
+
+ virtual Major MajorKey() const V8_OVERRIDE { return KeyedLoadICTrampoline; } 

  private:
-  Major MajorKey() const { return KeyedLoadICTrampoline; }
-
   virtual void Generate(MacroAssembler* masm);

   DISALLOW_COPY_AND_ASSIGN(KeyedLoadICTrampolineStub);
@@ -2007,9 +2010,10 @@
   virtual ExtraICState GetExtraICState() const V8_FINAL V8_OVERRIDE {
     return state_.GetExtraICState();
   }
+
+  virtual Major MajorKey() const V8_OVERRIDE { return VectorLoad; }

  private:
-  Major MajorKey() const { return VectorLoad; }
   int NotMissMinorKey() const { return state_.GetExtraICState(); }

   const LoadIC::State state_;
@@ -2033,10 +2037,10 @@
   virtual Code::Kind GetCodeKind() const V8_OVERRIDE {
     return Code::KEYED_LOAD_IC;
   }
+
+  virtual Major MajorKey() const V8_OVERRIDE { return VectorKeyedLoad; }

  private:
-  Major MajorKey() const { return VectorKeyedLoad; }
-
   DISALLOW_COPY_AND_ASSIGN(VectorKeyedLoadStub);
 };

=======================================
--- /branches/bleeding_edge/src/ia32/code-stubs-ia32.cc Tue Aug 26 14:12:47 2014 UTC +++ /branches/bleeding_edge/src/ia32/code-stubs-ia32.cc Tue Aug 26 14:56:35 2014 UTC 
@@ -4502,7 +4502,7 @@

 void LoadICTrampolineStub::Generate(MacroAssembler* masm) {
EmitLoadTypeFeedbackVector(masm, FullVectorLoadConvention::VectorRegister()); 
-  VectorLoadStub stub(isolate(), state_);
+  VectorLoadStub stub(isolate(), state());
   __ jmp(stub.GetCode(), RelocInfo::CODE_TARGET);
 }

=======================================
--- /branches/bleeding_edge/src/x64/code-stubs-x64.cc Tue Aug 26 14:12:47 2014 UTC +++ /branches/bleeding_edge/src/x64/code-stubs-x64.cc Tue Aug 26 14:56:35 2014 UTC 
@@ -4442,7 +4442,7 @@

 void LoadICTrampolineStub::Generate(MacroAssembler* masm) {
EmitLoadTypeFeedbackVector(masm, FullVectorLoadConvention::VectorRegister()); 
-  VectorLoadStub stub(isolate(), state_);
+  VectorLoadStub stub(isolate(), state());
   __ jmp(stub.GetCode(), RelocInfo::CODE_TARGET);
 }

--
--
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