ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Get rid of duplicated code in PS2Etypes.h. :) 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1088 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2009-04-29 11:47:05 +00:00
parent e81fbc728d
commit d8617c1ee8
12 changed files with 33 additions and 240 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build.sh
View File

@ -6,13 +6,13 @@
# Uncomment if building by itself, rather then with all the plugins # Uncomment if building by itself, rather then with all the plugins
#Normal #Normal
#export PCSX2OPTIONS="--enable-sse3 --enable-sse4 --prefix `pwd`" #export PCSX2OPTIONS="--prefix `pwd`"
#Optimized, but a devbuild #Optimized, but a devbuild
export PCSX2OPTIONS="--enable-sse3 --enable-sse4 --enable-devbuild --prefix `pwd`" export PCSX2OPTIONS="--enable-devbuild --prefix `pwd`"
#Debug / Devbuild version #Debug / Devbuild version
#export PCSX2OPTIONS="--enable-debug --enable-devbuild --enable-sse3 --prefix `pwd`" #export PCSX2OPTIONS="--enable-debug --enable-devbuild --prefix `pwd`"
#ZeroGS Normal mode #ZeroGS Normal mode
export ZEROGSOPTIONS="--enable-sse2" export ZEROGSOPTIONS="--enable-sse2"

8
common/include/PS2Edefs.h
View File

@ -48,13 +48,7 @@
*/ */
#include "PS2Etypes.h" #include "Pcsx2Defs.h"
/* common defines */
#ifndef C_ASSERT
#define C_ASSERT(e) typedef char __C_ASSERT__[(e)?1:-1]
#endif
#if defined(GSdefs) || defined(PADdefs) || defined(SIOdefs) || \ #if defined(GSdefs) || defined(PADdefs) || defined(SIOdefs) || \
defined(SPU2defs) || defined(CDVDdefs) || defined(DEV9defs) || \ defined(SPU2defs) || defined(CDVDdefs) || defined(DEV9defs) || \

218
common/include/PS2Etypes.h
View File

