From 7b2759552007792739f1cf99cb2b2e506c51e8d6 Mon Sep 17 00:00:00 2001 From: "akos.palfi@imgtec.com" Date: Tue, 29 Jul 2014 20:47:03 +0000 Subject: [PATCH] MIPS: Clean up name distinction between Keyed ICs and Element Handlers Port r22679 (c6e3041b) BUG= R=paul.lind@imgtec.com Review URL: https://codereview.chromium.org/430593002 git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@22685 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/mips/ic-mips.cc | 2 +- src/mips/macro-assembler-mips.cc | 3 +++ src/mips/stub-cache-mips.cc | 8 ++++---- src/mips64/ic-mips64.cc | 2 +- src/mips64/macro-assembler-mips64.cc | 3 +++ src/mips64/stub-cache-mips64.cc | 8 ++++---- 6 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/mips/ic-mips.cc b/src/mips/ic-mips.cc index 2986f25..d5e60c4 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); diff --git a/src/mips/macro-assembler-mips.cc b/src/mips/macro-assembler-mips.cc index 08d0454..b19096a 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); diff --git a/src/mips/stub-cache-mips.cc b/src/mips/stub-cache-mips.cc index 4f7b1ca..f74118a 100644 --- a/src/mips/stub-cache-mips.cc +++ b/src/mips/stub-cache-mips.cc @@ -1128,8 +1128,8 @@ Handle 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 PropertyICCompiler::CompileIndexedStorePolymorphic( +Handle PropertyICCompiler::CompileKeyedStorePolymorphic( MapHandleList* receiver_maps, CodeHandleList* handler_stubs, MapHandleList* transitioned_maps) { Label miss; @@ -1351,7 +1351,7 @@ Handle PropertyICCompiler::CompileIndexedStorePolymorphic( #define __ ACCESS_MASM(masm) -void IndexedHandlerCompiler::GenerateLoadDictionaryElement( +void ElementHandlerCompiler::GenerateLoadDictionaryElement( MacroAssembler* masm) { // The return address is in ra. Label slow, miss; diff --git a/src/mips64/ic-mips64.cc b/src/mips64/ic-mips64.cc index 1107b4c..317e446 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); diff --git a/src/mips64/macro-assembler-mips64.cc b/src/mips64/macro-assembler-mips64.cc index bf5a664..e332e07 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); diff --git a/src/mips64/stub-cache-mips64.cc b/src/mips64/stub-cache-mips64.cc index 7c09089..e5a1cee 100644 --- a/src/mips64/stub-cache-mips64.cc +++ b/src/mips64/stub-cache-mips64.cc @@ -1129,8 +1129,8 @@ Handle 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 PropertyICCompiler::CompileIndexedStorePolymorphic( +Handle PropertyICCompiler::CompileKeyedStorePolymorphic( MapHandleList* receiver_maps, CodeHandleList* handler_stubs, MapHandleList* transitioned_maps) { Label miss; @@ -1352,7 +1352,7 @@ Handle PropertyICCompiler::CompileIndexedStorePolymorphic( #define __ ACCESS_MASM(masm) -void IndexedHandlerCompiler::GenerateLoadDictionaryElement( +void ElementHandlerCompiler::GenerateLoadDictionaryElement( MacroAssembler* masm) { // The return address is in ra Label slow, miss; -- 2.7.4