Some improvements

Author: MFDGaming

compile.sh

@@ -76,6 +76,7 @@ mipsel-none-elf-gcc \
     -Os \
     -Wl,-z,max-page-size=0x1 \
     -o build/code.elf \
+    src/code/*.S \
     src/code/*.c
 
 mipsel-none-elf-objcopy \
@@ -87,6 +88,8 @@ mipsel-none-elf-objcopy \
     build/code.elf \
     build/code.bin
 
+echo "actual code.bin size: $(wc -c < build/code.bin)"
+
 mipsel-none-elf-gcc \
     -DV$dvd_ver \
     -Wl,--defsym=V$dvd_ver=1 \
@@ -102,8 +105,8 @@ mipsel-none-elf-gcc \
     -Os \
     -Wl,-z,max-page-size=0x1 \
     -o build/jump.elf \
-    src/jump/jump.c \
-    src/jump/ps2syscalls.c
+    src/jump/*.S \
+    src/jump/*.c
 
 mipsel-none-elf-objcopy \
     -O binary \
@@ -114,6 +117,8 @@ mipsel-none-elf-objcopy \
     build/jump.elf \
     build/jump.bin
 
+echo "actual jump.bin size: $(wc -c < build/jump.bin)"
+
 gcc -DV$dvd_ver src/injector/*.c -o build/injector.elf
 
 cp --recursive fs build/

fs/BOOT.ELF

@@ -121,10 +121,15 @@ void main() {
     unsigned char *elf_data = (unsigned char *)0x100000;
     Elf32_Ehdr *ehdr = (Elf32_Ehdr *)elf_data;
 
+    setup_pointers();
+
     sceSifInitRpc(0);
     readBufferInternal("", 0, elf_rsect, elf_data, BOOT_FILE_SC, 0);
     sceSifExitRpc();
 
+    while (!sceSifResetIop("", 0));
+    while(!sceSifSyncIop());
+
     // Validate ELF header
     if (ehdr->e_phnum > 256 || ehdr->e_phnum == 0) {
         Exit(0);  // Invalid program header count
@@ -139,7 +144,7 @@ void main() {
             if (phdr->p_memsz > 0x2000000 || phdr->p_filesz > phdr->p_memsz) {
                 continue;  // Skip invalid segments
             }
-            memcpy((unsigned char *)(unsigned long)phdr->p_vaddr, elf_data + phdr->p_offset, phdr->p_filesz);
+            memmove((unsigned char *)(unsigned long)phdr->p_vaddr, elf_data + phdr->p_offset, phdr->p_filesz);
             if(phdr->p_memsz > phdr->p_filesz) {
                 memset((unsigned char *)(unsigned long)phdr->p_vaddr + phdr->p_filesz, 0, phdr->p_memsz - phdr->p_filesz);
             }
@@ -149,14 +154,7 @@ void main() {
     FlushCache(0);
     FlushCache(2);
 
-    while (!sceSifResetIop("", 0));
-    while(!sceSifSyncIop());
-
     ExecPS2((void *)(unsigned long)ehdr->e_entry, 0, 0, NULL);
-}
 
-__attribute__((section(".text.boot")))
-void _start(void) {
-    setup_pointers();
-    main();
+    Exit(0); // This should never occur
 }

src/code/code.c

@@ -0,0 +1,8 @@
+.set noreorder
+.section .text.boot
+
+.global _start
+_start:
+    lui $sp, 0x7000
+    j main
+    ori $sp, $sp, 0x4000

src/code/crt0.S

@@ -0,0 +1,25 @@
+.set noreorder
+.section .text
+
+.macro syscall_map name, idn
+    .global \name
+    .type \name, @function
+    \name:
+        li  $v1, \idn
+        syscall
+        jr $ra
+        nop
+.endm
+
+syscall_map ExecPS2, 0x07
+syscall_map FlushCache, 0x64
+syscall_map DeleteThread, 0x21
+syscall_map TerminateThread, 0x25
+syscall_map ChangeThreadPriority, 0x29
+syscall_map GetThreadId, 0x2f
+syscall_map CancelWakeupThread, 0x35
+syscall_map Exit, 0x04
+syscall_map sceSifStopDma, 0x6b
+syscall_map sceSifGetReg, 0x7a
+syscall_map sceSifSetReg, 0x79
+syscall_map sceSifSetDma, 0x77

src/code/ps2syscalls.S

@@ -8,17 +8,17 @@ typedef struct {
 	unsigned int mode;
 } sceSifDmaData;
 
-void ExecPS2(void *entry, void *gp, int argc, char **argv);
-void FlushCache(int mode);
-void DeleteThread(int thread_id);
-void TerminateThread(int thread_id);
-void ChangeThreadPriority(int thread_id, int priority);
-int GetThreadId(void);
-int CancelWakeupThread(int thread_id);
-int Exit(int status);
-void sceSifStopDma(void);
-int sceSifGetReg(unsigned int register_num);
-int sceSifSetReg(unsigned int register_num, int register_value);
-unsigned int sceSifSetDma(sceSifDmaData *sdd, int len);
+extern void ExecPS2(void *entry, void *gp, int argc, char **argv);
+extern void FlushCache(int mode);
+extern void DeleteThread(int thread_id);
+extern void TerminateThread(int thread_id);
+extern void ChangeThreadPriority(int thread_id, int priority);
+extern int GetThreadId(void);
+extern int CancelWakeupThread(int thread_id);
+extern int Exit(int status);
+extern void sceSifStopDma(void);
+extern int sceSifGetReg(unsigned int register_num);
+extern int sceSifSetReg(unsigned int register_num, int register_value);
+extern unsigned int sceSifSetDma(sceSifDmaData *sdd, int len);
 
 #endif

src/code/ps2syscalls.c

@@ -0,0 +1,8 @@
+.set noreorder
+.section .text.boot
+
+.global _start
+_start:
+    lui $sp, 0x7000
+    j main
+    ori $sp, $sp, 0x4000

src/code/ps2syscalls.h

@@ -48,13 +48,11 @@ static void killAllThreads(void) {
     }
 }
 
-__attribute__((section(".text.boot")))
-void _start(void) {
-    asm ("la $sp, 0x70004000");
+void main(void) {
     killAllThreads();
     readBufferInternal("", 0, 4, code, 2, 0);
     FlushCache(0);
     FlushCache(2);
     code();
-    for (;;);
+    Exit(0);
 }

src/jump/crt0.S

@@ -0,0 +1,20 @@
+.set noreorder
+.section .text
+
+.macro syscall_map name, idn
+    .global \name
+    .type \name, @function
+    \name:
+        li  $v1, \idn
+        syscall
+        jr $ra
+        nop
+.endm
+
+syscall_map FlushCache, 0x64
+syscall_map DeleteThread, 0x21
+syscall_map TerminateThread, 0x25
+syscall_map ChangeThreadPriority, 0x29
+syscall_map GetThreadId, 0x2f
+syscall_map CancelWakeupThread, 0x35
+syscall_map Exit, 0x04