| OLD | NEW |
| 1 // Copyright 2012 the V8 project authors. All rights reserved. | 1 // Copyright 2012 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 385 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 396 ClearDebugBreakAtSlot(); | 396 ClearDebugBreakAtSlot(); |
| 397 } else { | 397 } else { |
| 398 // Patch the IC call. | 398 // Patch the IC call. |
| 399 ClearDebugBreakAtIC(); | 399 ClearDebugBreakAtIC(); |
| 400 } | 400 } |
| 401 ASSERT(!IsDebugBreak()); | 401 ASSERT(!IsDebugBreak()); |
| 402 } | 402 } |
| 403 | 403 |
| 404 | 404 |
| 405 bool BreakLocationIterator::IsStepInLocation(Isolate* isolate) { | 405 bool BreakLocationIterator::IsStepInLocation(Isolate* isolate) { |
| 406 if (RelocInfo::IsConstructCall(rmode())) { | 406 if (RelocInfo::IsConstructCall(original_rmode())) { |
| 407 return true; | 407 return true; |
| 408 } else if (RelocInfo::IsCodeTarget(rmode())) { | 408 } else if (RelocInfo::IsCodeTarget(rmode())) { |
| 409 HandleScope scope(debug_info_->GetIsolate()); | 409 HandleScope scope(debug_info_->GetIsolate()); |
| 410 Address target = rinfo()->target_address(); | 410 Address target = original_rinfo()->target_address(); |
| 411 Handle<Code> target_code(Code::GetCodeFromTargetAddress(target)); | 411 Handle<Code> target_code(Code::GetCodeFromTargetAddress(target)); |
| 412 if (target_code->kind() == Code::STUB) { | 412 if (target_code->kind() == Code::STUB) { |
| 413 return target_code->major_key() == CodeStub::CallFunction; | 413 return target_code->major_key() == CodeStub::CallFunction; |
| 414 } | 414 } |
| 415 return target_code->is_call_stub() || target_code->is_keyed_call_stub(); | 415 return target_code->is_call_stub() || target_code->is_keyed_call_stub(); |
| 416 } else { | 416 } else { |
| 417 return false; | 417 return false; |
| 418 } | 418 } |
| 419 } | 419 } |
| 420 | 420 |
| (...skipping 3444 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3865 { | 3865 { |
| 3866 Locker locker(reinterpret_cast<v8::Isolate*>(isolate_)); | 3866 Locker locker(reinterpret_cast<v8::Isolate*>(isolate_)); |
| 3867 isolate_->debugger()->CallMessageDispatchHandler(); | 3867 isolate_->debugger()->CallMessageDispatchHandler(); |
| 3868 } | 3868 } |
| 3869 } | 3869 } |
| 3870 } | 3870 } |
| 3871 | 3871 |
| 3872 #endif // ENABLE_DEBUGGER_SUPPORT | 3872 #endif // ENABLE_DEBUGGER_SUPPORT |
| 3873 | 3873 |
| 3874 } } // namespace v8::internal | 3874 } } // namespace v8::internal |
| OLD | NEW |