diff --git a/linux_various/pretty_print_dump.pl b/linux_various/pretty_print_dump.pl index ca24e69911..8942ead64b 100755 --- a/linux_various/pretty_print_dump.pl +++ b/linux_various/pretty_print_dump.pl @@ -71,25 +71,89 @@ my @pp_name = ( "cycle", "interrupt", "branch", "opmode", "tempcycles" ); +my @pp_iop_name = ( + # GPR + "0" , "at" , "v0" , "v1" , + "a0" , "a1" , "a2" , "a3" , + "t0" , "t1" , "t2" , "t3" , + "t4" , "t5" , "t6" , "t7" , + "s0" , "s1" , "s2" , "s3" , + "s4" , "s5" , "s6" , "s7" , + "t8" , "t9" , "k0" , "k1" , + "gp" , "sp" , "s8" , "ra" , + "hi" , "lo" , + + # CP0 + "Index" , "Random" , "EntryLo0" , "EntryLo1" , + "Context" , "PageMask" , "Wired" , "Reserved0" , + "BadVAddr" , "Count" , "EntryHi" , "Compare" , + "Status" , "Cause" , "EPC" , "PRid" , + "Config" , "LLAddr" , "WatchLO" , "WatchHI" , + "XContext" , "Reserved1" , "Reserved2" , "Debug" , + "DEPC" , "PerfCnt" , "ErrCtl" , "CacheErr" , + "TagLo" , "TagHi" , "ErrorEPC" , "DESAVE" , + + # CP2D + "CP2D1" , "CP2D2" , "CP2D3" , "CP2D4" , "CP2D5" , "CP2D6" , "CP2D7" , "CP2D8" , + "CP2D9" , "CP2D10" , "CP2D11" , "CP2D12" , "CP2D13" , "CP2D14" , "CP2D15" , "CP2D16" , + "CP2D17" , "CP2D18" , "CP2D19" , "CP2D20" , "CP2D21" , "CP2D22" , "CP2D23" , "CP2D24" , + "CP2D25" , "CP2D26" , "CP2D27" , "CP2D28" , "CP2D29" , "CP2D30" , "CP2D31" , "CP2D32" , + + # CP2H + "CP2H1" , "CP2H2" , "CP2H3" , "CP2H4" , "CP2H5" , "CP2H6" , "CP2H7" , "CP2H8" , + "CP2H9" , "CP2H10" , "CP2H11" , "CP2H12" , "CP2H13" , "CP2H14" , "CP2H15" , "CP2H16" , + "CP2H17" , "CP2H18" , "CP2H19" , "CP2H20" , "CP2H21" , "CP2H22" , "CP2H23" , "CP2H24" , + "CP2H25" , "CP2H26" , "CP2H27" , "CP2H28" , "CP2H29" , "CP2H30" , "CP2H31" , "CP2H32" , + + "pc", + "code", + "cycle", + "int", + + "eCycle0" , "eCycle1" , "eCycle2" , "eCycle3" , "eCycle4" , "eCycle5" , "eCycle6" , "eCycle7" , + "eCycle8" , "eCycle9" , "eCycle10" , "eCycle11" , "eCycle12" , "eCycle13" , "eCycle14" , "eCycle15" , + "eCycle16" , "eCycle17" , "eCycle18" , "eCycle19" , "eCycle20" , "eCycle21" , "eCycle22" , "eCycle23" , + "eCycle24" , "eCycle25" , "eCycle26" , "eCycle27" , "eCycle28" , "eCycle29" , "eCycle30" , "eCycle31" , + + "sCycle0" , "sCycle1" , "sCycle2" , "sCycle3" , "sCycle4" , "sCycle5" , "sCycle6" , "sCycle7" , + "sCycle8" , "sCycle9" , "sCycle10" , "sCycle11" , "sCycle12" , "sCycle13" , "sCycle14" , "sCycle15" , + "sCycle16" , "sCycle17" , "sCycle18" , "sCycle19" , "sCycle20" , "sCycle21" , "sCycle22" , "sCycle23" , + "sCycle24" , "sCycle25" , "sCycle26" , "sCycle27" , "sCycle28" , "sCycle29" , "sCycle30" , "sCycle31" , +); + my $line; my $cpu; +my $iop = 0; while($line = <$in>) { if ($line =~ /Dump register data: (0x[0-9a-f]+)/) { $cpu = hex($1); } + if ($line =~ /Dump PSX register data: (0x[0-9a-f]+)/) { + $cpu = hex($1); + $iop = 1; + } if ($line =~ /ds:(0x[0-9a-f]+)/) { my $mem = hex($1); my $offset = $mem - $cpu; - if ($offset >= 0 && $offset < 980) { - # Inside the cpuRegisters structure + my $pretty; + # keep only the cpuRegisters structure + next unless ($offset >= 0 && $offset < 980); + + if ($iop) { + my $byte = $offset % 4; + my $dw = $offset / 4; + + $pretty = "&$pp_iop_name[$dw]_B$byte"; + } else { my $byte = ($offset >= 544) ? $offset % 4 : $offset % 16; my $dw = $offset / 4; # FIXME B doesn't work for duplicated register - my $pretty = "&$pp_name[$dw]_B$byte"; - #print "AH $pretty\n"; - $line =~ s/ds:0x[0-9a-f]+/$pretty/; + $pretty = "&$pp_name[$dw]_B$byte"; } + + #print "AH $pretty\n"; + $line =~ s/ds:0x[0-9a-f]+/$pretty/; } print $line; } diff --git a/pcsx2/DebugTools/Debug.h b/pcsx2/DebugTools/Debug.h index d2cc49805a..f47e46b0ee 100644 --- a/pcsx2/DebugTools/Debug.h +++ b/pcsx2/DebugTools/Debug.h @@ -44,7 +44,6 @@ namespace R3000A extern void (*IOP_DEBUG_BSC[64])(char *buf); extern const char * const disRNameGPR[]; - extern char* disR3000Fasm(u32 code, u32 pc); extern char* disR3000AF(u32 code, u32 pc); } diff --git a/pcsx2/x86/iR3000A.cpp b/pcsx2/x86/iR3000A.cpp index 393885d1a3..943f7718b7 100644 --- a/pcsx2/x86/iR3000A.cpp +++ b/pcsx2/x86/iR3000A.cpp @@ -229,9 +229,11 @@ static void iIopDumpBlock( int startpc, u8 * ptr ) wxString filename( Path::Combine( g_Conf->Folders.Logs, wxsFormat( L"psxdump%.8X.txt", startpc ) ) ); AsciiFile f( filename, L"w" ); - /*for ( i = startpc; i < s_nEndBlock; i += 4 ) { - f.Printf("%s\n", disR3000Fasm( iopMemRead32( i ), i ) ); - }*/ + f.Printf("Dump PSX register data: 0x%x\n\n", (uptr)&psxRegs); + + for ( i = startpc; i < s_nEndBlock; i += 4 ) { + f.Printf("%s\n", disR3000AF( iopMemRead32( i ), i ) ); + } // write the instruction info f.Printf("\n\nlive0 - %x, lastuse - %x used - %x\n", EEINST_LIVE0, EEINST_LASTUSE, EEINST_USED); @@ -270,21 +272,17 @@ static void iIopDumpBlock( int startpc, u8 * ptr ) } f.Printf("\n"); } + f.Close(); #ifdef __linux__ - char command[256]; // dump the asm { AsciiFile f2( L"mydump1", L"w" ); f2.Write( ptr, (uptr)x86Ptr - (uptr)ptr ); } - wxCharBuffer buf( filename.ToUTF8() ); - const char* filenamea = buf.data(); - sprintf( command, "objdump -D --target=binary --architecture=i386 -M intel mydump1 | cat %s - > tempdump", filenamea ); - system( command ); - sprintf( command, "mv tempdump %s", filenamea ); - system( command ); - //f = fopen( filename.c_str(), "a+" ); + + std::system( wxsFormat("objdump -D -b binary -mi386 -M intel --no-show-raw-insn --adjust-vma=%d %s >> %s; rm %s", + (u32)ptr, "mydump1", WX_STR(filename), "mydump1") ); #endif } @@ -1011,8 +1009,10 @@ void psxRecompileNextInstruction(int delayslot) // pblock isn't used elsewhere in this function. //BASEBLOCK* pblock = PSX_GETBLOCK(psxpc); - if( IsDebugBuild ) + if( IsDebugBuild ) { + xNOP(); xMOV(eax, psxpc); + } psxRegs.code = iopMemRead32( psxpc ); s_psxBlockCycles++; @@ -1219,8 +1219,8 @@ StartRecomp: if( IsDebugBuild ) { for(i = 0; i < ArraySize(s_psxrecblocks); ++i) { - if( startpc == s_psxrecblocks[i] ) { - iIopDumpBlock(startpc, recPtr); + if( startpc == s_psxrecblocks[i] ) { + iIopDumpBlock(startpc, recPtr); } }