From 2ac6f60bbb02e05baf22d00692b1ed5becd4a5c9 Mon Sep 17 00:00:00 2001
From: Connor McLaughlin <stenzek@gmail.com>
Date: Sun, 4 Apr 2021 13:01:05 +1000
Subject: [PATCH] Rename cpu_detect.h to platform.h and add OS

---
 src/common/CMakeLists.txt         |  2 +-
 src/common/cd_image_chd.cpp       |  4 +-
 src/common/common.vcxproj         |  2 +-
 src/common/common.vcxproj.filters |  2 +-
 src/common/cpu_detect.h           | 35 ------------------
 src/common/jit_code_buffer.cpp    |  4 +-
 src/common/page_fault_handler.cpp |  6 +--
 src/common/platform.h             | 61 +++++++++++++++++++++++++++++++
 src/core/cdrom.cpp                |  2 +-
 src/core/cpu_recompiler_types.h   |  2 +-
 src/core/gpu_sw.cpp               |  2 +-
 src/core/texture_replacements.cpp |  2 +-
 12 files changed, 75 insertions(+), 49 deletions(-)
 delete mode 100644 src/common/cpu_detect.h
 create mode 100644 src/common/platform.h

diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index f664c4e6d..d0afe77fd 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -24,7 +24,6 @@ add_library(common
   cd_subchannel_replacement.h
   cd_xa.cpp
   cd_xa.h
-  cpu_detect.h
   crash_handler.cpp
   crash_handler.h
   dimensional_array.h
@@ -66,6 +65,7 @@ add_library(common
   memory_arena.h
   page_fault_handler.cpp
   page_fault_handler.h
+  platform.h
   pbp_types.h
   progress_callback.cpp
   progress_callback.h
diff --git a/src/common/cd_image_chd.cpp b/src/common/cd_image_chd.cpp
index 5b1972840..a2b7d6d09 100644
--- a/src/common/cd_image_chd.cpp
+++ b/src/common/cd_image_chd.cpp
@@ -6,11 +6,11 @@
 #include "assert.h"
 #include "cd_image.h"
 #include "cd_subchannel_replacement.h"
-#include "cpu_detect.h"
 #include "error.h"
 #include "file_system.h"
 #include "libchdr/chd.h"
 #include "log.h"
+#include "platform.h"
 #include <algorithm>
 #include <cerrno>
 #include <cstdio>
@@ -180,7 +180,7 @@ bool CDImageCHD::Open(const char* filename, Common::Error* error)
       if (error)
       {
         error->SetFormattedMessage("Incorrect track number at index %d, expected %d got %d", num_tracks,
-                                        (num_tracks + 1), track_num);
+                                   (num_tracks + 1), track_num);
       }
 
       return false;
diff --git a/src/common/common.vcxproj b/src/common/common.vcxproj
index ad1398e73..6443e036d 100644
--- a/src/common/common.vcxproj
+++ b/src/common/common.vcxproj
@@ -59,7 +59,6 @@
     <ClInclude Include="byte_stream.h" />
     <ClInclude Include="cd_image.h" />
     <ClInclude Include="cd_image_hasher.h" />
-    <ClInclude Include="cpu_detect.h" />
     <ClInclude Include="crash_handler.h" />
     <ClInclude Include="d3d11\shader_cache.h" />
     <ClInclude Include="d3d11\shader_compiler.h" />
@@ -94,6 +93,7 @@
     <ClInclude Include="md5_digest.h" />
     <ClInclude Include="null_audio_stream.h" />
     <ClInclude Include="pbp_types.h" />
+    <ClInclude Include="platform.h" />
     <ClInclude Include="progress_callback.h" />
     <ClInclude Include="memory_arena.h" />
     <ClInclude Include="page_fault_handler.h" />
diff --git a/src/common/common.vcxproj.filters b/src/common/common.vcxproj.filters
index 522ba0038..69b8eaf9f 100644
--- a/src/common/common.vcxproj.filters
+++ b/src/common/common.vcxproj.filters
@@ -45,7 +45,6 @@
     <ClInclude Include="file_system.h" />
     <ClInclude Include="string_util.h" />
     <ClInclude Include="md5_digest.h" />
-    <ClInclude Include="cpu_detect.h" />
     <ClInclude Include="d3d11\shader_cache.h">
       <Filter>d3d11</Filter>
     </ClInclude>
@@ -112,6 +111,7 @@
     <ClInclude Include="easing.h" />
     <ClInclude Include="pbp_types.h" />
     <ClInclude Include="error.h" />
+    <ClInclude Include="platform.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="jit_code_buffer.cpp" />
diff --git a/src/common/cpu_detect.h b/src/common/cpu_detect.h
deleted file mode 100644
index 5c3c278d4..000000000
--- a/src/common/cpu_detect.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#pragma once
-
-#if defined(_MSC_VER)
-
-#if defined(_M_X64)
-#define CPU_X64 1
-#elif defined(_M_IX86)
-#define CPU_X86 1
-#elif defined(_M_ARM64)
-#define CPU_AARCH64 1
-#elif defined(_M_ARM)
-#define CPU_AARCH32 1
-#else
-#error Unknown architecture.
-#endif
-
-#elif defined(__GNUC__) || defined(__clang__)
-
-#if defined(__x86_64__)
-#define CPU_X64 1
-#elif defined(__i386__)
-#define CPU_X86 1
-#elif defined(__aarch64__)
-#define CPU_AARCH64 1
-#elif defined(__arm__)
-#define CPU_AARCH32 1
-#else
-#error Unknown architecture.
-#endif
-
-#else
-
-#error Unknown compiler.
-
-#endif
diff --git a/src/common/jit_code_buffer.cpp b/src/common/jit_code_buffer.cpp
index 701c8a438..121c01886 100644
--- a/src/common/jit_code_buffer.cpp
+++ b/src/common/jit_code_buffer.cpp
@@ -1,8 +1,8 @@
 #include "jit_code_buffer.h"
 #include "align.h"
 #include "assert.h"
-#include "common/log.h"
-#include "cpu_detect.h"
+#include "log.h"
+#include "platform.h"
 #include <algorithm>
 Log_SetChannel(JitCodeBuffer);
 
diff --git a/src/common/page_fault_handler.cpp b/src/common/page_fault_handler.cpp
index c882114a6..1562bdfb3 100644
--- a/src/common/page_fault_handler.cpp
+++ b/src/common/page_fault_handler.cpp
@@ -1,6 +1,6 @@
 #include "page_fault_handler.h"
-#include "common/cpu_detect.h"
-#include "common/log.h"
+#include "log.h"
+#include "platform.h"
 #include <algorithm>
 #include <cstring>
 #include <mutex>
@@ -8,7 +8,7 @@
 Log_SetChannel(Common::PageFaultHandler);
 
 #if defined(WIN32)
-#include "common/windows_headers.h"
+#include "windows_headers.h"
 #elif defined(__linux__) || defined(__ANDROID__)
 #include <signal.h>
 #include <ucontext.h>
diff --git a/src/common/platform.h b/src/common/platform.h
new file mode 100644
index 000000000..45757c766
--- /dev/null
+++ b/src/common/platform.h
@@ -0,0 +1,61 @@
+#pragma once
+
+#if defined(_MSC_VER)
+
+#if defined(_M_X64)
+#define CPU_X64 1
+#elif defined(_M_IX86)
+#define CPU_X86 1
+#elif defined(_M_ARM64)
+#define CPU_AARCH64 1
+#elif defined(_M_ARM)
+#define CPU_AARCH32 1
+#else
+#error Unknown architecture.
+#endif
+
+#elif defined(__GNUC__) || defined(__clang__)
+
+#if defined(__x86_64__)
+#define CPU_X64 1
+#elif defined(__i386__)
+#define CPU_X86 1
+#elif defined(__aarch64__)
+#define CPU_AARCH64 1
+#elif defined(__arm__)
+#define CPU_AARCH32 1
+#else
+#error Unknown architecture.
+#endif
+
+#else
+
+#error Unknown compiler.
+
+#endif
+
+#if defined(CPU_X64)
+#define CPU_ARCH_STR "x64"
+#elif defined(CPU_X86)
+#define CPU_ARCH_STR "x86"
+#elif defined(CPU_AARCH32)
+#define CPU_ARCH_STR "AArch32"
+#elif defined(CPU_AARCH64)
+#define CPU_ARCH_STR "AArch64"
+#else
+#define CPU_ARCH_STR "Unknown"
+#endif
+
+#if defined(_WIN32)
+#define SYSTEM_STR "Windows"
+#elif defined(__ANDROID__)
+#define SYSTEM_STR "Android"
+#elif defined(__linux__)
+#define SYSTEM_STR "Linux"
+#elif defined(__FreeBSD__)
+#define SYSTEM_STR "FreeBSD"
+#elif defined(__APPLE__)
+#define SYSTEM_STR "macOS"
+#else
+#define SYSTEM_STR "Unknown"
+#endif
diff --git a/src/core/cdrom.cpp b/src/core/cdrom.cpp
index 826f00eab..3f8704d73 100644
--- a/src/core/cdrom.cpp
+++ b/src/core/cdrom.cpp
@@ -1,8 +1,8 @@
 #include "cdrom.h"
 #include "common/align.h"
 #include "common/cd_image.h"
-#include "common/cpu_detect.h"
 #include "common/log.h"
+#include "common/platform.h"
 #include "common/state_wrapper.h"
 #include "dma.h"
 #include "interrupt_controller.h"
diff --git a/src/core/cpu_recompiler_types.h b/src/core/cpu_recompiler_types.h
index bc06a10ee..a0214d7c7 100644
--- a/src/core/cpu_recompiler_types.h
+++ b/src/core/cpu_recompiler_types.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "common/cpu_detect.h"
+#include "common/platform.h"
 #include "cpu_types.h"
 
 #if defined(CPU_X64)
diff --git a/src/core/gpu_sw.cpp b/src/core/gpu_sw.cpp
index 26d85b212..d3cead497 100644
--- a/src/core/gpu_sw.cpp
+++ b/src/core/gpu_sw.cpp
@@ -1,9 +1,9 @@
 #include "gpu_sw.h"
 #include "common/align.h"
 #include "common/assert.h"
-#include "common/cpu_detect.h"
 #include "common/log.h"
 #include "common/make_array.h"
+#include "common/platform.h"
 #include "host_display.h"
 #include "system.h"
 #include <algorithm>
diff --git a/src/core/texture_replacements.cpp b/src/core/texture_replacements.cpp
index 1f3392d44..fa2107597 100644
--- a/src/core/texture_replacements.cpp
+++ b/src/core/texture_replacements.cpp
@@ -1,7 +1,7 @@
 #include "texture_replacements.h"
-#include "common/cpu_detect.h"
 #include "common/file_system.h"
 #include "common/log.h"
+#include "common/platform.h"
 #include "common/string_util.h"
 #include "common/timer.h"
 #include "host_interface.h"