More mac fixups.
This commit is contained in:
@@ -10,6 +10,8 @@
|
||||
#ifndef POLY_CXX_COMPAT_H_
|
||||
#define POLY_CXX_COMPAT_H_
|
||||
|
||||
#include <memory>
|
||||
|
||||
#include <poly/config.h>
|
||||
|
||||
// C++11 thread local storage.
|
||||
@@ -30,6 +32,16 @@
|
||||
#define alignas(N) __declspec(align(N))
|
||||
#endif // XE_COMPILER_MSVC
|
||||
|
||||
// C++1y make_unique.
|
||||
// http://herbsutter.com/2013/05/29/gotw-89-solution-smart-pointers/
|
||||
// This is present in clang with -std=c++1y, but not otherwise.
|
||||
namespace std {
|
||||
template <typename T, typename... Args>
|
||||
unique_ptr<T> make_unique(Args&&... args) {
|
||||
return unique_ptr<T>(new T(forward<Args>(args)...));
|
||||
}
|
||||
} // namespace std
|
||||
|
||||
namespace poly {} // namespace poly
|
||||
|
||||
#endif // POLY_CXX_COMPAT_H_
|
||||
|
||||
29
src/poly/debugging.h
Normal file
29
src/poly/debugging.h
Normal file
@@ -0,0 +1,29 @@
|
||||
/**
|
||||
******************************************************************************
|
||||
* Xenia : Xbox 360 Emulator Research Project *
|
||||
******************************************************************************
|
||||
* Copyright 2014 Ben Vanik. All rights reserved. *
|
||||
* Released under the BSD license - see LICENSE in the root for more details. *
|
||||
******************************************************************************
|
||||
*/
|
||||
|
||||
#ifndef POLY_DEBUGGING_H_
|
||||
#define POLY_DEBUGGING_H_
|
||||
|
||||
#include <cstdint>
|
||||
|
||||
#include <poly/config.h>
|
||||
|
||||
namespace poly {
|
||||
namespace debugging {
|
||||
|
||||
// Returns true if a debugger is attached to this process.
|
||||
// The state may change at any time (attach after launch, etc), so do not
|
||||
// cache this value. Determining if the debugger is attached is expensive,
|
||||
// though, so avoid calling it frequently.
|
||||
bool IsDebuggerAttached();
|
||||
|
||||
} // namespace debugging
|
||||
} // namespace poly
|
||||
|
||||
#endif // POLY_DEBUGGING_H_
|
||||
29
src/poly/debugging_mac.cc
Normal file
29
src/poly/debugging_mac.cc
Normal file
@@ -0,0 +1,29 @@
|
||||
/**
|
||||
******************************************************************************
|
||||
* Xenia : Xbox 360 Emulator Research Project *
|
||||
******************************************************************************
|
||||
* Copyright 2014 Ben Vanik. All rights reserved. *
|
||||
* Released under the BSD license - see LICENSE in the root for more details. *
|
||||
******************************************************************************
|
||||
*/
|
||||
|
||||
#include <poly/debugging.h>
|
||||
|
||||
#include <sys/sysctl.h>
|
||||
#include <unistd.h>
|
||||
|
||||
namespace poly {
|
||||
namespace debugging {
|
||||
|
||||
bool IsDebuggerAttached() {
|
||||
// https://developer.apple.com/library/mac/qa/qa1361/_index.html
|
||||
kinfo_proc info;
|
||||
info.kp_proc.p_flag = 0;
|
||||
int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid()};
|
||||
size_t size = sizeof(info);
|
||||
sysctl(mib, sizeof(mib) / sizeof(*mib), &info, &size, nullptr, 0);
|
||||
return (info.kp_proc.p_flag & P_TRACED) != 0;
|
||||
}
|
||||
|
||||
} // namespace debugging
|
||||
} // namespace poly
|
||||
20
src/poly/debugging_win.cc
Normal file
20
src/poly/debugging_win.cc
Normal file
@@ -0,0 +1,20 @@
|
||||
/**
|
||||
******************************************************************************
|
||||
* Xenia : Xbox 360 Emulator Research Project *
|
||||
******************************************************************************
|
||||
* Copyright 2014 Ben Vanik. All rights reserved. *
|
||||
* Released under the BSD license - see LICENSE in the root for more details. *
|
||||
******************************************************************************
|
||||
*/
|
||||
|
||||
#include <poly/debugging.h>
|
||||
|
||||
namespace poly {
|
||||
namespace debugging {
|
||||
|
||||
bool IsDebuggerAttached() {
|
||||
return IsDebuggerPresent() ? true : false;
|
||||
}
|
||||
|
||||
} // namespace debugging
|
||||
} // namespace poly
|
||||
@@ -27,109 +27,106 @@ XE_CPU: 32BIT | 64BIT | BIGENDIAN | LITTLEENDIAN
|
||||
#include <TargetConditionals.h>
|
||||
#endif
|
||||
|
||||
#if (defined(TARGET_OS_EMBEDDED) && TARGET_OS_EMBEDDED ) || \
|
||||
(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE ) || \
|
||||
#if (defined(TARGET_OS_EMBEDDED) && TARGET_OS_EMBEDDED) || \
|
||||
(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) || \
|
||||
(defined(TARGET_IPHONE_SIMULATOR) && TARGET_IPHONE_SIMULATOR)
|
||||
|
||||
#define XE_PLATFORM_IOS 1
|
||||
#define XE_LIKE_OSX 1
|
||||
#define XE_PROFILE_EMBEDDED 1
|
||||
#define XE_PLATFORM_IOS 1
|
||||
#define XE_LIKE_OSX 1
|
||||
#define XE_PROFILE_EMBEDDED 1
|
||||
|
||||
#if defined(TARGET_IPHONE_SIMULATOR) && TARGET_IPHONE_SIMULATOR
|
||||
// EMBEDDED *and* SIMULATOR
|
||||
#define XE_PROFILE_SIMULATOR 1
|
||||
#define XE_PROFILE_SIMULATOR 1
|
||||
#endif
|
||||
|
||||
#elif defined(TARGET_OS_MAC) && TARGET_OS_MAC
|
||||
|
||||
#define XE_PLATFORM_OSX 1
|
||||
#define XE_LIKE_OSX 1
|
||||
#define XE_PROFILE_DESKTOP 1
|
||||
#define XE_PLATFORM_OSX 1
|
||||
#define XE_LIKE_OSX 1
|
||||
#define XE_PROFILE_DESKTOP 1
|
||||
|
||||
#elif defined(_XBOX)
|
||||
|
||||
#define XE_PLATFORM_XBOX360 1
|
||||
#define XE_LIKE_WIN32 1
|
||||
#define XE_PROFILE_EMBEDDED 1
|
||||
#define XE_PLATFORM_XBOX360 1
|
||||
#define XE_LIKE_WIN32 1
|
||||
#define XE_PROFILE_EMBEDDED 1
|
||||
|
||||
#elif defined(_WIN32_WCE)
|
||||
|
||||
#define XE_PLATFORM_WINCE 1
|
||||
#define XE_LIKE_WIN32 1
|
||||
#define XE_PROFILE_EMBEDDED 1
|
||||
#define XE_PLATFORM_WINCE 1
|
||||
#define XE_LIKE_WIN32 1
|
||||
#define XE_PROFILE_EMBEDDED 1
|
||||
|
||||
#elif defined(__CYGWIN__)
|
||||
|
||||
#define XE_PLATFORM_CYGWIN 1
|
||||
#define XE_LIKE_POSIX 1
|
||||
#define XE_PROFILE_DESKTOP 1
|
||||
#define XE_PLATFORM_CYGWIN 1
|
||||
#define XE_LIKE_POSIX 1
|
||||
#define XE_PROFILE_DESKTOP 1
|
||||
|
||||
#elif defined(WIN32) || defined(_WIN32)
|
||||
|
||||
#define XE_PLATFORM_WIN32 1
|
||||
#define XE_LIKE_WIN32 1
|
||||
#define XE_PROFILE_DESKTOP 1
|
||||
#define XE_PLATFORM_WIN32 1
|
||||
#define XE_LIKE_WIN32 1
|
||||
#define XE_PROFILE_DESKTOP 1
|
||||
|
||||
#elif defined(ANDROID)
|
||||
|
||||
#define XE_PLATFORM_ANDROID 1
|
||||
#define XE_LIKE_POSIX 1
|
||||
#define XE_PROFILE_EMBEDDED 1
|
||||
#define XE_PLATFORM_ANDROID 1
|
||||
#define XE_LIKE_POSIX 1
|
||||
#define XE_PROFILE_EMBEDDED 1
|
||||
|
||||
#elif defined(__native_client__)
|
||||
|
||||
#define XE_PLATFORM_NACL 1
|
||||
#define XE_LIKE_POSIX 1
|
||||
#define XE_PROFILE_DESKTOP 1
|
||||
#define XE_PLATFORM_NACL 1
|
||||
#define XE_LIKE_POSIX 1
|
||||
#define XE_PROFILE_DESKTOP 1
|
||||
|
||||
#else
|
||||
|
||||
#define XE_PLATFORM_UNIX 1
|
||||
#define XE_LIKE_POSIX 1
|
||||
#define XE_PROFILE_DESKTOP 1
|
||||
#define XE_PLATFORM_UNIX 1
|
||||
#define XE_LIKE_POSIX 1
|
||||
#define XE_PROFILE_DESKTOP 1
|
||||
|
||||
#endif
|
||||
|
||||
#if defined(__clang__)
|
||||
#define XE_COMPILER_CLANG 1
|
||||
#define XE_COMPILER_CLANG 1
|
||||
#elif defined(__GNUC__)
|
||||
#define XE_COMPILER_GNUC 1
|
||||
#define XE_COMPILER_GNUC 1
|
||||
#elif defined(_MSC_VER)
|
||||
#define XE_COMPILER_MSVC 1
|
||||
#define XE_COMPILER_MSVC 1
|
||||
#elif defined(__MINGW32)
|
||||
#define XE_COMPILER_MINGW32 1
|
||||
#define XE_COMPILER_MINGW32 1
|
||||
#elif defined(__INTEL_COMPILER)
|
||||
#define XE_COMPILER_INTEL 1
|
||||
#define XE_COMPILER_INTEL 1
|
||||
#else
|
||||
#define XE_COMPILER_UNKNOWN 1
|
||||
#define XE_COMPILER_UNKNOWN 1
|
||||
#endif
|
||||
|
||||
#if defined(__ia64__) || defined(_M_IA64) || \
|
||||
defined(__ppc64__) || defined(__PPC64__) || \
|
||||
defined(__arch64__) || \
|
||||
defined(__x86_64__) || defined(_M_X64) || defined(_M_AMD64) || \
|
||||
defined(__LP64__) || defined(__LLP64) || \
|
||||
defined(_WIN64) || \
|
||||
(__WORDSIZE == 64)
|
||||
#define XE_CPU_64BIT 1
|
||||
#if defined(__ia64__) || defined(_M_IA64) || defined(__ppc64__) || \
|
||||
defined(__PPC64__) || defined(__arch64__) || defined(__x86_64__) || \
|
||||
defined(_M_X64) || defined(_M_AMD64) || defined(__LP64__) || \
|
||||
defined(__LLP64) || defined(_WIN64) || (__WORDSIZE == 64)
|
||||
#define XE_CPU_64BIT 1
|
||||
#else
|
||||
#define XE_CPU_32BIT 1
|
||||
#define XE_CPU_32BIT 1
|
||||
#endif // [64bit flags]
|
||||
|
||||
#if defined(__ppc__) || defined(__PPC__) || defined(__powerpc__) || defined(__powerpc) || defined(__POWERPC__) || defined(_M_PPC) || defined(__PPC) || \
|
||||
defined(__ppc64__) || defined(__PPC64__) || \
|
||||
defined(__ARMEB__) || defined(__THUMBEB__) || \
|
||||
defined(__AARCH64EB__) || \
|
||||
#if defined(__ppc__) || defined(__PPC__) || defined(__powerpc__) || \
|
||||
defined(__powerpc) || defined(__POWERPC__) || defined(_M_PPC) || \
|
||||
defined(__PPC) || defined(__ppc64__) || defined(__PPC64__) || \
|
||||
defined(__ARMEB__) || defined(__THUMBEB__) || defined(__AARCH64EB__) || \
|
||||
defined(__BIG_ENDIAN) || defined(__BIG_ENDIAN__)
|
||||
#define XE_CPU_BIGENDIAN 1
|
||||
#define XE_CPU_BIGENDIAN 1
|
||||
#else
|
||||
#define XE_CPU_LITTLEENDIAN 1
|
||||
#define XE_CPU_LITTLEENDIAN 1
|
||||
#endif // [big endian flags]
|
||||
|
||||
#if XE_CPU_32BIT
|
||||
#define XE_ALIGNMENT 8
|
||||
#define XE_ALIGNMENT 8
|
||||
#else
|
||||
#define XE_ALIGNMENT 16
|
||||
#define XE_ALIGNMENT 16
|
||||
#endif // 32BIT
|
||||
|
||||
#if XE_PLATFORM_WINCE || XE_PLATFORM_WIN32
|
||||
@@ -168,7 +165,7 @@ const char path_separator = '\\';
|
||||
const size_t max_path = _MAX_PATH;
|
||||
#else
|
||||
const char path_separator = '/';
|
||||
const size_t max_path = PATH_MAX;
|
||||
const size_t max_path = 1024; // PATH_MAX
|
||||
#endif // WIN32
|
||||
|
||||
} // namespace poly
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
'assert.h',
|
||||
'atomic.h',
|
||||
'byte_order.h',
|
||||
'debugging.h',
|
||||
'config.h',
|
||||
'cxx_compat.h',
|
||||
'math.cc',
|
||||
@@ -28,11 +29,13 @@
|
||||
}],
|
||||
['OS == "mac"', {
|
||||
'sources': [
|
||||
'debugging_mac.cc',
|
||||
'threading_mac.cc',
|
||||
],
|
||||
}],
|
||||
['OS == "win"', {
|
||||
'sources': [
|
||||
'debugging_win.cc',
|
||||
'threading_win.cc',
|
||||
],
|
||||
}],
|
||||
|
||||
Reference in New Issue
Block a user