mirror of https://github.com/PCSX2/pcsx2.git
Misc: Format Pcsx2Defs.h
This commit is contained in:
TellowKrinkle
tellowkrinkle
parent
42f438146c
commit
8ab884a89e
|
|
@ -16,15 +16,15 @@
|
|||
#pragma once
|
||||
|
||||
#ifdef __CYGWIN__
|
||||
#define __linux__
|
||||
#define __linux__
|
||||
#endif
|
||||
|
||||
// make sure __POSIX__ is defined for all systems where we assume POSIX
|
||||
// compliance
|
||||
#if defined(__linux__) || defined(__APPLE__) || defined(__unix__) || defined(__CYGWIN__) || defined(__LINUX__)
|
||||
#if !defined(__POSIX__)
|
||||
#define __POSIX__ 1
|
||||
#endif
|
||||
#ifndef __POSIX__
|
||||
#define __POSIX__ 1
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#include "Pcsx2Types.h"
|
||||
|
|
@ -39,7 +39,7 @@
|
|||
// Notes: I'd have used ARRAY_SIZE instead but ran into cross-platform lib conflicts with
|
||||
// that as well. >_<
|
||||
#ifndef ArraySize
|
||||
#define ArraySize(x) (sizeof(x) / sizeof((x)[0]))
|
||||
#define ArraySize(x) (sizeof(x) / sizeof((x)[0]))
|
||||
#endif
|
||||
|
||||
// --------------------------------------------------------------------------------------
|
||||
|
|
@ -51,35 +51,35 @@
|
|||
// some tight loops it will likely make debug builds unusably slow.
|
||||
//
|
||||
#ifdef PCSX2_DEVBUILD
|
||||
static const bool IsDevBuild = true;
|
||||
static const bool IsDevBuild = true;
|
||||
#else
|
||||
static const bool IsDevBuild = false;
|
||||
static const bool IsDevBuild = false;
|
||||
#endif
|
||||
|
||||
#ifdef PCSX2_DEBUG
|
||||
static const bool IsDebugBuild = true;
|
||||
static const bool IsDebugBuild = true;
|
||||
#else
|
||||
static const bool IsDebugBuild = false;
|
||||
static const bool IsDebugBuild = false;
|
||||
#endif
|
||||
|
||||
#ifdef PCSX2_DEBUG
|
||||
#define pxDebugCode(code) code
|
||||
#define pxDebugCode(code) code
|
||||
#else
|
||||
#define pxDebugCode(code)
|
||||
#define pxDebugCode(code)
|
||||
#endif
|
||||
|
||||
#ifdef PCSX2_DEVBUILD
|
||||
#define pxDevelCode(code) code
|
||||
#define pxDevelCode(code) code
|
||||
#else
|
||||
#define pxDevelCode(code)
|
||||
#define pxDevelCode(code)
|
||||
#endif
|
||||
|
||||
#if defined(PCSX2_DEBUG) || defined(PCSX2_DEVBUILD)
|
||||
#define pxReleaseCode(code)
|
||||
#define pxNonReleaseCode(code) code
|
||||
#define pxReleaseCode(code)
|
||||
#define pxNonReleaseCode(code) code
|
||||
#else
|
||||
#define pxReleaseCode(code) code
|
||||
#define pxNonReleaseCode(code)
|
||||
#define pxReleaseCode(code) code
|
||||
#define pxNonReleaseCode(code)
|
||||
#endif
|
||||
|
||||
// --------------------------------------------------------------------------------------
|
||||
|
|
@ -108,27 +108,27 @@ static const int __pagesize = PCSX2_PAGESIZE;
|
|||
// --------------------------------------------------------------------------------------
|
||||
#ifdef _MSC_VER
|
||||
|
||||
// Using these breaks compat with VC2005; so we're not using it yet.
|
||||
//# define __pack_begin __pragma(pack(1))
|
||||
//# define __pack_end __pragma(pack())
|
||||
// Using these breaks compat with VC2005; so we're not using it yet.
|
||||
//# define __pack_begin __pragma(pack(1))
|
||||
//# define __pack_end __pragma(pack())
|
||||
|
||||
// This is the 2005/earlier compatible packing define, which must be used in conjunction
|
||||
// with #ifdef _MSC_VER/#pragma pack() directives (ugly).
|
||||
#define __packed
|
||||
// This is the 2005/earlier compatible packing define, which must be used in conjunction
|
||||
// with #ifdef _MSC_VER/#pragma pack() directives (ugly).
|
||||
#define __packed
|
||||
|
||||
#define __aligned(alig) __declspec(align(alig))
|
||||
#define __aligned16 __declspec(align(16))
|
||||
#define __aligned32 __declspec(align(32))
|
||||
#define __pagealigned __declspec(align(PCSX2_PAGESIZE))
|
||||
#define __aligned(alig) __declspec(align(alig))
|
||||
#define __aligned16 __declspec(align(16))
|
||||
#define __aligned32 __declspec(align(32))
|
||||
#define __pagealigned __declspec(align(PCSX2_PAGESIZE))
|
||||
|
||||
#define __noinline __declspec(noinline)
|
||||
#define __noreturn __declspec(noreturn)
|
||||
#define __noinline __declspec(noinline)
|
||||
#define __noreturn __declspec(noreturn)
|
||||
|
||||
// Don't know if there are Visual C++ equivalents of these.
|
||||
#define likely(x) (!!(x))
|
||||
#define unlikely(x) (!!(x))
|
||||
// Don't know if there are Visual C++ equivalents of these.
|
||||
#define likely(x) (!!(x))
|
||||
#define unlikely(x) (!!(x))
|
||||
|
||||
#define CALLBACK __stdcall
|
||||
#define CALLBACK __stdcall
|
||||
|
||||
#else
|
||||
|
||||
|
|
@ -136,41 +136,41 @@ static const int __pagesize = PCSX2_PAGESIZE;
|
|||
// GCC / Intel Compilers Section
|
||||
// --------------------------------------------------------------------------------------
|
||||
|
||||
#ifndef __packed
|
||||
#define __packed __attribute__((packed))
|
||||
#endif
|
||||
#ifndef __aligned
|
||||
#define __aligned(alig) __attribute__((aligned(alig)))
|
||||
#endif
|
||||
#define __aligned16 __attribute__((aligned(16)))
|
||||
#define __aligned32 __attribute__((aligned(32)))
|
||||
#define __pagealigned __attribute__((aligned(PCSX2_PAGESIZE)))
|
||||
#ifndef __packed
|
||||
#define __packed __attribute__((packed))
|
||||
#endif
|
||||
#ifndef __aligned
|
||||
#define __aligned(alig) __attribute__((aligned(alig)))
|
||||
#endif
|
||||
#define __aligned16 __attribute__((aligned(16)))
|
||||
#define __aligned32 __attribute__((aligned(32)))
|
||||
#define __pagealigned __attribute__((aligned(PCSX2_PAGESIZE)))
|
||||
|
||||
#define __assume(cond) ((void)0) // GCC has no equivalent for __assume
|
||||
#define CALLBACK __attribute__((stdcall))
|
||||
#define __assume(cond) ((void)0) // GCC has no equivalent for __assume
|
||||
#define CALLBACK __attribute__((stdcall))
|
||||
|
||||
// Inlining note: GCC needs ((unused)) attributes defined on inlined functions to suppress
|
||||
// warnings when a static inlined function isn't used in the scope of a single file (which
|
||||
// happens *by design* like all the friggen time >_<)
|
||||
// Inlining note: GCC needs ((unused)) attributes defined on inlined functions to suppress
|
||||
// warnings when a static inlined function isn't used in the scope of a single file (which
|
||||
// happens *by design* like all the friggen time >_<)
|
||||
|
||||
#ifndef __fastcall
|
||||
#define __fastcall __attribute__((fastcall))
|
||||
#endif
|
||||
#define __vectorcall __fastcall
|
||||
#define _inline __inline__ __attribute__((unused))
|
||||
#ifdef NDEBUG
|
||||
#define __forceinline __attribute__((always_inline, unused))
|
||||
#else
|
||||
#define __forceinline __attribute__((unused))
|
||||
#endif
|
||||
#ifndef __noinline
|
||||
#define __noinline __attribute__((noinline))
|
||||
#endif
|
||||
#ifndef __noreturn
|
||||
#define __noreturn __attribute__((noreturn))
|
||||
#endif
|
||||
#define likely(x) __builtin_expect(!!(x), 1)
|
||||
#define unlikely(x) __builtin_expect(!!(x), 0)
|
||||
#ifndef __fastcall
|
||||
#define __fastcall __attribute__((fastcall))
|
||||
#endif
|
||||
#define __vectorcall __fastcall
|
||||
#define _inline __inline__ __attribute__((unused))
|
||||
#ifdef NDEBUG
|
||||
#define __forceinline __attribute__((always_inline, unused))
|
||||
#else
|
||||
#define __forceinline __attribute__((unused))
|
||||
#endif
|
||||
#ifndef __noinline
|
||||
#define __noinline __attribute__((noinline))
|
||||
#endif
|
||||
#ifndef __noreturn
|
||||
#define __noreturn __attribute__((noreturn))
|
||||
#endif
|
||||
#define likely(x) __builtin_expect(!!(x), 1)
|
||||
#define unlikely(x) __builtin_expect(!!(x), 0)
|
||||
#endif
|
||||
|
||||
// --------------------------------------------------------------------------------------
|
||||
|
|
@ -185,9 +185,9 @@ static const int __pagesize = PCSX2_PAGESIZE;
|
|||
// environment.
|
||||
//
|
||||
#ifdef PCSX2_DEVBUILD
|
||||
#define __releaseinline
|
||||
#define __releaseinline
|
||||
#else
|
||||
#define __releaseinline __forceinline
|
||||
#define __releaseinline __forceinline
|
||||
#endif
|
||||
|
||||
#define __ri __releaseinline
|
||||
|
|
|
|||
Loading…
Reference in New Issue