Skip to content

Commit

Permalink
- Add synchronizing instructions to EFB accesses.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Extrems
Extrems committed Dec 11, 2022
1 parent 8a69e1b commit 2b653b3
Show file tree
Hide file tree
Showing 7 changed files with 261 additions and 6 deletions.
2 changes: 1 addition & 1 deletion cube/patches/base/emulator.c
View file
Expand Up @@ -951,7 +951,7 @@ static void efb_read(uint32_t address, uint32_t *value)
{
uint16_t zmode = PE[0];
PE[0] = 0;
*(volatile uint32_t *)OSPhysicalToUncached(address) = 0xFFFFFF;
*(volatile uint32_t *)OSPhysicalToUncached(address) = address;
*value = *(volatile uint32_t *)OSPhysicalToUncached(address);
PE[0] = zmode;
}
Expand Down
8 changes: 8 additions & 0 deletions cube/swiss/include/patcher.h
View file
Expand Up @@ -80,6 +80,14 @@ extern u8 GXCopyDispHook[];
extern u32 GXCopyDispHook_length;
extern u8 GXInitTexObjLODHook[];
extern u32 GXInitTexObjLODHook_length;
extern u8 GXPeekARGBPatch[];
extern u32 GXPeekARGBPatch_length;
extern u8 GXPeekZPatch[];
extern u32 GXPeekZPatch_length;
extern u8 GXPokeARGBPatch[];
extern u32 GXPokeARGBPatch_length;
extern u8 GXPokeZPatch[];
extern u32 GXPokeZPatch_length;
extern u8 GXSetBlendModePatch1[];
extern u32 GXSetBlendModePatch1_length;
extern u8 GXSetBlendModePatch2[];
Expand Down
187 changes: 182 additions & 5 deletions cube/swiss/source/patcher.c
View file
Expand Up @@ -726,6 +726,75 @@ u32 _aigetdmastartaddr[] = {
0x4E800020 // blr
};

u32 _gxpeekargb_a[] = {
0x546013BA, // clrlslwi r0, r3, 16, 2
0x6400C800, // oris r0, r0, 0xC800
0x54030512, // rlwinm r3, r0, 0, 20, 9
0x54806126, // clrlslwi r0, r4, 16, 12
0x7C600378, // or r0, r3, r0
0x5403028E, // rlwinm r0, r0, 0, 10, 7
0x80030000, // lwz r0, 0 (r3)
0x90050000, // stw r0, 0 (r5)
0x4E800020 // blr
};

u32 _gxpeekargb_b[] = {
0x5463103A, // slwi r3, r3, 2
0x54846026, // slwi r4, r4, 12
0x6463C800, // oris r3, r3, 0xC800
0x54600512, // rlwinm r0, r3, 0, 20, 9
0x7C032378, // or r3, r0, r4
0x5463028E, // rlwinm r3, r3, 0, 10, 7
0x80030000, // lwz r0, 0 (r3)
0x90050000, // stw r0, 0 (r5)
0x4E800020 // blr
};

u32 _gxpeekargb_c[] = {
0x5460043E, // clrlwi r0, r3, 16
0x3C60C800, // lis r3, 0xC800
0x5003153A, // insrwi r3, r0, 10, 20
0x38000000, // li r0, 0
0x508362A6, // insrwi r3, r4, 10, 10
0x5003B212, // insrwi r3, r0, 2, 8
0x80030000, // lwz r0, 0 (r3)
0x90050000, // stw r0, 0 (r5)
0x4E800020 // blr
};

u32 _gxpokeargb_a[] = {
0x546013BA, // clrlslwi r0, r3, 16, 2
0x6400C800, // oris r0, r0, 0xC800
0x54030512, // rlwinm r3, r0, 0, 20, 9
0x54806126, // clrlslwi r0, r4, 16, 12
0x7C600378, // or r0, r3, r0
0x5403028E, // rlwinm r0, r0, 0, 10, 7
0x90A30000, // stw r5, 0 (r3)
0x4E800020 // blr
};

u32 _gxpokeargb_b[] = {
0x5463103A, // slwi r3, r3, 2
0x54846026, // slwi r4, r4, 12
0x6463C800, // oris r3, r3, 0xC800
0x54600512, // rlwinm r0, r3, 0, 20, 9
0x7C032378, // or r3, r0, r4
0x5463028E, // rlwinm r3, r3, 0, 10, 7
0x90A30000, // stw r5, 0 (r3)
0x4E800020 // blr
};

