diff options
Diffstat (limited to 'src/osd/modules/debugger/debugimgui.cpp')
-rw-r--r-- | src/osd/modules/debugger/debugimgui.cpp | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/src/osd/modules/debugger/debugimgui.cpp b/src/osd/modules/debugger/debugimgui.cpp index 25f6938f4fa..504899f560a 100644 --- a/src/osd/modules/debugger/debugimgui.cpp +++ b/src/osd/modules/debugger/debugimgui.cpp @@ -316,36 +316,36 @@ void debug_imgui::handle_keys() else { m_machine->schedule_soft_reset(); - debug_cpu_get_visible_cpu(*m_machine)->debug()->go(); + m_machine->debugger().cpu().get_visible_cpu()->debug()->go(); } } if(ImGui::IsKeyPressed(ITEM_ID_F5,false)) { - debug_cpu_get_visible_cpu(*m_machine)->debug()->go(); + m_machine->debugger().cpu().get_visible_cpu()->debug()->go(); m_running = true; } if(ImGui::IsKeyPressed(ITEM_ID_F6,false)) { - debug_cpu_get_visible_cpu(*m_machine)->debug()->go_next_device(); + m_machine->debugger().cpu().get_visible_cpu()->debug()->go_next_device(); m_running = true; } if(ImGui::IsKeyPressed(ITEM_ID_F7,false)) { - debug_cpu_get_visible_cpu(*m_machine)->debug()->go_interrupt(); + m_machine->debugger().cpu().get_visible_cpu()->debug()->go_interrupt(); m_running = true; } if(ImGui::IsKeyPressed(ITEM_ID_F8,false)) - debug_cpu_get_visible_cpu(*m_machine)->debug()->go_vblank(); + m_machine->debugger().cpu().get_visible_cpu()->debug()->go_vblank(); if(ImGui::IsKeyPressed(ITEM_ID_F9,false)) - debug_cpu_get_visible_cpu(*m_machine)->debug()->single_step_out(); + m_machine->debugger().cpu().get_visible_cpu()->debug()->single_step_out(); if(ImGui::IsKeyPressed(ITEM_ID_F10,false)) - debug_cpu_get_visible_cpu(*m_machine)->debug()->single_step_over(); + m_machine->debugger().cpu().get_visible_cpu()->debug()->single_step_over(); if(ImGui::IsKeyPressed(ITEM_ID_F11,false)) - debug_cpu_get_visible_cpu(*m_machine)->debug()->single_step(); + m_machine->debugger().cpu().get_visible_cpu()->debug()->single_step(); if(ImGui::IsKeyPressed(ITEM_ID_F12,false)) { - debug_cpu_get_visible_cpu(*m_machine)->debug()->go(); + m_machine->debugger().cpu().get_visible_cpu()->debug()->go(); m_hide = true; } @@ -425,11 +425,11 @@ void debug_imgui::handle_console(running_machine* machine) // if console input is empty, then do a single step if(strlen(view_main_console->console_input) == 0) { - debug_cpu_get_visible_cpu(*m_machine)->debug()->single_step(); + m_machine->debugger().cpu().get_visible_cpu()->debug()->single_step(); view_main_console->exec_cmd = false; return; } - debug_console_execute_command(*m_machine, view_main_console->console_input, 1); + m_machine->debugger().console().execute_command(view_main_console->console_input, true); // check for commands that start execution (so that input fields can be disabled) if(strcmp(view_main_console->console_input,"g") == 0) m_running = true; @@ -501,7 +501,7 @@ void debug_imgui::draw_view(debug_area* view_ptr, bool exp_change) if(view_ptr->type != DVT_MEMORY) // no scroll bars in memory views ImGui::SetScrollY(view_ptr->view->visible_position().y * fsize.y); } - + // update view location, while the cursor is at 0,0. view_ptr->ofs_x = ImGui::GetCursorScreenPos().x; view_ptr->ofs_y = ImGui::GetCursorScreenPos().y; @@ -526,7 +526,7 @@ void debug_imgui::draw_view(debug_area* view_ptr, bool exp_change) pos.y = ImGui::GetScrollY() / fsize.y; view_ptr->view->set_visible_position(pos); } - + viewdata = view_ptr->view->viewdata(); xy1.x = view_ptr->ofs_x; @@ -866,33 +866,33 @@ void debug_imgui::draw_console() ImGui::Separator(); if(ImGui::MenuItem("Run", "F5")) { - debug_cpu_get_visible_cpu(*m_machine)->debug()->go(); + m_machine->debugger().cpu().get_visible_cpu()->debug()->go(); m_running = true; } if(ImGui::MenuItem("Go to next CPU", "F6")) { - debug_cpu_get_visible_cpu(*m_machine)->debug()->go_next_device(); + m_machine->debugger().cpu().get_visible_cpu()->debug()->go_next_device(); m_running = true; } if(ImGui::MenuItem("Run until next interrupt", "F7")) { - debug_cpu_get_visible_cpu(*m_machine)->debug()->go_interrupt(); + m_machine->debugger().cpu().get_visible_cpu()->debug()->go_interrupt(); m_running = true; } if(ImGui::MenuItem("Run until VBLANK", "F8")) - debug_cpu_get_visible_cpu(*m_machine)->debug()->go_vblank(); + m_machine->debugger().cpu().get_visible_cpu()->debug()->go_vblank(); if(ImGui::MenuItem("Run and hide debugger", "F12")) { - debug_cpu_get_visible_cpu(*m_machine)->debug()->go(); + m_machine->debugger().cpu().get_visible_cpu()->debug()->go(); m_hide = true; } ImGui::Separator(); if(ImGui::MenuItem("Single step", "F11")) - debug_cpu_get_visible_cpu(*m_machine)->debug()->single_step(); + m_machine->debugger().cpu().get_visible_cpu()->debug()->single_step(); if(ImGui::MenuItem("Step over", "F10")) - debug_cpu_get_visible_cpu(*m_machine)->debug()->single_step_over(); + m_machine->debugger().cpu().get_visible_cpu()->debug()->single_step_over(); if(ImGui::MenuItem("Step out", "F9")) - debug_cpu_get_visible_cpu(*m_machine)->debug()->single_step_out(); + m_machine->debugger().cpu().get_visible_cpu()->debug()->single_step_out(); ImGui::EndMenu(); } @@ -1108,7 +1108,7 @@ void debug_imgui::wait_for_debugger(device_t &device, bool firststop) void debug_imgui::debugger_update() { - if ((m_machine != nullptr) && (!debug_cpu_is_stopped(*m_machine)) && (m_machine->phase() == MACHINE_PHASE_RUNNING) && !m_hide) + if ((m_machine != nullptr) && (!m_machine->debugger().cpu().is_stopped()) && (m_machine->phase() == MACHINE_PHASE_RUNNING) && !m_hide) { UINT32 width = m_machine->render().ui_target().width(); UINT32 height = m_machine->render().ui_target().height(); |