v0.92

Add CFW 4.86C
Zarh · May 31, 2020 · 1ada3c6 · 1ada3c6
1 parent 9a2746f
commit 1ada3c6
Show file tree

Hide file tree

Showing 45 changed files with 59 additions and 12 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.91
+VERSION     := 0.92
 NAME        := IDPSet
 
 TARGET		:= $(NAME)_v$(VERSION)
@@ -126,7 +126,12 @@ export OUTPUT	:=	$(CURDIR)/$(TARGET)
 $(BUILD):
 	@[ -d $@ ] || mkdir -p $@
 	@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
-
+#---------------------------------------------------------------------------------
+update:
+	cd ../ManaGunZ/OffsetFinder; ./OffsetFinder.exe	idpset
+	@$(MAKE) -C payload/spu --no-print-directory
+	@$(MAKE) -C payload/source --no-print-directory
+
 #---------------------------------------------------------------------------------
 clean:
 	@echo clean ...

diff --git a/data/payload_421C.bin b/data/payload_421C.bin
diff --git a/data/payload_421D.bin b/data/payload_421D.bin
diff --git a/data/payload_430C.bin b/data/payload_430C.bin
diff --git a/data/payload_430D.bin b/data/payload_430D.bin
diff --git a/data/payload_431C.bin b/data/payload_431C.bin
diff --git a/data/payload_440C.bin b/data/payload_440C.bin
diff --git a/data/payload_441C.bin b/data/payload_441C.bin
diff --git a/data/payload_441D.bin b/data/payload_441D.bin
diff --git a/data/payload_446C.bin b/data/payload_446C.bin
diff --git a/data/payload_446D.bin b/data/payload_446D.bin
diff --git a/data/payload_450C.bin b/data/payload_450C.bin
diff --git a/data/payload_450D.bin b/data/payload_450D.bin
diff --git a/data/payload_453C.bin b/data/payload_453C.bin
diff --git a/data/payload_453D.bin b/data/payload_453D.bin
diff --git a/data/payload_455C.bin b/data/payload_455C.bin
diff --git a/data/payload_455D.bin b/data/payload_455D.bin
diff --git a/data/payload_460C.bin b/data/payload_460C.bin
diff --git a/data/payload_465C.bin b/data/payload_465C.bin
diff --git a/data/payload_465D.bin b/data/payload_465D.bin
diff --git a/data/payload_470C.bin b/data/payload_470C.bin
diff --git a/data/payload_470D.bin b/data/payload_470D.bin
diff --git a/data/payload_475C.bin b/data/payload_475C.bin
diff --git a/data/payload_475D.bin b/data/payload_475D.bin
diff --git a/data/payload_476C.bin b/data/payload_476C.bin
diff --git a/data/payload_476D.bin b/data/payload_476D.bin
diff --git a/data/payload_478C.bin b/data/payload_478C.bin
diff --git a/data/payload_478D.bin b/data/payload_478D.bin
diff --git a/data/payload_480C.bin b/data/payload_480C.bin
diff --git a/data/payload_480D.bin b/data/payload_480D.bin
diff --git a/data/payload_481C.bin b/data/payload_481C.bin
diff --git a/data/payload_481D.bin b/data/payload_481D.bin
diff --git a/data/payload_482C.bin b/data/payload_482C.bin
diff --git a/data/payload_482D.bin b/data/payload_482D.bin
diff --git a/data/payload_483C.bin b/data/payload_483C.bin
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/data/payload_485C.bin b/data/payload_485C.bin
diff --git a/data/payload_486C.bin b/data/payload_486C.bin
diff --git a/payload/source/FIRMWARES b/payload/source/FIRMWARES
@@ -1 +1 @@
-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 484C 484D 485C 
+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 484C 484D 485C 486C 
diff --git a/payload/source/dumper.c b/payload/source/dumper.c
@@ -11,7 +11,7 @@ const unsigned char dumper_payload[1544] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x20,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x1F, 0xF0, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x01, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06,
-    0x00, 0x04, 0x00, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x04, 0x00, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x7F, 0x45, 0x4C, 0x46, 0x01, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x02, 0x00, 0x17, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x2C, 0x00, 0x00, 0x00, 0x00, 0x34,
     0x00, 0x00, 0x01, 0xC4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x00, 0x20, 0x00, 0x01, 0x00, 0x28,