@ -15,221 +15,13 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
// This file is just for backwards compatability.
#ifndef __PS2ETYPES_H__ #ifndef __PS2ETYPES_H__
#define __PS2ETYPES_H__ #define __PS2ETYPES_H__
#if defined (__linux__) && !defined(__LINUX__) // some distributions are lower case // This brings in both all the things that used to be in PS2types.h that weren't type related,
#define __LINUX__ // and also brings Pcsx2Types in.
#endif #include "Pcsx2Defs.h"
#ifdef __CYGWIN__
#define __LINUX__
#endif
// Renamed ARRAYSIZE to ArraySize -- looks nice and gets rid of Windows.h conflicts (air)
#ifndef ArraySize
#define ArraySize(x) (sizeof(x)/sizeof((x)[0]))
#endif
//////////////////////////////////////////////////////////////////////////////////////////
// jASSUME - give hints to the optimizer
// This is primarily useful for the default case switch optimizer, which enables VC to
// generate more compact switches.
#ifdef NDEBUG
# define jBREAKPOINT() ((void) 0)
# ifdef _MSC_VER
# define jASSUME(exp) (__assume(exp))
# else
# define jASSUME(exp) ((void) sizeof(exp))
# endif
#else
# if defined(_MSC_VER)
# define jBREAKPOINT() do { __asm int 3 } while(0)
# else
# define jBREAKPOINT() ((void) *(volatile char *) 0)
# endif
# define jASSUME(exp) if(exp) ; else jBREAKPOINT()
#endif
// disable the default case in a switch
#define jNO_DEFAULT \
{ \
default: \
jASSUME(0); \
break; \
}
//////////////////////////////////////////////////////////////////////////////////////////
// Basic Atomic Types
#if defined(_MSC_VER)
typedef __int8 s8;
typedef __int16 s16;
typedef __int32 s32;
typedef __int64 s64;
typedef unsigned __int8 u8;
typedef unsigned __int16 u16;
typedef unsigned __int32 u32;
typedef unsigned __int64 u64;
typedef unsigned int uint;
// Note: building the 'extern' into PCSX2_ALIGNED16_DECL fixes Visual Assist X's intellisense.
#define PCSX2_ALIGNED(alig,x) __declspec(align(alig)) x
#define PCSX2_ALIGNED_EXTERN(alig,x) extern __declspec(align(alig)) x
#define PCSX2_ALIGNED16(x) __declspec(align(16)) x
#define PCSX2_ALIGNED16_EXTERN(x) extern __declspec(align(16)) x
#define __naked __declspec(naked)
#define __unused /*unused*/
#define __noinline __declspec(noinline)
#define CALLBACK __stdcall
#else // _MSC_VER
#ifdef __LINUX__
#ifdef HAVE_STDINT_H
#include "stdint.h"
typedef int8_t s8;
typedef int16_t s16;
typedef int32_t s32;
typedef int64_t s64;
typedef uint8_t u8;
typedef uint16_t u16;
typedef uint32_t u32;
typedef uint64_t u64;
typedef uintptr_t uptr;
typedef intptr_t sptr;
#else // HAVE_STDINT_H
typedef char s8;
typedef short s16;
typedef int s32;
typedef long long s64;
typedef unsigned char u8;
typedef unsigned short u16;
typedef unsigned int u32;
typedef unsigned long long u64;
#endif // HAVE_STDINT_H
typedef unsigned int uint;
#define LONG long
typedef union _LARGE_INTEGER
{
long long QuadPart;
} LARGE_INTEGER;
#define __fastcall __attribute__((fastcall))
#define __unused __attribute__((unused))
#define _inline __inline__ __attribute__((unused))
#define __forceinline __attribute__((always_inline,unused))
#define __noinline __attribute__((noinline))
#define __naked // GCC lacks the naked specifier
#define CALLBACK // CALLBACK is win32-specific mess
#endif // __LINUX__
#define PCSX2_ALIGNED(alig,x) x __attribute((aligned(alig)))
#define PCSX2_ALIGNED16(x) x __attribute((aligned(16)))
// fixme - is this needed for recent versions of GCC? Or can we just use the macros
// above instead for both definitions (implementations) and declarations (includes)? -- air
#define PCSX2_ALIGNED_EXTERN(alig,x) extern x __attribute((aligned(alig)))
#define PCSX2_ALIGNED16_EXTERN(x) extern x __attribute((aligned(16)))
#endif // _MSC_VER
#if !defined(__LINUX__) || !defined(HAVE_STDINT_H)
#if defined(__x86_64__)
typedef u64 uptr;
typedef s64 sptr;
#else
typedef u32 uptr;
typedef s32 sptr;
#endif
#endif
//////////////////////////////////////////////////////////////////////////////////////////
// A rough-and-ready cross platform 128-bit datatype, Non-SSE style.
#ifdef __cplusplus
struct u128
{
u64 lo;
u64 hi;
// Implicit conversion from u64
u128( u64 src ) :
lo( src )
, hi( 0 ) {}
// Implicit conversion from u32
u128( u32 src ) :
lo( src )
, hi( 0 ) {}
};
struct s128
{
s64 lo;
s64 hi;
// Implicit conversion from u64
s128( s64 src ) :
lo( src )
, hi( 0 ) {}
// Implicit conversion from u32
s128( s32 src ) :
lo( src )
, hi( 0 ) {}
};
#else
typedef union _u128_t
{
u64 lo;
u64 hi;
} u128;
typedef union _s128_t
{
s64 lo;
s64 hi;
} s128;
#endif
typedef struct {
int size;
s8 *data;
} freezeData;
// event values:
#define KEYPRESS 1
#define KEYRELEASE 2
typedef struct _keyEvent {
u32 key;
u32 evt;
} keyEvent;
/* common defines */
#ifndef C_ASSERT
#define C_ASSERT(e) typedef char __C_ASSERT__[(e)?1:-1]
#endif
#endif /* __PS2ETYPES_H__ */ #endif /* __PS2ETYPES_H__ */

