summaryrefslogtreecommitdiffstats
path: root/src/osd/modules/debugger/qt/memorywindow.cpp
diff options
context:
space:
mode:
author therealmogminer@gmail.com <therealmogminer@gmail.com>2016-06-08 08:10:55 +1000
committer Vas Crabb <vas@vastheman.com>2016-06-08 08:10:55 +1000
commit56bd36c5ef3960874628bc08cbfcedf4c6057a19 (patch)
tree3cce04b8c27b773befde51785210bc83673f9fd0 /src/osd/modules/debugger/qt/memorywindow.cpp
parentbf281b3cad1d05c6ef863fa179d3d6ab442a163c (diff)
Major refactoring of debugger core [Ryan Holtz]
* Eliminate globals/file statics * Remove lots of stuff from global scope * Use std::function for custom command registration * Eliminate some trampolines * Build fixes from Vas Crabb and balr0g
Diffstat (limited to 'src/osd/modules/debugger/qt/memorywindow.cpp')
-rw-r--r--src/osd/modules/debugger/qt/memorywindow.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/osd/modules/debugger/qt/memorywindow.cpp b/src/osd/modules/debugger/qt/memorywindow.cpp
index 9d10dbb5024..8709c8d5aa2 100644
--- a/src/osd/modules/debugger/qt/memorywindow.cpp
+++ b/src/osd/modules/debugger/qt/memorywindow.cpp
@@ -291,7 +291,7 @@ void MemoryWindow::populateComboBox()
void MemoryWindow::setToCurrentCpu()
{
- device_t* curCpu = debug_cpu_get_visible_cpu(*m_machine);
+ device_t* curCpu = m_machine->debugger().cpu().get_visible_cpu();
const debug_view_source *source = m_memTable->view()->source_for_device(curCpu);
const int listIndex = m_memTable->view()->source_list().indexof(*source);
m_memoryComboBox->setCurrentIndex(listIndex);
@@ -346,7 +346,7 @@ void DebuggerMemView::mousePressEvent(QMouseEvent* event)
const debug_view_memory_source* source = downcast<const debug_view_memory_source*>(memView->source());
address_space* addressSpace = source->space();
const int nativeDataWidth = addressSpace->data_width() / 8;
- const UINT64 memValue = debug_read_memory(*addressSpace,
+ const UINT64 memValue = source->device()->machine().debugger().cpu().read_memory(*addressSpace,
addressSpace->address_to_byte(address),
nativeDataWidth,
true);