diff options
author | Michaël Zasso <targos@protonmail.com> | 2016-05-27 16:37:42 +0200 |
---|---|---|
committer | Michaël Zasso <targos@protonmail.com> | 2016-06-29 09:04:28 +0200 |
commit | 2cc29517966de7257a2f1b34c58c77225a21e05d (patch) | |
tree | 210bd177df2f06eec16e1e22edafdbcbffe66f8a /deps/v8/src/debug/mips | |
parent | bbf3838c70aaec1dd296fa75ae334fd1c7866df3 (diff) | |
download | android-node-v8-2cc29517966de7257a2f1b34c58c77225a21e05d.tar.gz android-node-v8-2cc29517966de7257a2f1b34c58c77225a21e05d.tar.bz2 android-node-v8-2cc29517966de7257a2f1b34c58c77225a21e05d.zip |
deps: update V8 to 5.1.281.69
Pick up the latest branch-head for V8 5.1. This branch brings in
improved language support and performance improvements. For full
details: http://v8project.blogspot.com/2016/04/v8-release-51.html
* Picks up the latest branch head for 5.1 [1]
* Edit v8 gitignore to allow trace_event copy
* Update V8 DEP trace_event as per deps/v8/DEPS [2]
[1] https://chromium.googlesource.com/v8/v8.git/+/dc81244
[2] https://chromium.googlesource.com/chromium/src/base/trace_event/common/+/c8c8665
PR-URL: https://github.com/nodejs/node/pull/7016
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Diffstat (limited to 'deps/v8/src/debug/mips')
-rw-r--r-- | deps/v8/src/debug/mips/debug-mips.cc | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/deps/v8/src/debug/mips/debug-mips.cc b/deps/v8/src/debug/mips/debug-mips.cc index 1d9f7d6037..8e00d61ef5 100644 --- a/deps/v8/src/debug/mips/debug-mips.cc +++ b/deps/v8/src/debug/mips/debug-mips.cc @@ -77,9 +77,15 @@ void DebugCodegen::GenerateDebugBreakStub(MacroAssembler* masm, __ li(at, Operand(Smi::FromInt(LiveEdit::kFramePaddingInitialSize))); __ push(at); - if (mode == SAVE_RESULT_REGISTER) __ push(v0); - - __ PrepareCEntryArgs(0); // No arguments. + // Push arguments for DebugBreak call. + if (mode == SAVE_RESULT_REGISTER) { + // Break on return. + __ push(v0); + } else { + // Non-return breaks. + __ Push(masm->isolate()->factory()->the_hole_value()); + } + __ PrepareCEntryArgs(1); __ PrepareCEntryFunction(ExternalReference( Runtime::FunctionForId(Runtime::kDebugBreak), masm->isolate())); @@ -89,12 +95,14 @@ void DebugCodegen::GenerateDebugBreakStub(MacroAssembler* masm, if (FLAG_debug_code) { for (int i = 0; i < kNumJSCallerSaved; i++) { Register reg = {JSCallerSavedCode(i)}; - __ li(reg, kDebugZapValue); + // Do not clobber v0 if mode is SAVE_RESULT_REGISTER. It will + // contain return value of the function returned by DebugBreak. + if (!(reg.is(v0) && (mode == SAVE_RESULT_REGISTER))) { + __ li(reg, kDebugZapValue); + } } } - if (mode == SAVE_RESULT_REGISTER) __ pop(v0); - // Don't bother removing padding bytes pushed on the stack // as the frame is going to be restored right away. @@ -114,9 +122,10 @@ void DebugCodegen::GenerateDebugBreakStub(MacroAssembler* masm, void DebugCodegen::GenerateFrameDropperLiveEdit(MacroAssembler* masm) { // We do not know our frame height, but set sp based on fp. - __ Subu(sp, fp, Operand(kPointerSize)); + __ lw(a1, MemOperand(fp, FrameDropperFrameConstants::kFunctionOffset)); - __ Pop(ra, fp, a1); // Return address, Frame, Function. + // Pop return address and frame. + __ LeaveFrame(StackFrame::INTERNAL); ParameterCount dummy(0); __ FloodFunctionIfStepping(a1, no_reg, dummy, dummy); |