Merge pull request #2931 from unknownbrackets/endian

Improve endian define handling and fix a couple typos
hrydgard · Jul 26, 2013 · 3c86141 · 3c86141
2 parents cc8bba1 + a740888
commit 3c86141
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 14 deletions.
diff --git a/Common/CommonTypes.h b/Common/CommonTypes.h
@@ -54,13 +54,51 @@ typedef signed long long s64;
 
 #endif // _WIN32
 
+// Android
+#if defined(ANDROID)
+#include <sys/endian.h>
+
+#if _BYTE_ORDER == _LITTLE_ENDIAN && !defined(COMMON_LITTLE_ENDIAN)
+#define COMMON_LITTLE_ENDIAN 1
+#elif _BYTE_ORDER == _BIG_ENDIAN && !defined(COMMON_BIG_ENDIAN)
+#define COMMON_BIG_ENDIAN 1
+#endif
+
+// GCC 4.6+
+#elif __GNUC__ >= 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
+
+#if __BYTE_ORDER__ && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) && !defined(COMMON_LITTLE_ENDIAN)
+#define COMMON_LITTLE_ENDIAN 1
+#elif __BYTE_ORDER__ && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) && !defined(COMMON_BIG_ENDIAN)
+#define COMMON_BIG_ENDIAN 1
+#endif
+
+// LLVM/clang
+#elif __clang__
+
+#if __LITTLE_ENDIAN__ && !defined(COMMON_LITTLE_ENDIAN)
+#define COMMON_LITTLE_ENDIAN 1
+#elif __BIG_ENDIAN__ && !defined(COMMON_BIG_ENDIAN)
+#define COMMON_BIG_ENDIAN 1
+#endif
+
+// MSVC
+#elif defined(_MSC_VER) && !defined(COMMON_BIG_ENDIAN) && !defined(COMMON_LITTLE_ENDIAN)
+
+#ifdef _XBOX
+#define COMMON_BIG_ENDIAN 1
+#else
+#define COMMON_LITTLE_ENDIAN 1
+#endif
+
+#endif
 
-#ifdef ANDROID
-#undef BIG_ENDIAN
-#undef __BIG_ENDIAN__
+// Worst case, default to little endian.
+#if !COMMON_BIG_ENDIAN && !COMMON_LITTLE_ENDIAN
+#define COMMON_LITTLE_ENDIAN 1
 #endif
 
-#if !BIG_ENDIAN && !__BIG_ENDIAN__
+#if COMMON_LITTLE_ENDIAN
 typedef u32 u32_le;
 typedef u16 u16_le;
 typedef u64 u64_le;

diff --git a/Core/FileSystems/DirectoryFileSystem.cpp b/Core/FileSystems/DirectoryFileSystem.cpp
@@ -702,7 +702,7 @@ VirtualDiscFileSystem::VirtualDiscFileSystem(IHandleAllocator *_hAlloc, std::str
 
 VirtualDiscFileSystem::~VirtualDiscFileSystem() {
 	for (auto iter = entries.begin(); iter != entries.end(); ++iter) {
-		if (!iter->second.type != VFILETYPE_ISO)
+		if (iter->second.type != VFILETYPE_ISO)
 			iter->second.hFile.Close();
 	}
 }

diff --git a/Core/Font/PGF.h b/Core/Font/PGF.h
@@ -109,12 +109,7 @@ struct Glyph {
 };
 
 
-#ifdef ANDROID
-#undef BIG_ENDIAN
-#undef __BIG_ENDIAN__
-#endif
-
-#if !BIG_ENDIAN && !__BIG_ENDIAN__
+#if COMMON_LITTLE_ENDIAN
 typedef FontPixelFormat FontPixelFormat_le;
 #else
 #error FIX ME

diff --git a/Core/HLE/__sceAudio.cpp b/Core/HLE/__sceAudio.cpp
@@ -46,7 +46,7 @@ const int hostAttemptBlockSize = 256;
 #else
 const int hwBlockSize = 64;
 const int hostAttemptBlockSize = 512;
-#endif;
+#endif
 
 const int audioIntervalUs = (int)(1000000ULL * hwBlockSize / hwSampleRate);
 const int audioHostIntervalUs = (int)(1000000ULL * hostAttemptBlockSize / hwSampleRate);

diff --git a/Core/HLE/sceKernelThread.cpp b/Core/HLE/sceKernelThread.cpp
@@ -21,6 +21,7 @@
 #include <algorithm>
 
 #include "Common/LogManager.h"
+#include "Common/CommonTypes.h"
 #include "HLE.h"
 #include "HLETables.h"
 #include "../MIPS/MIPSInt.h"
@@ -149,7 +150,7 @@ class Callback : public KernelObject
 	u32 savedIdRegister;
 };
 
-#if !defined(BIG_ENDIAN) && !defined(__BIG_ENDIAN__)
+#if COMMON_LITTLE_ENDIAN
 typedef WaitType WaitType_le;
 #else
 #error FIX ME

diff --git a/native b/native