[v8-dev] MIPS: Clean up name distinction between Keyed ICs and Element Handlers (issue 430593002 by [email protected])

Tue, 29 Jul 2014 13:23:45 -0700

Reviewers: Toon Verwaest, danno, paul.l..., gergely.kis.imgtec, balazs.kilvady, dusmil.imgtec, 

Message:
PTAL.

Description:
MIPS: Clean up name distinction between Keyed ICs and Element Handlers

Port r22679 (c6e3041b)

BUG=

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

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

Affected files (+16, -10 lines):
  M src/mips/ic-mips.cc
  M src/mips/macro-assembler-mips.cc
  M src/mips/stub-cache-mips.cc
  M src/mips64/ic-mips64.cc
  M src/mips64/macro-assembler-mips64.cc
  M src/mips64/stub-cache-mips64.cc


Index: src/mips/ic-mips.cc
diff --git a/src/mips/ic-mips.cc b/src/mips/ic-mips.cc
index 2986f2598a788200256c03ad9cc347855fe2b675..d5e60c452ed2f87b6b3db204550e21c5ec14aa09 100644 
--- a/src/mips/ic-mips.cc
+++ b/src/mips/ic-mips.cc
@@ -1067,7 +1067,7 @@ void KeyedLoadIC::GenerateIndexedInterceptor(MacroAssembler* masm) { 

   // Perform tail call to the entry.
   __ TailCallExternalReference(ExternalReference(
- IC_Utility(kKeyedLoadPropertyWithInterceptor), masm->isolate()), 2, 1); 
+       IC_Utility(kLoadElementWithInterceptor), masm->isolate()), 2, 1);

   __ bind(&slow);
   GenerateMiss(masm);
Index: src/mips/macro-assembler-mips.cc
diff --git a/src/mips/macro-assembler-mips.cc b/src/mips/macro-assembler-mips.cc index 08d045470fa32fb8b2a33a84da20371737384e26..b19096ad7357720f151b2277a531b8f01cad46d0 100644 
--- a/src/mips/macro-assembler-mips.cc
+++ b/src/mips/macro-assembler-mips.cc
@@ -480,6 +480,9 @@ void MacroAssembler::CheckAccessGlobalProxy(Register holder_reg, 
 }
