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

[Project64] Clean up SystemTiming.cpp

This commit is contained in:
zilmar 2015-12-13 17:58:08 +11:00
parent fa680564bd
commit 199fa2f7f8
2 changed files with 362 additions and 365 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
Source/Project64-core/N64System/Mips/SystemTiming.cpp
View File

@ -15,11 +15,10 @@
#include <Project64-core/N64System/N64Class.h> #include <Project64-core/N64System/N64Class.h>
#include <Project64-core/3rdParty/zip.h> #include <Project64-core/3rdParty/zip.h>
CSystemTimer::CSystemTimer( int & NextTimer ) : CSystemTimer::CSystemTimer(int & NextTimer) :
m_NextTimer(NextTimer), m_NextTimer(NextTimer),
m_inFixTimer(false) m_inFixTimer(false)
{ {
} }
void CSystemTimer::Reset() void CSystemTimer::Reset()
@ -34,11 +33,11 @@ void CSystemTimer::Reset()
m_LastUpdate = 0; m_LastUpdate = 0;
m_NextTimer = 0; m_NextTimer = 0;
SetTimer(ViTimer,50000,false); SetTimer(ViTimer, 50000, false);
SetCompareTimer(); SetCompareTimer();
} }
void CSystemTimer::SetTimer ( TimerType Type, uint32_t Cycles, bool bRelative ) void CSystemTimer::SetTimer(TimerType Type, uint32_t Cycles, bool bRelative)
{ {
if (Type >= MaxTimer || Type == UnknownTimer) if (Type >= MaxTimer || Type == UnknownTimer)
{ {
@ -66,7 +65,7 @@ void CSystemTimer::SetTimer ( TimerType Type, uint32_t Cycles, bool bRelative )
FixTimers(); FixTimers();
} }
uint32_t CSystemTimer::GetTimer ( TimerType Type ) uint32_t CSystemTimer::GetTimer(TimerType Type)
{ {
if (Type >= MaxTimer || Type == UnknownTimer) if (Type >= MaxTimer || Type == UnknownTimer)
{ {
@ -89,7 +88,7 @@ uint32_t CSystemTimer::GetTimer ( TimerType Type )
return (uint32_t)CyclesToTimer; return (uint32_t)CyclesToTimer;
} }
void CSystemTimer::StopTimer ( TimerType Type ) void CSystemTimer::StopTimer(TimerType Type)
{ {
if (Type >= MaxTimer || Type == UnknownTimer) if (Type >= MaxTimer || Type == UnknownTimer)
{ {
@ -100,10 +99,8 @@ void CSystemTimer::StopTimer ( TimerType Type )
FixTimers(); FixTimers();
} }
void CSystemTimer::FixTimers() void CSystemTimer::FixTimers()
{ {
if (m_inFixTimer) if (m_inFixTimer)
{ {
return; return;
@ -177,7 +174,7 @@ void CSystemTimer::TimerDone()
{ {
UpdateTimers(); UpdateTimers();
/* uint32_t LastTimer; /* uint32_t LastTimer;
if (Profiling) if (Profiling)
{ {
LastTimer = StartTimer(Timer_Done); LastTimer = StartTimer(Timer_Done);
@ -186,7 +183,7 @@ void CSystemTimer::TimerDone()
{ {
LogMessage("%08X: Timer Done (Type: %d CurrentTimer: %d)", *_PROGRAM_COUNTER, m_Current, *_Timer ); LogMessage("%08X: Timer Done (Type: %d CurrentTimer: %d)", *_PROGRAM_COUNTER, m_Current, *_Timer );
} }
*/ */
switch (m_Current) switch (m_Current)
{ {
case CSystemTimer::CompareTimer: case CSystemTimer::CompareTimer:
@ -217,7 +214,7 @@ void CSystemTimer::TimerDone()
} }
catch (...) catch (...)
{ {
WriteTraceF(TraceError,__FUNCTION__ ": Exception caught\nFile: %s\nLine: %d",__FILE__,__LINE__); WriteTraceF(TraceError, __FUNCTION__ ": Exception caught\nFile: %s\nLine: %d", __FILE__, __LINE__);
} }
g_Reg->MI_INTR_REG |= MI_INTR_VI; g_Reg->MI_INTR_REG |= MI_INTR_VI;
g_Reg->CheckInterrupts(); g_Reg->CheckInterrupts();
@ -267,15 +264,15 @@ void CSystemTimer::SetCompareTimer()
NextCompare = 0x7FFFFFFF; NextCompare = 0x7FFFFFFF;
} }
} }
SetTimer(CompareTimer,NextCompare,false); SetTimer(CompareTimer, NextCompare, false);
} }
void CSystemTimer::UpdateCompareTimer ( void ) void CSystemTimer::UpdateCompareTimer(void)
{ {
SetCompareTimer(); SetCompareTimer();
} }
bool CSystemTimer::SaveAllowed ( void ) bool CSystemTimer::SaveAllowed(void)
{ {
if (GetTimer(CompareTimer) <= 0) if (GetTimer(CompareTimer) <= 0)
{ {
@ -299,70 +296,70 @@ bool CSystemTimer::SaveAllowed ( void )
return true; return true;
} }
void CSystemTimer::SaveData ( void * file ) const void CSystemTimer::SaveData(void * file) const
{ {
uint32_t TimerDetailsSize = sizeof(TIMER_DETAILS); uint32_t TimerDetailsSize = sizeof(TIMER_DETAILS);
uint32_t Entries = sizeof(m_TimerDetatils)/sizeof(m_TimerDetatils[0]); uint32_t Entries = sizeof(m_TimerDetatils) / sizeof(m_TimerDetatils[0]);
zipWriteInFileInZip(file,&TimerDetailsSize,sizeof(TimerDetailsSize)); zipWriteInFileInZip(file, &TimerDetailsSize, sizeof(TimerDetailsSize));
zipWriteInFileInZip(file,&Entries,sizeof(Entries)); zipWriteInFileInZip(file, &Entries, sizeof(Entries));
zipWriteInFileInZip(file,(void *)&m_TimerDetatils,sizeof(m_TimerDetatils)); zipWriteInFileInZip(file, (void *)&m_TimerDetatils, sizeof(m_TimerDetatils));
zipWriteInFileInZip(file,(void *)&m_LastUpdate,sizeof(m_LastUpdate)); zipWriteInFileInZip(file, (void *)&m_LastUpdate, sizeof(m_LastUpdate));
zipWriteInFileInZip(file,&m_NextTimer,sizeof(m_NextTimer)); zipWriteInFileInZip(file, &m_NextTimer, sizeof(m_NextTimer));
zipWriteInFileInZip(file,(void *)&m_Current,sizeof(m_Current)); zipWriteInFileInZip(file, (void *)&m_Current, sizeof(m_Current));
} }
void CSystemTimer::LoadData ( void * file ) void CSystemTimer::LoadData(void * file)
{ {
uint32_t TimerDetailsSize, Entries; uint32_t TimerDetailsSize, Entries;
unzReadCurrentFile( file,&TimerDetailsSize,sizeof(TimerDetailsSize)); unzReadCurrentFile(file, &TimerDetailsSize, sizeof(TimerDetailsSize));
unzReadCurrentFile( file,&Entries,sizeof(Entries)); unzReadCurrentFile(file, &Entries, sizeof(Entries));
if (TimerDetailsSize != sizeof(TIMER_DETAILS)) if (TimerDetailsSize != sizeof(TIMER_DETAILS))
{ {
g_Notify->BreakPoint(__FILE__, __LINE__); g_Notify->BreakPoint(__FILE__, __LINE__);
return; return;
} }
if (Entries != sizeof(m_TimerDetatils)/sizeof(m_TimerDetatils[0])) if (Entries != sizeof(m_TimerDetatils) / sizeof(m_TimerDetatils[0]))
{ {
g_Notify->BreakPoint(__FILE__, __LINE__); g_Notify->BreakPoint(__FILE__, __LINE__);
return; return;
} }
unzReadCurrentFile(file,(void *)&m_TimerDetatils,sizeof(m_TimerDetatils)); unzReadCurrentFile(file, (void *)&m_TimerDetatils, sizeof(m_TimerDetatils));
unzReadCurrentFile(file,(void *)&m_LastUpdate,sizeof(m_LastUpdate)); unzReadCurrentFile(file, (void *)&m_LastUpdate, sizeof(m_LastUpdate));
unzReadCurrentFile(file,&m_NextTimer,sizeof(m_NextTimer)); unzReadCurrentFile(file, &m_NextTimer, sizeof(m_NextTimer));
unzReadCurrentFile(file,(void *)&m_Current,sizeof(m_Current)); unzReadCurrentFile(file, (void *)&m_Current, sizeof(m_Current));
} }
void CSystemTimer::RecordDifference( CLog &LogFile, const CSystemTimer& rSystemTimer) void CSystemTimer::RecordDifference(CLog &LogFile, const CSystemTimer& rSystemTimer)
{ {
if (m_LastUpdate != rSystemTimer.m_LastUpdate) if (m_LastUpdate != rSystemTimer.m_LastUpdate)
{ {
LogFile.LogF("Timer-LastUpdate: %X %X\r\n",m_LastUpdate,rSystemTimer.m_LastUpdate); LogFile.LogF("Timer-LastUpdate: %X %X\r\n", m_LastUpdate, rSystemTimer.m_LastUpdate);
} }
if (m_NextTimer != rSystemTimer.m_NextTimer) if (m_NextTimer != rSystemTimer.m_NextTimer)
{ {
LogFile.LogF("Timer-NextTimer: %X %X\r\n",m_NextTimer,rSystemTimer.m_NextTimer); LogFile.LogF("Timer-NextTimer: %X %X\r\n", m_NextTimer, rSystemTimer.m_NextTimer);
} }
if (m_Current != rSystemTimer.m_Current) if (m_Current != rSystemTimer.m_Current)
{ {
LogFile.LogF("Timer-Current %X %X\r\n",m_Current,rSystemTimer.m_Current); LogFile.LogF("Timer-Current %X %X\r\n", m_Current, rSystemTimer.m_Current);
} }
if (m_inFixTimer != rSystemTimer.m_inFixTimer) if (m_inFixTimer != rSystemTimer.m_inFixTimer)
{ {
LogFile.LogF("Timer-inFixTimer %X %X\r\n",(int)m_inFixTimer,(int)rSystemTimer.m_inFixTimer); LogFile.LogF("Timer-inFixTimer %X %X\r\n", (int)m_inFixTimer, (int)rSystemTimer.m_inFixTimer);
} }
for (int i = 0; i < MaxTimer; i++) for (int i = 0; i < MaxTimer; i++)
{ {
if (m_TimerDetatils[i].Active != rSystemTimer.m_TimerDetatils[i].Active) if (m_TimerDetatils[i].Active != rSystemTimer.m_TimerDetatils[i].Active)
{ {
LogFile.LogF("Timer-m_TimerDetatils[%d] %X %X\r\n",i,(int)m_TimerDetatils[i].Active,(int)rSystemTimer.m_TimerDetatils[i].Active); LogFile.LogF("Timer-m_TimerDetatils[%d] %X %X\r\n", i, (int)m_TimerDetatils[i].Active, (int)rSystemTimer.m_TimerDetatils[i].Active);
} }
if (m_TimerDetatils[i].CyclesToTimer != rSystemTimer.m_TimerDetatils[i].CyclesToTimer) if (m_TimerDetatils[i].CyclesToTimer != rSystemTimer.m_TimerDetatils[i].CyclesToTimer)
{ {
LogFile.LogF("Timer-m_TimerDetatils[%d] 0x%08X, 0x%08X\r\n",i,(uint32_t)m_TimerDetatils[i].CyclesToTimer,(uint32_t)rSystemTimer.m_TimerDetatils[i].CyclesToTimer ); LogFile.LogF("Timer-m_TimerDetatils[%d] 0x%08X, 0x%08X\r\n", i, (uint32_t)m_TimerDetatils[i].CyclesToTimer, (uint32_t)rSystemTimer.m_TimerDetatils[i].CyclesToTimer);
} }
} }
} }

20
Source/Project64-core/N64System/Mips/SystemTiming.h
View File

@ -39,20 +39,20 @@ public:
}; };
public: public:
CSystemTimer ( int & NextTimer ); CSystemTimer(int & NextTimer);
void SetTimer(TimerType Type, uint32_t Cycles, bool bRelative); void SetTimer(TimerType Type, uint32_t Cycles, bool bRelative);
uint32_t GetTimer(TimerType Type); uint32_t GetTimer(TimerType Type);
void StopTimer ( TimerType Type ); void StopTimer(TimerType Type);
void UpdateTimers (); void UpdateTimers();
void TimerDone (); void TimerDone();
void Reset (); void Reset();
void UpdateCompareTimer (); void UpdateCompareTimer();
bool SaveAllowed (); bool SaveAllowed();
void SaveData ( void * file ) const; void SaveData(void * file) const;
void LoadData ( void * file ); void LoadData(void * file);
void RecordDifference( CLog &LogFile, const CSystemTimer& rSystemTimer); void RecordDifference(CLog &LogFile, const CSystemTimer& rSystemTimer);
TimerType CurrentType() const { return m_Current; } TimerType CurrentType() const { return m_Current; }