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

Fix win32 compilation error, and fix Linux FMVs and (hopefully) some segfaults too, likely caused by not saving EBP. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1965 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2009-10-05 12:04:19 +00:00
parent b71b837efa
commit 278d43a5a7
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pcsx2/IPU/yuv2rgb.cpp
View File

@ -29,8 +29,8 @@
struct SSE2_Tables struct SSE2_Tables
{ {
u16 C_bias[8]; // offset -64 u16 C_bias[8]; // offset -64
u8 Y_bias[16]; // offset -48 u8 Y_bias[16]; // offset -48
u16 Y_mask[8]; // offset -32 u16 Y_mask[8]; // offset -32
u16 round_1bit[8]; // offset -16 u16 round_1bit[8]; // offset -16
@ -214,6 +214,10 @@ ihatemsvc:
#elif defined(__GNUC__) #elif defined(__GNUC__)
// offset to the middle of the sse2 table, so that we can use 1-byte address displacement
// to access all fields:
static const u8* sse2_tableoffset = ((u8*)&sse2_tables) + 64;
__asm__ __volatile__ ( __asm__ __volatile__ (
".intel_syntax noprefix\n" ".intel_syntax noprefix\n"
"mov eax, 1\n" "mov eax, 1\n"
@ -345,7 +349,7 @@ ihatemsvc:
:[C_BIAS]"i"(C_BIAS), [Y_BIAS]"i"(Y_BIAS), [Y_MASK]"i"(Y_MASK), :[C_BIAS]"i"(C_BIAS), [Y_BIAS]"i"(Y_BIAS), [Y_MASK]"i"(Y_MASK),
[ROUND_1BIT]"i"(ROUND_1BIT), [Y_COEFF]"i"(Y_COEFF), [GCr_COEFF]"i"(GCr_COEFF), [ROUND_1BIT]"i"(ROUND_1BIT), [Y_COEFF]"i"(Y_COEFF), [GCr_COEFF]"i"(GCr_COEFF),
[GCb_COEFF]"i"(GCb_COEFF), [RCr_COEFF]"i"(RCr_COEFF), [BCb_COEFF]"i"(BCb_COEFF), [GCb_COEFF]"i"(GCb_COEFF), [RCr_COEFF]"i"(RCr_COEFF), [BCb_COEFF]"i"(BCb_COEFF),
[yuv2rgb_temp]"r"(yuv2rgb_temp), [sse2_tables]"r"(&sse2_tables) [yuv2rgb_temp]"r"(yuv2rgb_temp), [sse2_tables]"r"(sse2_tableoffset)
: "eax", "ebx", "esi", "edi", "xmm0", "xmm1", "xmm2", "xmm3", "xmm4", "xmm5", "xmm6", "xmm7", "memory" : "eax", "ebx", "esi", "edi", "xmm0", "xmm1", "xmm2", "xmm3", "xmm4", "xmm5", "xmm6", "xmm7", "memory"
); );
#else #else

6
pcsx2/x86/ix86-32/iR5900-32.cpp
View File

@ -614,11 +614,11 @@ static void recExecute()
//"push ebx\n" //"push ebx\n"
//"push esi\n" //"push esi\n"
//"push edi\n" //"push edi\n"
//"push ebp\n" "push ebp\n"
"call DispatcherReg\n" "call DispatcherReg\n"
//"pop ebp\n" "pop ebp\n"
//"pop edi\n" //"pop edi\n"
//"pop esi\n" //"pop esi\n"
//"pop ebx\n" //"pop ebx\n"
@ -688,7 +688,7 @@ void recClear(u32 addr, u32 size)
// necessary since recompiler doesn't call femms/emms // necessary since recompiler doesn't call femms/emms
#ifdef _MSC_VER #ifdef _MSC_VER
asm emms; __asm emms;
#else #else
__asm__ __volatile__("emms"); __asm__ __volatile__("emms");
#endif #endif