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

VU Int: Clang formatting

This commit is contained in:
refractionpcsx2 2021-09-12 15:57:43 +01:00
parent 52943d8399
commit b0d1d4ff44
2 changed files with 1253 additions and 886 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
pcsx2/VU0microInterp.cpp
View File

@ -23,13 +23,15 @@
extern void _vuFlushAll(VURegs* VU); extern void _vuFlushAll(VURegs* VU);
static void _vu0ExecUpper(VURegs* VU, u32 *ptr) { static void _vu0ExecUpper(VURegs* VU, u32* ptr)
{
VU->code = ptr[1]; VU->code = ptr[1];
IdebugUPPER(VU0); IdebugUPPER(VU0);
VU0_UPPER_OPCODE[VU->code & 0x3f](); VU0_UPPER_OPCODE[VU->code & 0x3f]();
} }
static void _vu0ExecLower(VURegs* VU, u32 *ptr) { static void _vu0ExecLower(VURegs* VU, u32* ptr)
{
VU->code = ptr[0]; VU->code = ptr[0];
IdebugLOWER(VU0); IdebugLOWER(VU0);
VU0_LOWER_OPCODE[VU->code >> 25](); VU0_LOWER_OPCODE[VU->code >> 25]();
@ -57,21 +59,21 @@ static void _vu0Exec(VURegs* VU)
} }
if (ptr[1] & 0x10000000) // D flag if (ptr[1] & 0x10000000) // D flag
{ {
if (VU0.VI[REG_FBRST].UL & 0x4) { if (VU0.VI[REG_FBRST].UL & 0x4)
{
VU0.VI[REG_VPU_STAT].UL |= 0x2; VU0.VI[REG_VPU_STAT].UL |= 0x2;
hwIntcIrq(INTC_VU0); hwIntcIrq(INTC_VU0);
VU->ebit = 1; VU->ebit = 1;
} }
} }
if (ptr[1] & 0x08000000) // T flag if (ptr[1] & 0x08000000) // T flag
{ {
if (VU0.VI[REG_FBRST].UL & 0x8) { if (VU0.VI[REG_FBRST].UL & 0x8)
{
VU0.VI[REG_VPU_STAT].UL |= 0x4; VU0.VI[REG_VPU_STAT].UL |= 0x4;
hwIntcIrq(INTC_VU0); hwIntcIrq(INTC_VU0);
VU->ebit = 1; VU->ebit = 1;
} }
} }
VU->code = ptr[1]; VU->code = ptr[1];
@ -219,11 +221,16 @@ void vu0Exec(VURegs* VU)
VU->cycle++; VU->cycle++;
_vu0Exec(VU); _vu0Exec(VU);
if (VU->VI[0].UL != 0) DbgCon.Error("VI[0] != 0!!!!\n"); if (VU->VI[0].UL != 0)
if (VU->VF[0].f.x != 0.0f) DbgCon.Error("VF[0].x != 0.0!!!!\n"); DbgCon.Error("VI[0] != 0!!!!\n");
if (VU->VF[0].f.y != 0.0f) DbgCon.Error("VF[0].y != 0.0!!!!\n"); if (VU->VF[0].f.x != 0.0f)
if (VU->VF[0].f.z != 0.0f) DbgCon.Error("VF[0].z != 0.0!!!!\n"); DbgCon.Error("VF[0].x != 0.0!!!!\n");
if (VU->VF[0].f.w != 1.0f) DbgCon.Error("VF[0].w != 1.0!!!!\n"); if (VU->VF[0].f.y != 0.0f)
DbgCon.Error("VF[0].y != 0.0!!!!\n");
if (VU->VF[0].f.z != 0.0f)
DbgCon.Error("VF[0].z != 0.0!!!!\n");
if (VU->VF[0].f.w != 1.0f)
DbgCon.Error("VF[0].w != 1.0!!!!\n");
} }
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
@ -244,7 +251,6 @@ void InterpVU0::Reset()
VU0.ialuwritepos = 0; VU0.ialuwritepos = 0;
VU0.ialureadpos = 0; VU0.ialureadpos = 0;
VU0.ialucount = 0; VU0.ialucount = 0;
} }
void InterpVU0::SetStartPC(u32 startPC) void InterpVU0::SetStartPC(u32 startPC)
{ {
@ -264,10 +270,13 @@ void InterpVU0::Execute(u32 cycles)
VU0.VI[REG_TPC].UL <<= 3; VU0.VI[REG_TPC].UL <<= 3;
VU0.flags &= ~VUFLAG_MFLAGSET; VU0.flags &= ~VUFLAG_MFLAGSET;
u32 startcycles = VU0.cycle; u32 startcycles = VU0.cycle;
while((VU0.cycle - startcycles) < cycles) { while ((VU0.cycle - startcycles) < cycles)
if (!(VU0.VI[REG_VPU_STAT].UL & 0x1)) { {
if (!(VU0.VI[REG_VPU_STAT].UL & 0x1))
{
// Branches advance the PC to the new location if there was a branch in the E-Bit delay slot // Branches advance the PC to the new location if there was a branch in the E-Bit delay slot
if (VU0.branch) { if (VU0.branch)
{
VU0.VI[REG_TPC].UL = VU0.branchpc; VU0.VI[REG_TPC].UL = VU0.branchpc;
VU0.branch = 0; VU0.branch = 0;
} }
@ -275,6 +284,7 @@ void InterpVU0::Execute(u32 cycles)
} }
if (VU0.flags & VUFLAG_MFLAGSET) if (VU0.flags & VUFLAG_MFLAGSET)
break; break;
vu0Exec(&VU0); vu0Exec(&VU0);
} }
VU0.VI[REG_TPC].UL >>= 3; VU0.VI[REG_TPC].UL >>= 3;

1165
pcsx2/VUops.cpp
View File

File diff suppressed because it is too large Load Diff