ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

debug: add no$ message support

This commit is contained in:
zeromus 2010-03-17 22:45:33 +00:00
parent 6a27ce1264
commit ee66bde8a0
3 changed files with 62 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
desmume/src/debug.cpp
View File

@ -29,6 +29,8 @@
#include "thumb_instructions.h"
#include "cp15.h"
#include "NDSSystem.h"
#include "utils/xstring.h"
#include "movie.h"
#ifdef HAVE_LUA
#include "lua-engine.h"
@ -290,7 +292,7 @@ void IdeasLog(armcpu_t* cpu)
{
u32 adr = cpu->R[0];
for(;;) {
u8 c = MMU_read8(cpu->proc_ID,adr);
u8 c = _MMU_read08(cpu->proc_ID, MMU_AT_DEBUG, adr);
adr++;
if(!c) break;
printf("%c",c);
@ -298,3 +300,50 @@ void IdeasLog(armcpu_t* cpu)
//don't emit a newline. that is a pain in the butt.
}
void NocashMessage(armcpu_t* cpu)
{
u32 adr = cpu->instruct_adr + 6;
std::string todo;
for(;;) {
u8 c = _MMU_read08(cpu->proc_ID, MMU_AT_DEBUG, adr);
adr++;
if(!c) break;
todo.push_back(c);
}
//r0,r1,r2,...,r15 show register content (displayed as 32bit Hex number)
//sp,lr,pc alias for r13,r14,r15
//scanline show current scanline number
//frame show total number of frames since coldboot
//totalclks show total number of clock cycles since coldboot
//lastclks show number of cycles since previous lastclks (or zeroclks)
//zeroclks resets the 'lastclks' counter
//this is very inefficiently coded!
char tmp[100];
todo = mass_replace(todo,"%sp%","%r13%");
todo = mass_replace(todo,"%lr%","%r14%");
todo = mass_replace(todo,"%pc%","%r15%");
sprintf(tmp,"%08X",cpu->R[0]); todo = mass_replace(todo,"%r0%",tmp);
sprintf(tmp,"%08X",cpu->R[1]); todo = mass_replace(todo,"%r1%",tmp);
sprintf(tmp,"%08X",cpu->R[2]); todo = mass_replace(todo,"%r2%",tmp);
sprintf(tmp,"%08X",cpu->R[3]); todo = mass_replace(todo,"%r3%",tmp);
sprintf(tmp,"%08X",cpu->R[4]); todo = mass_replace(todo,"%r4%",tmp);
sprintf(tmp,"%08X",cpu->R[5]); todo = mass_replace(todo,"%r5%",tmp);
sprintf(tmp,"%08X",cpu->R[6]); todo = mass_replace(todo,"%r6%",tmp);
sprintf(tmp,"%08X",cpu->R[7]); todo = mass_replace(todo,"%r7%",tmp);
sprintf(tmp,"%08X",cpu->R[8]); todo = mass_replace(todo,"%r8%",tmp);
sprintf(tmp,"%08X",cpu->R[9]); todo = mass_replace(todo,"%r9%",tmp);
sprintf(tmp,"%08X",cpu->R[10]); todo = mass_replace(todo,"%r10%",tmp);
sprintf(tmp,"%08X",cpu->R[11]); todo = mass_replace(todo,"%r11%",tmp);
sprintf(tmp,"%08X",cpu->R[12]); todo = mass_replace(todo,"%r12%",tmp);
sprintf(tmp,"%08X",cpu->R[13]); todo = mass_replace(todo,"%r13%",tmp);
sprintf(tmp,"%08X",cpu->R[14]); todo = mass_replace(todo,"%r14%",tmp);
sprintf(tmp,"%08X",cpu->R[15]); todo = mass_replace(todo,"%r15%",tmp);
sprintf(tmp,"%d",nds.VCount); todo = mass_replace(todo,"%scanline%",tmp);
sprintf(tmp,"%d",currFrameCounter); todo = mass_replace(todo,"%frame%",tmp);
sprintf(tmp,"%lld",nds_timer); todo = mass_replace(todo,"%totalclks%",tmp);
printf("%s",todo.c_str());
}

1
desmume/src/debug.h
View File

@ -138,6 +138,7 @@ public:
#define INFO(...) INFOC(10, __VA_ARGS__)
void IdeasLog(armcpu_t* cpu);
void NocashMessage(armcpu_t* cpu);
enum EDEBUG_EVENT
{

11
desmume/src/thumb_instructions.cpp
View File

@ -1034,6 +1034,17 @@ TEMPLATE static u32 FASTCALL OP_B_COND(const u32 i)
TEMPLATE static u32 FASTCALL OP_B_UNCOND(const u32 i)
{
#ifdef DEVELOPER
//nocash message detection
const u16 last = _MMU_read16<PROCNUM,MMU_AT_DEBUG>(cpu->instruct_adr-2);
const u16 next = _MMU_read16<PROCNUM,MMU_AT_DEBUG>(cpu->instruct_adr+2);
static const u16 mov_r12_r12 = 0x46E4;
if(last == mov_r12_r12 && next == 0x6464)
{
NocashMessage(cpu);
}
#endif
cpu->R[15] += (SIGNEEXT_IMM11(i)<<1);
cpu->next_instruction = cpu->R[15];
return 1;