Reviewers: Yang, loislo, yurys,
Message:
Yang, could you please take a look.
Description:
Support LiveEdit on ARM
BUG=368580
Please review this at https://codereview.chromium.org/344573004/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+36, -13 lines):
M src/arm/debug-arm.cc
M src/objects.h
M test/mjsunit/mjsunit.status
Index: src/arm/debug-arm.cc
diff --git a/src/arm/debug-arm.cc b/src/arm/debug-arm.cc
index
e5460f54903179c2595e7e584ba00317425da664..d5b55b7d7bce68fe1c687fcc249ceea845e74f42
100644
--- a/src/arm/debug-arm.cc
+++ b/src/arm/debug-arm.cc
@@ -27,7 +27,7 @@ void BreakLocationIterator::SetDebugBreakAtReturn() {
// ldr ip, [pc, #0]
// blx ip
// <debug break return code entry point address>
- // bktp 0
+ // bkpt 0
CodePatcher patcher(rinfo()->pc(),
Assembler::kJSReturnSequenceInstructions);
patcher.masm()->ldr(v8::internal::ip, MemOperand(v8::internal::pc, 0));
patcher.masm()->blx(v8::internal::ip);
@@ -93,6 +93,14 @@ static void
Generate_DebugBreakCallHelper(MacroAssembler* masm,
{
FrameAndConstantPoolScope scope(masm, StackFrame::INTERNAL);
+ // Load padding words on stack.
+ __ mov(ip, Operand(Smi::FromInt(LiveEdit::kFramePaddingValue)));
+ for (int i = 0; i < LiveEdit::kFramePaddingInitialSize; i++) {
+ __ push(ip);
+ }
+ __ mov(ip, Operand(Smi::FromInt(LiveEdit::kFramePaddingInitialSize)));
+ __ push(ip);
+
// Store the registers containing live values on the expression stack
to
// make sure that these are correctly updated during GC. Non object
values
// are stored as a smi causing it to be untouched by GC.
@@ -139,6 +147,9 @@ static void
Generate_DebugBreakCallHelper(MacroAssembler* masm,
}
}
+ // Don't bother removing padding bytes pushed on the stack
+ // as the frame is going to be restored right away.
+
// Leave the internal frame.
}
@@ -282,16 +293,37 @@ void
DebugCodegen::GenerateSlotDebugBreak(MacroAssembler* masm) {
void DebugCodegen::GeneratePlainReturnLiveEdit(MacroAssembler* masm) {
- masm->Abort(kLiveEditFrameDroppingIsNotSupportedOnArm);
+ __ Ret();
}
void DebugCodegen::GenerateFrameDropperLiveEdit(MacroAssembler* masm) {
- masm->Abort(kLiveEditFrameDroppingIsNotSupportedOnArm);
+ ExternalReference restarter_frame_function_slot =
+ ExternalReference::debug_restarter_frame_function_pointer_address(
+ masm->isolate());
+ __ mov(ip, Operand(restarter_frame_function_slot));
+ __ mov(r1, Operand::Zero());
+ __ str(r1, MemOperand(ip, 0));
+
+ // We do not know our frame height, but set sp based on fp.
+ __ sub(sp, fp, Operand(kPointerSize));
+
+ __ Pop(lr, fp, r1); // Return address, Frame, Function.
+
+ // Load context from the function.
+ __ ldr(cp, FieldMemOperand(r1, JSFunction::kContextOffset));
+
+ // Get function code.
+ __ ldr(ip, FieldMemOperand(r1, JSFunction::kSharedFunctionInfoOffset));
+ __ ldr(ip, FieldMemOperand(ip, SharedFunctionInfo::kCodeOffset));
+ __ add(ip, ip, Operand(Code::kHeaderSize - kHeapObjectTag));
+
+ // Re-run JSFunction, r1 is function, cp is context.
+ __ Jump(ip);
}
-const bool LiveEdit::kFrameDropperSupported = false;
+const bool LiveEdit::kFrameDropperSupported = true;
#undef __
Index: src/objects.h
diff --git a/src/objects.h b/src/objects.h
index
46661b681eb20940b4446b28ecbce04df7152c75..1ea98aa3c69feadf8ee626b10a7665a0d98715f7
100644
--- a/src/objects.h
+++ b/src/objects.h
@@ -1152,8 +1152,6 @@ template <class C> inline bool Is(Object* obj);
V(kLiveBytesCountOverflowChunkSize, "Live Bytes Count overflow chunk
size") \
V(kLiveEditFrameDroppingIsNotSupportedOnARM64,
\
"LiveEdit frame dropping is not supported on
arm64") \
-
V(kLiveEditFrameDroppingIsNotSupportedOnArm,
\
- "LiveEdit frame dropping is not supported on
arm") \
V(kLiveEditFrameDroppingIsNotSupportedOnMips,
\
"LiveEdit frame dropping is not supported on
mips") \
V(kLiveEdit, "LiveEdit")
\
Index: test/mjsunit/mjsunit.status
diff --git a/test/mjsunit/mjsunit.status b/test/mjsunit/mjsunit.status
index
e147dd66033cb4ed32194a6162701e051038a63f..eb4fe35ce72117cf74039a95224e6f4d8a2de96b
100644
--- a/test/mjsunit/mjsunit.status
+++ b/test/mjsunit/mjsunit.status
@@ -301,13 +301,6 @@
# should be platform-independent.
'regress/regress-1132': [SKIP],
- # Stack manipulations in LiveEdit is not implemented for this arch.
- 'debug-liveedit-check-stack': [SKIP],
- 'debug-liveedit-stack-padding': [SKIP],
- 'debug-liveedit-restart-frame': [SKIP],
- 'debug-liveedit-double-call': [SKIP],
- 'harmony/generators-debug-liveedit': [SKIP],
-
# Currently always deopt on minus zero
'math-floor-of-div-minus-zero': [SKIP],
--
--
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.
