diff --git a/pcsx2/Patch.cpp b/pcsx2/Patch.cpp index d8715e5e75..4ce517ff7a 100644 --- a/pcsx2/Patch.cpp +++ b/pcsx2/Patch.cpp @@ -61,6 +61,9 @@ static const PatchTextTable dataType[] = { 3, L"word", NULL }, { 4, L"double", NULL }, { 5, L"extended", NULL }, + { 6, L"leshort", NULL}, + { 7, L"leword", NULL}, + { 8, L"ledouble", NULL}, { 0, wxEmptyString, NULL } }; diff --git a/pcsx2/Patch.h b/pcsx2/Patch.h index 01deb51dc8..57b5bae84e 100644 --- a/pcsx2/Patch.h +++ b/pcsx2/Patch.h @@ -51,7 +51,10 @@ enum patch_data_type { SHORT_T, WORD_T, DOUBLE_T, - EXTENDED_T + EXTENDED_T, + SHORT_LE_T, + WORD_LE_T, + DOUBLE_LE_T }; // "place" is the first number at a pnach line (patch=,...), e.g.: @@ -128,3 +131,8 @@ extern void PatchesVerboseReset(); // regardless, they don't seem to have an implementation anywhere. // extern int AddPatch(int Mode, int Place, int Address, int Size, u64 data); // extern void ResetPatch(void); + +// Swaps endianess of InputNum +// ex. 01020304 -> 04030201 +// BitLength is length of InputNum in bits, ex. double,64 word,32 short,16 +extern u64 SwapEndian(u64 InputNum, u8 BitLength); diff --git a/pcsx2/Patch_Memory.cpp b/pcsx2/Patch_Memory.cpp index da01076b5f..2b7e6a1bbb 100644 --- a/pcsx2/Patch_Memory.cpp +++ b/pcsx2/Patch_Memory.cpp @@ -387,6 +387,9 @@ void handle_extended_t(IniPatch *p) // Patch.cpp itself declares this prototype, so make sure to keep in sync. void _ApplyPatch(IniPatch *p) { + u64 mem = 0; + u64 ledata = 0; + if (p->enabled == 0) return; switch (p->cpu) @@ -410,7 +413,6 @@ void _ApplyPatch(IniPatch *p) break; case DOUBLE_T: - u64 mem; memRead64(p->addr, &mem); if (mem != p->data) memWrite64(p->addr, &p->data); @@ -420,6 +422,25 @@ void _ApplyPatch(IniPatch *p) handle_extended_t(p); break; + case SHORT_LE_T: + ledata = SwapEndian(p->data, 16); + if (memRead16(p->addr) != (u16)ledata) + memWrite16(p->addr, (u16)ledata); + break; + + case WORD_LE_T: + ledata = SwapEndian(p->data, 32); + if (memRead32(p->addr) != (u32)ledata) + memWrite32(p->addr, (u32)ledata); + break; + + case DOUBLE_LE_T: + ledata = SwapEndian(p->data, 64); + memRead64(p->addr, &mem); + if (mem != ledata) + memWrite64(p->addr, ledata); + break; + default: break; } @@ -449,3 +470,18 @@ void _ApplyPatch(IniPatch *p) break; } } + +u64 SwapEndian(u64 InputNum, u8 BitLength) +{ + if (BitLength == 64) // DOUBLE_LE_T + { + InputNum = (InputNum & 0x00000000FFFFFFFF) << 32 | (InputNum & 0xFFFFFFFF00000000) >> 32; //Swaps 4 bytes + } + if ((BitLength == 32)||(BitLength==64)) // WORD_LE_T + { + InputNum = (InputNum & 0x0000FFFF0000FFFF) << 16 | (InputNum & 0xFFFF0000FFFF0000) >> 16; // Swaps 2 bytes + } + InputNum = (InputNum & 0x00FF00FF00FF00FF) << 8 | (InputNum & 0xFF00FF00FF00FF00) >> 8; // Swaps 1 byte + return InputNum; +} +