Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-06 17:08:28 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/mamedev/mame

Browse Source
This commit is contained in:
Robbbert 2016-06-17 21:40:57 +10:00
commit 07cb83f3ff
4 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/emu/debug/debugcpu.cpp
View File

@ -55,7 +55,7 @@ debugger_cpu::debugger_cpu(running_machine &machine)
m_tempvar = make_unique_clear<UINT64[]>(NUM_TEMP_VARIABLES); m_tempvar = make_unique_clear<UINT64[]>(NUM_TEMP_VARIABLES);
/* create a global symbol table */ /* create a global symbol table */
m_symtable = global_alloc(symbol_table(&m_machine)); m_symtable = std::make_unique<symbol_table>(&m_machine);
// configure our base memory accessors // configure our base memory accessors
configure_memory(*m_symtable); configure_memory(*m_symtable);
@ -84,8 +84,6 @@ debugger_cpu::debugger_cpu(running_machine &machine)
/* add callback for breaking on VBLANK */ /* add callback for breaking on VBLANK */
if (m_machine.first_screen() != nullptr) if (m_machine.first_screen() != nullptr)
m_machine.first_screen()->register_vblank_callback(vblank_state_delegate(FUNC(debugger_cpu::on_vblank), this)); m_machine.first_screen()->register_vblank_callback(vblank_state_delegate(FUNC(debugger_cpu::on_vblank), this));
machine.add_notifier(MACHINE_NOTIFY_EXIT, machine_notify_delegate(FUNC(debugger_cpu::exit), this));
} }
void debugger_cpu::configure_memory(symbol_table &table) void debugger_cpu::configure_memory(symbol_table &table)
@ -163,7 +161,7 @@ bool debugger_cpu::is_stopped()
symbol_table* debugger_cpu::get_global_symtable() symbol_table* debugger_cpu::get_global_symtable()
{ {
return m_symtable; return m_symtable.get();
} }
@ -956,16 +954,6 @@ UINT64 debugger_cpu::read_opcode(address_space &space, offs_t address, int size)
INTERNAL HELPERS INTERNAL HELPERS
***************************************************************************/ ***************************************************************************/
/*-------------------------------------------------
exit - free all memory
-------------------------------------------------*/
void debugger_cpu::exit()
{
global_free(m_symtable);
}
/*------------------------------------------------- /*-------------------------------------------------
on_vblank - called when a VBLANK hits on_vblank - called when a VBLANK hits
-------------------------------------------------*/ -------------------------------------------------*/

3
src/emu/debug/debugcpu.h
View File

@ -606,7 +606,6 @@ private:
UINT64 get_frame(symbol_table &table, void *ref); UINT64 get_frame(symbol_table &table, void *ref);
/* internal helpers */ /* internal helpers */
void exit();
void on_vblank(screen_device &device, bool vblank_state); void on_vblank(screen_device &device, bool vblank_state);
running_machine& m_machine; running_machine& m_machine;
@ -617,7 +616,7 @@ private:
FILE * m_source_file; // script source file FILE * m_source_file; // script source file
symbol_table * m_symtable; // global symbol table std::unique_ptr<symbol_table> m_symtable; // global symbol table
bool m_within_instruction_hook; bool m_within_instruction_hook;
bool m_vblank_occurred; bool m_vblank_occurred;

6
src/emu/debug/debugvw.cpp
View File

@ -355,12 +355,6 @@ debug_view *debug_view_manager::alloc_view(debug_view_type type, debug_view_osd_
case DVT_LOG: case DVT_LOG:
return append(global_alloc(debug_view_log(machine(), osdupdate, osdprivate))); return append(global_alloc(debug_view_log(machine(), osdupdate, osdprivate)));
case DVT_TIMERS:
// return append(global_alloc(debug_view_timers(machine(), osdupdate, osdprivate)));
case DVT_ALLOCS:
// return append(global_alloc(debug_view_allocs(machine(), osdupdate, osdprivate)));
case DVT_BREAK_POINTS: case DVT_BREAK_POINTS:
return append(global_alloc(debug_view_breakpoints(machine(), osdupdate, osdprivate))); return append(global_alloc(debug_view_breakpoints(machine(), osdupdate, osdprivate)));

2
src/emu/debug/debugvw.h
View File

@ -27,8 +27,6 @@ enum debug_view_type
DVT_DISASSEMBLY, DVT_DISASSEMBLY,
DVT_MEMORY, DVT_MEMORY,
DVT_LOG, DVT_LOG,
DVT_TIMERS,
DVT_ALLOCS,
DVT_BREAK_POINTS, DVT_BREAK_POINTS,
DVT_WATCH_POINTS DVT_WATCH_POINTS
}; };