Merge pull request #2 from wally4000/main

Fix for GCC14 - PSPToolchain

Author: JoseAaronLopezGarcia

kernel_read.c

@@ -1,5 +1,5 @@
 #include <pspsdk.h>
-
+#include <psprtc.h>
 /*
   sceRtcCompareTick kernel exploit by davee, implementation by CelesteBlue
 */

kernel_write.c

@@ -1,5 +1,6 @@
 
 #include "libpspexploit.h"
+#include <stdint.h> 
 
 // allocate enough to scan sysmem
 #define KRAM_BACKUP_SIZE (128*1024)
@@ -15,7 +16,7 @@ static int (* _sceKernelLibcTime)(u32 a0, u32 a1) = (void*)NULL;
 volatile static u32 packet[256];
 volatile static int is_exploited;
 
-volatile static u32 patch_addr = NULL;
+volatile static u32 patch_addr = 0U;
 volatile static u32 patch_inst = 0;
 
 void pspXploitExecuteKernel(u32 kernelContentFunction)
@@ -43,7 +44,7 @@ int pspXploitInitKernelExploit(){
     void* kram_copy = sceKernelGetBlockHeadAddr(memid);
 
     // user read-only kxploit to dump sysmem
-    pspXploitDumpKernel(kram_copy, 0x88000000, KRAM_BACKUP_SIZE);
+    pspXploitDumpKernel(kram_copy, (u32*)0x88000000, KRAM_BACKUP_SIZE);
 
     #ifdef DEBUG
     pspDebugScreenPrintf("Scanning sceKernelLibcTime address\n");

libpspexploit.c

@@ -1,4 +1,5 @@
 #include "libpspexploit.h"
+#include <pspsuspend.h>
 
 static int AddressInRange(u32 addr, u32 lower, u32 higher){
     return (addr >= lower && addr < higher);
@@ -59,7 +60,7 @@ u32 pspXploitFindImportRange(char *libname, u32 nid, u32 lower, u32 higher){
         if((stub->libname != libname) && AddressInRange((u32)stub->libname, lower, higher) \
             && AddressInRange((u32)stub->nidtable, lower, higher) && AddressInRange((u32)stub->stubtable, lower, higher)) {
             if(strcmp(libname, stub->libname) == 0) {
-                u32 *table = stub->nidtable;
+                u32 *table =(u32*)stub->nidtable;
 
                 int j;
                 for(j = 0; j < stub->stubcount; j++) {
@@ -220,7 +221,7 @@ static u32 FindSysMemStruct(){
 u32 pspXploitFindModuleByName(const char *modulename){
     u32 mod = FindSysMemStruct();
     while (mod){
-        if (strcmp(mod+8, modulename) == 0){
+        if (strcmp((const char *)(mod+8), modulename) == 0){
             return mod;
         }
         mod = _lw(mod);
@@ -286,7 +287,7 @@ int pspXploitSetUserLevel(int level)
 {
 
     static int (*KernelGetUserLevel)() = NULL;
-    if (!KernelGetUserLevel) KernelGetUserLevel = pspXploitFindFunction("sceThreadManager", "ThreadManForKernel", 0xF6427665);
+    if (!KernelGetUserLevel) KernelGetUserLevel =(int(*)()) pspXploitFindFunction("sceThreadManager", "ThreadManForKernel", 0xF6427665);
 
     // Backup User Level
     int previouslevel = KernelGetUserLevel();