Reviewers: dstence, joransiu, john.yan, mvstanton,

Description:
PPC: Cleanup: Remove unncessary leave_frame parameter from stub cache.

Port fe432e1ace48c345c659c0bcb6a84798bca0b15e

[email protected], [email protected], [email protected],
[email protected]
BUG=

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

Base URL: https://chromium.googlesource.com/v8/v8.git@master

Affected files (+15, -18 lines):
  M src/ic/ppc/ic-ppc.cc
  M src/ic/ppc/stub-cache-ppc.cc
  M src/ppc/code-stubs-ppc.cc


Index: src/ic/ppc/ic-ppc.cc
diff --git a/src/ic/ppc/ic-ppc.cc b/src/ic/ppc/ic-ppc.cc
index 7c9c0493a440da74aac0ab92ab2f7d6fb504a9ef..7cac3058bbcca157bf3c206ac5d116d37898a602 100644
--- a/src/ic/ppc/ic-ppc.cc
+++ b/src/ic/ppc/ic-ppc.cc
@@ -448,8 +448,8 @@ void KeyedLoadIC::GenerateMegamorphic(MacroAssembler* masm,

   Code::Flags flags = Code::RemoveTypeAndHolderFromFlags(
       Code::ComputeHandlerFlags(Code::LOAD_IC));
-  masm->isolate()->stub_cache()->GenerateProbe(
- masm, Code::KEYED_LOAD_IC, flags, false, receiver, key, r7, r8, r9, r10); + masm->isolate()->stub_cache()->GenerateProbe(masm, Code::KEYED_LOAD_IC, flags, + receiver, key, r7, r8, r9, r10);
   // Cache miss.
   GenerateMiss(masm);

@@ -722,8 +722,8 @@ void KeyedStoreIC::GenerateMegamorphic(MacroAssembler* masm,

   Code::Flags flags = Code::RemoveTypeAndHolderFromFlags(
       Code::ComputeHandlerFlags(Code::STORE_IC));
-  masm->isolate()->stub_cache()->GenerateProbe(
-      masm, Code::STORE_IC, flags, false, receiver, key, r6, r7, r8, r9);
+  masm->isolate()->stub_cache()->GenerateProbe(masm, Code::STORE_IC, flags,
+ receiver, key, r6, r7, r8, r9);
   // Cache miss.
   __ b(&miss);

@@ -784,8 +784,8 @@ void StoreIC::GenerateMegamorphic(MacroAssembler* masm) {
   Code::Flags flags = Code::RemoveTypeAndHolderFromFlags(
       Code::ComputeHandlerFlags(Code::STORE_IC));

-  masm->isolate()->stub_cache()->GenerateProbe(
-      masm, Code::STORE_IC, flags, false, receiver, name, r6, r7, r8, r9);
+  masm->isolate()->stub_cache()->GenerateProbe(masm, Code::STORE_IC, flags,
+ receiver, name, r6, r7, r8, r9);

   // Cache miss: Jump to runtime.
   GenerateMiss(masm);
Index: src/ic/ppc/stub-cache-ppc.cc
diff --git a/src/ic/ppc/stub-cache-ppc.cc b/src/ic/ppc/stub-cache-ppc.cc
index 079a159b07d0f68298807a3fc3655c7f3d49d997..ed703fb21e9af09a32022ceba02e6d6e5719cb4a 100644
--- a/src/ic/ppc/stub-cache-ppc.cc
+++ b/src/ic/ppc/stub-cache-ppc.cc
@@ -16,7 +16,7 @@ namespace internal {


 static void ProbeTable(Isolate* isolate, MacroAssembler* masm,
- Code::Kind ic_kind, Code::Flags flags, bool leave_frame,
+                       Code::Kind ic_kind, Code::Flags flags,
StubCache::Table table, Register receiver, Register name,
                        // Number of the cache entry, not scaled.
Register offset, Register scratch, Register scratch2, @@ -93,8 +93,6 @@ static void ProbeTable(Isolate* isolate, MacroAssembler* masm,
   }
 #endif

-  if (leave_frame) __ LeaveFrame(StackFrame::INTERNAL);
-
   // Jump to the first instruction in the code stub.
   __ addi(r0, code, Operand(Code::kHeaderSize - kHeapObjectTag));
   __ mtctr(r0);
@@ -106,10 +104,9 @@ static void ProbeTable(Isolate* isolate, MacroAssembler* masm,


 void StubCache::GenerateProbe(MacroAssembler* masm, Code::Kind ic_kind,
-                              Code::Flags flags, bool leave_frame,
-                              Register receiver, Register name,
- Register scratch, Register extra, Register extra2,
-                              Register extra3) {
+                              Code::Flags flags, Register receiver,
+ Register name, Register scratch, Register extra,
+                              Register extra2, Register extra3) {
   Isolate* isolate = masm->isolate();
   Label miss;

@@ -163,8 +160,8 @@ void StubCache::GenerateProbe(MacroAssembler* masm, Code::Kind ic_kind,
           Operand((kPrimaryTableSize - 1) << kCacheIndexShift));

   // Probe the primary table.
- ProbeTable(isolate, masm, ic_kind, flags, leave_frame, kPrimary, receiver,
-             name, scratch, extra, extra2, extra3);
+ ProbeTable(isolate, masm, ic_kind, flags, kPrimary, receiver, name, scratch,
+             extra, extra2, extra3);

   // Primary miss: Compute hash for secondary probe.
   __ sub(scratch, scratch, name);
@@ -173,8 +170,8 @@ void StubCache::GenerateProbe(MacroAssembler* masm, Code::Kind ic_kind,
           Operand((kSecondaryTableSize - 1) << kCacheIndexShift));

   // Probe the secondary table.
- ProbeTable(isolate, masm, ic_kind, flags, leave_frame, kSecondary, receiver,
-             name, scratch, extra, extra2, extra3);
+ ProbeTable(isolate, masm, ic_kind, flags, kSecondary, receiver, name, scratch,
+             extra, extra2, extra3);

   // Cache miss: Fall-through and let caller handle the miss by
   // entering the runtime system.
Index: src/ppc/code-stubs-ppc.cc
diff --git a/src/ppc/code-stubs-ppc.cc b/src/ppc/code-stubs-ppc.cc
index 8edef61482199863dbbf1c6a3c6f41dc5b1db00e..a46e86a9abbeba14830c0edfb034d8280060a00c 100644
--- a/src/ppc/code-stubs-ppc.cc
+++ b/src/ppc/code-stubs-ppc.cc
@@ -4780,7 +4780,7 @@ void LoadICStub::GenerateImpl(MacroAssembler* masm, bool in_frame) {
   Code::Flags code_flags = Code::RemoveTypeAndHolderFromFlags(
       Code::ComputeHandlerFlags(Code::LOAD_IC));
masm->isolate()->stub_cache()->GenerateProbe(masm, Code::LOAD_IC, code_flags, - false, receiver, name, feedback,
+                                               receiver, name, feedback,
receiver_map, scratch1, r10);

   __ bind(&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