+// Compute the hash code from the untagged key. This must be kept in sync with 
+// ComputeIntegerHash in utils.h and KeyedLoadGenericStub in
+// code-stub-hydrogen.cc
 void MacroAssembler::GetNumberHash(Register reg0, Register scratch) {
   // First of all we assign the hash seed to scratch.
   LoadRoot(scratch, Heap::kHashSeedRootIndex);
Index: src/mips/stub-cache-mips.cc
diff --git a/src/mips/stub-cache-mips.cc b/src/mips/stub-cache-mips.cc
index 4f7b1ca5cb2edd96f234bc2c528f45a8e675cf94..a3868ae1afbfc8a90946d03074813949f0b96a44 100644 
--- a/src/mips/stub-cache-mips.cc
+++ b/src/mips/stub-cache-mips.cc
@@ -1128,8 +1128,8 @@ Handle<Code> NamedStoreHandlerCompiler::CompileStoreInterceptor( 
   __ Push(receiver(), this->name(), value());

   // Do tail-call to the runtime system.
-  ExternalReference store_ic_property =
- ExternalReference(IC_Utility(IC::kStoreInterceptorProperty), isolate()); 
+  ExternalReference store_ic_property = ExternalReference(
+          IC_Utility(IC::kStorePropertyWithInterceptor), isolate());
   __ TailCallExternalReference(store_ic_property, 3, 1);

   // Return the generated code.
@@ -1318,7 +1318,7 @@ void NamedStoreHandlerCompiler::GenerateStoreArrayLength() { 
 }


-Handle<Code> PropertyICCompiler::CompileIndexedStorePolymorphic(
+Handle<Code> PropertyICCompiler::CompileKeyedStorePolymorphic(
     MapHandleList* receiver_maps, CodeHandleList* handler_stubs,
     MapHandleList* transitioned_maps) {
   Label miss;
@@ -1351,7 +1351,7 @@ Handle<Code> PropertyICCompiler::CompileIndexedStorePolymorphic( 
 #define __ ACCESS_MASM(masm)


-void IndexedHandlerCompiler::GenerateLoadDictionaryElement(
+void ElementHandlerCompiler::GenerateLoadDictionaryElement(
     MacroAssembler* masm) {
   // The return address is in ra.
   Label slow, miss;
Index: src/mips64/ic-mips64.cc
diff --git a/src/mips64/ic-mips64.cc b/src/mips64/ic-mips64.cc
index 1107b4c38a56b1cdd5f7a3361c8d92912593a103..317e446c785de0dd28ee3dc5631c6cc61c69fb43 100644 
--- a/src/mips64/ic-mips64.cc
+++ b/src/mips64/ic-mips64.cc
@@ -1077,7 +1077,7 @@ void KeyedLoadIC::GenerateIndexedInterceptor(MacroAssembler* masm) { 

   // Perform tail call to the entry.
   __ TailCallExternalReference(ExternalReference(
- IC_Utility(kKeyedLoadPropertyWithInterceptor), masm->isolate()), 2, 1); 
+       IC_Utility(kLoadElementWithInterceptor), masm->isolate()), 2, 1);

   __ bind(&slow);
   GenerateMiss(masm);
Index: src/mips64/macro-assembler-mips64.cc
diff --git a/src/mips64/macro-assembler-mips64.cc b/src/mips64/macro-assembler-mips64.cc index bf5a6647cef3ca610170726e50e8dd12e4f57a39..e332e070f01c7fcd834c8007af985bb65590b7db 100644 
--- a/src/mips64/macro-assembler-mips64.cc
+++ b/src/mips64/macro-assembler-mips64.cc
@@ -485,6 +485,9 @@ void MacroAssembler::CheckAccessGlobalProxy(Register holder_reg, 
 }
+// Compute the hash code from the untagged key. This must be kept in sync with 
+// ComputeIntegerHash in utils.h and KeyedLoadGenericStub in
+// code-stub-hydrogen.cc
 void MacroAssembler::GetNumberHash(Register reg0, Register scratch) {
   // First of all we assign the hash seed to scratch.
   LoadRoot(scratch, Heap::kHashSeedRootIndex);
Index: src/mips64/stub-cache-mips64.cc
diff --git a/src/mips64/stub-cache-mips64.cc b/src/mips64/stub-cache-mips64.cc index 7c09089aa226ea949aa8d750d0eb8e6e2459e084..e5a1cee64621144f6850a45920a8e31a6cddf038 100644 
--- a/src/mips64/stub-cache-mips64.cc
+++ b/src/mips64/stub-cache-mips64.cc
@@ -1129,8 +1129,8 @@ Handle<Code> NamedStoreHandlerCompiler::CompileStoreInterceptor( 
   __ Push(receiver(), this->name(), value());

   // Do tail-call to the runtime system.
-  ExternalReference store_ic_property =
- ExternalReference(IC_Utility(IC::kStoreInterceptorProperty), isolate()); 
+  ExternalReference store_ic_property = ExternalReference(
+      IC_Utility(IC::kStorePropertyWithInterceptor), isolate());
   __ TailCallExternalReference(store_ic_property, 3, 1);

   // Return the generated code.
@@ -1319,7 +1319,7 @@ void NamedStoreHandlerCompiler::GenerateStoreArrayLength() { 
 }


-Handle<Code> PropertyICCompiler::CompileIndexedStorePolymorphic(
+Handle<Code> PropertyICCompiler::CompileKeyedStorePolymorphic(
     MapHandleList* receiver_maps, CodeHandleList* handler_stubs,
     MapHandleList* transitioned_maps) {
   Label miss;
@@ -1352,7 +1352,7 @@ Handle<Code> PropertyICCompiler::CompileIndexedStorePolymorphic( 
 #define __ ACCESS_MASM(masm)


-void IndexedHandlerCompiler::GenerateLoadDictionaryElement(
+void ElementHandlerCompiler::GenerateLoadDictionaryElement(
     MacroAssembler* masm) {
   // The return address is in ra
   Label slow, miss;


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