u32 _gxpokeargb_c[] = {
0x5460043E, // clrlwi r0, r3, 16
0x3C60C800, // lis r3, 0xC800
0x5003153A, // insrwi r3, r0, 10, 20
0x38000000, // li r0, 0
0x508362A6, // insrwi r3, r4, 10, 10
0x5003B212, // insrwi r3, r0, 2, 8
0x90A30000, // stw r5, 0 (r3)
0x4E800020 // blr
};

u32 _gxpeekz_a[] = {
0x546013BA, // clrlslwi r0, r3, 16, 2
0x6400C800, // oris r0, r0, 0xC800
Expand Down Expand Up @@ -764,6 +833,41 @@ u32 _gxpeekz_c[] = {
0x4E800020 // blr
};

u32 _gxpokez_a[] = {
0x546013BA, // clrlslwi r0, r3, 16, 2
0x6400C800, // oris r0, r0, 0xC800
0x54030512, // rlwinm r3, r0, 0, 20, 9
0x54806126, // clrlslwi r0, r4, 16, 12
0x7C600378, // or r0, r3, r0
0x5400028E, // rlwinm r0, r0, 0, 10, 7
0x64030040, // oris r3, r0, 0x0040
0x90A30000, // stw r5, 0 (r3)
0x4E800020 // blr
};

u32 _gxpokez_b[] = {
0x5463103A, // slwi r3, r3, 2
0x54846026, // slwi r4, r4, 12
0x6463C800, // oris r3, r3, 0xC800
0x54600512, // rlwinm r0, r3, 0, 20, 9
0x7C032378, // or r3, r0, r4
0x5460028E, // rlwinm r0, r3, 0, 10, 7
0x64030040, // oris r3, r0, 0x0040
0x90A30000, // stw r5, 0 (r3)
0x4E800020 // blr
};

u32 _gxpokez_c[] = {
0x5460043E, // clrlwi r0, r3, 16
0x3C60C800, // lis r3, 0xC800
0x5003153A, // insrwi r3, r0, 10, 20
0x38000001, // li r0, 1
0x508362A6, // insrwi r3, r4, 10, 10
0x5003B212, // insrwi r3, r0, 2, 8
0x90A30000, // stw r5, 0 (r3)
0x4E800020 // blr
};

int Patch_Hypervisor(u32 *data, u32 length, int dataType)
{
int i, j, k;
Expand Down Expand Up @@ -1390,10 +1494,25 @@ int Patch_Hypervisor(u32 *data, u32 length, int dataType)
{ 7, 2, 0, 0, 0, 0, NULL, 0, "AIGetDMAStartAddrD" },
{ 7, 2, 0, 0, 0, 0, NULL, 0, "AIGetDMAStartAddr" }
};
FuncPattern GXPeekARGBSigs[3] = {
{ 9, 1, 1, 0, 0, 1, GXPeekARGBPatch, GXPeekARGBPatch_length, "GXPeekARGB" },
{ 9, 1, 1, 0, 0, 1, GXPeekARGBPatch, GXPeekARGBPatch_length, "GXPeekARGB" }, // SN Systems ProDG
{ 9, 3, 1, 0, 0, 0, GXPeekARGBPatch, GXPeekARGBPatch_length, "GXPeekARGB" }
};
FuncPattern GXPokeARGBSigs[3] = {
{ 8, 0, 1, 0, 0, 1, GXPokeARGBPatch, GXPokeARGBPatch_length, "GXPokeARGB" },
{ 8, 0, 1, 0, 0, 1, GXPokeARGBPatch, GXPokeARGBPatch_length, "GXPokeARGB" }, // SN Systems ProDG
{ 8, 2, 1, 0, 0, 0, GXPokeARGBPatch, GXPokeARGBPatch_length, "GXPokeARGB" }
};
FuncPattern GXPeekZSigs[3] = {
{ 10, 1, 1, 0, 0, 1, NULL, 0, "GXPeekZ" },
{ 10, 1, 1, 0, 0, 1, NULL, 0, "GXPeekZ" }, // SN Systems ProDG
{ 9, 3, 1, 0, 0, 0, NULL, 0, "GXPeekZ" }
{ 10, 1, 1, 0, 0, 1, GXPeekZPatch, GXPeekZPatch_length, "GXPeekZ" },
{ 10, 1, 1, 0, 0, 1, GXPeekZPatch, GXPeekZPatch_length, "GXPeekZ" }, // SN Systems ProDG
{ 9, 3, 1, 0, 0, 0, GXPeekZPatch, GXPeekZPatch_length, "GXPeekZ" }
};
FuncPattern GXPokeZSigs[3] = {
{ 9, 0, 1, 0, 0, 1, GXPokeZPatch, GXPokeZPatch_length, "GXPokeZ" },
{ 9, 0, 1, 0, 0, 1, GXPokeZPatch, GXPokeZPatch_length, "GXPokeZ" }, // SN Systems ProDG
{ 8, 2, 1, 0, 0, 0, GXPokeZPatch, GXPokeZPatch_length, "GXPokeZ" }
};
FuncPattern __VMBASESetupExceptionHandlersSigs[2] = {
{ 95, 38, 12, 6, 0, 20, NULL, 0, "__VMBASESetupExceptionHandlers" },
Expand Down Expand Up @@ -1434,12 +1553,30 @@ int Patch_Hypervisor(u32 *data, u32 length, int dataType)
AIGetDMAStartAddrSigs[0].offsetFoundAt = i;
else if (!memcmp(data + i, _aigetdmastartaddr, sizeof(_aigetdmastartaddr)))
AIGetDMAStartAddrSigs[1].offsetFoundAt = i;
else if (!memcmp(data + i, _gxpeekargb_a, sizeof(_gxpeekargb_a)))
GXPeekARGBSigs[0].offsetFoundAt = i;
else if (!memcmp(data + i, _gxpeekargb_b, sizeof(_gxpeekargb_b)))
GXPeekARGBSigs[1].offsetFoundAt = i;
else if (!memcmp(data + i, _gxpeekargb_c, sizeof(_gxpeekargb_c)))
GXPeekARGBSigs[2].offsetFoundAt = i;
else if (!memcmp(data + i, _gxpokeargb_a, sizeof(_gxpokeargb_a)))
GXPokeARGBSigs[0].offsetFoundAt = i;
else if (!memcmp(data + i, _gxpokeargb_b, sizeof(_gxpokeargb_b)))
GXPokeARGBSigs[1].offsetFoundAt = i;
else if (!memcmp(data + i, _gxpokeargb_c, sizeof(_gxpokeargb_c)))
GXPokeARGBSigs[2].offsetFoundAt = i;
else if (!memcmp(data + i, _gxpeekz_a, sizeof(_gxpeekz_a)))
GXPeekZSigs[0].offsetFoundAt = i;
else if (!memcmp(data + i, _gxpeekz_b, sizeof(_gxpeekz_b)))
GXPeekZSigs[1].offsetFoundAt = i;
else if (!memcmp(data + i, _gxpeekz_c, sizeof(_gxpeekz_c)))
GXPeekZSigs[2].offsetFoundAt = i;
else if (!memcmp(data + i, _gxpokez_a, sizeof(_gxpokez_a)))
GXPokeZSigs[0].offsetFoundAt = i;
else if (!memcmp(data + i, _gxpokez_b, sizeof(_gxpokez_b)))
GXPokeZSigs[1].offsetFoundAt = i;
else if (!memcmp(data + i, _gxpokez_c, sizeof(_gxpokez_c)))
GXPokeZSigs[2].offsetFoundAt = i;
continue;
}

Expand Down Expand Up @@ -6224,20 +6361,60 @@ int Patch_Hypervisor(u32 *data, u32 length, int dataType)
}
}

