Reviewers: danno, loislo, paul.l..., akos.palfi.imgtec, gergely.kis.imgtec,
dusmil.imgtec,
Description:
MIPS: CpuProfiler: fix for CollectDeoptEvents test.
Port a925f3f4784f8318f69a201a6b44aa94f97e4ba3
Original commit message:
The same idea as in https://codereview.chromium.org/984893003/
BUG=chromium:452067
LOG=n
Please review this at https://codereview.chromium.org/996883002/
Base URL: https://chromium.googlesource.com/v8/v8.git@master
Affected files (+24, -37 lines):
M src/mips/lithium-codegen-mips.cc
Index: src/mips/lithium-codegen-mips.cc
diff --git a/src/mips/lithium-codegen-mips.cc
b/src/mips/lithium-codegen-mips.cc
index
ac7c7411484d03018cdb2d975242bb9c1fe34a25..179088080fd5b185c4335a31ad43cac67e7e1ce8
100644
--- a/src/mips/lithium-codegen-mips.cc
+++ b/src/mips/lithium-codegen-mips.cc
@@ -347,50 +347,37 @@ bool LCodeGen::GenerateJumpTable() {
if (table_entry->needs_frame) {
DCHECK(!info()->saves_caller_doubles());
- if (needs_frame.is_bound()) {
- __ Branch(&needs_frame);
- } else {
- __ bind(&needs_frame);
- Comment(";;; call deopt with frame");
- __ MultiPush(cp.bit() | fp.bit() | ra.bit());
- // This variant of deopt can only be used with stubs. Since we
don't
- // have a function pointer to install in the stack frame that
we're
- // building, install a special marker there instead.
- DCHECK(info()->IsStub());
- __ li(at, Operand(Smi::FromInt(StackFrame::STUB)));
- __ push(at);
- __ Addu(fp, sp,
- Operand(StandardFrameConstants::kFixedFrameSizeFromFp));
- __ bind(&call_deopt_entry);
- // Add the base address to the offset previously loaded in
- // entry_offset.
- __ Addu(entry_offset, entry_offset,
- Operand(ExternalReference::ForDeoptEntry(base)));
- __ Call(entry_offset);
- }
+ Comment(";;; call deopt with frame");
+ __ MultiPush(cp.bit() | fp.bit() | ra.bit());
+ __ Call(&needs_frame);
} else {
- // The last entry can fall through into `call_deopt_entry`,
avoiding a
- // branch.
- bool need_branch = ((i + 1) != length) ||
call_deopt_entry.is_bound();
-
- if (need_branch) __ Branch(&call_deopt_entry);
+ __ Call(&call_deopt_entry);
}
}
- if (!call_deopt_entry.is_bound()) {
- Comment(";;; call deopt");
- __ bind(&call_deopt_entry);
+ if (needs_frame.is_linked()) {
+ __ bind(&needs_frame);
+ // This variant of deopt can only be used with stubs. Since we don't
+ // have a function pointer to install in the stack frame that we're
+ // building, install a special marker there instead.
+ DCHECK(info()->IsStub());
+ __ li(at, Operand(Smi::FromInt(StackFrame::STUB)));
+ __ push(at);
+ __ Addu(fp, sp,
Operand(StandardFrameConstants::kFixedFrameSizeFromFp));
+ }
- if (info()->saves_caller_doubles()) {
- DCHECK(info()->IsStub());
- RestoreCallerDoubles();
- }
+ Comment(";;; call deopt");
+ __ bind(&call_deopt_entry);
- // Add the base address to the offset previously loaded in
entry_offset.
- __ Addu(entry_offset, entry_offset,
- Operand(ExternalReference::ForDeoptEntry(base)));
- __ Call(entry_offset);
+ if (info()->saves_caller_doubles()) {
+ DCHECK(info()->IsStub());
+ RestoreCallerDoubles();
}
+
+ // Add the base address to the offset previously loaded in
entry_offset.
+ __ Addu(entry_offset, entry_offset,
+ Operand(ExternalReference::ForDeoptEntry(base)));
+ __ Call(entry_offset);
}
__ RecordComment("]");
--
--
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.
