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

Fix Dev/Release mode compilation errors from prev rev. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2078 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2009-10-25 20:05:36 +00:00
parent a6d716b351
commit eae4643a40
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pcsx2/VifDma.cpp
View File

@ -266,9 +266,7 @@ template<const u32 VIFdmanum> u32 VIFalign(u32 *data, vifCode *v, u32 size)
VURegs * VU;
u8 *cdata = (u8*)data;
#ifdef PCSX2_DEBUG
u32 memsize = vif_size(VIFdmanum);
#endif
if (VIFdmanum == 0)
{
@ -286,7 +284,9 @@ template<const u32 VIFdmanum> u32 VIFalign(u32 *data, vifCode *v, u32 size)
vif = &vif1;
vifRow = g_vifmask.Row1;
}
#ifdef PCSX2_DEBUG
pxAssert(v->addr < memsize);
#endif
dest = (u32*)(VU->Mem + v->addr);
@ -300,10 +300,7 @@ template<const u32 VIFdmanum> u32 VIFalign(u32 *data, vifCode *v, u32 size)
func = vif->usn ? ft->funcU : ft->funcS;
size <<= 2;
#ifdef PCSX2_DEBUG
memsize = size;
#endif
if(vifRegs->offset != 0)
{
@ -319,7 +316,7 @@ template<const u32 VIFdmanum> u32 VIFalign(u32 *data, vifCode *v, u32 size)
if (((u32)size / (u32)ft->dsize) < ((u32)ft->qsize - vifRegs->offset))
{
DevCon.Error("Wasn't enough left size/dsize = %x left to write %x", (size / ft->dsize), (ft->qsize - vifRegs->offset));
DevCon.Error("Wasn't enough left size/dsize = %x left to write %x", (size / ft->dsize), (ft->qsize - vifRegs->offset));
}
unpacksize = min((size / ft->dsize), (ft->qsize - vifRegs->offset));
@ -493,7 +490,9 @@ template<const u32 VIFdmanum> void VIFunpack(u32 *data, vifCode *v, u32 size)
vifMaskRegs = g_vif0Masks;
vif = &vif0;
vifRow = g_vifmask.Row0;
#ifdef PCSX2_DEBUG
pxAssert(v->addr < memsize);
#endif
}
else
{
@ -503,7 +502,9 @@ template<const u32 VIFdmanum> void VIFunpack(u32 *data, vifCode *v, u32 size)
vifMaskRegs = g_vif1Masks;
vif = &vif1;
vifRow = g_vifmask.Row1;
#ifdef PCSX2_DEBUG
pxAssert(v->addr < memsize);
#endif
}
dest = (u32*)(VU->Mem + v->addr);

8
pcsx2/VifDma_internal.h
View File

@ -51,18 +51,16 @@ extern u8 s_maskwrite[256];
template<const u32 VIFdmanum> void ProcessMemSkip(u32 size, u32 unpackType);
template<const u32 VIFdmanum> u32 VIFalign(u32 *data, vifCode *v, u32 size);
template<const u32 VIFdmanum> void VIFunpack(u32 *data, vifCode *v, u32 size);
template <const u32 VIFdmanum> void vuExecMicro(u32 addr);
template<const u32 VIFdmanum> void vuExecMicro(u32 addr);
extern __forceinline void vif0FLUSH();
extern __forceinline void vif1FLUSH();
__forceinline static u32 vif_size(u8 num)
static __forceinline u32 vif_size(u8 num)
{
if (num == 0)
return 0x1000;
else if (num == 1)
else
return 0x4000;
return 0;
}
#endif