The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-10 08:09:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

linux build fix

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@195 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
hrydgard 2008-08-14 18:29:18 +00:00
parent 1b70b3dc7a
commit 697ed23474
6 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/Core/Src/PowerPC/Jit64/JitAsm.cpp
View File

@ -54,7 +54,6 @@ const u8 *fifoDirectWrite16;
const u8 *fifoDirectWrite32; const u8 *fifoDirectWrite32;
const u8 *fifoDirectWriteFloat; const u8 *fifoDirectWriteFloat;
static bool blockMode = false; //doesn't work as true!
bool compareEnabled = false; bool compareEnabled = false;
//TODO - make an option //TODO - make an option
@ -278,7 +277,7 @@ void GenFifoWrite(int size)
if (size != 32) if (size != 32)
PUSH(EDX); PUSH(EDX);
BSWAP(size, ABI_PARAM1); BSWAP(size, ABI_PARAM1);
MOV(32, R(EAX), Imm32((u32)GPFifo::m_gatherPipe)); MOV(32, R(EAX), Imm32((u32)(u64)GPFifo::m_gatherPipe));
MOV(32, R(ESI), M(&GPFifo::m_gatherPipeCount)); MOV(32, R(ESI), M(&GPFifo::m_gatherPipeCount));
if (size != 32) { if (size != 32) {
MOV(32, R(EDX), R(ABI_PARAM1)); MOV(32, R(EDX), R(ABI_PARAM1));
@ -303,7 +302,7 @@ void GenFifoFloatWrite()
MOVSS(M(&temp32), XMM0); MOVSS(M(&temp32), XMM0);
MOV(32, R(EDX), M(&temp32)); MOV(32, R(EDX), M(&temp32));
BSWAP(32, EDX); BSWAP(32, EDX);
MOV(32, R(EAX), Imm32((u32)GPFifo::m_gatherPipe)); MOV(32, R(EAX), Imm32((u32)(u64)GPFifo::m_gatherPipe));
MOV(32, R(ESI), M(&GPFifo::m_gatherPipeCount)); MOV(32, R(ESI), M(&GPFifo::m_gatherPipeCount));
MOV(32, MComplex(RAX, RSI, 1, 0), R(EDX)); MOV(32, MComplex(RAX, RSI, 1, 0), R(EDX));
ADD(32, R(ESI), Imm8(4)); ADD(32, R(ESI), Imm8(4));

5
Source/Core/Core/Src/PowerPC/Jit64/JitRegCache.cpp
View File

@ -103,8 +103,7 @@ namespace Jit64
{ {
int aCount; int aCount;
const int *aOrder = GetAllocationOrder(aCount); const int *aOrder = GetAllocationOrder(aCount);
int i; for (int i = 0; i < aCount; i++)
for (i = 0; i < aCount; i++)
{ {
X64Reg xr = (X64Reg)aOrder[i]; X64Reg xr = (X64Reg)aOrder[i];
if (!xlocks[xr] && xregs[xr].free) if (!xlocks[xr] && xregs[xr].free)
@ -238,7 +237,7 @@ namespace Jit64
#ifdef _WIN32 #ifdef _WIN32
RSI, RDI, R12, R13, R14, R8, R9, R10, R11 //, RCX RSI, RDI, R12, R13, R14, R8, R9, R10, R11 //, RCX
#else #else
R12, R13, R14, R8, R9, R10, R11, RSI, RDI //, RCX RBP, R12, R13, R14, R8, R9, R10, R11, //, RCX
#endif #endif
#elif _M_IX86 #elif _M_IX86
ESI, EDI, EBX, EBP, EDX, ECX, ESI, EDI, EBX, EBP, EDX, ECX,

8
Source/Core/Core/Src/PowerPC/Jit64/Jit_Branch.cpp
View File

@ -111,10 +111,10 @@ namespace Jit64
gpr.Flush(FLUSH_ALL); gpr.Flush(FLUSH_ALL);
fpr.Flush(FLUSH_ALL); fpr.Flush(FLUSH_ALL);
CCFlags branch; CCFlags branch = CC_Z;
const bool only_counter_check = (inst.BO & 16) ? true : false; //const bool only_counter_check = (inst.BO & 16) ? true : false;
const bool only_condition_check = (inst.BO & 4) ? true : false; //const bool only_condition_check = (inst.BO & 4) ? true : false;
//if (only_condition_check && only_counter_check) //if (only_condition_check && only_counter_check)
// PanicAlert("Bizarre bcx encountered. Likely bad or corrupt code."); // PanicAlert("Bizarre bcx encountered. Likely bad or corrupt code.");
bool doFullTest = (inst.BO & 16) == 0 && (inst.BO & 4) == 0; bool doFullTest = (inst.BO & 16) == 0 && (inst.BO & 4) == 0;
@ -192,7 +192,7 @@ namespace Jit64
gpr.Flush(FLUSH_ALL); gpr.Flush(FLUSH_ALL);
fpr.Flush(FLUSH_ALL); fpr.Flush(FLUSH_ALL);
bool fastway = true; // bool fastway = true;
if ((inst.BO & 16) == 0) if ((inst.BO & 16) == 0)
{ {

4
Source/Core/Core/Src/PowerPC/Jit64/Jit_FloatingPoint.cpp
View File

@ -25,12 +25,8 @@
#include "JitCache.h" #include "JitCache.h"
#include "JitRegCache.h" #include "JitRegCache.h"
#ifdef _WIN32
#define INSTRUCTION_START #define INSTRUCTION_START
// #define INSTRUCTION_START Default(inst); return; // #define INSTRUCTION_START Default(inst); return;
#else
#define INSTRUCTION_START Default(inst); return;
#endif
namespace Jit64 namespace Jit64
{ {

2
Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStore.cpp
View File

@ -249,7 +249,7 @@ namespace Jit64
#ifdef _M_X64 #ifdef _M_X64
MOV(accessSize, MComplex(RBX, ABI_PARAM1, SCALE_1, (u32)offset), R(EAX)); MOV(accessSize, MComplex(RBX, ABI_PARAM1, SCALE_1, (u32)offset), R(EAX));
#elif _M_IX86 #elif _M_IX86
AND(32, R(ECX), Imm32(Memory::MEMVIEW32_MASK)); AND(32, R(ABI_PARAM1), Imm32(Memory::MEMVIEW32_MASK));
MOV(accessSize, MDisp(ABI_PARAM1, (u32)Memory::base + (u32)offset), R(EAX)); MOV(accessSize, MDisp(ABI_PARAM1, (u32)Memory::base + (u32)offset), R(EAX));
#endif #endif
if (update) if (update)

6
Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStorePaired.cpp
View File

@ -37,8 +37,12 @@
#include "JitAsm.h" #include "JitAsm.h"
#include "JitRegCache.h" #include "JitRegCache.h"
// #define INSTRUCTION_START Default(inst); return; #ifndef _WIN32
// GCC won't obey alignment requirement :(
#define INSTRUCTION_START Default(inst); return;
#else
#define INSTRUCTION_START #define INSTRUCTION_START
#endif
#ifdef _M_IX86 #ifdef _M_IX86
#define DISABLE_32BIT Default(inst); return; #define DISABLE_32BIT Default(inst); return;