piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-07-22 13:50:11 -06:00
Code Issues Packages Projects Releases Wiki Activity

3D: fix0r matrix stack handling when stack pointers overflow (it fucking wraps around).

Browse Source 
fixes #231 and probably others of the same vein.
This commit is contained in:
StapleButter
2018-11-05 16:05:16 +01:00
parent b4165cc0a9
commit 9b32418367
2 changed files with 23 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/CP15.h
View File

@ -22,9 +22,6 @@
namespace CP15 namespace CP15
{ {
extern u8 ITCM[0x8000];
extern u32 ITCMSize;
void Reset(); void Reset();
void DoSavestate(Savestate* file); void DoSavestate(Savestate* file);

81
src/GPU3D.cpp
View File

@ -211,8 +211,8 @@ bool ClipMatrixDirty;
u32 Viewport[6]; u32 Viewport[6];
s32 ProjMatrixStack[16]; s32 ProjMatrixStack[16];
s32 PosMatrixStack[31][16]; s32 PosMatrixStack[32][16];
s32 VecMatrixStack[31][16]; s32 VecMatrixStack[32][16];
s32 TexMatrixStack[16]; s32 TexMatrixStack[16];
s32 ProjMatrixStackPointer; s32 ProjMatrixStackPointer;
s32 PosMatrixStackPointer; s32 PosMatrixStackPointer;
@ -1465,40 +1465,28 @@ void ExecuteCommand()
NumPushPopCommands--; NumPushPopCommands--;
if (MatrixMode == 0) if (MatrixMode == 0)
{ {
if (ProjMatrixStackPointer > 0) if (ProjMatrixStackPointer > 0) GXStat |= (1<<15);
{
printf("!! PROJ MATRIX STACK OVERFLOW\n");
GXStat |= (1<<15);
break;
}
memcpy(ProjMatrixStack, ProjMatrix, 16*4); memcpy(ProjMatrixStack, ProjMatrix, 16*4);
ProjMatrixStackPointer++; ProjMatrixStackPointer++;
ProjMatrixStackPointer &= 0x1;
} }
else if (MatrixMode == 3) else if (MatrixMode == 3)
{ {
if (TexMatrixStackPointer > 0) if (TexMatrixStackPointer > 0) GXStat |= (1<<15);
{
printf("!! TEX MATRIX STACK OVERFLOW\n");
GXStat |= (1<<15);
break;
}
memcpy(TexMatrixStack, TexMatrix, 16*4); memcpy(TexMatrixStack, TexMatrix, 16*4);
TexMatrixStackPointer++; TexMatrixStackPointer++;
TexMatrixStackPointer &= 0x1;
} }
else else
{ {
if (PosMatrixStackPointer > 30) if (PosMatrixStackPointer > 30) GXStat |= (1<<15);
{
printf("!! POS MATRIX STACK OVERFLOW\n");
GXStat |= (1<<15);
break;
}
memcpy(PosMatrixStack[PosMatrixStackPointer], PosMatrix, 16*4); memcpy(PosMatrixStack[PosMatrixStackPointer & 0x1F], PosMatrix, 16*4);
memcpy(VecMatrixStack[PosMatrixStackPointer], VecMatrix, 16*4); memcpy(VecMatrixStack[PosMatrixStackPointer & 0x1F], VecMatrix, 16*4);
PosMatrixStackPointer++; PosMatrixStackPointer++;
PosMatrixStackPointer &= 0x3F;
} }
break; break;
@ -1506,44 +1494,31 @@ void ExecuteCommand()
NumPushPopCommands--; NumPushPopCommands--;
if (MatrixMode == 0) if (MatrixMode == 0)
{ {
if (ProjMatrixStackPointer <= 0) if (ProjMatrixStackPointer == 0) GXStat |= (1<<15);
{
printf("!! PROJ MATRIX STACK UNDERFLOW\n");
GXStat |= (1<<15);
break;
}
ProjMatrixStackPointer--; ProjMatrixStackPointer--;
ProjMatrixStackPointer &= 0x1;
memcpy(ProjMatrix, ProjMatrixStack, 16*4); memcpy(ProjMatrix, ProjMatrixStack, 16*4);
ClipMatrixDirty = true; ClipMatrixDirty = true;
} }
else if (MatrixMode == 3) else if (MatrixMode == 3)
{ {
if (TexMatrixStackPointer <= 0) if (TexMatrixStackPointer == 0) GXStat |= (1<<15);
{
printf("!! TEX MATRIX STACK UNDERFLOW\n");
GXStat |= (1<<15);
break;
}
TexMatrixStackPointer--; TexMatrixStackPointer--;
TexMatrixStackPointer &= 0x1;
memcpy(TexMatrix, TexMatrixStack, 16*4); memcpy(TexMatrix, TexMatrixStack, 16*4);
} }
else else
{ {
s32 offset = (s32)(ExecParams[0] << 26) >> 26; s32 offset = (s32)(ExecParams[0] << 26) >> 26;
PosMatrixStackPointer -= offset; PosMatrixStackPointer -= offset;
PosMatrixStackPointer &= 0x3F;
if (PosMatrixStackPointer < 0 || PosMatrixStackPointer > 30) if (PosMatrixStackPointer > 30) GXStat |= (1<<15);
{
//printf("!! POS MATRIX STACK UNDER/OVERFLOW %d\n", PosMatrixStackPointer);
PosMatrixStackPointer += offset;
GXStat |= (1<<15);
break;
}
memcpy(PosMatrix, PosMatrixStack[PosMatrixStackPointer], 16*4); memcpy(PosMatrix, PosMatrixStack[PosMatrixStackPointer & 0x1F], 16*4);
memcpy(VecMatrix, VecMatrixStack[PosMatrixStackPointer], 16*4); memcpy(VecMatrix, VecMatrixStack[PosMatrixStackPointer & 0x1F], 16*4);
ClipMatrixDirty = true; ClipMatrixDirty = true;
} }
break; break;
@ -1560,12 +1535,7 @@ void ExecuteCommand()
else else
{ {
u32 addr = ExecParams[0] & 0x1F; u32 addr = ExecParams[0] & 0x1F;
if (addr > 30) if (addr > 30) GXStat |= (1<<15);
{
printf("!! POS MATRIX STORE ADDR 31\n");
GXStat |= (1<<15);
break;
}
memcpy(PosMatrixStack[addr], PosMatrix, 16*4); memcpy(PosMatrixStack[addr], PosMatrix, 16*4);
memcpy(VecMatrixStack[addr], VecMatrix, 16*4); memcpy(VecMatrixStack[addr], VecMatrix, 16*4);
@ -1585,12 +1555,7 @@ void ExecuteCommand()
else else
{ {
u32 addr = ExecParams[0] & 0x1F; u32 addr = ExecParams[0] & 0x1F;
if (addr > 30) if (addr > 30) GXStat |= (1<<15);
{
printf("!! POS MATRIX STORE ADDR 31\n");
GXStat |= (1<<15);
break;
}
memcpy(PosMatrix, PosMatrixStack[addr], 16*4); memcpy(PosMatrix, PosMatrixStack[addr], 16*4);
memcpy(VecMatrix, VecMatrixStack[addr], 16*4); memcpy(VecMatrix, VecMatrixStack[addr], 16*4);
@ -2254,7 +2219,7 @@ void Write8(u32 addr, u8 val)
GXStat &= ~0x8000; GXStat &= ~0x8000;
ProjMatrixStackPointer = 0; ProjMatrixStackPointer = 0;
//PosMatrixStackPointer = 0; //PosMatrixStackPointer = 0;
TexMatrixStackPointer = 0; TexMatrixStackPointer = 0; // CHECKME
} }
return; return;
case 0x04000603: case 0x04000603:
@ -2319,7 +2284,7 @@ void Write16(u32 addr, u16 val)
GXStat &= ~0x8000; GXStat &= ~0x8000;
ProjMatrixStackPointer = 0; ProjMatrixStackPointer = 0;
//PosMatrixStackPointer = 0; //PosMatrixStackPointer = 0;
TexMatrixStackPointer = 0; TexMatrixStackPointer = 0; // CHECKME
} }
return; return;
case 0x04000602: case 0x04000602:
@ -2389,7 +2354,7 @@ void Write32(u32 addr, u32 val)
GXStat &= ~0x8000; GXStat &= ~0x8000;
ProjMatrixStackPointer = 0; ProjMatrixStackPointer = 0;
//PosMatrixStackPointer = 0; //PosMatrixStackPointer = 0;
TexMatrixStackPointer = 0; TexMatrixStackPointer = 0; // CHECKME
} }
val &= 0xC0000000; val &= 0xC0000000;
GXStat &= 0x3FFFFFFF; GXStat &= 0x3FFFFFFF;