Reviewers: danno, Jakob, paul.l..., dusmil.imgtec, akos.palfi.imgtec,
gergely.kis.imgtec,
Description:
MIPS: Add MEGAMORPHIC state support for KeyedStoreIC.
Port r24500 (e10f342)
BUG=
Please review this at https://codereview.chromium.org/645593006/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+50, -8 lines):
M src/ic/mips/ic-mips.cc
M src/ic/mips64/ic-mips64.cc
Index: src/ic/mips/ic-mips.cc
diff --git a/src/ic/mips/ic-mips.cc b/src/ic/mips/ic-mips.cc
index
d97a6ba066e24a64c63fe23e45c8039e68825ea3..559786d42ef3a29706c5be433980cff1f6c94a3f
100644
--- a/src/ic/mips/ic-mips.cc
+++ b/src/ic/mips/ic-mips.cc
@@ -766,8 +766,9 @@ static void KeyedStoreGenerateGenericHelper(
}
-void KeyedStoreIC::GenerateGeneric(MacroAssembler* masm,
- StrictMode strict_mode) {
+void KeyedStoreIC::GenerateGeneric(
+ MacroAssembler* masm, StrictMode strict_mode,
+ KeyedStoreStubCacheRequirement handler_requirement) {
// ---------- S t a t e --------------
// -- a0 : value
// -- a1 : key
@@ -776,7 +777,7 @@ void KeyedStoreIC::GenerateGeneric(MacroAssembler* masm,
// -----------------------------------
Label slow, fast_object, fast_object_grow;
Label fast_double, fast_double_grow;
- Label array, extra, check_if_double_array;
+ Label array, extra, check_if_double_array, maybe_name_key, miss;
// Register usage.
Register value = StoreDescriptor::ValueRegister();
@@ -789,7 +790,7 @@ void KeyedStoreIC::GenerateGeneric(MacroAssembler* masm,
// t0 and t1 are used as general scratch registers.
// Check that the key is a smi.
- __ JumpIfNotSmi(key, &slow);
+ __ JumpIfNotSmi(key, &maybe_name_key);
// Check that the object isn't a smi.
__ JumpIfSmi(receiver, &slow);
// Get the map of the object.
@@ -819,6 +820,23 @@ void KeyedStoreIC::GenerateGeneric(MacroAssembler*
masm,
// a1: key.
// a2: receiver.
PropertyICCompiler::GenerateRuntimeSetProperty(masm, strict_mode);
+ // Never returns to here.
+
+ __ bind(&maybe_name_key);
+ __ lw(t0, FieldMemOperand(key, HeapObject::kMapOffset));
+ __ lb(t0, FieldMemOperand(t0, Map::kInstanceTypeOffset));
+ __ JumpIfNotUniqueNameInstanceType(t0, &slow);
+ Code::Flags flags = Code::RemoveTypeAndHolderFromFlags(
+ Code::ComputeHandlerFlags(Code::STORE_IC));
+ masm->isolate()->stub_cache()->GenerateProbe(masm, flags, false,
receiver,
+ key, a3, t0, t1, t2);
+ // Cache miss.
+ if (handler_requirement == kCallRuntimeOnMissingHandler) {
+ __ Branch(&slow);
+ } else {
+ DCHECK(handler_requirement == kMissOnMissingHandler);
+ __ Branch(&miss);
+ }
// Extra capacity case: Check if there is extra capacity to
// perform the store and update the length. Used for adding one
@@ -858,6 +876,9 @@ void KeyedStoreIC::GenerateGeneric(MacroAssembler* masm,
&slow, kDontCheckMap, kIncrementLength,
value,
key, receiver, receiver_map,
elements_map,
elements);
+
+ __ bind(&miss);
+ GenerateMiss(masm);
}
Index: src/ic/mips64/ic-mips64.cc
diff --git a/src/ic/mips64/ic-mips64.cc b/src/ic/mips64/ic-mips64.cc
index
a5d9fe78ff199b41867c78ec0e0efd2c44d25e75..0bed35e3ba62b28d4ce1b5b14e449e03c613513e
100644
--- a/src/ic/mips64/ic-mips64.cc
+++ b/src/ic/mips64/ic-mips64.cc
@@ -775,8 +775,9 @@ static void KeyedStoreGenerateGenericHelper(
}
-void KeyedStoreIC::GenerateGeneric(MacroAssembler* masm,
- StrictMode strict_mode) {
+void KeyedStoreIC::GenerateGeneric(
+ MacroAssembler* masm, StrictMode strict_mode,
+ KeyedStoreStubCacheRequirement handler_requirement) {
// ---------- S t a t e --------------
// -- a0 : value
// -- a1 : key
@@ -785,7 +786,7 @@ void KeyedStoreIC::GenerateGeneric(MacroAssembler* masm,
// -----------------------------------
Label slow, fast_object, fast_object_grow;
Label fast_double, fast_double_grow;
- Label array, extra, check_if_double_array;
+ Label array, extra, check_if_double_array, maybe_name_key, miss;
// Register usage.
Register value = StoreDescriptor::ValueRegister();
@@ -798,7 +799,7 @@ void KeyedStoreIC::GenerateGeneric(MacroAssembler* masm,
// a4 and a5 are used as general scratch registers.
// Check that the key is a smi.
- __ JumpIfNotSmi(key, &slow);
+ __ JumpIfNotSmi(key, &maybe_name_key);
// Check that the object isn't a smi.
__ JumpIfSmi(receiver, &slow);
// Get the map of the object.
@@ -828,6 +829,23 @@ void KeyedStoreIC::GenerateGeneric(MacroAssembler*
masm,
// a1: key.
// a2: receiver.
PropertyICCompiler::GenerateRuntimeSetProperty(masm, strict_mode);
+ // Never returns to here.
+
+ __ bind(&maybe_name_key);
+ __ ld(a4, FieldMemOperand(key, HeapObject::kMapOffset));
+ __ lb(a4, FieldMemOperand(a4, Map::kInstanceTypeOffset));
+ __ JumpIfNotUniqueNameInstanceType(a4, &slow);
+ Code::Flags flags = Code::RemoveTypeAndHolderFromFlags(
+ Code::ComputeHandlerFlags(Code::STORE_IC));
+ masm->isolate()->stub_cache()->GenerateProbe(masm, flags, false,
receiver,
+ key, a3, a4, a5, a6);
+ // Cache miss.
+ if (handler_requirement == kCallRuntimeOnMissingHandler) {
+ __ Branch(&slow);
+ } else {
+ DCHECK(handler_requirement == kMissOnMissingHandler);
+ __ Branch(&miss);
+ }
// Extra capacity case: Check if there is extra capacity to
// perform the store and update the length. Used for adding one
@@ -867,6 +885,9 @@ void KeyedStoreIC::GenerateGeneric(MacroAssembler* masm,
&slow, kDontCheckMap, kIncrementLength,
value,
key, receiver, receiver_map,
elements_map,
elements);
+
+ __ bind(&miss);
+ GenerateMiss(masm);
}
--
--
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.
