Commit 1607c9d1 authored by mbrandy's avatar mbrandy Committed by Commit bot

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

Port fe432e1a

R=mvstanton@chromium.org, jyan@ca.ibm.com, dstence@us.ibm.com, joransiu@ca.ibm.com
BUG=

Review URL: https://codereview.chromium.org/1321483003

Cr-Commit-Position: refs/heads/master@{#30394}
parent 939c37df
...@@ -448,8 +448,8 @@ void KeyedLoadIC::GenerateMegamorphic(MacroAssembler* masm, ...@@ -448,8 +448,8 @@ void KeyedLoadIC::GenerateMegamorphic(MacroAssembler* masm,
Code::Flags flags = Code::RemoveTypeAndHolderFromFlags( Code::Flags flags = Code::RemoveTypeAndHolderFromFlags(
Code::ComputeHandlerFlags(Code::LOAD_IC)); Code::ComputeHandlerFlags(Code::LOAD_IC));
masm->isolate()->stub_cache()->GenerateProbe( masm->isolate()->stub_cache()->GenerateProbe(masm, Code::KEYED_LOAD_IC, flags,
masm, Code::KEYED_LOAD_IC, flags, false, receiver, key, r7, r8, r9, r10); receiver, key, r7, r8, r9, r10);
// Cache miss. // Cache miss.
GenerateMiss(masm); GenerateMiss(masm);
...@@ -722,8 +722,8 @@ void KeyedStoreIC::GenerateMegamorphic(MacroAssembler* masm, ...@@ -722,8 +722,8 @@ void KeyedStoreIC::GenerateMegamorphic(MacroAssembler* masm,
Code::Flags flags = Code::RemoveTypeAndHolderFromFlags( Code::Flags flags = Code::RemoveTypeAndHolderFromFlags(
Code::ComputeHandlerFlags(Code::STORE_IC)); Code::ComputeHandlerFlags(Code::STORE_IC));
masm->isolate()->stub_cache()->GenerateProbe( masm->isolate()->stub_cache()->GenerateProbe(masm, Code::STORE_IC, flags,
masm, Code::STORE_IC, flags, false, receiver, key, r6, r7, r8, r9); receiver, key, r6, r7, r8, r9);
// Cache miss. // Cache miss.
__ b(&miss); __ b(&miss);
...@@ -784,8 +784,8 @@ void StoreIC::GenerateMegamorphic(MacroAssembler* masm) { ...@@ -784,8 +784,8 @@ void StoreIC::GenerateMegamorphic(MacroAssembler* masm) {
Code::Flags flags = Code::RemoveTypeAndHolderFromFlags( Code::Flags flags = Code::RemoveTypeAndHolderFromFlags(
Code::ComputeHandlerFlags(Code::STORE_IC)); Code::ComputeHandlerFlags(Code::STORE_IC));
masm->isolate()->stub_cache()->GenerateProbe( masm->isolate()->stub_cache()->GenerateProbe(masm, Code::STORE_IC, flags,
masm, Code::STORE_IC, flags, false, receiver, name, r6, r7, r8, r9); receiver, name, r6, r7, r8, r9);
// Cache miss: Jump to runtime. // Cache miss: Jump to runtime.
GenerateMiss(masm); GenerateMiss(masm);
......
...@@ -16,7 +16,7 @@ namespace internal { ...@@ -16,7 +16,7 @@ namespace internal {
static void ProbeTable(Isolate* isolate, MacroAssembler* masm, 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, StubCache::Table table, Register receiver, Register name,
// Number of the cache entry, not scaled. // Number of the cache entry, not scaled.
Register offset, Register scratch, Register scratch2, Register offset, Register scratch, Register scratch2,
...@@ -93,8 +93,6 @@ static void ProbeTable(Isolate* isolate, MacroAssembler* masm, ...@@ -93,8 +93,6 @@ static void ProbeTable(Isolate* isolate, MacroAssembler* masm,
} }
#endif #endif
if (leave_frame) __ LeaveFrame(StackFrame::INTERNAL);
// Jump to the first instruction in the code stub. // Jump to the first instruction in the code stub.
__ addi(r0, code, Operand(Code::kHeaderSize - kHeapObjectTag)); __ addi(r0, code, Operand(Code::kHeaderSize - kHeapObjectTag));
__ mtctr(r0); __ mtctr(r0);
...@@ -106,10 +104,9 @@ static void ProbeTable(Isolate* isolate, MacroAssembler* masm, ...@@ -106,10 +104,9 @@ static void ProbeTable(Isolate* isolate, MacroAssembler* masm,
void StubCache::GenerateProbe(MacroAssembler* masm, Code::Kind ic_kind, void StubCache::GenerateProbe(MacroAssembler* masm, Code::Kind ic_kind,
Code::Flags flags, bool leave_frame, Code::Flags flags, Register receiver,
Register receiver, Register name, Register name, Register scratch, Register extra,
Register scratch, Register extra, Register extra2, Register extra2, Register extra3) {
Register extra3) {
Isolate* isolate = masm->isolate(); Isolate* isolate = masm->isolate();
Label miss; Label miss;
...@@ -163,8 +160,8 @@ void StubCache::GenerateProbe(MacroAssembler* masm, Code::Kind ic_kind, ...@@ -163,8 +160,8 @@ void StubCache::GenerateProbe(MacroAssembler* masm, Code::Kind ic_kind,
Operand((kPrimaryTableSize - 1) << kCacheIndexShift)); Operand((kPrimaryTableSize - 1) << kCacheIndexShift));
// Probe the primary table. // Probe the primary table.
ProbeTable(isolate, masm, ic_kind, flags, leave_frame, kPrimary, receiver, ProbeTable(isolate, masm, ic_kind, flags, kPrimary, receiver, name, scratch,
name, scratch, extra, extra2, extra3); extra, extra2, extra3);
// Primary miss: Compute hash for secondary probe. // Primary miss: Compute hash for secondary probe.
__ sub(scratch, scratch, name); __ sub(scratch, scratch, name);
...@@ -173,8 +170,8 @@ void StubCache::GenerateProbe(MacroAssembler* masm, Code::Kind ic_kind, ...@@ -173,8 +170,8 @@ void StubCache::GenerateProbe(MacroAssembler* masm, Code::Kind ic_kind,
Operand((kSecondaryTableSize - 1) << kCacheIndexShift)); Operand((kSecondaryTableSize - 1) << kCacheIndexShift));
// Probe the secondary table. // Probe the secondary table.
ProbeTable(isolate, masm, ic_kind, flags, leave_frame, kSecondary, receiver, ProbeTable(isolate, masm, ic_kind, flags, kSecondary, receiver, name, scratch,
name, scratch, extra, extra2, extra3); extra, extra2, extra3);
// Cache miss: Fall-through and let caller handle the miss by // Cache miss: Fall-through and let caller handle the miss by
// entering the runtime system. // entering the runtime system.
......
...@@ -4772,7 +4772,7 @@ void LoadICStub::GenerateImpl(MacroAssembler* masm, bool in_frame) { ...@@ -4772,7 +4772,7 @@ void LoadICStub::GenerateImpl(MacroAssembler* masm, bool in_frame) {
Code::Flags code_flags = Code::RemoveTypeAndHolderFromFlags( Code::Flags code_flags = Code::RemoveTypeAndHolderFromFlags(
Code::ComputeHandlerFlags(Code::LOAD_IC)); Code::ComputeHandlerFlags(Code::LOAD_IC));
masm->isolate()->stub_cache()->GenerateProbe(masm, Code::LOAD_IC, code_flags, masm->isolate()->stub_cache()->GenerateProbe(masm, Code::LOAD_IC, code_flags,
false, receiver, name, feedback, receiver, name, feedback,
receiver_map, scratch1, r10); receiver_map, scratch1, r10);
__ bind(&miss); __ bind(&miss);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment