From 1fee769aa0429a620dc93b351168396a9ead45c9 Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Wed, 6 May 2015 01:56:39 -0300 Subject: Common: Remove unused enums --- src/common/common.h | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'src/common/common.h') diff --git a/src/common/common.h b/src/common/common.h index f7d0f55c5..d11e57b1e 100644 --- a/src/common/common.h +++ b/src/common/common.h @@ -100,21 +100,4 @@ private: # define _M_SSE 0x402 #endif -// Host communication. -enum HOST_COMM -{ - // Begin at 10 in case there is already messages with wParam = 0, 1, 2 and so on - WM_USER_STOP = 10, - WM_USER_CREATE, - WM_USER_SETCURSOR, -}; - -// Used for notification on emulation state -enum EMUSTATE_CHANGE -{ - EMUSTATE_CHANGE_PLAY = 1, - EMUSTATE_CHANGE_PAUSE, - EMUSTATE_CHANGE_STOP -}; - #include "swap.h" -- cgit v1.2.3 From 7a4b717772daf91819170caf32a71baa845c46ea Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Wed, 6 May 2015 01:56:18 -0300 Subject: Common: Use C++11 deleted functions for NonCopyable --- src/common/common.h | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'src/common/common.h') diff --git a/src/common/common.h b/src/common/common.h index d11e57b1e..d64635620 100644 --- a/src/common/common.h +++ b/src/common/common.h @@ -14,15 +14,13 @@ #define STACKALIGN // An inheritable class to disallow the copy constructor and operator= functions -class NonCopyable -{ +class NonCopyable { protected: - NonCopyable() {} - NonCopyable(const NonCopyable&&) {} - void operator=(const NonCopyable&&) {} -private: - NonCopyable(NonCopyable&); - NonCopyable& operator=(NonCopyable& other); + NonCopyable() = default; + ~NonCopyable() = default; + + NonCopyable(NonCopyable&) = delete; + NonCopyable& operator=(NonCopyable&) = delete; }; #include "common/assert.h" -- cgit v1.2.3 From 6ad71c216b2d1112c96d621140c60b4e1b359811 Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Wed, 6 May 2015 04:05:02 -0300 Subject: Common: Move NonCopyable to common_types.h --- src/common/common.h | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'src/common/common.h') diff --git a/src/common/common.h b/src/common/common.h index d64635620..a4a403fb9 100644 --- a/src/common/common.h +++ b/src/common/common.h @@ -13,16 +13,6 @@ #define STACKALIGN -// An inheritable class to disallow the copy constructor and operator= functions -class NonCopyable { -protected: - NonCopyable() = default; - ~NonCopyable() = default; - - NonCopyable(NonCopyable&) = delete; - NonCopyable& operator=(NonCopyable&) = delete; -}; - #include "common/assert.h" #include "common/logging/log.h" #include "common/common_types.h" -- cgit v1.2.3 From bf12f270b3c74f694c789a57cc69f414753ca080 Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Wed, 6 May 2015 22:59:59 -0300 Subject: Common: Remove many unnecessary cross-platform compatibility macros --- src/common/common.h | 43 +++++-------------------------------------- 1 file changed, 5 insertions(+), 38 deletions(-) (limited to 'src/common/common.h') diff --git a/src/common/common.h b/src/common/common.h index a4a403fb9..00d1d14f9 100644 --- a/src/common/common.h +++ b/src/common/common.h @@ -11,8 +11,6 @@ #include #include -#define STACKALIGN - #include "common/assert.h" #include "common/logging/log.h" #include "common/common_types.h" @@ -20,56 +18,25 @@ #include "common/common_paths.h" #include "common/platform.h" -#ifdef __APPLE__ -// The Darwin ABI requires that stack frames be aligned to 16-byte boundaries. -// This is only needed on i386 gcc - x86_64 already aligns to 16 bytes. - #if defined __i386__ && defined __GNUC__ - #undef STACKALIGN - #define STACKALIGN __attribute__((__force_align_arg_pointer__)) - #endif -#elif defined _WIN32 -// Check MSC ver - #if defined _MSC_VER && _MSC_VER <= 1000 - #error needs at least version 1000 of MSC - #endif - - #ifndef NOMINMAX - #define NOMINMAX - #endif - -// Alignment +#ifdef _WIN32 + // Alignment #define MEMORY_ALIGNED16(x) __declspec(align(16)) x #define MEMORY_ALIGNED32(x) __declspec(align(32)) x #define MEMORY_ALIGNED64(x) __declspec(align(64)) x #define MEMORY_ALIGNED128(x) __declspec(align(128)) x - #define MEMORY_ALIGNED16_DECL(x) __declspec(align(16)) x - #define MEMORY_ALIGNED64_DECL(x) __declspec(align(64)) x -#endif - -// Windows compatibility -#ifndef _WIN32 +#else + // Windows compatibility #ifdef _LP64 #define _M_X64 1 #else #define _M_IX86 1 #endif + #define __forceinline inline __attribute__((always_inline)) #define MEMORY_ALIGNED16(x) __attribute__((aligned(16))) x #define MEMORY_ALIGNED32(x) __attribute__((aligned(32))) x #define MEMORY_ALIGNED64(x) __attribute__((aligned(64))) x #define MEMORY_ALIGNED128(x) __attribute__((aligned(128))) x - #define MEMORY_ALIGNED16_DECL(x) __attribute__((aligned(16))) x - #define MEMORY_ALIGNED64_DECL(x) __attribute__((aligned(64))) x -#endif - -#ifdef _MSC_VER - #define __strdup _strdup - #define __getcwd _getcwd - #define __chdir _chdir -#else - #define __strdup strdup - #define __getcwd getcwd - #define __chdir chdir #endif #if defined _M_GENERIC -- cgit v1.2.3 From ae963d75f8ac37dd870054c20ff14f4e5418f661 Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Wed, 6 May 2015 23:18:04 -0300 Subject: Common: Move SSE detection ifdefs to platform.h --- src/common/common.h | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'src/common/common.h') diff --git a/src/common/common.h b/src/common/common.h index 00d1d14f9..e8d32bc93 100644 --- a/src/common/common.h +++ b/src/common/common.h @@ -39,20 +39,4 @@ #define MEMORY_ALIGNED128(x) __attribute__((aligned(128))) x #endif -#if defined _M_GENERIC -# define _M_SSE 0x0 -#elif defined __GNUC__ -# if defined __SSE4_2__ -# define _M_SSE 0x402 -# elif defined __SSE4_1__ -# define _M_SSE 0x401 -# elif defined __SSSE3__ -# define _M_SSE 0x301 -# elif defined __SSE3__ -# define _M_SSE 0x300 -# endif -#elif (_MSC_VER >= 1500) || __INTEL_COMPILER // Visual Studio 2008 -# define _M_SSE 0x402 -#endif - #include "swap.h" -- cgit v1.2.3 From 1bd1a13a02e317a50252b0b5d5077b6ab2dbef53 Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Wed, 6 May 2015 23:26:19 -0300 Subject: Common: Move alignment macros to common_funcs.h --- src/common/common.h | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'src/common/common.h') diff --git a/src/common/common.h b/src/common/common.h index e8d32bc93..a9d3a6e6a 100644 --- a/src/common/common.h +++ b/src/common/common.h @@ -18,25 +18,4 @@ #include "common/common_paths.h" #include "common/platform.h" -#ifdef _WIN32 - // Alignment - #define MEMORY_ALIGNED16(x) __declspec(align(16)) x - #define MEMORY_ALIGNED32(x) __declspec(align(32)) x - #define MEMORY_ALIGNED64(x) __declspec(align(64)) x - #define MEMORY_ALIGNED128(x) __declspec(align(128)) x -#else - // Windows compatibility - #ifdef _LP64 - #define _M_X64 1 - #else - #define _M_IX86 1 - #endif - - #define __forceinline inline __attribute__((always_inline)) - #define MEMORY_ALIGNED16(x) __attribute__((aligned(16))) x - #define MEMORY_ALIGNED32(x) __attribute__((aligned(32))) x - #define MEMORY_ALIGNED64(x) __attribute__((aligned(64))) x - #define MEMORY_ALIGNED128(x) __attribute__((aligned(128))) x -#endif - #include "swap.h" -- cgit v1.2.3 From e1fbac3ca13d37d2625c11d30cfdece4327b446b Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Wed, 6 May 2015 04:06:12 -0300 Subject: Common: Remove common.h --- src/common/common.h | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 src/common/common.h (limited to 'src/common/common.h') diff --git a/src/common/common.h b/src/common/common.h deleted file mode 100644 index a9d3a6e6a..000000000 --- a/src/common/common.h +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright 2013 Dolphin Emulator Project / 2014 Citra Emulator Project -// Licensed under GPLv2 or any later version -// Refer to the license.txt file included. - -#pragma once - -// DO NOT EVER INCLUDE directly _or indirectly_ from this file -// since it slows down the build a lot. - -#include -#include -#include - -#include "common/assert.h" -#include "common/logging/log.h" -#include "common/common_types.h" -#include "common/common_funcs.h" -#include "common/common_paths.h" -#include "common/platform.h" - -#include "swap.h" -- cgit v1.2.3