1.93

Zarh · Jun 25, 2021 · 37769d6 · 37769d6
1 parent 1ada3c6
commit 37769d6
Show file tree

Hide file tree

Showing 47 changed files with 92 additions and 8 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.92
+VERSION := 0.93
 NAME := IDPSet
 
 TARGET := $(NAME)_v$(VERSION)

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/data/payload_487C.bin b/data/payload_487C.bin
diff --git a/data/payload_488C.bin b/data/payload_488C.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 486C 
+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 487C 488C 
diff --git a/payload/source/dumper.c b/payload/source/dumper.c
@@ -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,
- 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,
+ 0x78, 0xB6, 0x68, 0xBF, 0x59, 0x3D, 0x29, 0x50, 0xB8, 0xE9, 0x41, 0x93, 0x29, 0xA7, 0x56, 0x67,
+ 0x13, 0x2A, 0xAD, 0x80, 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,
+ 0x88, 0xFF, 0x73, 0x38, 0xCF, 0xB6, 0x32, 0x32, 0xA4, 0xFD, 0x7A, 0xE0, 0x98, 0x5C, 0xBA, 0x26,
  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, 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,
+ 0x45, 0x85, 0xC4, 0x74, 0xFA, 0x15, 0x77, 0xED, 0xE0, 0x32, 0x52, 0x32, 0x04, 0x7E, 0x54, 0xEE,
+ 0x01, 0x1C, 0x6B, 0xD0, 0x9D, 0x60, 0x12, 0x10, 0xA3, 0x2E, 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
@@ -383,5 +383,25 @@
  #define GAMEOS_LPAR_SIZE_PTR 0x800000000037A640ULL
 #endif
 
+#ifdef FIRMWARE_487C
+ #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_488C
+ #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
@@ -39,5 +39,7 @@
 #include "payload_484D_bin.h"
 #include "payload_485C_bin.h"
 #include "payload_486C_bin.h"
+#include "payload_487C_bin.h"
+#include "payload_488C_bin.h"
 
 #endif /* __DATA_H__ */
diff --git a/source/firmware.c b/source/firmware.c
@@ -712,6 +712,42 @@ int init_IDPSet()
  payload_size = payload_486C_bin_size;
  payload = (u64 *) payload_486C_bin;
  } else
+ if(( lv2peek(FW_DATE_OFFSET_487C )==FW_DATE_1_487C) &&
+ ( lv2peek(FW_DATE_OFFSET_487C + 8)==FW_DATE_2_487C) )
+ {
+ firmware = 0x487C;
+
+ TOC_OFFSET = TOC_OFFSET_487C;
+ HV_START_OFFSET = HV_START_OFFSET_487C;
+ HTAB_OFFSET = HTAB_OFFSET_487C;
+ SYSCALL_TABLE_OFFSET = SYSCALL_TABLE_487C;
+ MMAP_OFFSET1 = MMAP_OFFSET1_487C;
+ MMAP_OFFSET2 = MMAP_OFFSET2_487C;
+ SPE_OFFSET = SPE_OFFSET_487C;
+ OFFSET_1_IDPS = OFFSET_1_IDPS_487C;
+ OFFSET_2_IDPS = OFFSET_2_IDPS_487C;
+
+ payload_size = payload_487C_bin_size;
+ payload = (u64 *) payload_487C_bin;
+ } else
+ if(( lv2peek(FW_DATE_OFFSET_488C )==FW_DATE_1_488C) &&
+ ( lv2peek(FW_DATE_OFFSET_488C + 8)==FW_DATE_2_488C) )
+ {
+ firmware = 0x488C;
+
+ TOC_OFFSET = TOC_OFFSET_488C;
+ HV_START_OFFSET = HV_START_OFFSET_488C;
+ HTAB_OFFSET = HTAB_OFFSET_488C;
+ SYSCALL_TABLE_OFFSET = SYSCALL_TABLE_488C;
+ MMAP_OFFSET1 = MMAP_OFFSET1_488C;
+ MMAP_OFFSET2 = MMAP_OFFSET2_488C;
+ SPE_OFFSET = SPE_OFFSET_488C;
+ OFFSET_1_IDPS = OFFSET_1_IDPS_488C;
+ OFFSET_2_IDPS = OFFSET_2_IDPS_488C;
+
+ payload_size = payload_488C_bin_size;
+ payload = (u64 *) payload_488C_bin;
+ } else
  {
  u64 n;
  for(n=0x350000; n<0x4A0000; n++) {
@@ -737,7 +773,7 @@ int init_IDPSet()
  if(OFFSET_2_IDPS != 0) break;
  }
  if(OFFSET_1_IDPS == 0 || OFFSET_2_IDPS == 0) return FAILED;
- }
+  }
 
  rebug = fw_is_rebug();
 

diff --git a/source/firmware.h b/source/firmware.h
@@ -500,4 +500,30 @@ int init_IDPSet();
 #define OFFSET_1_IDPS_486C 0x80000000003E2E30ULL
 #define OFFSET_2_IDPS_486C 0x8000000000474AF4ULL
 
+#define HTAB_OFFSET_487C 0x2DD70C
+#define MMAP_OFFSET1_487C 0x2DCF54
+#define MMAP_OFFSET2_487C 0x2DD284
+#define SPE_OFFSET_487C 0x2F9EB8
+#define HV_START_OFFSET_487C 0x370F28
+#define TOC_OFFSET_487C 0x800000000034FBB0ULL
+#define SYSCALL_TABLE_487C 0x8000000000363BE0ULL
+#define FW_DATE_OFFSET_487C 0x80000000002FCB68ULL
+#define FW_DATE_1_487C 0x323032302F30372FULL
+#define FW_DATE_2_487C 0x32322031313A3431ULL
+#define OFFSET_1_IDPS_487C 0x80000000003E2E30ULL
+#define OFFSET_2_IDPS_487C 0x8000000000474AF4ULL
+
+#define HTAB_OFFSET_488C 0x2DD70C
+#define MMAP_OFFSET1_488C 0x2DCF54
+#define MMAP_OFFSET2_488C 0x2DD284
+#define SPE_OFFSET_488C 0x2F9EB8
+#define HV_START_OFFSET_488C 0x370F28
+#define TOC_OFFSET_488C 0x800000000034FBB0ULL
+#define SYSCALL_TABLE_488C 0x8000000000363BE0ULL
+#define FW_DATE_OFFSET_488C 0x80000000002FCB68ULL
+#define FW_DATE_1_488C 0x323032312F30342FULL
+#define FW_DATE_2_488C 0x31322031303A3031ULL
+#define OFFSET_1_IDPS_488C 0x80000000003E2E30ULL
+#define OFFSET_2_IDPS_488C 0x8000000000474AF4ULL
+
 #endif /* __FIRMWARE_H__ */