/[pcsx2_0.9.7]/trunk/pcsx2/Dump.cpp
ViewVC logotype

Diff of /trunk/pcsx2/Dump.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 31 by william, Tue Sep 7 03:24:11 2010 UTC revision 62 by william, Tue Sep 7 11:08:22 2010 UTC
# Line 25  Line 25 
25  #include "Utilities/AsciiFile.h"  #include "Utilities/AsciiFile.h"
26    
27  using namespace R5900;  using namespace R5900;
28    using std::string;
29    
30  // fixme: currently should not be uncommented.  // fixme: currently should not be uncommented.
31  //#define TEST_BROKEN_DUMP_ROUTINES  //#define TEST_BROKEN_DUMP_ROUTINES
32    
# Line 53  void iDumpPsxRegisters(u32 startpc, u32 Line 55  void iDumpPsxRegisters(u32 startpc, u32
55    
56          for(i = 0; i < 34; i+=2) __Log("%spsx%s: %x %x", pstr, disRNameGPR[i], psxRegs.GPR.r[i], psxRegs.GPR.r[i+1]);          for(i = 0; i < 34; i+=2) __Log("%spsx%s: %x %x", pstr, disRNameGPR[i], psxRegs.GPR.r[i], psxRegs.GPR.r[i+1]);
57    
58          DbgCon.WriteLn("%scycle: %x %x %x; counters %x %x", pstr, psxRegs.cycle, g_psxNextBranchCycle, EEsCycle,          DbgCon.WriteLn("%scycle: %x %x %x; counters %x %x", pstr, psxRegs.cycle, g_iopNextEventCycle, EEsCycle,
59                  psxNextsCounter, psxNextCounter);                  psxNextsCounter, psxNextCounter);
60    
61          DbgCon.WriteLn(wxsFormat(L"psxdma%d ", 2) + hw_dma(2).desc());          DbgCon.WriteLn(wxsFormat(L"psxdma%d ", 2) + hw_dma(2).desc());
# Line 107  void iDumpRegisters(u32 startpc, u32 tem Line 109  void iDumpRegisters(u32 startpc, u32 tem
109          __Log("%svfACC: %x %x %x %x", pstr, VU0.ACC.UL[3], VU0.ACC.UL[2], VU0.ACC.UL[1], VU0.ACC.UL[0]);          __Log("%svfACC: %x %x %x %x", pstr, VU0.ACC.UL[3], VU0.ACC.UL[2], VU0.ACC.UL[1], VU0.ACC.UL[0]);
110          __Log("%sLO: %x_%x_%x_%x, HI: %x_%x_%x_%x", pstr, cpuRegs.LO.UL[3], cpuRegs.LO.UL[2], cpuRegs.LO.UL[1], cpuRegs.LO.UL[0],          __Log("%sLO: %x_%x_%x_%x, HI: %x_%x_%x_%x", pstr, cpuRegs.LO.UL[3], cpuRegs.LO.UL[2], cpuRegs.LO.UL[1], cpuRegs.LO.UL[0],
111          cpuRegs.HI.UL[3], cpuRegs.HI.UL[2], cpuRegs.HI.UL[1], cpuRegs.HI.UL[0]);          cpuRegs.HI.UL[3], cpuRegs.HI.UL[2], cpuRegs.HI.UL[1], cpuRegs.HI.UL[0]);
112          __Log("%sCycle: %x %x, Count: %x", pstr, cpuRegs.cycle, g_nextBranchCycle, cpuRegs.CP0.n.Count);          __Log("%sCycle: %x %x, Count: %x", pstr, cpuRegs.cycle, g_nextEventCycle, cpuRegs.CP0.n.Count);
113    
114          iDumpPsxRegisters(psxRegs.pc, temp);          iDumpPsxRegisters(psxRegs.pc, temp);
115    
# Line 127  void iDumpRegisters(u32 startpc, u32 tem Line 129  void iDumpRegisters(u32 startpc, u32 tem
129          __Log("gif: %x %x %x", psHu32(0x3000), psHu32(0x3010), psHu32(0x3020));          __Log("gif: %x %x %x", psHu32(0x3000), psHu32(0x3010), psHu32(0x3020));
130    
131          for(i = 0; i < ArraySize(dmacs); ++i) {          for(i = 0; i < ArraySize(dmacs); ++i) {
132                  DMACh* p = (DMACh*)(PS2MEM_HW+dmacs[i]);                  DMACh* p = (DMACh*)(&eeHw[dmacs[i]]);
133                  __Log("dma%d c%x m%x q%x t%x s%x", i, p->chcr._u32, p->madr, p->qwc, p->tadr, p->sadr);                  __Log("dma%d c%x m%x q%x t%x s%x", i, p->chcr._u32, p->madr, p->qwc, p->tadr, p->sadr);
134          }          }
135          __Log(L"dmac " + dmacRegs->ctrl.desc() + L" " + dmacRegs->stat.desc() + L" " + dmacRegs->rbsr.desc() + L" " + dmacRegs->rbor.desc());          __Log(L"dmac " + dmacRegs.ctrl.desc() + L" " + dmacRegs.stat.desc() + L" " + dmacRegs.rbsr.desc() + L" " + dmacRegs.rbor.desc());
136          __Log(L"intc " + intcRegs->stat.desc() + L" " +  intcRegs->mask.desc());          __Log(L"intc " + intcRegs->stat.desc() + L" " +  intcRegs->mask.desc());
137          __Log("sif: %x %x %x %x %x", psHu32(SBUS_F200), psHu32(SBUS_F220), psHu32(SBUS_F230), psHu32(SBUS_F240), psHu32(SBUS_F260));          __Log("sif: %x %x %x %x %x", psHu32(SBUS_F200), psHu32(SBUS_F220), psHu32(SBUS_F230), psHu32(SBUS_F240), psHu32(SBUS_F260));
138  #endif  #endif

Legend:
Removed from v.31  
changed lines
  Added in v.62

  ViewVC Help
Powered by ViewVC 1.1.22