Merge pull request #3 from theheroGAC/master

update for 4.84C and 4.84D
Zarh · Apr 18, 2019 · 827bec0 · 827bec0
2 parents 2fa4f13 + a284218
commit 827bec0
Show file tree

Hide file tree

Showing 7 changed files with 86 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -15,7 +15,7 @@ include $(PSL1GHT)/ppu_rules
 # SOURCES is a list of directories containing source code
 # INCLUDES is a list of directories containing extra header files
 #---------------------------------------------------------------------------------
-VERSION     := 0.89
+VERSION     := 0.90
 NAME        := IDPSet
 
 TARGET		:= $(NAME)_v$(VERSION)

diff --git a/data/payload_484C.bin b/data/payload_484C.bin
diff --git a/data/payload_484D.bin b/data/payload_484D.bin
diff --git a/payload/source/Makefile b/payload/source/Makefile
@@ -16,7 +16,7 @@ endif
 LDFLAGS = -Tldscript.ld -nostartfiles -nostdlib -nodefaultlibs -Wl,--gc-sections -Wl,-Map=$(TARGET)_$@.map
 
 PAYLOADS := 421C 421D 430C 430D 431C 440C 441C 441D 446C 446D 450C 450D 453C 453D 455C 455D 460C \
-			465C 465D 470C 470D 475C 475D 476C 476D 478C 478D 480C 480D 481C 481D 482C 482D 483C
+			465C 465D 470C 470D 475C 475D 476C 476D 478C 478D 480C 480D 481C 481D 482C 482D 483C 484C 484D
 
 define do_payload
 	$(CC) $(ASFLAGS) -DFIRMWARE_$@ -c start.S -o start.S.o

diff --git a/payload/source/symbols.h b/payload/source/symbols.h
@@ -343,5 +343,24 @@
 	#define GAMEOS_LPAR_SIZE_PTR                 0x800000000037A640ULL
 #endif
 
+#ifdef FIRMWARE_484C
+	#define KERNEL_TOC			                 0x34FBB0
+	#define KERNEL_SYMBOL_EXTEND_KSTACK          0x0700A4
+	#define KERNEL_SYMBOL_COPY_TO_USER           0x00F86C
+	#define KERNEL_SYMBOL_MEMSET                 0x04D66C
+	#define KERNEL_SYMBOL_MEMCPY                 0x07E92C
+	#define GAMEOS_LPAR_BASE_PTR                 0x800000000037A638ULL
+	#define GAMEOS_LPAR_SIZE_PTR                 0x800000000037A640ULL
+#endif
+
+#ifdef FIRMWARE_484D
+	#define KERNEL_TOC			                 0x3759C0
+	#define KERNEL_SYMBOL_EXTEND_KSTACK          0x073BF4
+	#define KERNEL_SYMBOL_COPY_TO_USER           0x00FEB4
+	#define KERNEL_SYMBOL_MEMSET                 0x051014
+	#define KERNEL_SYMBOL_MEMCPY                 0x082A08
+	#define GAMEOS_LPAR_BASE_PTR                 0x80000000003A1238ULL
+	#define GAMEOS_LPAR_SIZE_PTR                 0x80000000003A1240ULL
+#endif
 
 #endif /* __SYMBOLS_H__ */
diff --git a/source/firmware.h b/source/firmware.h
@@ -444,4 +444,30 @@
 #define OFFSET_1_IDPS_483C       0x80000000003E2E30ULL
 #define OFFSET_2_IDPS_483C       0x8000000000474AF4ULL
 
