Reviewers: Rodolph Perfetta (ARM), ulan,
Message:
plz review
https://codereview.chromium.org/143293003/diff/1/src/a64/lithium-codegen-a64.cc
File src/a64/lithium-codegen-a64.cc (right):
https://codereview.chromium.org/143293003/diff/1/src/a64/lithium-codegen-a64.cc#newcode835
src/a64/lithium-codegen-a64.cc:835: bool
LCodeGen::GenerateDeoptJumpTable() {
ARM has a check that the table is not too far away. I didn't put the
check here, because eventually, we'll support arbitrary long jumps,
right?
Description:
A64: Implement LCodeGen::GenerateDeoptJumpTable
BUG=none
[email protected],[email protected]
Please review this at https://codereview.chromium.org/143293003/
SVN Base: https://v8.googlecode.com/svn/branches/experimental/a64
Affected files (+51, -17 lines):
M src/a64/lithium-codegen-a64.cc
Index: src/a64/lithium-codegen-a64.cc
diff --git a/src/a64/lithium-codegen-a64.cc b/src/a64/lithium-codegen-a64.cc
index
627caa752233d1f8ff0a03554a083b227b788217..b5c19cd4094fe04890a7922d5491e33e90bbe251
100644
--- a/src/a64/lithium-codegen-a64.cc
+++ b/src/a64/lithium-codegen-a64.cc
@@ -833,12 +833,46 @@ bool LCodeGen::GenerateDeferredCode() {
bool LCodeGen::GenerateDeoptJumpTable() {
- TODO_UNIMPLEMENTED("generate level 1 deopt table");
+ if (deopt_jump_table_.length() > 0) {
+ Comment(";;; -------------------- Jump table --------------------");
+ }
+ Label table_start;
+ __ bind(&table_start);
+ Label needs_frame;
+ for (int i = 0; i < deopt_jump_table_.length(); i++) {
+ __ Bind(&deopt_jump_table_[i].label);
+ Address entry = deopt_jump_table_[i].address;
+ Deoptimizer::BailoutType type = deopt_jump_table_[i].bailout_type;
+ int id = Deoptimizer::GetDeoptimizationId(isolate(), entry, type);
+ if (id == Deoptimizer::kNotDeoptimizationEntry) {
+ Comment(";;; jump table entry %d.", i);
+ } else {
+ Comment(";;; jump table entry %d: deoptimization bailout %d.", i,
id);
+ }
+ if (deopt_jump_table_[i].needs_frame) {
+ __ Mov(__ Tmp0(), Operand(ExternalReference::ForDeoptEntry(entry)));
+ if (needs_frame.is_bound()) {
+ __ B(&needs_frame);
+ } else {
+ __ 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.
+ ASSERT(info()->IsStub());
+ __ Mov(__ Tmp1(), Operand(Smi::FromInt(StackFrame::STUB)));
+ __ Push(lr, fp, cp, __ Tmp1());
+ __ Add(fp, __ StackPointer(), 2 * kPointerSize);
+ __ Call(__ Tmp0());
+ }
+ } else {
+ __ Call(entry, RelocInfo::RUNTIME_ENTRY);
+ }
+ masm()->CheckConstPool(false, false);
+ }
- // TODO(jbramley): On ARM, the deopt entry for stubs is different in
that it
- // inserts a special marker instead of a function pointer. We need to do
that
- // same on A64, but since we don't use the jump table, we have to do it
- // in LCodeGen::Deoptimize().
+ // Force constant pool emission at the end of the deopt jump table to
make
+ // sure that no constant pools are emitted after.
+ masm()->CheckConstPool(true, false);
// The deoptimization jump table is the last part of the instruction
// sequence. Mark the generated code as done unless we bailed out.
@@ -995,22 +1029,22 @@ void LCodeGen::Deoptimize(LEnvironment* environment,
}
- // TODO(all): Currently this code directly jump to the second level deopt
- // table entry. This code need to be updated if we decide to use the
- // 2 levels of table.
ASSERT(info()->IsStub() || frame_is_built_);
if (frame_is_built_) {
__ Call(entry, RelocInfo::RUNTIME_ENTRY);
} else {
- // We need to build a frame to deoptimize a stub. Because stubs don't
have a
- // function pointer to put in the frame, put a special marker there
instead.
- // TODO(jbramley): In other architectures, this happens in the jump
table.
- // This is a temporary hack until we implement jump tables in A64.
- __ Mov(__ Tmp1(), Operand(Smi::FromInt(StackFrame::STUB)));
- __ Push(lr, fp, cp, __ Tmp1());
- __ Add(fp, __ StackPointer(), 2 * kPointerSize);
- // TODO(jbramley): Can this be a jump, rather than a call?
- __ Call(entry, RelocInfo::RUNTIME_ENTRY);
+ // We often have several deopts to the same entry, reuse the last
+ // jump entry if this is the case.
+ if (deopt_jump_table_.is_empty() ||
+ (deopt_jump_table_.last().address != entry) ||
+ (deopt_jump_table_.last().bailout_type != bailout_type) ||
+ (deopt_jump_table_.last().needs_frame != !frame_is_built_)) {
+ Deoptimizer::JumpTableEntry table_entry(entry,
+ bailout_type,
+ !frame_is_built_);
+ deopt_jump_table_.Add(table_entry, zone());
+ }
+ __ B(&deopt_jump_table_.last().label);
}
}
--
--
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/groups/opt_out.
