Revision: 22685
Author: [email protected]
Date: Tue Jul 29 20:47:03 2014 UTC
Log: MIPS: Clean up name distinction between Keyed ICs and Element
Handlers
Port r22679 (c6e3041b)
BUG=
[email protected]
Review URL: https://codereview.chromium.org/430593002
http://code.google.com/p/v8/source/detail?r=22685
Modified:
/branches/bleeding_edge/src/mips/ic-mips.cc
/branches/bleeding_edge/src/mips/macro-assembler-mips.cc
/branches/bleeding_edge/src/mips/stub-cache-mips.cc
/branches/bleeding_edge/src/mips64/ic-mips64.cc
/branches/bleeding_edge/src/mips64/macro-assembler-mips64.cc
/branches/bleeding_edge/src/mips64/stub-cache-mips64.cc
=======================================
--- /branches/bleeding_edge/src/mips/ic-mips.cc Mon Jul 21 19:09:56 2014 UTC
+++ /branches/bleeding_edge/src/mips/ic-mips.cc Tue Jul 29 20:47:03 2014 UTC
@@ -1067,7 +1067,7 @@
// 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);
=======================================
--- /branches/bleeding_edge/src/mips/macro-assembler-mips.cc Tue Jul 29
14:38:39 2014 UTC
+++ /branches/bleeding_edge/src/mips/macro-assembler-mips.cc Tue Jul 29
20:47:03 2014 UTC
@@ -480,6 +480,9 @@
}
+// 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);
=======================================
--- /branches/bleeding_edge/src/mips/stub-cache-mips.cc Tue Jul 29 19:39:14
2014 UTC
+++ /branches/bleeding_edge/src/mips/stub-cache-mips.cc Tue Jul 29 20:47:03
2014 UTC
@@ -1128,8 +1128,8 @@
__ 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 @@
}
-Handle<Code> PropertyICCompiler::CompileIndexedStorePolymorphic(
+Handle<Code> PropertyICCompiler::CompileKeyedStorePolymorphic(
MapHandleList* receiver_maps, CodeHandleList* handler_stubs,
MapHandleList* transitioned_maps) {
Label miss;
@@ -1351,7 +1351,7 @@
#define __ ACCESS_MASM(masm)
-void IndexedHandlerCompiler::GenerateLoadDictionaryElement(
+void ElementHandlerCompiler::GenerateLoadDictionaryElement(
MacroAssembler* masm) {
// The return address is in ra.
Label slow, miss;
=======================================
--- /branches/bleeding_edge/src/mips64/ic-mips64.cc Mon Jul 21 19:09:56
2014 UTC
+++ /branches/bleeding_edge/src/mips64/ic-mips64.cc Tue Jul 29 20:47:03
2014 UTC
@@ -1077,7 +1077,7 @@
// 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);
=======================================
--- /branches/bleeding_edge/src/mips64/macro-assembler-mips64.cc Tue Jul 29
18:02:26 2014 UTC
+++ /branches/bleeding_edge/src/mips64/macro-assembler-mips64.cc Tue Jul 29
20:47:03 2014 UTC
@@ -485,6 +485,9 @@
}
+// 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);
=======================================
--- /branches/bleeding_edge/src/mips64/stub-cache-mips64.cc Tue Jul 29
19:39:14 2014 UTC
+++ /branches/bleeding_edge/src/mips64/stub-cache-mips64.cc Tue Jul 29
20:47:03 2014 UTC
@@ -1129,8 +1129,8 @@
__ 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 @@
}
-Handle<Code> PropertyICCompiler::CompileIndexedStorePolymorphic(
+Handle<Code> PropertyICCompiler::CompileKeyedStorePolymorphic(
MapHandleList* receiver_maps, CodeHandleList* handler_stubs,
MapHandleList* transitioned_maps) {
Label miss;
@@ -1352,7 +1352,7 @@
#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.
