From 07779b787a0965990fc567f0236bff08cf0a9e90 Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Thu, 2 Sep 2021 23:45:51 -0700 Subject: [PATCH] fusee_cpp: implement nogc patches --- .../source/fusee_exception_handler.cpp | 4 + .../source/fusee_secondary_archive.hpp | 13 +- .../program/source/fusee_stratosphere.cpp | 215 +++++++++++++++++- fusee_cpp/program/split_bin.py | 122 +++++++++- 4 files changed, 334 insertions(+), 20 deletions(-) diff --git a/fusee_cpp/program/source/fusee_exception_handler.cpp b/fusee_cpp/program/source/fusee_exception_handler.cpp index 3863f6890..9117cc9ac 100644 --- a/fusee_cpp/program/source/fusee_exception_handler.cpp +++ b/fusee_cpp/program/source/fusee_exception_handler.cpp @@ -32,6 +32,10 @@ namespace ams::nxboot { NORETURN void ExceptionHandlerImpl(s32 which, u32 lr, u32 svc_lr) { /* TODO */ + *reinterpret_cast(0x40038004) = 0xCAFEBABE; + *reinterpret_cast(0x40038008) = which; + *reinterpret_cast(0x4003800C) = lr; + *reinterpret_cast(0x40038010) = svc_lr; ErrorStop(); } diff --git a/fusee_cpp/program/source/fusee_secondary_archive.hpp b/fusee_cpp/program/source/fusee_secondary_archive.hpp index 93eafa88f..b0f356978 100644 --- a/fusee_cpp/program/source/fusee_secondary_archive.hpp +++ b/fusee_cpp/program/source/fusee_secondary_archive.hpp @@ -19,7 +19,7 @@ namespace ams::nxboot { - constexpr inline const size_t SecondaryArchiveSize = 4_MB + FrameBufferSize; + constexpr inline const size_t SecondaryArchiveSize = 8_MB; constexpr inline const size_t InitialProcessStorageSizeMax = 3_MB / 8; @@ -46,12 +46,12 @@ namespace ams::nxboot { u32 reserved0; /* Previously entrypoint. */ u32 metadata_offset; - u32 reserved1; + u32 flags; u32 num_kips; - u32 reserved2[4]; + u32 reserved1[4]; u32 magic; u32 total_size; - u32 reserved3; /* Previously crt0 offset. */ + u32 reserved2; /* Previously crt0 offset. */ u32 content_header_offset; u32 num_content_headers; u32 supported_hos_version; @@ -60,7 +60,7 @@ namespace ams::nxboot { SecondaryArchiveContentMeta content_metas[(0x400 - 0x40) / sizeof(SecondaryArchiveContentMeta)]; SecondaryArchiveKipMeta emummc_meta; SecondaryArchiveKipMeta kip_metas[8]; - u8 reserved4[0x800 - (0x400 + 9 * sizeof(SecondaryArchiveKipMeta))]; + u8 reserved3[0x800 - (0x400 + 9 * sizeof(SecondaryArchiveKipMeta))]; }; static_assert(sizeof(SecondaryArchiveHeader) == 0x800); @@ -75,6 +75,9 @@ namespace ams::nxboot { u8 mesosphere[0xAA000]; /* 0x056000-0x100000 */ u8 kips[3_MB]; /* 0x100000-0x400000 */ u8 splash_screen_fb[FrameBufferSize]; /* 0x400000-0x7C0000 */ + u8 fusee[0x20000]; /* 0x7C0000-0x7E0000 */ + u8 reboot_stub[0x1000]; /* 0x7E0000-0x7E1000 */ + u8 reserved[0x1F000]; /* 0x7E1000-0x800000 */ }; static_assert(sizeof(SecondaryArchive) == SecondaryArchiveSize); diff --git a/fusee_cpp/program/source/fusee_stratosphere.cpp b/fusee_cpp/program/source/fusee_stratosphere.cpp index 0af4eff9c..84591da3f 100644 --- a/fusee_cpp/program/source/fusee_stratosphere.cpp +++ b/fusee_cpp/program/source/fusee_stratosphere.cpp @@ -64,8 +64,10 @@ namespace ams::nxboot { static_assert(sizeof(InitialProcessHeader) == 0x100); struct PatchMeta { - u32 offset; - void *data; + PatchMeta *next; + u32 start_segment; + u32 rel_offset; + const void *data; u32 size; }; @@ -73,7 +75,8 @@ namespace ams::nxboot { InitialProcessMeta *next = nullptr; const InitialProcessHeader *kip; u32 kip_size; - PatchMeta *patches; + PatchMeta *patches_head; + PatchMeta *patches_tail; u32 patch_segments; u64 program_id; se::Sha256Hash kip_hash; @@ -271,7 +274,8 @@ namespace ams::nxboot { } /* Clear patches. */ - meta->patches = nullptr; + meta->patches_head = nullptr; + meta->patches_tail = nullptr; meta->patch_segments = 0; /* Increase the initial process binary's size. */ @@ -308,8 +312,8 @@ namespace ams::nxboot { return true; } - const InitialProcessMeta *FindInitialProcess(u64 program_id) { - for (const InitialProcessMeta *cur = std::addressof(g_initial_process_meta); cur != nullptr; cur = cur->next) { + InitialProcessMeta *FindInitialProcess(u64 program_id) { + for (InitialProcessMeta *cur = std::addressof(g_initial_process_meta); cur != nullptr; cur = cur->next) { if (cur->program_id == program_id) { return cur; } @@ -317,6 +321,193 @@ namespace ams::nxboot { return nullptr; } + u32 GetPatchSegments(const InitialProcessHeader *kip, u32 offset, size_t size) { + /* Create segment mask. */ + u32 segments = 0; + + /* Get the segment extents. */ + const u32 rx_start = kip->rx_address; + const u32 ro_start = kip->ro_address; + const u32 rw_start = kip->rw_address; + const u32 rx_end = ro_start; + const u32 ro_end = rw_start; + const u32 rw_end = rw_start + kip->rw_size; + + /* If the offset is below the kip header, ignore it. */ + if (offset < sizeof(*kip)) { + return segments; + } + + /* Adjust the offset in bounds. */ + offset -= sizeof(*kip); + + /* Check if the offset strays out of bounds. */ + if (offset + size > rw_end) { + return segments; + } + + /* Set bits for the affected segments. */ + if (util::HasOverlap(offset, size, rx_start, rx_end - rx_start)) { + segments |= (1 << 0); + } + if (util::HasOverlap(offset, size, ro_start, ro_end - ro_start)) { + segments |= (1 << 1); + } + if (util::HasOverlap(offset, size, rw_start, rw_end - rw_start)) { + segments |= (1 << 2); + } + + return segments; + } + + void AddPatch(InitialProcessMeta *meta, u32 offset, const void *data, size_t data_size) { + /* Determine the segment. */ + const u32 segments = GetPatchSegments(meta->kip, offset, data_size); + + /* If the patch hits no segments, we don't need it. */ + if (segments == 0) { + return; + } + + /* Update patch segments. */ + meta->patch_segments |= segments; + + /* Adjust offset. */ + const u32 start_segment = util::CountTrailingZeros(segments); + offset -= sizeof(*meta->kip); + switch (start_segment) { + case 0: offset -= meta->kip->rx_address; break; + case 1: offset -= meta->kip->ro_address; break; + case 2: offset -= meta->kip->rw_address; break; + } + + /* Create patch. */ + auto *new_patch = static_cast(AllocateAligned(sizeof(PatchMeta), alignof(PatchMeta))); + + new_patch->next = nullptr; + new_patch->start_segment = start_segment; + new_patch->rel_offset = offset; + new_patch->data = data; + new_patch->size = data_size; + + /* Add the patch. */ + if (meta->patches_head == nullptr) { + meta->patches_head = new_patch; + } else { + meta->patches_tail->next = new_patch; + } + + meta->patches_tail = new_patch; + } + + constexpr const u8 NogcPatch0[] = { + 0x80 + }; + + constexpr const u8 NogcPatch1[] = { + 0xE0, 0x03, 0x1F, 0x2A, 0xC0, 0x03, 0x5F, 0xD6, + }; + + void AddNogcPatches(InitialProcessMeta *fs_meta, FsVersion fs_version) { + switch (fs_version) { + case FsVersion_1_0_0: + case FsVersion_2_0_0: + case FsVersion_2_0_0_Exfat: + case FsVersion_2_1_0: + case FsVersion_2_1_0_Exfat: + case FsVersion_3_0_0: + case FsVersion_3_0_0_Exfat: + case FsVersion_3_0_1: + case FsVersion_3_0_1_Exfat: + /* There were no lotus firmware updates prior to 4.0.0. */ + /* TODO: Implement patches, regardless? */ + break; + case FsVersion_4_0_0: + case FsVersion_4_0_0_Exfat: + AddPatch(fs_meta, 0x0A3539, NogcPatch0, sizeof(NogcPatch0)); + AddPatch(fs_meta, 0x0AAC44, NogcPatch1, sizeof(NogcPatch1)); + break; + case FsVersion_4_1_0: + case FsVersion_4_1_0_Exfat: + AddPatch(fs_meta, 0x0A35BD, NogcPatch0, sizeof(NogcPatch0)); + AddPatch(fs_meta, 0x0AACA8, NogcPatch1, sizeof(NogcPatch1)); + break; + case FsVersion_5_0_0: + case FsVersion_5_0_0_Exfat: + AddPatch(fs_meta, 0x0CF4C5, NogcPatch0, sizeof(NogcPatch0)); + AddPatch(fs_meta, 0x0D74A0, NogcPatch1, sizeof(NogcPatch1)); + break; + case FsVersion_5_1_0: + case FsVersion_5_1_0_Exfat: + AddPatch(fs_meta, 0x0CF895, NogcPatch0, sizeof(NogcPatch0)); + AddPatch(fs_meta, 0x0D7870, NogcPatch1, sizeof(NogcPatch1)); + break; + case FsVersion_6_0_0: + AddPatch(fs_meta, 0x1539F5, NogcPatch0, sizeof(NogcPatch0)); + AddPatch(fs_meta, 0x12CD20, NogcPatch1, sizeof(NogcPatch1)); + break; + case FsVersion_6_0_0_Exfat: + AddPatch(fs_meta, 0x15F0F5, NogcPatch0, sizeof(NogcPatch0)); + AddPatch(fs_meta, 0x138420, NogcPatch1, sizeof(NogcPatch1)); + break; + case FsVersion_7_0_0: + AddPatch(fs_meta, 0x15C005, NogcPatch0, sizeof(NogcPatch0)); + AddPatch(fs_meta, 0x134260, NogcPatch1, sizeof(NogcPatch1)); + break; + case FsVersion_7_0_0_Exfat: + AddPatch(fs_meta, 0x1675B5, NogcPatch0, sizeof(NogcPatch0)); + AddPatch(fs_meta, 0x13F810, NogcPatch1, sizeof(NogcPatch1)); + break; + case FsVersion_8_0_0: + case FsVersion_8_1_0: + AddPatch(fs_meta, 0x15EC95, NogcPatch0, sizeof(NogcPatch0)); + AddPatch(fs_meta, 0x136900, NogcPatch1, sizeof(NogcPatch1)); + break; + case FsVersion_8_0_0_Exfat: + case FsVersion_8_1_0_Exfat: + AddPatch(fs_meta, 0x16A245, NogcPatch0, sizeof(NogcPatch0)); + AddPatch(fs_meta, 0x141EB0, NogcPatch1, sizeof(NogcPatch1)); + break; + case FsVersion_9_0_0: + case FsVersion_9_0_0_Exfat: + AddPatch(fs_meta, 0x143369, NogcPatch0, sizeof(NogcPatch0)); + AddPatch(fs_meta, 0x129520, NogcPatch1, sizeof(NogcPatch1)); + break; + case FsVersion_9_1_0: + case FsVersion_9_1_0_Exfat: + AddPatch(fs_meta, 0x143379, NogcPatch0, sizeof(NogcPatch0)); + AddPatch(fs_meta, 0x129530, NogcPatch1, sizeof(NogcPatch1)); + break; + case FsVersion_10_0_0: + case FsVersion_10_0_0_Exfat: + AddPatch(fs_meta, 0x14DF09, NogcPatch0, sizeof(NogcPatch0)); + AddPatch(fs_meta, 0x13BF90, NogcPatch1, sizeof(NogcPatch1)); + break; + case FsVersion_10_2_0: + case FsVersion_10_2_0_Exfat: + AddPatch(fs_meta, 0x14E369, NogcPatch0, sizeof(NogcPatch0)); + AddPatch(fs_meta, 0x13C3F0, NogcPatch1, sizeof(NogcPatch1)); + break; + case FsVersion_11_0_0: + case FsVersion_11_0_0_Exfat: + AddPatch(fs_meta, 0x156FB9, NogcPatch0, sizeof(NogcPatch0)); + AddPatch(fs_meta, 0x1399B4, NogcPatch1, sizeof(NogcPatch1)); + break; + case FsVersion_12_0_0: + case FsVersion_12_0_0_Exfat: + AddPatch(fs_meta, 0x155469, NogcPatch0, sizeof(NogcPatch0)); + AddPatch(fs_meta, 0x13EB24, NogcPatch1, sizeof(NogcPatch1)); + break; + case FsVersion_12_0_3: + case FsVersion_12_0_3_Exfat: + AddPatch(fs_meta, 0x155579, NogcPatch0, sizeof(NogcPatch0)); + AddPatch(fs_meta, 0x13EC34, NogcPatch1, sizeof(NogcPatch1)); + break; + default: + break; + } + } + } u32 ConfigureStratosphere(const u8 *nn_package2, ams::TargetFirmware target_firmware, bool emummc_enabled, bool nogc_enabled) { @@ -393,7 +584,7 @@ namespace ams::nxboot { /* Get meta for FS process. */ constexpr u64 FsProgramId = 0x0100000000000000; - const auto *fs_meta = FindInitialProcess(FsProgramId); + auto *fs_meta = FindInitialProcess(FsProgramId); if (fs_meta == nullptr) { /* Get nintendo header/data. */ const pkg2::Package2Header *nn_header = reinterpret_cast(nn_package2); @@ -431,7 +622,15 @@ namespace ams::nxboot { } } - /* TODO: Parse/prepare relevant nogc/kip patches. */ + /* Parse/prepare relevant nogc/kip patches. */ + { + /* Add nogc patches. */ + if (nogc_enabled) { + AddNogcPatches(fs_meta, fs_version); + } + + /* Add generic patches. */ + } /* Return the fs version we're using. */ return static_cast(fs_version); diff --git a/fusee_cpp/program/split_bin.py b/fusee_cpp/program/split_bin.py index 123df8ed8..aa1139acd 100644 --- a/fusee_cpp/program/split_bin.py +++ b/fusee_cpp/program/split_bin.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -import sys, lz4 -from struct import unpack as up +import sys, lz4, hashlib +from struct import unpack as up, pack as pk def lz4_compress(data): try: @@ -20,6 +20,105 @@ def pad(data, size): def get_overlay(program, i): return program[0x2B000 + 0x14000 * i:0x2B000 + 0x14000 * (i+1)] +KIP_NAMES = ['Loader', 'NCM', 'ProcessManager', 'sm', 'boot', 'spl', 'ams_mitm'] + +def get_kips(): + emummc = read_file('../../../../emummc/emummc.kip') + loader = read_file('../../../../stratosphere/loader/loader.kip') + ncm = read_file('../../../../stratosphere/ncm/ncm.kip') + pm = read_file('../../../../stratosphere/pm/pm.kip') + sm = read_file('../../../../stratosphere/sm/sm.kip') + boot = read_file('../../../../stratosphere/boot/boot.kip') + spl = read_file('../../../../stratosphere/spl/spl.kip') + ams_mitm = read_file('../../../../stratosphere/ams_mitm/ams_mitm.kip') + return (emummc, { + 'Loader' : loader, + 'NCM' : ncm, + 'ProcessManager' : pm, + 'sm' : sm, + 'boot' : boot, + 'spl' : spl, + 'ams_mitm' : ams_mitm, + }) + +def write_kip_meta(f, kip, ofs): + # Write program id + f.write(kip[0x10:0x18]) + # Write offset, size + f.write(pk('