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

pcsx2: Added back a few headers. A non POD-safe argument was fixed. Commented out some unused variables. And added a few helper functions for later. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3300 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2010-06-25 09:18:14 +00:00
parent 5b16838591
commit 26c497ceea
6 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/include/Utilities/FixedPointTypes.h
View File

@ -18,6 +18,9 @@
#include "Dependencies.h"
#include "Exceptions.h"
// Needed for pow().
#include <math.h>
template< int Precision >
struct FixedInt
{

6
pcsx2/Dmac.h
View File

@ -142,6 +142,7 @@ union tDMA_CHCR {
u16 upper() const { return (_u32 >> 16); }
u16 lower() const { return (u16)_u32; }
wxString desc() const { return wxsFormat(L"Chcr: 0x%x", _u32); }
tDMA_TAG tag() { return (tDMA_TAG)_u32; }
};
#define CHCR(value) ((tDMA_CHCR)(value))
@ -157,6 +158,7 @@ union tDMA_SADR {
void reset() { _u32 = 0; }
wxString desc() const { return wxsFormat(L"Sadr: 0x%x", _u32); }
tDMA_TAG tag() { return (tDMA_TAG)_u32; }
};
union tDMA_MADR {
@ -170,6 +172,7 @@ union tDMA_MADR {
void reset() { _u32 = 0; }
wxString desc() const { return wxsFormat(L"Madr: 0x%x", _u32); }
tDMA_TAG tag() { return (tDMA_TAG)_u32; }
};
union tDMA_TADR {
@ -183,6 +186,7 @@ union tDMA_TADR {
void reset() { _u32 = 0; }
wxString desc() const { return wxsFormat(L"Tadr: 0x%x", _u32); }
tDMA_TAG tag() { return (tDMA_TAG)_u32; }
};
union tDMA_ASR { // The Address Stack Register
@ -196,6 +200,7 @@ union tDMA_ASR { // The Address Stack Register
void reset() { _u32 = 0; }
wxString desc() const { return wxsFormat(L"Asr: 0x%x", _u32); }
tDMA_TAG tag() { return (tDMA_TAG)_u32; }
};
union tDMA_QWC {
@ -209,6 +214,7 @@ union tDMA_QWC {
void reset() { _u32 = 0; }
wxString desc() const { return wxsFormat(L"QWC: 0x%x", _u32); }
tDMA_TAG tag() { return (tDMA_TAG)_u32; }
};
static __forceinline void setDmacStat(u32 num);
static __forceinline tDMA_TAG *dmaGetAddr(u32 addr, bool write);

2
pcsx2/Gif.cpp
View File

@ -363,7 +363,7 @@ void GIFdma()
GIFchain(); //Transfers the data set by the switch
CPU_INT(DMAC_GIF, gscycles);
return;
} else DevCon.Warning("GIF Normalmode or QWC going to invalid case? CHCR %x", gif->chcr);
} else DevCon.Warning("GIF Normalmode or QWC going to invalid case? CHCR %x", gif->chcr._u32);
//else DevCon.WriteLn("GIFdma() case 2, but qwc = 0!"); //Don't do 0 GIFchain and then return, fixes Dual Hearts
}

2
pcsx2/R5900.cpp
View File

@ -354,7 +354,7 @@ static __forceinline void _cpuTestPERF()
static bool cpuIntsEnabled(int Interrupt)
{
int IntType = cpuRegs.CP0.n.Status.val & Interrupt; //Choose either INTC or DMAC, depending on what called it
//int IntType = cpuRegs.CP0.n.Status.val & Interrupt; //Choose either INTC or DMAC, depending on what called it
return cpuRegs.CP0.n.Status.b.EIE && cpuRegs.CP0.n.Status.b.IE &&
!cpuRegs.CP0.n.Status.b.EXL && (cpuRegs.CP0.n.Status.b.ERL == 0) && Interrupt;

2
pcsx2/gui/SysState.cpp
View File

@ -104,7 +104,7 @@ public:
}
};
static bool IsSavingOrLoading = false;
//static bool IsSavingOrLoading = false;
// --------------------------------------------------------------------------------------

3
pcsx2/x86/sVU_zerorec.cpp
View File

@ -41,6 +41,9 @@
#include "NakedAsm.h"
#include "AppConfig.h"
// Needed in gcc for find.
#include <algorithm>
using namespace std;
using namespace x86Emitter;