Bump version to 0.2.3

Update Dockerfile
Update .gitignore to ignore all files with .zip extension
2024-04-24 19:08:04 +02:00 · 2024-04-24 19:08:04 +02:00 · 2024-04-24 19:08:04 +02:00 · 2024-04-24 19:08:04 +02:00
4 changed files with 10 additions and 9 deletions
--- a/.gitignore
+++ b/.gitignore
@ -8,3 +8,4 @@ build/
 cmake-build-debug/
 CMakeLists.txt
 *.wms
+*.zip
--- a/4
+++ b/4
@ -1,7 +1,7 @@
-FROM ghcr.io/wiiu-env/devkitppc:20230621
+FROM ghcr.io/wiiu-env/devkitppc:20240423

 COPY --from=ghcr.io/wiiu-env/libkernel:20230621 /artifacts $DEVKITPRO
 COPY --from=ghcr.io/wiiu-env/libfunctionpatcher:20230621 /artifacts $DEVKITPRO
-COPY --from=ghcr.io/wiiu-env/wiiumodulesystem:20230719 /artifacts $DEVKITPRO
+COPY --from=ghcr.io/wiiu-env/wiiumodulesystem:20240424 /artifacts $DEVKITPRO

 WORKDIR project
--- a/source/PatchedFunctionData.cpp
+++ b/source/PatchedFunctionData.cpp
@ -232,15 +232,15 @@ void PatchedFunctionData::generateJumpToOriginal() {

    uint32_t jumpToAddress = this->realEffectiveFunctionAddress + 4;

-    this->jumpToOriginal[0] = this->replacedInstruction;
-
    if (((uint32_t) jumpToAddress & 0x01FFFFFC) != (uint32_t) jumpToAddress) {
        // We need to do a long jump
-        this->jumpToOriginal[1] = 0x3d600000 | ((jumpToAddress >> 16) & 0x0000FFFF); // lis        r11 ,0x1234
-        this->jumpToOriginal[2] = 0x616b0000 | (jumpToAddress & 0x0000ffff);         // ori        r11 ,r11 ,0x5678
-        this->jumpToOriginal[3] = 0x7d6903a6;                                        // mtspr      CTR ,r11
-        this->jumpToOriginal[4] = 0x4e800420;                                        // bctr
+        this->jumpToOriginal[0] = 0x3d600000 | ((jumpToAddress >> 16) & 0x0000FFFF); // lis        r11 ,0x1234
+        this->jumpToOriginal[1] = 0x616b0000 | (jumpToAddress & 0x0000ffff);         // ori        r11 ,r11 ,0x5678
+        this->jumpToOriginal[2] = 0x7d6903a6;                                        // mtspr      CTR ,r11
+        this->jumpToOriginal[3] = this->replacedInstruction;
+        this->jumpToOriginal[4] = 0x4e800420; // bctr
    } else {
+        this->jumpToOriginal[0] = this->replacedInstruction;
        this->jumpToOriginal[1] = 0x48000002 | (jumpToAddress & 0x01FFFFFC);
    }

--- a/source/utils/globals.h
+++ b/source/utils/globals.h
@ -5,7 +5,7 @@
 #include <memory>
 #include <vector>

-#define MODULE_VERSION      "v0.2.2"
+#define MODULE_VERSION      "v0.2.3"
 #define MODULE_VERSION_FULL MODULE_VERSION MODULE_VERSION_EXTRA

 #define JUMP_HEAP_DATA_SIZE (32 * 1024)
Author	SHA1	Message	Date
Maschell	6c05c4dbdc	Bump version to 0.2.3	2024-04-24 19:08:04 +02:00
Maschell	df287468a1	Update Dockerfile	2024-04-24 19:08:04 +02:00
Maschell	52192d0cb4	Update .gitignore to ignore all files with .zip extension	2024-04-24 19:08:04 +02:00
Maschell	8de9c37137	Fix some jumps to original functions by placing the replaced intruction after setting CTR	2024-04-24 19:08:04 +02:00