Changeset View
Changeset View
Standalone View
Standalone View
source/Target/StopInfo.cpp
| Show First 20 Lines • Show All 686 Lines • ▼ Show 20 Line(s) | 682 | { | |||
|---|---|---|---|---|---|
| 687 | // re-enable the watchpoint | 687 | // re-enable the watchpoint | ||
| 688 | if (process_sp) { | 688 | if (process_sp) { | ||
| 689 | uint32_t num; | 689 | uint32_t num; | ||
| 690 | bool wp_triggers_after; | 690 | bool wp_triggers_after; | ||
| 691 | 691 | | |||
| 692 | if (process_sp->GetWatchpointSupportInfo(num, wp_triggers_after) | 692 | if (process_sp->GetWatchpointSupportInfo(num, wp_triggers_after) | ||
| 693 | .Success()) { | 693 | .Success()) { | ||
| 694 | if (!wp_triggers_after) { | 694 | if (!wp_triggers_after) { | ||
| 695 | process_sp->DisableWatchpoint(wp_sp.get(), false); | 695 | // We need to preserve the watch_index before watchpoint | ||
| 696 | // is disable. Since Watchpoint::SetEnabled will clear the | ||||
| 697 | // watch index. | ||||
| 698 | // This will fix TestWatchpointIter failure | ||||
| 699 | Watchpoint *wp = wp_sp.get(); | ||||
| 700 | uint32_t watch_index = wp->GetHardwareIndex(); | ||||
| 701 | process_sp->DisableWatchpoint(wp, false); | ||||
| 696 | StopInfoSP stored_stop_info_sp = thread_sp->GetStopInfo(); | 702 | StopInfoSP stored_stop_info_sp = thread_sp->GetStopInfo(); | ||
| 697 | assert(stored_stop_info_sp.get() == this); | 703 | assert(stored_stop_info_sp.get() == this); | ||
| 698 | 704 | | |||
| 699 | ThreadPlanSP new_plan_sp( | 705 | ThreadPlanSP new_plan_sp( | ||
| 700 | thread_sp->QueueThreadPlanForStepSingleInstruction( | 706 | thread_sp->QueueThreadPlanForStepSingleInstruction( | ||
| 701 | false, // step-over | 707 | false, // step-over | ||
| 702 | false, // abort_other_plans | 708 | false, // abort_other_plans | ||
| 703 | true)); // stop_other_threads | 709 | true)); // stop_other_threads | ||
| 704 | new_plan_sp->SetIsMasterPlan(true); | 710 | new_plan_sp->SetIsMasterPlan(true); | ||
| 705 | new_plan_sp->SetOkayToDiscard(false); | 711 | new_plan_sp->SetOkayToDiscard(false); | ||
| 706 | new_plan_sp->SetPrivate(true); | 712 | new_plan_sp->SetPrivate(true); | ||
| 707 | process_sp->GetThreadList().SetSelectedThreadByID( | 713 | process_sp->GetThreadList().SetSelectedThreadByID( | ||
| 708 | thread_sp->GetID()); | 714 | thread_sp->GetID()); | ||
| 709 | process_sp->ResumeSynchronous(nullptr); | 715 | process_sp->ResumeSynchronous(nullptr); | ||
| 710 | process_sp->GetThreadList().SetSelectedThreadByID( | 716 | process_sp->GetThreadList().SetSelectedThreadByID( | ||
| 711 | thread_sp->GetID()); | 717 | thread_sp->GetID()); | ||
| 712 | thread_sp->SetStopInfo(stored_stop_info_sp); | 718 | thread_sp->SetStopInfo(stored_stop_info_sp); | ||
| 713 | process_sp->EnableWatchpoint(wp_sp.get(), false); | 719 | process_sp->EnableWatchpoint(wp, false); | ||
| 720 | wp->SetHardwareIndex(watch_index); | ||||
| 714 | } | 721 | } | ||
| 715 | } | 722 | } | ||
| 716 | } | 723 | } | ||
| 717 | } | 724 | } | ||
| 718 | 725 | | |||
| 719 | // This sentry object makes sure the current watchpoint is disabled | 726 | // This sentry object makes sure the current watchpoint is disabled | ||
| 720 | // while performing watchpoint actions, | 727 | // while performing watchpoint actions, | ||
| 721 | // and it is then enabled after we are finished. | 728 | // and it is then enabled after we are finished. | ||
| ▲ Show 20 Lines • Show All 455 Lines • Show Last 20 Lines | |||||