From 0e2c6676a3c44f387d979403e15a6d7c68571406 Mon Sep 17 00:00:00 2001
From: Stenzek <stenzek@gmail.com>
Date: Sat, 4 Nov 2023 20:03:45 +1000
Subject: [PATCH] Build: Compiling x64 builds on Apple Silicon host

---
 CMakeLists.txt    | 2 +-
 src/core/pgxp.cpp | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ae645bb4c..5b0052373 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -139,7 +139,7 @@ if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64")
   # Cross-compile on macos.
   set(CPU_ARCH "aarch64")
 elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64" OR "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "amd64" OR
-   "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "AMD64")
+       "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "AMD64" OR "${CMAKE_OSX_ARCHITECTURES}" STREQUAL "x86_64")
   if(CMAKE_SIZEOF_VOID_P EQUAL 8)
     set(CPU_ARCH "x64")
   else()
diff --git a/src/core/pgxp.cpp b/src/core/pgxp.cpp
index 826c6f0cd..29fce1065 100644
--- a/src/core/pgxp.cpp
+++ b/src/core/pgxp.cpp
@@ -160,7 +160,7 @@ ALWAYS_INLINE_RELEASE PGXP_value* ReadMem(u32 addr)
 ALWAYS_INLINE_RELEASE void ValidateAndCopyMem(PGXP_value* dest, u32 addr, u32 value)
 {
   PGXP_value* pMem = GetPtr(addr);
-  if (pMem != NULL)
+  if (pMem)
   {
     Validate(pMem, value);
     *dest = *pMem;
@@ -175,7 +175,7 @@ ALWAYS_INLINE_RELEASE static void ValidateAndCopyMem16(PGXP_value* dest, u32 add
   u32 validMask = 0;
   psx_value val, mask;
   PGXP_value* pMem = GetPtr(addr);
-  if (pMem != NULL)
+  if (pMem)
   {
     mask.d = val.d = 0;
     // determine if high or low word
@@ -224,7 +224,7 @@ ALWAYS_INLINE_RELEASE void WriteMem(const PGXP_value* value, u32 addr)
 ALWAYS_INLINE_RELEASE static void WriteMem16(const PGXP_value* src, u32 addr)
 {
   PGXP_value* dest = GetPtr(addr);
-  psx_value* pVal = NULL;
+  psx_value* pVal = nullptr;
 
   if (dest)
   {