AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Support LiveEdit on Arm64

Browse Source 
BUG=368580
LOG=Y
R=yangguo@chromium.org

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

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@21937 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
alph@chromium.org 2014-06-23 13:20:26 +00:00
parent 2411bc9447
commit f61854fe0a
3 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/arm64/debug-arm64.cc
View File

@ -131,6 +131,14 @@ static void Generate_DebugBreakCallHelper(MacroAssembler* masm,
{
FrameScope scope(masm, StackFrame::INTERNAL);
// Load padding words on stack.
__ ldr(scratch, Smi::FromInt(LiveEdit::kFramePaddingValue));
for (int i = 0; i < LiveEdit::kFramePaddingInitialSize; i++) {
__ push(scratch);
}
__ ldr(scratch, Smi::FromInt(LiveEdit::kFramePaddingInitialSize));
__ push(scratch);
// Any live values (object_regs and non_object_regs) in caller-saved
// registers (or lr) need to be stored on the stack so that their values are
// safely preserved for a call into C code.
@ -200,6 +208,9 @@ static void Generate_DebugBreakCallHelper(MacroAssembler* masm,
__ Bfxil(reg, scratch, 32, 32);
}
// Don't bother removing padding bytes pushed on the stack
// as the frame is going to be restored right away.
// Leave the internal frame.
}
@ -341,16 +352,37 @@ void DebugCodegen::GenerateSlotDebugBreak(MacroAssembler* masm) {
void DebugCodegen::GeneratePlainReturnLiveEdit(MacroAssembler* masm) {
masm->Abort(kLiveEditFrameDroppingIsNotSupportedOnARM64);
__ Ret();
}
void DebugCodegen::GenerateFrameDropperLiveEdit(MacroAssembler* masm) {
masm->Abort(kLiveEditFrameDroppingIsNotSupportedOnARM64);
ExternalReference restarter_frame_function_slot =
ExternalReference::debug_restarter_frame_function_pointer_address(
masm->isolate());
__ mov(x1, xzr);
__ Mov(ip0, restarter_frame_function_slot);
__ str(x1, MemOperand(ip0, 0));
// We do not know our frame height, but set sp based on fp.
__ sub(jssp, fp, Operand(kPointerSize));
__ Pop(x1, fp, lr); // Function, Frame, Return address.
// Load context from the function.
__ ldr(cp, FieldMemOperand(x1, JSFunction::kContextOffset));
// Get function code.
__ ldr(ip0, FieldMemOperand(x1, JSFunction::kSharedFunctionInfoOffset));
__ ldr(ip0, FieldMemOperand(ip0, SharedFunctionInfo::kCodeOffset));
__ add(ip0, ip0, Operand(Code::kHeaderSize - kHeapObjectTag));
// Re-run JSFunction, x1 is function, cp is context.
__ Jump(ip0);
}
const bool LiveEdit::kFrameDropperSupported = false;
const bool LiveEdit::kFrameDropperSupported = true;
} } // namespace v8::internal

2
src/objects.h
View File

@ -1157,8 +1157,6 @@ template <class C> inline bool Is(Object* obj);
V(kLetBindingReInitialization, "Let binding re-initialization") \
V(kLhsHasBeenClobbered, "lhs has been clobbered") \
V(kLiveBytesCountOverflowChunkSize, "Live Bytes Count overflow chunk size") \
V(kLiveEditFrameDroppingIsNotSupportedOnARM64, \
"LiveEdit frame dropping is not supported on arm64") \
V(kLiveEdit, "LiveEdit") \
V(kLookupVariableInCountOperation, \
"Lookup variable in count operation") \

7
test/mjsunit/mjsunit.status
View File

@ -204,13 +204,6 @@
'regress/regress-2185-2': [PASS, TIMEOUT],
'whitespaces': [PASS, TIMEOUT, SLOW],
# 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],
# BUG(v8:3147). It works on other architectures by accident.
'regress/regress-conditional-position': [FAIL],