From 84b3522c242f77999972b365ac3254d4af88e7fe Mon Sep 17 00:00:00 2001 From: hrydgard Date: Wed, 6 Aug 2008 20:23:53 +0000 Subject: [PATCH] Fix build on linux (grr), minor ABI fix. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@142 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Common/Src/ABI.cpp | 4 ++-- Source/Core/VideoCommon/Src/TextureDecoder.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/Core/Common/Src/ABI.cpp b/Source/Core/Common/Src/ABI.cpp index 06cc435aee..04aafa0bf2 100644 --- a/Source/Core/Common/Src/ABI.cpp +++ b/Source/Core/Common/Src/ABI.cpp @@ -138,11 +138,11 @@ void ABI_PushAllCalleeSavedRegsAndAdjustStack() { PUSH(R13); PUSH(R14); PUSH(R15); - PUSH(RAX); //just to align stack. we don't care about it's value. + PUSH(R15); //just to align stack. duped push/pop doesn't hurt. } void ABI_PopAllCalleeSavedRegsAndAdjustStack() { - POP(RAX); + POP(R15); POP(R15); POP(R14); POP(R13); diff --git a/Source/Core/VideoCommon/Src/TextureDecoder.cpp b/Source/Core/VideoCommon/Src/TextureDecoder.cpp index 1d5f0b7754..21b20c8a14 100644 --- a/Source/Core/VideoCommon/Src/TextureDecoder.cpp +++ b/Source/Core/VideoCommon/Src/TextureDecoder.cpp @@ -462,7 +462,6 @@ extern unsigned char data_raw[]; PC_TexFormat TexDecoder_Decode(u8 *dst, u8 *src, int width, int height, int texformat, int tlutaddr, int tlutfmt) { - PC_TexFormat retval = TexDecoder_Decode_real(dst,src,width,height,texformat,tlutaddr,tlutfmt); if((!TexFmt_Overlay_Enable)/*||(retval==PC_TEX_FMT_NONE)*/) @@ -504,7 +503,7 @@ PC_TexFormat TexDecoder_Decode(u8 *dst, u8 *src, int width, int height, int texf return retval; } -static unsigned char data_raw[] = { +unsigned char data_raw[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, @@ -2606,4 +2605,5 @@ static unsigned char data_raw[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, }; -#endif \ No newline at end of file +#endif +