Merge branch 'master' into wii-network

Conflicts:
	CMakeLists.txt
	Source/Core/Core/Core.vcxproj
	Source/Core/DolphinWX/Dolphin.vcxproj
	Source/Core/DolphinWX/Dolphin.vcxproj.filters
	Source/Dolphin_2010.sln
	Source/VSProps/Dolphin.Win32.props
	Source/VSProps/Dolphin.x64.props

Source/Core/Common/Src/ArmCPUDetect.cpp

@@ -44,6 +44,56 @@ char *GetCPUString()
 	}
 	return cpu_string;
 }
+
+unsigned char GetCPUImplementer()
+{
+	const char marker[] = "CPU implementer\t: ";
+	char *implementer_string = 0;
+	unsigned char implementer = 0;
+	char buf[1024];
+
+	File::IOFile file(procfile, "r");
+	auto const fp = file.GetHandle();
+	if (!fp)
+		return 0;
+
+	while (fgets(buf, sizeof(buf), fp))
+	{
+		if (strncmp(buf, marker, sizeof(marker) - 1))
+			continue;
+		implementer_string = buf + sizeof(marker) - 1;
+		implementer_string = strndup(implementer_string, strlen(implementer_string) - 1); // Strip the newline
+		sscanf(implementer_string, "0x%02hhx", &implementer);
+		break;
+	}
+	return implementer;
+}
+
+unsigned short GetCPUPart()
+{
+	const char marker[] = "CPU part\t: ";
+	char *part_string = 0;
+	unsigned short part = 0;
+	char buf[1024];
+
+	File::IOFile file(procfile, "r");
+	auto const fp = file.GetHandle();
+	if (!fp)
+		return 0;
+
+	while (fgets(buf, sizeof(buf), fp))
+	{
+		if (strncmp(buf, marker, sizeof(marker) - 1))
+			continue;
+		part_string = buf + sizeof(marker) - 1;
+		part_string = strndup(part_string, strlen(part_string) - 1); // Strip the newline
+		sscanf(part_string, "0x%03hx", &part);
+		break;
+	}
+	return part;
+
+}
+
 bool CheckCPUFeature(const char *feature)
 {
 	const char marker[] = "Features\t: ";
@@ -123,10 +173,9 @@ void CPUInfo::Detect()
 	bIDIVa = CheckCPUFeature("idiva");
 	bIDIVt = CheckCPUFeature("idivt");
 
-	// On some buggy kernels(Qualcomm) they show that they support VFPv4 but not IDIVa
-	// All VFPv4 CPUs will support IDIVa
-	if (bVFPv4)
-		bIDIVa = bIDIVt = true;
+	// Qualcomm Krait supports IDIVA but it doesn't report it. Check for krait.
+	if (GetCPUImplementer() == 0x51 && GetCPUPart() == 0x6F) // Krait(300) is 0x6F, Scorpion is 0x4D
+		bIDIVa = bIDIVt = true; 
 
 	// These two are ARMv8 specific.
 	bFP = CheckCPUFeature("fp");

Source/Core/Common/Src/ArmEmitter.cpp

@@ -86,7 +86,7 @@ bool TryMakeOperand2_AllowNegation(s32 imm, Operand2 &op2, bool *negated)
 Operand2 AssumeMakeOperand2(u32 imm) {
 	Operand2 op2;
 	bool result = TryMakeOperand2(imm, op2);
-	_dbg_assert_msg_(JIT, result, "Could not make assumed Operand2.");
+	_assert_msg_(DYNA_REC, result, "Could not make assumed Operand2.");
 	return op2;
 }
 
@@ -868,7 +868,7 @@ void ARMXEmitter::VADD(IntegerSize Size, ARMReg Vd, ARMReg Vn, ARMReg Vm)
 
 	Write32((0xF2 << 24) | ((Vd & 0x10) << 18) | (Size << 20) | ((Vn & 0xF) << 16) \
 		| ((Vd & 0xF) << 12) | (0x8 << 8) | ((Vn & 0x10) << 3) | (register_quad << 6) \
-		| ((Vm & 0x10) << 2) | (Vm & 0xF)); 
+		| ((Vm & 0x10) << 1) | (Vm & 0xF)); 
 
 }
 void ARMXEmitter::VSUB(IntegerSize Size, ARMReg Vd, ARMReg Vn, ARMReg Vm)

Source/Core/Common/Src/Common.h

@@ -143,7 +143,6 @@ enum HOST_COMM
 	WM_USER_STOP = 10,
 	WM_USER_CREATE,
 	WM_USER_SETCURSOR,
-	WM_USER_KEYDOWN,
 };
 
 // Used for notification on emulation state

Source/Core/Common/Src/CommonFuncs.h

