OLD | NEW |
1 // Copyright 2006-2008 the V8 project authors. All rights reserved. | 1 // Copyright 2006-2008 the V8 project authors. All rights reserved. |
2 // Redistribution and use in source and binary forms, with or without | 2 // Redistribution and use in source and binary forms, with or without |
3 // modification, are permitted provided that the following conditions are | 3 // modification, are permitted provided that the following conditions are |
4 // met: | 4 // met: |
5 // | 5 // |
6 // * Redistributions of source code must retain the above copyright | 6 // * Redistributions of source code must retain the above copyright |
7 // notice, this list of conditions and the following disclaimer. | 7 // notice, this list of conditions and the following disclaimer. |
8 // * Redistributions in binary form must reproduce the above | 8 // * Redistributions in binary form must reproduce the above |
9 // copyright notice, this list of conditions and the following | 9 // copyright notice, this list of conditions and the following |
10 // disclaimer in the documentation and/or other materials provided | 10 // disclaimer in the documentation and/or other materials provided |
(...skipping 435 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
446 // fast case. We need to patch back the keyed store because no | 446 // fast case. We need to patch back the keyed store because no |
447 // patching happens when running normally. For keyed loads, the | 447 // patching happens when running normally. For keyed loads, the |
448 // map check will get patched back when running normally after ICs | 448 // map check will get patched back when running normally after ICs |
449 // have been cleared at GC. | 449 // have been cleared at GC. |
450 if (code->is_keyed_store_stub()) KeyedStoreIC::RestoreInlinedVersion(pc()); | 450 if (code->is_keyed_store_stub()) KeyedStoreIC::RestoreInlinedVersion(pc()); |
451 } | 451 } |
452 } | 452 } |
453 | 453 |
454 | 454 |
455 bool BreakLocationIterator::IsDebuggerStatement() { | 455 bool BreakLocationIterator::IsDebuggerStatement() { |
456 if (RelocInfo::IsCodeTarget(rmode())) { | 456 return RelocInfo::DEBUG_BREAK == rmode(); |
457 Address target = original_rinfo()->target_address(); | |
458 Code* code = Code::GetCodeFromTargetAddress(target); | |
459 if (code->kind() == Code::STUB) { | |
460 CodeStub::Major major_key = code->major_key(); | |
461 return (major_key == CodeStub::DebuggerStatement); | |
462 } | |
463 } | |
464 return false; | |
465 } | 457 } |
466 | 458 |
467 | 459 |
468 Object* BreakLocationIterator::BreakPointObjects() { | 460 Object* BreakLocationIterator::BreakPointObjects() { |
469 return debug_info_->GetBreakPointObjects(code_position()); | 461 return debug_info_->GetBreakPointObjects(code_position()); |
470 } | 462 } |
471 | 463 |
472 | 464 |
473 // Clear out all the debug break code. This is ONLY supposed to be used when | 465 // Clear out all the debug break code. This is ONLY supposed to be used when |
474 // shutting down the debugger as it will leave the break point information in | 466 // shutting down the debugger as it will leave the break point information in |
(...skipping 2319 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2794 { | 2786 { |
2795 Locker locker; | 2787 Locker locker; |
2796 Debugger::CallMessageDispatchHandler(); | 2788 Debugger::CallMessageDispatchHandler(); |
2797 } | 2789 } |
2798 } | 2790 } |
2799 } | 2791 } |
2800 | 2792 |
2801 #endif // ENABLE_DEBUGGER_SUPPORT | 2793 #endif // ENABLE_DEBUGGER_SUPPORT |
2802 | 2794 |
2803 } } // namespace v8::internal | 2795 } } // namespace v8::internal |
OLD | NEW |