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

Merge branch 'master' of https://github.com/project64/project64

This commit is contained in:
zilmar 2015-12-22 19:06:11 +11:00
parent 379cff09ae 341efe227d
commit a05c3f5c00
17 changed files with 49 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Common/md5.h
View File

@ -43,6 +43,9 @@ documentation and/or software.
#include <string>
#include <functional>
#include <stdio.h>
#include <string.h>
#include "path.h"
struct MD5Digest

4
Source/Project64-core/Logging.cpp
View File

@ -10,6 +10,10 @@
****************************************************************************/
#include "stdafx.h"
#include "Logging.h"
#include <string.h>
#include <stdio.h>
#include <stdarg.h>
#include <Common/path.h>
#include <Project64-core/N64System/SystemGlobals.h>
#include <Project64-core/N64System/Mips/TranslateVaddr.h>

1
Source/Project64-core/Multilanguage/LanguageClass.cpp
View File

@ -9,6 +9,7 @@
* *
****************************************************************************/
#include "stdafx.h"
#include <stdio.h>
#include <Common/stdtypes.h>
#include <Common/path.h>

3
Source/Project64-core/N64System/CheatClass.cpp
View File

@ -9,8 +9,9 @@
* *
****************************************************************************/
#include "stdafx.h"
#include <string.h>
#include "CheatClass.h"
#include <Project64-core/Settings/SettingType/SettingsType-Cheats.h>
#include <Project64-core/Plugins/GFXPlugin.h>
#include <Project64-core/Plugins/AudioPlugin.h>

2
Source/Project64-core/N64System/FramePerSecondClass.h
View File

@ -31,6 +31,6 @@ private:
enum { NoOfFrames = 7 };
__int64 m_Frequency, m_Frames[NoOfFrames], m_LastFrame;
int64_t m_Frequency, m_Frames[NoOfFrames], m_LastFrame;
int m_CurrentFrame;
};

1
Source/Project64-core/N64System/Mips/OpcodeName.cpp
View File

@ -9,6 +9,7 @@
* *
****************************************************************************/
#include "stdafx.h"
#include <stdio.h>
#include "OpCode.h"
#include "RegisterClass.h"

3
Source/Project64-core/N64System/Mips/PifRam.cpp
View File

@ -9,7 +9,10 @@
* *
****************************************************************************/
#include "stdafx.h"
#include <stdio.h>
#include <string.h>
#include "PifRam.h"
#include <Project64-core/N64System/SystemGlobals.h>
#include <Project64-core/Plugins/ControllerPlugin.h>
#include <Project64-core/N64System/Mips/RegisterClass.h>

2
Source/Project64-core/N64System/Mips/RegisterClass.cpp
View File

@ -9,7 +9,9 @@
* *
****************************************************************************/
#include "stdafx.h"
#include <string.h>
#include "RegisterClass.h"
#include <Project64-core/N64System/N64Class.h>
#include <Project64-core/N64System/SystemGlobals.h>
#include <Project64-core/Logging.h>

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