for (j = 0; j < sizeof(GXPeekARGBSigs) / sizeof(FuncPattern); j++)
if ((i = GXPeekARGBSigs[j].offsetFoundAt)) {
u32 *GXPeekARGB = Calc_ProperAddress(data, dataType, i * sizeof(u32));

if (GXPeekARGB) {
memset(data + i, 0, GXPeekARGBSigs[j].Length * sizeof(u32));
memcpy(data + i, GXPeekARGBSigs[j].Patch, GXPeekARGBSigs[j].PatchLength);

print_gecko("Found:[%s$%i] @ %08X\n", GXPeekARGBSigs[j].Name, j, GXPeekARGB);
patched++;
}
}

for (j = 0; j < sizeof(GXPokeARGBSigs) / sizeof(FuncPattern); j++)
if ((i = GXPokeARGBSigs[j].offsetFoundAt)) {
u32 *GXPokeARGB = Calc_ProperAddress(data, dataType, i * sizeof(u32));

if (GXPokeARGB) {
memset(data + i, 0, GXPokeARGBSigs[j].Length * sizeof(u32));
memcpy(data + i, GXPokeARGBSigs[j].Patch, GXPokeARGBSigs[j].PatchLength);

print_gecko("Found:[%s$%i] @ %08X\n", GXPokeARGBSigs[j].Name, j, GXPokeARGB);
patched++;
}
}

