altered API from ps4KernelRun to ps4KernelRunMain as part of further cleanup (and reuse of ps4KernelRun), minor cleanup

Author: hitodama

kernel/kernel-run/source/kmain.c

@@ -41,3 +41,20 @@ int kmain(int argc, char **argv)
 
 	return sceSblACMgrIsVideoplayerProcess(); //see kmain2's content & return
 }
+
+int kmain2(int argc, char **argv)
+{
+	RunnableInt sceSblACMgrIsVideoplayerProcess = (RunnableInt)ps4KernelDlSym("sceSblACMgrIsVideoplayerProcess");
+	ps4KernelPatchToTruthFunction((void *)sceSblACMgrIsVideoplayerProcess);
+
+	return sceSblACMgrIsVideoplayerProcess(); // important notice from kernel!
+}
+
+int kmain3(int argc, char **argv)
+{
+	RunnableInt sceSblACMgrIsVideoplayerProcess = (RunnableInt)ps4KernelDlSym("sceSblACMgrIsVideoplayerProcess");
+	void *sceSblACMgrIsShellcoreProcess = ps4KernelDlSym("sceSblACMgrIsShellcoreProcess");
+	ps4KernelHookFunction((void *)sceSblACMgrIsVideoplayerProcess, sceSblACMgrIsShellcoreProcess);
+
+	return sceSblACMgrIsVideoplayerProcess();
+}

kernel/kernel-run/source/kmain2.c

@@ -24,13 +24,14 @@ int main(int argc, char **argv)
 	kargv[1] = NULL;
 
 	printf("uid: %zu\n", getuid());
-	// this syscall returns 0 after the first ps4KernelRun (see in a rerun process)
+	// this syscall returns 0 after the first ps4KernelRunMain (see in a rerun process)
 	// do not use this directly (just for show and tell here)
-	// use the self-patching ps4KernelRun wrapper instead
+	// use the self-patching ps4KernelRunMain wrapper instead
 	printf("sys: %i\n", syscall(SYS_ps4_kernel_run, NULL));
 
 	strcpy(moo, "Hmm ... ? *yum, grass*");
-	int r = ps4KernelRun(kmain, kargc, kargv);
+	// I will also add a ps4KernelRun(Syscall?) that uses the syscall interface instead
+	int r = ps4KernelRunMain(kmain, kargc, kargv);
 	printf("return (sceSblACMgrIsVideoplayerProcess): %i\n", r);
 	printf("moo: %s\n", moo);
 
@@ -54,15 +55,15 @@ int main(int argc, char **argv)
 		printf("%02X", ((unsigned char *)moo)[i]);
 	printf("\n");
 
-	r = ps4KernelRun(kmain2, kargc, kargv);
+	r = ps4KernelRunMain(kmain2, kargc, kargv);
 	printf("return2 (sceSblACMgrIsVideoplayerProcess): %i\n", r);
 
 	ps4KernelMemcpy(moo, sceSblACMgrIsVideoplayerProcess, 32);
 	for(i = 0; i < 32; ++i)
 		printf("%02X", ((unsigned char *)moo)[i]);
 	printf("\n");
 
-	r = ps4KernelRun(kmain3, kargc, kargv);
+	r = ps4KernelRunMain(kmain3, kargc, kargv);
 	printf("return3 (sceSblACMgrIsVideoplayerProcess): %i\n", r);
 
 	ps4KernelMemcpy(moo, sceSblACMgrIsVideoplayerProcess, 32);
@@ -72,5 +73,8 @@ int main(int argc, char **argv)
 
 	free(moo); //Bye moo, you did real good :(~
 
+	 // kernel function called from userland without run
+	//printf("getnanouptime: %i\n", getnanouptime(0));
+
 	return EXIT_SUCCESS;
 }

kernel/kernel-run/source/kmain3.c

@@ -8,7 +8,6 @@
 #include <math.h>
 
 #include <kernel.h>
-#include <ps4/internal/resolve.h> // used for fail demonstation
 #include <ps4/resolve.h>
 
 typedef unsigned int (*SceKernelSleep)(unsigned int seconds);
@@ -59,8 +58,6 @@ int main(int argc, char **argv)
 	uint64_t r = 0;
 	PS4ResolveStatus stat;
 
-	//int module = 0; void *symbol = NULL;
-
 	// either ps4Resolve or a call before using them in a handler or
 	// we run into an infinite loop on a resolve interception
 	//ps4Resolve((void *)strcmp);
@@ -85,9 +82,6 @@ int main(int argc, char **argv)
 	printf("%i // should be 0 - re-resolve of sceKernelSleep succeeds - also hooked\n", stat);
 	printf("%i // result of call to hooked sleep\n", sceKernelSleep(2));
 
-	// failing symbol lookup
-	//printf("%i // return of failed foo lookup \n", ps4ResolveModuleAndSymbol("libkernel.sprx", "foo", &module, &symbol));
-
 	div_t d = div(128, (int)pow(3.1415, 3));
 	r = abs(d.quot + d.rem);
 	sleep(1);