diff options
author | Ali Ijaz Sheikh <ofrobots@google.com> | 2016-03-01 08:58:05 -0800 |
---|---|---|
committer | Ali Sheikh <ofrobots@lemonhope.roam.corp.google.com> | 2016-03-03 20:35:20 -0800 |
commit | 069e02ab47656b3efd1b6829c65856b2e1c2d1db (patch) | |
tree | eb643e0a2e88fd64bb9fc927423458d2ae96c2db /deps/v8/src/debug/mips | |
parent | 8938355398c79f583a468284b768652d12ba9bc9 (diff) | |
download | android-node-v8-069e02ab47656b3efd1b6829c65856b2e1c2d1db.tar.gz android-node-v8-069e02ab47656b3efd1b6829c65856b2e1c2d1db.tar.bz2 android-node-v8-069e02ab47656b3efd1b6829c65856b2e1c2d1db.zip |
deps: upgrade to V8 4.9.385.18
Pick up the current branch head for V8 4.9
https://github.com/v8/v8/commit/1ecba0f
PR-URL: https://github.com/nodejs/node/pull/4722
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Michaƫl Zasso <mic.besace@gmail.com>
Diffstat (limited to 'deps/v8/src/debug/mips')
-rw-r--r-- | deps/v8/src/debug/mips/OWNERS | 1 | ||||
-rw-r--r-- | deps/v8/src/debug/mips/debug-mips.cc | 31 |
2 files changed, 14 insertions, 18 deletions
diff --git a/deps/v8/src/debug/mips/OWNERS b/deps/v8/src/debug/mips/OWNERS index 5508ba626f..89455a4fbd 100644 --- a/deps/v8/src/debug/mips/OWNERS +++ b/deps/v8/src/debug/mips/OWNERS @@ -3,3 +3,4 @@ gergely.kis@imgtec.com akos.palfi@imgtec.com balazs.kilvady@imgtec.com dusan.milosavljevic@imgtec.com +ivica.bogosavljevic@imgtec.com diff --git a/deps/v8/src/debug/mips/debug-mips.cc b/deps/v8/src/debug/mips/debug-mips.cc index 30bdcac1b6..c5c58d044b 100644 --- a/deps/v8/src/debug/mips/debug-mips.cc +++ b/deps/v8/src/debug/mips/debug-mips.cc @@ -24,25 +24,25 @@ void EmitDebugBreakSlot(MacroAssembler* masm) { } -void DebugCodegen::GenerateSlot(MacroAssembler* masm, RelocInfo::Mode mode, - int call_argc) { +void DebugCodegen::GenerateSlot(MacroAssembler* masm, RelocInfo::Mode mode) { // Generate enough nop's to make space for a call instruction. Avoid emitting // the trampoline pool in the debug break slot code. Assembler::BlockTrampolinePoolScope block_pool(masm); - masm->RecordDebugBreakSlot(mode, call_argc); + masm->RecordDebugBreakSlot(mode); EmitDebugBreakSlot(masm); } -void DebugCodegen::ClearDebugBreakSlot(Address pc) { - CodePatcher patcher(pc, Assembler::kDebugBreakSlotInstructions); +void DebugCodegen::ClearDebugBreakSlot(Isolate* isolate, Address pc) { + CodePatcher patcher(isolate, pc, Assembler::kDebugBreakSlotInstructions); EmitDebugBreakSlot(patcher.masm()); } -void DebugCodegen::PatchDebugBreakSlot(Address pc, Handle<Code> code) { +void DebugCodegen::PatchDebugBreakSlot(Isolate* isolate, Address pc, + Handle<Code> code) { DCHECK_EQ(Code::BUILTIN, code->kind()); - CodePatcher patcher(pc, Assembler::kDebugBreakSlotInstructions); + CodePatcher patcher(isolate, pc, Assembler::kDebugBreakSlotInstructions); // Patch the code changing the debug break slot code from: // nop(DEBUG_BREAK_NOP) - nop(1) is sll(zero_reg, zero_reg, 1) // nop(DEBUG_BREAK_NOP) @@ -108,26 +108,21 @@ void DebugCodegen::GenerateDebugBreakStub(MacroAssembler* masm, } -void DebugCodegen::GeneratePlainReturnLiveEdit(MacroAssembler* masm) { - __ Ret(); -} - - void DebugCodegen::GenerateFrameDropperLiveEdit(MacroAssembler* masm) { - ExternalReference restarter_frame_function_slot = - ExternalReference::debug_restarter_frame_function_pointer_address( - masm->isolate()); - __ li(at, Operand(restarter_frame_function_slot)); - __ sw(zero_reg, MemOperand(at, 0)); - // We do not know our frame height, but set sp based on fp. __ Subu(sp, fp, Operand(kPointerSize)); __ Pop(ra, fp, a1); // Return address, Frame, Function. + ParameterCount dummy(0); + __ FloodFunctionIfStepping(a1, no_reg, dummy, dummy); + // Load context from the function. __ lw(cp, FieldMemOperand(a1, JSFunction::kContextOffset)); + // Clear new.target as a safety measure. + __ LoadRoot(a3, Heap::kUndefinedValueRootIndex); + // Get function code. __ lw(at, FieldMemOperand(a1, JSFunction::kSharedFunctionInfoOffset)); __ lw(at, FieldMemOperand(at, SharedFunctionInfo::kCodeOffset)); |