Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-27 10:43:07 +03:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

chihiro.cpp: move threadlist debug command to xbox (nw)

Browse Source
This commit is contained in:
yz70s 2016-12-03 18:29:25 +01:00
parent da667b3881
commit fe72e4b633
3 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/mame/drivers/chihiro.cpp
View File

@ -562,7 +562,6 @@ public:
private: private:
void jamtable_disasm(address_space &space, uint32_t address, uint32_t size); void jamtable_disasm(address_space &space, uint32_t address, uint32_t size);
void jamtable_disasm_command(int ref, int params, const char **param); void jamtable_disasm_command(int ref, int params, const char **param);
void threadlist_command(int ref, int params, const char **param);
void chihiro_help_command(int ref, int params, const char **param); void chihiro_help_command(int ref, int params, const char **param);
void debug_commands(int ref, int params, const char **param); void debug_commands(int ref, int params, const char **param);
}; };
@ -694,42 +693,12 @@ void chihiro_state::jamtable_disasm_command(int ref, int params, const char **pa
jamtable_disasm(space, (uint32_t)addr, (uint32_t)size); jamtable_disasm(space, (uint32_t)addr, (uint32_t)size);
} }
void chihiro_state::threadlist_command(int ref, int params, const char **param)
{
address_space &space = m_maincpu->space();
debugger_cpu &cpu = machine().debugger().cpu();
debugger_console &con = machine().debugger().console();
con.printf("Pri. _KTHREAD Stack Function\n");
con.printf("-------------------------------\n");
for (int pri=0;pri < 16;pri++)
{
uint32_t curr = debugc_bios->parameter[1-1] + pri * 8;
uint32_t next = cpu.read_dword(space, curr, true);
while (next != curr)
{
uint32_t kthrd = next - debugc_bios->parameter[2-1];
uint32_t topstack = cpu.read_dword(space, kthrd + debugc_bios->parameter[3-1], true);
uint32_t tlsdata = cpu.read_dword(space, kthrd + debugc_bios->parameter[4-1], true);
uint32_t function;
if (tlsdata == 0)
function = cpu.read_dword(space, topstack - debugc_bios->parameter[5-1] - debugc_bios->parameter[6-1], true);
else
function = cpu.read_dword(space, tlsdata - debugc_bios->parameter[6-1], true);
con.printf(" %02d %08x %08x %08x\n", pri, kthrd, topstack, function);
next = cpu.read_dword(space, next, true);
}
}
}
void chihiro_state::chihiro_help_command(int ref, int params, const char **param) void chihiro_state::chihiro_help_command(int ref, int params, const char **param)
{ {
debugger_console &con = machine().debugger().console(); debugger_console &con = machine().debugger().console();
con.printf("Available Chihiro commands:\n"); con.printf("Available Chihiro commands:\n");
con.printf(" chihiro jamdis,<start>,<size> -- Disassemble <size> bytes of JamTable instructions starting at <start>\n"); con.printf(" chihiro jamdis,<start>,<size> -- Disassemble <size> bytes of JamTable instructions starting at <start>\n");
con.printf(" chihiro threadlist -- list of currently active threads\n");
con.printf(" chihiro help -- this list\n"); con.printf(" chihiro help -- this list\n");
} }
@ -739,8 +708,6 @@ void chihiro_state::debug_commands(int ref, int params, const char **param)
return; return;
if (strcmp("jamdis", param[0]) == 0) if (strcmp("jamdis", param[0]) == 0)
jamtable_disasm_command(ref, params - 1, param + 1); jamtable_disasm_command(ref, params - 1, param + 1);
else if (strcmp("threadlist", param[0]) == 0)
threadlist_command(ref, params - 1, param + 1);
else else
chihiro_help_command(ref, params - 1, param + 1); chihiro_help_command(ref, params - 1, param + 1);
} }

1
src/mame/includes/xbox.h
View File

@ -129,6 +129,7 @@ private:
void dump_dpc_command(int ref, int params, const char **param); void dump_dpc_command(int ref, int params, const char **param);
void dump_timer_command(int ref, int params, const char **param); void dump_timer_command(int ref, int params, const char **param);
void curthread_command(int ref, int params, const char **param); void curthread_command(int ref, int params, const char **param);
void threadlist_command(int ref, int params, const char **param);
void generate_irq_command(int ref, int params, const char **param); void generate_irq_command(int ref, int params, const char **param);
void nv2a_combiners_command(int ref, int params, const char **param); void nv2a_combiners_command(int ref, int params, const char **param);
void waitvblank_command(int ref, int params, const char **param); void waitvblank_command(int ref, int params, const char **param);