+#define HTAB_OFFSET_484C         0x2DD70C
+#define MMAP_OFFSET1_484C        0x2DCF54
+#define MMAP_OFFSET2_484C        0x2DD284
+#define SPE_OFFSET_484C          0x2F9EB8
+#define HV_START_OFFSET_484C     0x370F28
+#define TOC_OFFSET_484C          0x800000000034FBB0ULL
+#define SYSCALL_TABLE_484C       0x8000000000363BE0ULL
+#define FW_DATE_OFFSET_484C      0x80000000002FCB68ULL
+#define FW_DATE_1_484C           0x323031392F30312FULL
+#define FW_DATE_2_484C           0x30382031343A3238ULL
+#define OFFSET_1_IDPS_484C       0x80000000003E2E30ULL
+#define OFFSET_2_IDPS_484C       0x8000000000474AF4ULL
+
+#define HTAB_OFFSET_484D         0x2DD70C
+#define MMAP_OFFSET1_484D        0x2DCF54
+#define MMAP_OFFSET2_484D        0x2DD284
+#define SPE_OFFSET_484D          0x2F9EB8
+#define HV_START_OFFSET_484D     0x370F28
+#define TOC_OFFSET_484D          0x80000000003759C0ULL
+#define SYSCALL_TABLE_484D       0x800000000038A4E8ULL
+#define FW_DATE_OFFSET_484D      0x800000000031F028ULL
+#define FW_DATE_1_484D           0x323031392F30312FULL
+#define FW_DATE_2_484D           0x30382031343A3237ULL
+#define OFFSET_1_IDPS_484D       0x8000000000409A30ULL
+#define OFFSET_2_IDPS_484D       0x800000000049CAF4ULL
+
 #endif /* __FIRMWARE_H__ */
diff --git a/source/main.c b/source/main.c
@@ -79,6 +79,8 @@
 #include "payload_482C_bin.h"
 #include "payload_482D_bin.h"
 #include "payload_483C_bin.h"
+#include "payload_484C_bin.h"
+#include "payload_484D_bin.h"
 
 #include "NOT_PNG_bin.h"
 
@@ -1020,7 +1022,7 @@ int init_IDPSet()
 	if(( lv2peek(FW_DATE_OFFSET_483C    )==FW_DATE_1_483C) &&
 	   ( lv2peek(FW_DATE_OFFSET_483C + 8)==FW_DATE_2_483C) )
 	{
-		firmware = 0x482D;
+		firmware = 0x483C;
 
 		TOC_OFFSET = TOC_OFFSET_483C;
 		HV_START_OFFSET = HV_START_OFFSET_483C;
@@ -1034,6 +1036,42 @@ int init_IDPSet()
 
 		payload = (u64 *) payload_483C_bin;
 		payload_size = payload_483C_bin_size;
+	}  else
+	if(( lv2peek(FW_DATE_OFFSET_484C    )==FW_DATE_1_484C) &&
+	   ( lv2peek(FW_DATE_OFFSET_484C + 8)==FW_DATE_2_484C) )
+	{
+		firmware = 0x484C;
+
+		TOC_OFFSET = TOC_OFFSET_484C;
+		HV_START_OFFSET = HV_START_OFFSET_484C;
+		HTAB_OFFSET = HTAB_OFFSET_484C;
+		SYSCALL_TABLE_OFFSET = SYSCALL_TABLE_484C;
+		MMAP_OFFSET1 = MMAP_OFFSET1_484C;
+		MMAP_OFFSET2 = MMAP_OFFSET2_484C;
+		SPE_OFFSET = SPE_OFFSET_484C;
+		OFFSET_1_IDPS = OFFSET_1_IDPS_484C;
+		OFFSET_2_IDPS = OFFSET_2_IDPS_484C;
+
+		payload = (u64 *) payload_484C_bin;
+		payload_size = payload_484C_bin_size;
+	}  else
+	if(( lv2peek(FW_DATE_OFFSET_484D    )==FW_DATE_1_484D) &&
+	   ( lv2peek(FW_DATE_OFFSET_484D + 8)==FW_DATE_2_484D) )
+	{
+		firmware = 0x484D;
+
+		TOC_OFFSET = TOC_OFFSET_484D;
+		HV_START_OFFSET = HV_START_OFFSET_484D;
+		HTAB_OFFSET = HTAB_OFFSET_484D;
+		SYSCALL_TABLE_OFFSET = SYSCALL_TABLE_484D;
+		MMAP_OFFSET1 = MMAP_OFFSET1_484D;
+		MMAP_OFFSET2 = MMAP_OFFSET2_484D;
+		SPE_OFFSET = SPE_OFFSET_484D;
+		OFFSET_1_IDPS = OFFSET_1_IDPS_484D;
+		OFFSET_2_IDPS = OFFSET_2_IDPS_484D;
+
+		payload = (u64 *) payload_484D_bin;
+		payload_size = payload_484D_bin_size;
 	}
 	else { // firmware inconnu
 		u64 n;