@@ -86,6 +86,45 @@ inline u64 _rotr64(u64 x, unsigned int shift){
 	#define unlink _unlink
 	#define snprintf _snprintf
 	#define vscprintf _vscprintf
+	
+// Locale Cross-Compatibility
+	#define locale_t _locale_t
+	#define freelocale _free_locale
+	#define newlocale(mask, locale, base) _create_locale(mask, locale)
+	
+	#define LC_GLOBAL_LOCALE	((locale_t)-1)
+	#define LC_ALL_MASK			LC_ALL
+	#define LC_COLLATE_MASK		LC_COLLATE
+	#define LC_CTYPE_MASK		LC_CTYPE
+	#define LC_MONETARY_MASK	LC_MONETARY
+	#define LC_NUMERIC_MASK		LC_NUMERIC
+	#define LC_TIME_MASK		LC_TIME
+	
+	inline locale_t uselocale(locale_t new_locale)
+	{
+		// Retrieve the current per thread locale setting
+		bool bIsPerThread = (_configthreadlocale(0) == _ENABLE_PER_THREAD_LOCALE);
+
+		// Retrieve the current thread-specific locale
+		locale_t old_locale = bIsPerThread ? _get_current_locale() : LC_GLOBAL_LOCALE;
+
+		if(new_locale == LC_GLOBAL_LOCALE)
+		{
+			// Restore the global locale
+			_configthreadlocale(_DISABLE_PER_THREAD_LOCALE);
+		}
+		else if(new_locale != NULL)
+		{
+			// Configure the thread to set the locale only for this thread
+			_configthreadlocale(_ENABLE_PER_THREAD_LOCALE);
+
+			// Set all locale categories
+			for(int i = LC_MIN; i <= LC_MAX; i++)
+				setlocale(i, new_locale->locinfo->lc_category[i].locale);
+		}
+
+		return old_locale;
+	}
 
 // 64 bit offsets for windows
 	#define fseeko _fseeki64
@@ -123,17 +162,19 @@ const char* GetLastErrorMsg();
 namespace Common
 {
 inline u8 swap8(u8 _data) {return _data;}
+inline u32 swap24(const u8* _data) {return (_data[0] << 16) | (_data[1] << 8) | _data[2];}
+
+#ifdef ANDROID
+#undef swap16
+#undef swap32
+#undef swap64
+#endif
 
 #ifdef _WIN32
 inline u16 swap16(u16 _data) {return _byteswap_ushort(_data);}
 inline u32 swap32(u32 _data) {return _byteswap_ulong (_data);}
 inline u64 swap64(u64 _data) {return _byteswap_uint64(_data);}
 #elif _M_ARM
-#ifdef ANDROID
-#undef swap16
-#undef swap32
-#undef swap64
-#endif
 inline u16 swap16 (u16 _data) { u32 data = _data; __asm__ ("rev16 %0, %1\n" : "=l" (data) : "l" (data)); return (u16)data;} 
 inline u32 swap32 (u32 _data) {__asm__ ("rev %0, %1\n" : "=l" (_data) : "l" (_data)); return _data;} 
 inline u64 swap64(u64 _data) {return ((u64)swap32(_data) << 32) | swap32(_data >> 32);}

Source/Core/Common/Src/Version.cpp

@@ -27,8 +27,12 @@ const char *scm_rev_str = "Dolphin "
 #ifdef _M_X64
 #define NP_ARCH "x64"
 #else
+#ifdef _M_ARM
+#define NP_ARCH "ARM"
+#else	
 #define NP_ARCH "x86"
 #endif
+#endif
 
 #ifdef _WIN32
 const char *netplay_dolphin_ver = SCM_DESC_STR " W" NP_ARCH;

Source/Core/Common/Src/VideoBackendBase.cpp

@@ -9,7 +9,7 @@
 #include "../../../Plugins/Plugin_VideoDX9/Src/VideoBackend.h"
 #include "../../../Plugins/Plugin_VideoDX11/Src/VideoBackend.h"
 #endif
-#ifndef USE_GLES
+#if !defined(USE_GLES) || USE_GLES3
 #include "../../../Plugins/Plugin_VideoOGL/Src/VideoBackend.h"
 #endif
 #include "../../../Plugins/Plugin_VideoSoftware/Src/VideoBackend.h"
@@ -45,7 +45,7 @@ void VideoBackend::PopulateList()
 	if (IsGteVista())
 		g_available_video_backends.push_back(backends[0] = new DX11::VideoBackend);
 #endif
-#ifndef USE_GLES
+#if !defined(USE_GLES) || USE_GLES3
 	g_available_video_backends.push_back(backends[1] = new OGL::VideoBackend);
 #endif
 	g_available_video_backends.push_back(backends[3] = new SW::VideoSoftware);