32
src/mame/machine/xbox.cpp
View File

@ -297,6 +297,35 @@ void xbox_base_state::curthread_command(int ref, int params, const char **param)
con.printf("Current thread function is %08X\n", cpu.read_dword(space, address, true)); con.printf("Current thread function is %08X\n", cpu.read_dword(space, address, true));
} }
void xbox_base_state::threadlist_command(int ref, int params, const char **param)
{
address_space &space = m_maincpu->space();
debugger_cpu &cpu = machine().debugger().cpu();
debugger_console &con = machine().debugger().console();
con.printf("Pri. _KTHREAD Stack Function\n");
con.printf("-------------------------------\n");
for (int pri = 0; pri < 16; pri++)
{
uint32_t curr = debugc_bios->parameter[1 - 1] + pri * 8;
uint32_t next = cpu.read_dword(space, curr, true);
while ((next != curr) && (next != 0))
{
uint32_t kthrd = next - debugc_bios->parameter[2 - 1];
uint32_t topstack = cpu.read_dword(space, kthrd + debugc_bios->parameter[3 - 1], true);
uint32_t tlsdata = cpu.read_dword(space, kthrd + debugc_bios->parameter[4 - 1], true);
uint32_t function;
if (tlsdata == 0)
function = cpu.read_dword(space, topstack - debugc_bios->parameter[5 - 1] - debugc_bios->parameter[6 - 1], true);
else
function = cpu.read_dword(space, tlsdata - debugc_bios->parameter[6 - 1], true);
con.printf(" %02d %08x %08x %08x\n", pri, kthrd, topstack, function);
next = cpu.read_dword(space, next, true);
}
}
}
void xbox_base_state::generate_irq_command(int ref, int params, const char **param) void xbox_base_state::generate_irq_command(int ref, int params, const char **param)
{ {
uint64_t irq; uint64_t irq;
@ -426,6 +455,7 @@ void xbox_base_state::help_command(int ref, int params, const char **param)
con.printf(" xbox dump_dpc,<address> -- Dump _KDPC object at <address>\n"); con.printf(" xbox dump_dpc,<address> -- Dump _KDPC object at <address>\n");
con.printf(" xbox dump_timer,<address> -- Dump _KTIMER object at <address>\n"); con.printf(" xbox dump_timer,<address> -- Dump _KTIMER object at <address>\n");
con.printf(" xbox curthread -- Print information about current thread\n"); con.printf(" xbox curthread -- Print information about current thread\n");
con.printf(" xbox threadlist -- list of currently active threads\n");
con.printf(" xbox irq,<number> -- Generate interrupt with irq number 0-15\n"); con.printf(" xbox irq,<number> -- Generate interrupt with irq number 0-15\n");
con.printf(" xbox nv2a_combiners -- Toggle use of register combiners\n"); con.printf(" xbox nv2a_combiners -- Toggle use of register combiners\n");
con.printf(" xbox waitvblank -- Toggle support for wait vblank method\n"); con.printf(" xbox waitvblank -- Toggle support for wait vblank method\n");
@ -451,6 +481,8 @@ void xbox_base_state::xbox_debug_commands(int ref, int params, const char **para
dump_timer_command(ref, params - 1, param + 1); dump_timer_command(ref, params - 1, param + 1);
else if (strcmp("curthread", param[0]) == 0) else if (strcmp("curthread", param[0]) == 0)
curthread_command(ref, params - 1, param + 1); curthread_command(ref, params - 1, param + 1);
else if (strcmp("threadlist", param[0]) == 0)
threadlist_command(ref, params - 1, param + 1);
else if (strcmp("irq", param[0]) == 0) else if (strcmp("irq", param[0]) == 0)
generate_irq_command(ref, params - 1, param + 1); generate_irq_command(ref, params - 1, param + 1);
else if (strcmp("nv2a_combiners", param[0]) == 0) else if (strcmp("nv2a_combiners", param[0]) == 0)