5
common/include/Pcsx2Defs.h
View File

@ -27,6 +27,8 @@
#define __LINUX__ #define __LINUX__
#endif #endif
#include "Pcsx2Types.h"
// Renamed ARRAYSIZE to ArraySize -- looks nice and gets rid of Windows.h conflicts (air) // Renamed ARRAYSIZE to ArraySize -- looks nice and gets rid of Windows.h conflicts (air)
#ifndef ArraySize #ifndef ArraySize
#define ArraySize(x) (sizeof(x)/sizeof((x)[0])) #define ArraySize(x) (sizeof(x)/sizeof((x)[0]))
@ -77,6 +79,8 @@ default: \
#define PCSX2_ALIGNED16_EXTERN(x) extern __declspec(align(16)) x #define PCSX2_ALIGNED16_EXTERN(x) extern __declspec(align(16)) x
#define __naked __declspec(naked) #define __naked __declspec(naked)
#define __unused /*unused*/
#define __noinline __declspec(noinline)
#define CALLBACK __stdcall #define CALLBACK __stdcall
#else #else
@ -96,6 +100,7 @@ default: \
#define __unused __attribute__((unused)) #define __unused __attribute__((unused))
#define _inline __inline__ __attribute__((unused)) #define _inline __inline__ __attribute__((unused))
#define __forceinline __attribute__((always_inline,unused)) #define __forceinline __attribute__((always_inline,unused))
#define __noinline __attribute__((noinline))
#endif #endif
typedef struct { typedef struct {

22
common/include/Pcsx2Types.h
View File

@ -19,8 +19,6 @@
#ifndef __PCSX2TYPES_H__ #ifndef __PCSX2TYPES_H__
#define __PCSX2TYPES_H__ #define __PCSX2TYPES_H__
// Note; this header is experamental, and will be a shifting target. Only use this if you are willing to repeatedly fix breakage.
/* /*
* Based on PS2E Definitions by * Based on PS2E Definitions by
linuzappz@hotmail.com, linuzappz@hotmail.com,
@ -45,12 +43,10 @@ typedef unsigned __int32 u32;
typedef unsigned __int64 u64; typedef unsigned __int64 u64;
typedef unsigned int uint; typedef unsigned int uint;
typedef u32 uptr;
typedef s32 sptr;
#else // _MSC_VER #else // _MSC_VER*/
#ifdef __LINUX__ #ifdef __LINUX__
#ifdef HAVE_STDINT_H #ifdef HAVE_STDINT_H
#include "stdint.h" #include "stdint.h"
@ -80,9 +76,6 @@ typedef unsigned short u16;
typedef unsigned int u32; typedef unsigned int u32;
typedef unsigned long long u64; typedef unsigned long long u64;
typedef u32 uptr;
typedef s32 sptr;
#endif // HAVE_STDINT_H #endif // HAVE_STDINT_H
typedef unsigned int uint; typedef unsigned int uint;
@ -96,6 +89,15 @@ typedef union _LARGE_INTEGER
#endif // __LINUX__ #endif // __LINUX__
#endif //_MSC_VER #endif //_MSC_VER
#if !defined(__LINUX__) || !defined(HAVE_STDINT_H)
#if defined(__x86_64__)
typedef u64 uptr;
typedef s64 sptr;
#else
typedef u32 uptr;
typedef s32 sptr;
#endif
#endif
////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////
// A rough-and-ready cross platform 128-bit datatype, Non-SSE style. // A rough-and-ready cross platform 128-bit datatype, Non-SSE style.
@ -148,4 +150,4 @@ typedef union _s128_t
#endif #endif
#endif #endif

2
pcsx2/Common.h
View File

@ -19,7 +19,7 @@
#ifndef __COMMON_H__ #ifndef __COMMON_H__
#define __COMMON_H__ #define __COMMON_H__
#include "PS2Etypes.h" #include "Pcsx2Defs.h"
#define BIAS 2 // Bus is half of the actual ps2 speed #define BIAS 2 // Bus is half of the actual ps2 speed
//#define PS2CLK 36864000 /* 294.912 mhz */ //#define PS2CLK 36864000 /* 294.912 mhz */

2
pcsx2/Patch.h
View File

@ -18,7 +18,7 @@
#ifndef __PATCH_H__ #ifndef __PATCH_H__
#define __PATCH_H__ #define __PATCH_H__
#include "PS2Etypes.h" #include "Pcsx2Defs.h"
// //
// Defines // Defines

2
pcsx2/PrecompiledHeader.h
View File

@ -69,7 +69,7 @@ typedef int BOOL;
// unchanged for long periods of time. // unchanged for long periods of time.
#include "zlib/zlib.h" #include "zlib/zlib.h"
#include "PS2Etypes.h" #include "Pcsx2Defs.h"
#include "MemcpyFast.h" #include "MemcpyFast.h"
#include "StringUtils.h" #include "StringUtils.h"
#include "Exceptions.h" #include "Exceptions.h"

2
pcsx2/R5900OpcodeTables.h
View File

@ -18,7 +18,7 @@
#ifndef _R5900_OPCODETABLES_H #ifndef _R5900_OPCODETABLES_H
#define _R5900_OPCODETABLES_H #define _R5900_OPCODETABLES_H
#include "PS2Etypes.h" #include "Pcsx2Defs.h"
// TODO : Move these into the OpcodeTables namespace // TODO : Move these into the OpcodeTables namespace
extern void (*Int_COP2PrintTable[32])(); extern void (*Int_COP2PrintTable[32])();

2
pcsx2/System.h
View File

@ -19,7 +19,7 @@
#ifndef __SYSTEM_H__ #ifndef __SYSTEM_H__
#define __SYSTEM_H__ #define __SYSTEM_H__
#include "PS2Etypes.h" #include "Pcsx2Defs.h"
#include "Paths.h" #include "Paths.h"
#include "Pcsx2Config.h" #include "Pcsx2Config.h"
#include "Exceptions.h" #include "Exceptions.h"

2
pcsx2/Threading.h
View File

@ -22,7 +22,7 @@
#include <errno.h> // EBUSY #include <errno.h> // EBUSY
#include <semaphore.h> #include <semaphore.h>
#include "PS2Etypes.h" #include "Pcsx2Defs.h"
#include "Exceptions.h" #include "Exceptions.h"
namespace Threading namespace Threading

2
pcsx2/configure.ac
View File

@ -38,7 +38,7 @@ fi
WARNING_FLAGS="-Wno-format -Wno-unused-parameter -Wno-unused-value -Wunused-variable " WARNING_FLAGS="-Wno-format -Wno-unused-parameter -Wno-unused-value -Wunused-variable "
EXTRA_WARNING_FLAGS="-Wall -Wextra" EXTRA_WARNING_FLAGS="-Wall -Wextra"
NORMAL_FLAGS=" -pipe -msse -msse2 -O2 ${WARNING_FLAGS}" NORMAL_FLAGS=" -pipe -msse -msse2 -O2 ${WARNING_FLAGS}"
# These optimizations seem to cause issues with GCC 4.3.3, so we'll turn them off. # These optimizations seem to cause issues with GCC 4.3.3, so we'll turn them off. Comment if not on 4.3+
NORMAL_FLAGS+=" -fno-guess-branch-probability -fno-dse -fno-tree-dse " NORMAL_FLAGS+=" -fno-guess-branch-probability -fno-dse -fno-tree-dse "
DEBUG_FLAGS+=" -g -msse -msse2 ${EXTRA_WARNING_FLAGS} ${WARNING_FLAGS} " DEBUG_FLAGS+=" -g -msse -msse2 ${EXTRA_WARNING_FLAGS} ${WARNING_FLAGS} "