@ -55,12 +55,12 @@ void CSystemTimer::SetTimer(TimerType Type, uint32_t Cycles, bool bRelative)
}
else
{
m_TimerDetatils[Type].CyclesToTimer = (__int64)Cycles - (__int64)m_NextTimer; //replace the new cycles
m_TimerDetatils[Type].CyclesToTimer = (int64_t)Cycles - (int64_t)m_NextTimer; //replace the new cycles
}
}
else
{
m_TimerDetatils[Type].CyclesToTimer = (__int64)Cycles - (__int64)m_NextTimer; //replace the new cycles
m_TimerDetatils[Type].CyclesToTimer = (int64_t)Cycles - (int64_t)m_NextTimer; //replace the new cycles
}
FixTimers();
}
@ -76,7 +76,7 @@ uint32_t CSystemTimer::GetTimer(TimerType Type)
{
return 0;
}
__int64 CyclesToTimer = m_TimerDetatils[Type].CyclesToTimer + m_NextTimer;
int64_t CyclesToTimer = m_TimerDetatils[Type].CyclesToTimer + m_NextTimer;
if (CyclesToTimer < 0)
{
return 0;

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

@ -35,7 +35,7 @@ public:
struct TIMER_DETAILS
{
bool Active;
__int64 CyclesToTimer;
int64_t CyclesToTimer;
};
public:

13
Source/Project64-core/N64System/N64Types.h
View File

@ -10,6 +10,19 @@
****************************************************************************/
#pragma once
#include <Common/stdtypes.h>
/*
* The limits of COP1 extend to native SSE2 register capabilities, but for
* now this is only being included to dodge the MSVC inline asm for x86.
*
* As better cross-platform methods of handling FP precision are implemented
* for non-Intel-architecture builds, this #include may become obsolete.
*/
#if defined(__i386) || defined(__x86_64__) || defined(_M_X64)
#include <emmintrin.h>
#endif
enum PauseType
{
PauseType_FromMenu,

10
Source/Project64-core/N64System/ProfilingClass.cpp
View File

@ -62,9 +62,9 @@ SPECIAL_TIMERS CProfiling::StopTimer() {
g_Notify->BreakPoint(__FILE__, __LINE__);
#endif
__int64 StopTime = ((unsigned __int64)HiValue << 32) + (unsigned __int64)LoValue;
__int64 StartTime = ((unsigned __int64)m_StartTimeHi << 32) + (unsigned __int64)m_StartTimeLo;
__int64 TimeTaken = StopTime - StartTime;
int64_t StopTime = ((uint64_t)HiValue << 32) + (uint64_t)LoValue;
int64_t StartTime = ((uint64_t)m_StartTimeHi << 32) + (uint64_t)m_StartTimeLo;
int64_t TimeTaken = StopTime - StartTime;
PROFILE_ENRTY Entry = m_Entries.find(m_CurrentTimerAddr);
if (Entry != m_Entries.end()) {
@ -79,7 +79,7 @@ SPECIAL_TIMERS CProfiling::StopTimer() {
}
void CProfiling::ShowCPU_Usage() {
__int64 TotalTime, CPU = 0, Alist = 0, Dlist = 0, Idle = 0;
int64_t TotalTime, CPU = 0, Alist = 0, Dlist = 0, Idle = 0;
PROFILE_ENRTY Entry;
if (m_CurrentDisplayCount > 0) { m_CurrentDisplayCount -= 1; return; }
@ -132,7 +132,7 @@ void CProfiling::GenerateLog() {
LogFileName = Log.FileName();
//Get the total time
__int64 TotalTime = 0;
int64_t TotalTime = 0;
for (PROFILE_ENRTY itemTime = m_Entries.begin(); itemTime != m_Entries.end(); itemTime++ ) {
TotalTime += itemTime->second;
}

2
Source/Project64-core/N64System/ProfilingClass.h
View File

@ -11,7 +11,7 @@
#pragma once
#include <Project64-core/N64System/N64Types.h>
typedef std::map<SPECIAL_TIMERS, __int64 > PROFILE_ENRTIES;
typedef std::map<SPECIAL_TIMERS, int64_t > PROFILE_ENRTIES;
typedef PROFILE_ENRTIES::iterator PROFILE_ENRTY;
typedef PROFILE_ENRTIES::value_type PROFILE_VALUE;

2
Source/Project64-core/N64System/Recompiler/CodeBlock.cpp
View File

@ -9,8 +9,10 @@
* *
****************************************************************************/
#include "stdafx.h"
#include <string.h>
#include "CodeBlock.h"
#include "x86CodeLog.h"
#include <Project64-core/N64System/SystemGlobals.h>
#include <Project64-core/N64System/Mips/TranslateVaddr.h>
#include <Project64-core/N64System/N64Class.h>

2
Source/Project64-core/N64System/Recompiler/LoopAnalysis.cpp
View File

@ -9,7 +9,9 @@
* *
****************************************************************************/
#include "stdafx.h"
#include <string.h>
#include "LoopAnalysis.h"
#include <Project64-core/N64System/N64Types.h>
#include <Project64-core/N64System/Recompiler/CodeBlock.h>
#include <Project64-core/N64System/Recompiler/x86CodeLog.h>

2
Source/Project64-core/N64System/Recompiler/RecompilerOps.cpp
View File

@ -15,6 +15,8 @@
#include <Project64-core/N64System/Interpreter/InterpreterOps.h>
#include <Project64-core/N64System/Interpreter/InterpreterCPU.h>
#include <Project64-core/N64System/N64Class.h>
#include <stdio.h>
#include "RecompilerClass.h"
#include "RecompilerOps.h"
#include "CodeSection.h"

3
Source/Project64-core/N64System/Recompiler/RegInfo.cpp
View File

@ -11,6 +11,9 @@
#include "stdafx.h"
#include <Project64-core/N64System/SystemGlobals.h>
#include <Project64-core/N64System/N64Class.h>
#include <stdio.h>
#include <string.h>
#include "RegInfo.h"
#include "RecompilerClass.h"
#include "x86CodeLog.h"