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

Make Linux build compile, and mirror 32 bit changes to 64 bit. 

git-svn-id: http://pcsx2-playground.googlecode.com/svn/trunk@316 a6443dda-0b58-4228-96e9-037be469359c
This commit is contained in:
arcum42 2008-11-11 14:24:52 +00:00 committed by Gregory Hainaut
parent dc12877b8b
commit d49f177706
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pcsx2/IPU/mpeg2lib/Mpeg.c
View File

@ -165,7 +165,7 @@ int get_macroblock_modes (decoder_t * const decoder)
#undef bit_ptr #undef bit_ptr
} }
static FORCEINLINE int get_quantizer_scale (decoder_t * const decoder) static __forceinline int get_quantizer_scale (decoder_t * const decoder)
{ {
int quantizer_scale_code; int quantizer_scale_code;
@ -176,7 +176,7 @@ static FORCEINLINE int get_quantizer_scale (decoder_t * const decoder)
else return quantizer_scale_code << 1; else return quantizer_scale_code << 1;
} }
static FORCEINLINE int get_coded_block_pattern (decoder_t * const decoder) static __forceinline int get_coded_block_pattern (decoder_t * const decoder)
{ {
const CBPtab * tab; const CBPtab * tab;
@ -193,7 +193,7 @@ static FORCEINLINE int get_coded_block_pattern (decoder_t * const decoder)
return tab->cbp; return tab->cbp;
} }
static FORCEINLINE int get_luma_dc_dct_diff (decoder_t * const decoder) static __forceinline int get_luma_dc_dct_diff (decoder_t * const decoder)
{ {
#define bit_buf (decoder->bitstream_buf) #define bit_buf (decoder->bitstream_buf)
#define bits (decoder->bitstream_bits) #define bits (decoder->bitstream_bits)
@ -231,7 +231,7 @@ static FORCEINLINE int get_luma_dc_dct_diff (decoder_t * const decoder)
#undef bit_ptr #undef bit_ptr
} }
static FORCEINLINE int get_chroma_dc_dct_diff (decoder_t * const decoder) static __forceinline int get_chroma_dc_dct_diff (decoder_t * const decoder)
{ {
#define bit_buf (decoder->bitstream_buf) #define bit_buf (decoder->bitstream_buf)
#define bits (decoder->bitstream_bits) #define bits (decoder->bitstream_bits)
@ -275,7 +275,7 @@ do { \
val = SBITS (val, 1) ^ 2047; \ val = SBITS (val, 1) ^ 2047; \
} while (0) } while (0)
static FORCEINLINE void get_intra_block_B14 (decoder_t * const decoder) static __forceinline void get_intra_block_B14 (decoder_t * const decoder)
{ {
int i; int i;
int j; int j;
@ -384,7 +384,7 @@ static FORCEINLINE void get_intra_block_B14 (decoder_t * const decoder)
decoder->bitstream_bits = bits; decoder->bitstream_bits = bits;
} }
static FORCEINLINE void get_intra_block_B15 (decoder_t * const decoder) static __forceinline void get_intra_block_B15 (decoder_t * const decoder)
{ {
int i; int i;
int j; int j;
@ -489,7 +489,7 @@ static FORCEINLINE void get_intra_block_B15 (decoder_t * const decoder)
decoder->bitstream_bits = bits; decoder->bitstream_bits = bits;
} }
static FORCEINLINE int get_non_intra_block (decoder_t * const decoder) static __forceinline int get_non_intra_block (decoder_t * const decoder)
{ {
#define bit_buf (decoder->bitstream_buf) #define bit_buf (decoder->bitstream_buf)
#define bits (decoder->bitstream_bits) #define bits (decoder->bitstream_bits)
@ -617,7 +617,7 @@ static FORCEINLINE int get_non_intra_block (decoder_t * const decoder)
#undef bit_ptr #undef bit_ptr
} }
static FORCEINLINE void get_mpeg1_intra_block (decoder_t * const decoder) static __forceinline void get_mpeg1_intra_block (decoder_t * const decoder)
{ {
int i; int i;
int j; int j;
@ -740,7 +740,7 @@ static FORCEINLINE void get_mpeg1_intra_block (decoder_t * const decoder)
decoder->bitstream_bits = bits; decoder->bitstream_bits = bits;
} }
static FORCEINLINE int get_mpeg1_non_intra_block (decoder_t * const decoder) static __forceinline int get_mpeg1_non_intra_block (decoder_t * const decoder)
{ {
int i; int i;
int j; int j;
@ -1287,7 +1287,7 @@ void mpeg2_slice(void* pdone)
so_exit(); so_exit();
} }
int FORCEINLINE get_motion_delta (decoder_t * const decoder, int __forceinline get_motion_delta (decoder_t * const decoder,
const int f_code) const int f_code)
{ {
#define bit_buf (decoder->bitstream_buf) #define bit_buf (decoder->bitstream_buf)
@ -1341,7 +1341,7 @@ int FORCEINLINE get_motion_delta (decoder_t * const decoder,
#undef bit_ptr #undef bit_ptr
} }
int FORCEINLINE get_dmv (decoder_t * const decoder) int __forceinline get_dmv (decoder_t * const decoder)
{ {
#define bit_buf (decoder->bitstream_buf) #define bit_buf (decoder->bitstream_buf)
#define bits (decoder->bitstream_bits) #define bits (decoder->bitstream_bits)

10
pcsx2/x86/ix86-64/iR5900-64.c
View File

@ -1753,7 +1753,15 @@ void StopPerfCounter()
// assert( !g_globalXMMSaved ); // assert( !g_globalXMMSaved );
//} //}
#define EECYCLE_MULT (CHECK_EESYNC_HACK ? (CHECK_EE_IOP_EXTRA ? 3.375 : 2.25) : (9/8)) //fixme : this is all a huge hack, we base the counter advancements on the average an opcode should take (wtf?)
// If that wasn't bad enough we have default values like 9/8 which will get cast to int later
// (yeah, that means all sync code couldn't have worked to beginn with)
// So for now these are new settings that work. I would've set 1 for default but that seemed too low
// (rama)
// applying this to 64 bit as well - arcum42
//#define EECYCLE_MULT (CHECK_EESYNC_HACK ? (CHECK_EE_IOP_EXTRA ? 3.375 : 2.25) : (9/8))
#define EECYCLE_MULT (CHECK_EESYNC_HACK ? (CHECK_EE_IOP_EXTRA ? 3 : 2) : (1.2))
static void iBranchTest(u32 newpc, u32 cpuBranch) static void iBranchTest(u32 newpc, u32 cpuBranch)
{ {