for (j = 0; j < sizeof(GXPeekZSigs) / sizeof(FuncPattern); j++)
if ((i = GXPeekZSigs[j].offsetFoundAt)) {
u32 *GXPeekZ = Calc_ProperAddress(data, dataType, i * sizeof(u32));

if (GXPeekZ) {
memcpy(data + i, _gxpeekz_c, sizeof(_gxpeekz_c));
memset(data + i, 0, GXPeekZSigs[j].Length * sizeof(u32));
memcpy(data + i, GXPeekZSigs[j].Patch, GXPeekZSigs[j].PatchLength);

data[i + 1] = 0x3C600800; // lis r3, 0x0800
data[i + 1] = 0x3CC00800; // lis r6, 0x0800

print_gecko("Found:[%s$%i] @ %08X\n", GXPeekZSigs[j].Name, j, GXPeekZ);
patched++;
}
}

for (j = 0; j < sizeof(GXPokeZSigs) / sizeof(FuncPattern); j++)
if ((i = GXPokeZSigs[j].offsetFoundAt)) {
u32 *GXPokeZ = Calc_ProperAddress(data, dataType, i * sizeof(u32));

if (GXPokeZ) {
memset(data + i, 0, GXPokeZSigs[j].Length * sizeof(u32));
memcpy(data + i, GXPokeZSigs[j].Patch, GXPokeZSigs[j].PatchLength);

print_gecko("Found:[%s$%i] @ %08X\n", GXPokeZSigs[j].Name, j, GXPokeZ);
patched++;
}
}

for (j = 0; j < sizeof(__VMBASESetupExceptionHandlersSigs) / sizeof(FuncPattern); j++)
if ((i = __VMBASESetupExceptionHandlersSigs[j].offsetFoundAt)) {
u32 *__VMBASESetupExceptionHandlers = Calc_ProperAddress(data, dataType, i * sizeof(u32));
Expand Down
17 changes: 17 additions & 0 deletions cube/swiss/source/patches/gx/GXPeekARGBPatch.s
View file
@@ -0,0 +1,17 @@
#include "../asm.h"
#define _LANGUAGE_ASSEMBLY
#include "../../../../reservedarea.h"

.globl GXPeekARGBPatch
GXPeekARGBPatch:
lis %r6, 0xC800
insrwi %r6, %r3, 10, 20
insrwi %r6, %r4, 10, 10
sync
lwz %r0, 0 (%r6)
stw %r0, 0 (%r5)
blr

.globl GXPeekARGBPatch_length
GXPeekARGBPatch_length:
.long (GXPeekARGBPatch_length - GXPeekARGBPatch)
19 changes: 19 additions & 0 deletions cube/swiss/source/patches/gx/GXPeekZPatch.s
View file
@@ -0,0 +1,19 @@
#include "../asm.h"
#define _LANGUAGE_ASSEMBLY
#include "../../../../reservedarea.h"

.globl GXPeekZPatch
GXPeekZPatch:
li %r0, 1
lis %r6, 0xC800
insrwi %r6, %r3, 10, 20
insrwi %r6, %r4, 10, 10
insrwi %r6, %r0, 2, 8
sync
lwz %r0, 0 (%r6)
stw %r0, 0 (%r5)
blr

.globl GXPeekZPatch_length
GXPeekZPatch_length:
.long (GXPeekZPatch_length - GXPeekZPatch)
16 changes: 16 additions & 0 deletions cube/swiss/source/patches/gx/GXPokeARGBPatch.s
View file
@@ -0,0 +1,16 @@
#include "../asm.h"
#define _LANGUAGE_ASSEMBLY
#include "../../../../reservedarea.h"

.globl GXPokeARGBPatch
GXPokeARGBPatch:
lis %r6, 0xC800
insrwi %r6, %r3, 10, 20
insrwi %r6, %r4, 10, 10
sync
stw %r5, 0 (%r6)
blr

.globl GXPokeARGBPatch_length
GXPokeARGBPatch_length:
.long (GXPokeARGBPatch_length - GXPokeARGBPatch)
18 changes: 18 additions & 0 deletions cube/swiss/source/patches/gx/GXPokeZPatch.s
View file
@@ -0,0 +1,18 @@
#include "../asm.h"
#define _LANGUAGE_ASSEMBLY
#include "../../../../reservedarea.h"

.globl GXPokeZPatch
GXPokeZPatch:
li %r0, 1
lis %r6, 0xC800
insrwi %r6, %r3, 10, 20
insrwi %r6, %r4, 10, 10
insrwi %r6, %r0, 2, 8
sync
stw %r5, 0 (%r6)
blr

.globl GXPokeZPatch_length
GXPokeZPatch_length:
.long (GXPokeZPatch_length - GXPokeZPatch)

0 comments on commit 2b653b3

Please sign in to comment.