OLD | NEW |
1 // Copyright 2012 the V8 project authors. All rights reserved. | 1 // Copyright 2012 the V8 project authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "src/v8.h" | 5 #include "src/v8.h" |
6 | 6 |
7 #include "src/api.h" | 7 #include "src/api.h" |
8 #include "src/arguments.h" | 8 #include "src/arguments.h" |
9 #include "src/bootstrapper.h" | 9 #include "src/bootstrapper.h" |
10 #include "src/code-stubs.h" | 10 #include "src/code-stubs.h" |
(...skipping 2342 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2353 } | 2353 } |
2354 | 2354 |
2355 // Move back to where the call instruction sequence started. | 2355 // Move back to where the call instruction sequence started. |
2356 after_break_target_ = addr - Assembler::kPatchReturnSequenceAddressOffset; | 2356 after_break_target_ = addr - Assembler::kPatchReturnSequenceAddressOffset; |
2357 } else if (at_debug_break_slot) { | 2357 } else if (at_debug_break_slot) { |
2358 // Address of where the debug break slot starts. | 2358 // Address of where the debug break slot starts. |
2359 addr = addr - Assembler::kPatchDebugBreakSlotAddressOffset; | 2359 addr = addr - Assembler::kPatchDebugBreakSlotAddressOffset; |
2360 | 2360 |
2361 // Continue just after the slot. | 2361 // Continue just after the slot. |
2362 after_break_target_ = addr + Assembler::kDebugBreakSlotLength; | 2362 after_break_target_ = addr + Assembler::kDebugBreakSlotLength; |
2363 } else if (IsDebugBreak(Assembler::target_address_at(addr, *code))) { | 2363 } else { |
2364 // We now know that there is still a debug break call at the target address, | 2364 addr = Assembler::target_address_from_return_address(frame->pc()); |
2365 // so the break point is still there and the original code will hold the | 2365 if (IsDebugBreak(Assembler::target_address_at(addr, *code))) { |
2366 // address to jump to in order to complete the call which is replaced by a | 2366 // We now know that there is still a debug break call at the target |
2367 // call to DebugBreakXXX. | 2367 // address, so the break point is still there and the original code will |
| 2368 // hold the address to jump to in order to complete the call which is |
| 2369 // replaced by a call to DebugBreakXXX. |
2368 | 2370 |
2369 // Find the corresponding address in the original code. | 2371 // Find the corresponding address in the original code. |
2370 addr += original_code->instruction_start() - code->instruction_start(); | 2372 addr += original_code->instruction_start() - code->instruction_start(); |
2371 | 2373 |
2372 // Install jump to the call address in the original code. This will be the | 2374 // Install jump to the call address in the original code. This will be the |
2373 // call which was overwritten by the call to DebugBreakXXX. | 2375 // call which was overwritten by the call to DebugBreakXXX. |
2374 after_break_target_ = Assembler::target_address_at(addr, *original_code); | 2376 after_break_target_ = Assembler::target_address_at(addr, *original_code); |
2375 } else { | 2377 } else { |
2376 // There is no longer a break point present. Don't try to look in the | 2378 // There is no longer a break point present. Don't try to look in the |
2377 // original code as the running code will have the right address. This takes | 2379 // original code as the running code will have the right address. This |
2378 // care of the case where the last break point is removed from the function | 2380 // takes care of the case where the last break point is removed from the |
2379 // and therefore no "original code" is available. | 2381 // function and therefore no "original code" is available. |
2380 after_break_target_ = Assembler::target_address_at(addr, *code); | 2382 after_break_target_ = Assembler::target_address_at(addr, *code); |
| 2383 } |
2381 } | 2384 } |
2382 } | 2385 } |
2383 | 2386 |
2384 | 2387 |
2385 bool Debug::IsBreakAtReturn(JavaScriptFrame* frame) { | 2388 bool Debug::IsBreakAtReturn(JavaScriptFrame* frame) { |
2386 HandleScope scope(isolate_); | 2389 HandleScope scope(isolate_); |
2387 | 2390 |
2388 // If there are no break points this cannot be break at return, as | 2391 // If there are no break points this cannot be break at return, as |
2389 // the debugger statement and stack guard bebug break cannot be at | 2392 // the debugger statement and stack guard bebug break cannot be at |
2390 // return. | 2393 // return. |
(...skipping 981 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3372 logger_->DebugEvent("Put", message.text()); | 3375 logger_->DebugEvent("Put", message.text()); |
3373 } | 3376 } |
3374 | 3377 |
3375 | 3378 |
3376 void LockingCommandMessageQueue::Clear() { | 3379 void LockingCommandMessageQueue::Clear() { |
3377 base::LockGuard<base::Mutex> lock_guard(&mutex_); | 3380 base::LockGuard<base::Mutex> lock_guard(&mutex_); |
3378 queue_.Clear(); | 3381 queue_.Clear(); |
3379 } | 3382 } |
3380 | 3383 |
3381 } } // namespace v8::internal | 3384 } } // namespace v8::internal |
OLD | NEW |