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

Source/Common/md5.h

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

Source/Project64-core/Logging.cpp

@@ -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>

Source/Project64-core/Multilanguage/LanguageClass.cpp

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

Source/Project64-core/N64System/CheatClass.cpp

@@ -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>

Source/Project64-core/N64System/FramePerSecondClass.h

@@ -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;
 };

Source/Project64-core/N64System/Mips/OpcodeName.cpp

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

Source/Project64-core/N64System/Mips/PifRam.cpp

@@ -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>

Source/Project64-core/N64System/Mips/RegisterClass.cpp

@@ -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>

Source/Project64-core/N64System/Mips/SystemTiming.cpp

@@ -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;

Source/Project64-core/N64System/Mips/SystemTiming.h

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

Source/Project64-core/N64System/N64Types.h

@@ -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,

Source/Project64-core/N64System/ProfilingClass.cpp

@@ -62,9 +62,9 @@ SPECIAL_TIMERS CProfiling::StopTimer() {
 	g_Notify->BreakPoint(__FILE__, __LINE__);
 #endif
 
-	__int64 StopTime  = ((unsigned __int64)HiValue << 32) + (unsigned __int64)LoValue;
+    int64_t StopTime  = ((uint64_t)HiValue << 32) + (uint64_t)LoValue;
-	__int64 StartTime = ((unsigned __int64)m_StartTimeHi << 32) + (unsigned __int64)m_StartTimeLo;
+    int64_t StartTime = ((uint64_t)m_StartTimeHi << 32) + (uint64_t)m_StartTimeLo;
-	__int64 TimeTaken = StopTime - StartTime;
+    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;
 		}

Source/Project64-core/N64System/ProfilingClass.h

@@ -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;
 

Source/Project64-core/N64System/Recompiler/CodeBlock.cpp

@@ -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>

Source/Project64-core/N64System/Recompiler/LoopAnalysis.cpp

@@ -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>

Source/Project64-core/N64System/Recompiler/RecompilerOps.cpp

@@ -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"

Source/Project64-core/N64System/Recompiler/RegInfo.cpp

@@ -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"