@@ -40,12 +40,12 @@ const unsigned char dumper_payload[1544] = {
     0xD0, 0x50, 0x09, 0xED, 0x56, 0x60, 0xE6, 0xED, 0x8B, 0x76, 0x9E, 0x43, 0x13, 0xE7, 0x7F, 0x0B,
     0xA9, 0x84, 0x1F, 0xE1, 0xA3, 0x14, 0xC7, 0x74, 0x1E, 0x48, 0xF9, 0x77, 0x9B, 0x69, 0xCD, 0xE0,
     0x03, 0xBB, 0xDF, 0xB1, 0x80, 0xF4, 0xCA, 0xC1, 0xD4, 0x50, 0x7F, 0x16, 0x6F, 0xF9, 0x3D, 0x15,
-    0x42, 0x52, 0x37, 0x7C, 0xA4, 0x5F, 0x6E, 0xC9, 0x38, 0xB6, 0xFE, 0x1A, 0x03, 0xD2, 0x23, 0x9F,
-    0xA1, 0xC7, 0x44, 0x80, 0xBE, 0x12, 0x58, 0x8A, 0x9B, 0x7D, 0xDA, 0x4D, 0x55, 0xB4, 0xFE, 0x8C,
-    0x78, 0xDC, 0xA0, 0xA5, 0x78, 0xEF, 0xDE, 0x22, 0x06, 0xB7, 0x0C, 0x4C, 0x38, 0x27, 0x69, 0x2C,
-    0xF2, 0x41, 0xCF, 0x1D, 0x89, 0xEF, 0x93, 0xFD, 0xD1, 0x07, 0x5C, 0x58, 0x3A, 0x1A, 0x9D, 0x00,
-    0xA8, 0xE9, 0x3F, 0x31, 0xE0, 0xDB, 0xF0, 0x65, 0x26, 0x54, 0xD6, 0xA5, 0x1B, 0x08, 0x0F, 0x88,
-    0x31, 0x79, 0xB2, 0x53, 0x5F, 0xB7, 0x7D, 0x3C, 0x34, 0xF6, 0xC1, 0xF5, 0xD5, 0x2F, 0x6A, 0xA0,
+    0xF2, 0xD0, 0x84, 0x2A, 0xDD, 0x17, 0x6A, 0x26, 0xA2, 0x37, 0x01, 0x67, 0x53, 0x76, 0xAA, 0xA7,
+    0xD9, 0x85, 0x3A, 0x01, 0xBE, 0x12, 0x58, 0x8A, 0x9B, 0x7D, 0xDA, 0x4D, 0x55, 0xB4, 0xFE, 0x8C,
+    0xC3, 0x0E, 0xF7, 0x9E, 0x6A, 0x79, 0x95, 0x30, 0x0F, 0xAB, 0x96, 0xCB, 0x38, 0x27, 0x69, 0x2C,
+    0xFB, 0xC0, 0x93, 0x75, 0x94, 0x71, 0x63, 0x5B, 0xB9, 0xA0, 0x2F, 0x90, 0xD1, 0x8E, 0x9F, 0xAE,
+    0xA5, 0xEA, 0xA2, 0x7C, 0x29, 0xE1, 0xE3, 0x10, 0x9D, 0xB0, 0xBF, 0x11, 0x5F, 0x2D, 0xD8, 0x48,
+    0x8B, 0xF8, 0x74, 0x34, 0xCB, 0xBE, 0x32, 0x32, 0xA5, 0xF9, 0x7A, 0xE1, 0x98, 0x5C, 0xBA, 0x27,
     0xF0, 0x81, 0x10, 0xB9, 0x8E, 0xC1, 0xB7, 0x92, 0x3F, 0x0F, 0x46, 0x5F, 0xC1, 0x27, 0x31, 0x91,
     0xB3, 0x81, 0xE0, 0x95, 0x1D, 0xAA, 0x99, 0x81, 0x90, 0x67, 0x73, 0x58, 0x36, 0x5B, 0x98, 0xB9,
     0xE9, 0x8B, 0x5B, 0xFD, 0x24, 0xAD, 0xF1, 0x6D, 0x85, 0x52, 0x90, 0x65, 0x4F, 0x16, 0x7F, 0xF7,
@@ -58,8 +58,8 @@ const unsigned char dumper_payload[1544] = {
     0xF8, 0x20, 0x98, 0x75, 0xA3, 0xAD, 0xFE, 0xED, 0xF2, 0x0B, 0x23, 0xCE, 0x4B, 0x1E, 0x03, 0x04,
     0xA0, 0xFD, 0x3C, 0xDE, 0xD8, 0x0E, 0xCF, 0x9D, 0xF5, 0xD2, 0xFF, 0x01, 0xC9, 0x84, 0xD1, 0xE7,
     0x91, 0xE4, 0x64, 0x53, 0x2C, 0x82, 0xC1, 0x42, 0x48, 0x1B, 0x92, 0x95, 0xAD, 0x18, 0xDB, 0xD4,
-    0x45, 0x85, 0xC4, 0x74, 0xFA, 0x15, 0xDD, 0xCA, 0x03, 0x07, 0xD0, 0x56, 0x33, 0xE9, 0xF1, 0x65,
-    0x8D, 0x3D, 0x67, 0xCC, 0x14, 0xFC, 0x6C, 0x0F, 0xDC, 0xC1, 0x6A, 0x41, 0x2D, 0x15, 0x0B, 0xBF,
+    0x45, 0x85, 0xC4, 0x74, 0xFA, 0x15, 0x58, 0xB4, 0xB9, 0xDF, 0xCD, 0x3F, 0x53, 0x5F, 0x91, 0x25,
+    0x65, 0xB1, 0x63, 0x53, 0xC2, 0x6A, 0x63, 0xB5, 0x26, 0xE2, 0x03, 0x2F, 0x2D, 0x3B, 0x79, 0xD0,
     0x40, 0xD7, 0xB0, 0xA5, 0xF7, 0x56, 0x1A, 0xB8, 0x28, 0xEA, 0x14, 0xE0, 0xD3, 0x06, 0x35, 0xA3,
     0x44, 0xB4, 0xB8, 0x91, 0xC6, 0x76, 0x25, 0xDA, 0x9E, 0x2B, 0xDE, 0xEF, 0x33, 0x4A, 0xB7, 0xFB,
     0xED, 0x27, 0x6D, 0x15, 0xF9, 0xC7, 0x8B, 0xCB, 0x40, 0x75, 0xD8, 0x10, 0x8A, 0xC2, 0xBD, 0x69,

diff --git a/payload/source/symbols.h b/payload/source/symbols.h
@@ -373,5 +373,15 @@
 	#define GAMEOS_LPAR_SIZE_PTR                 0x800000000037A640ULL
 #endif
 
+#ifdef FIRMWARE_486C
+	#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
+
 
 #endif /* __SYMBOLS_H__ */
diff --git a/source/data.h b/source/data.h
@@ -38,5 +38,6 @@
 #include "payload_484C_bin.h"
 #include "payload_484D_bin.h"
 #include "payload_485C_bin.h"
+#include "payload_486C_bin.h"
 
 #endif /* __DATA_H__ */
diff --git a/source/firmware.c b/source/firmware.c
@@ -694,6 +694,24 @@ int init_IDPSet()
 		payload_size = payload_485C_bin_size;
 		payload = (u64 *) payload_485C_bin;
 	} else
+	if(( lv2peek(FW_DATE_OFFSET_486C    )==FW_DATE_1_486C) &&
+	( lv2peek(FW_DATE_OFFSET_486C + 8)==FW_DATE_2_486C) )
+	{
+		firmware = 0x486C;
+
+		TOC_OFFSET = TOC_OFFSET_486C;
+		HV_START_OFFSET = HV_START_OFFSET_486C;
+		HTAB_OFFSET = HTAB_OFFSET_486C;
+		SYSCALL_TABLE_OFFSET = SYSCALL_TABLE_486C;
+		MMAP_OFFSET1 = MMAP_OFFSET1_486C;
+		MMAP_OFFSET2 = MMAP_OFFSET2_486C;
+		SPE_OFFSET = SPE_OFFSET_486C;
+		OFFSET_1_IDPS = OFFSET_1_IDPS_486C;
+		OFFSET_2_IDPS = OFFSET_2_IDPS_486C;
+
+		payload_size = payload_486C_bin_size;
+		payload = (u64 *) payload_486C_bin;
+	} else
 	{
 		u64 n;
 		for(n=0x350000; n<0x4A0000; n++) {

diff --git a/source/firmware.h b/source/firmware.h
@@ -487,4 +487,17 @@ int init_IDPSet();
 #define OFFSET_1_IDPS_485C       0x80000000003E2E30ULL
 #define OFFSET_2_IDPS_485C       0x8000000000474AF4ULL
 
+#define HTAB_OFFSET_486C         0x2DD70C
+#define MMAP_OFFSET1_486C        0x2DCF54
+#define MMAP_OFFSET2_486C        0x2DD284
+#define SPE_OFFSET_486C          0x2F9EB8
+#define HV_START_OFFSET_486C     0x370F28
+#define TOC_OFFSET_486C          0x800000000034FBB0ULL
+#define SYSCALL_TABLE_486C       0x8000000000363BE0ULL
+#define FW_DATE_OFFSET_486C      0x80000000002FCB68ULL
+#define FW_DATE_1_486C           0x323032302F30312FULL
+#define FW_DATE_2_486C           0x33302031313A3330ULL
+#define OFFSET_1_IDPS_486C       0x80000000003E2E30ULL
+#define OFFSET_2_IDPS_486C       0x8000000000474AF4ULL
+
 #endif /* __FIRMWARE_H__ */