OmniNX/Horizon-OC
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update ams ldr patch

Browse Source
This commit is contained in:
KazushiM
2021-10-31 02:49:05 +08:00
parent c8727f0b91
commit 195c442a6e
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Atmosphere/ldr_patcher.cpp
View File

@@ -1,6 +1,6 @@
// placed in Atmosphere/stratosphere/loader/source/ // placed in Atmosphere/stratosphere/loader/source/
/* /*
* Copyright (c) 2018-2020 Atmosphère-NX * Copyright (c) Atmosphère-NX
* *
* This program is free software; you can redistribute it and/or modify it * This program is free software; you can redistribute it and/or modify it
* under the terms and conditions of the GNU General Public License, * under the terms and conditions of the GNU General Public License,
@@ -88,7 +88,7 @@ namespace ams::ldr {
AMS_ASSUME(ofs < sizeof(module_id)); AMS_ASSUME(ofs < sizeof(module_id));
AMS_ASSUME(str[1] != 0); AMS_ASSUME(str[1] != 0);
module_id.build_id[ofs] = (ParseNybble(str[0]) << 4) | (ParseNybble(str[1]) << 0); module_id.data[ofs] = (ParseNybble(str[0]) << 4) | (ParseNybble(str[1]) << 0);
str += 2; str += 2;
ofs++; ofs++;
@@ -117,7 +117,7 @@ namespace ams::ldr {
void LocateAndApplyIpsPatchesToModule(const u8 *module_id_data, uintptr_t mapped_nso, size_t mapped_size) { void LocateAndApplyIpsPatchesToModule(const u8 *module_id_data, uintptr_t mapped_nso, size_t mapped_size) {
for(int i = 0; i < VERS; i++) for(int i = 0; i < VERS; i++)
{ {
if(memcmp(PcvModuleId[i], module_id_data, sizeof(PcvModuleId[i])) == 0) { if(std::memcmp(PcvModuleId[i], module_id_data, sizeof(PcvModuleId[i])) == 0) {
ApplyPcvPatch(reinterpret_cast<u8 *>(mapped_nso), mapped_size, i); ApplyPcvPatch(reinterpret_cast<u8 *>(mapped_nso), mapped_size, i);
return; // Return here since pcv module loads before sd card can be mounted return; // Return here since pcv module loads before sd card can be mounted
} }
@@ -128,15 +128,15 @@ namespace ams::ldr {
} }
ro::ModuleId module_id; ro::ModuleId module_id;
std::memcpy(&module_id.data, module_id_data, sizeof(module_id.data)); std::memcpy(std::addressof(module_id.data), module_id_data, sizeof(module_id.data));
ams::patcher::LocateAndApplyIpsPatchesToModule(LoaderSdMountName, NsoPatchesDirectory, NsoPatchesProtectedSize, NsoPatchesProtectedOffset, &module_id, reinterpret_cast<u8 *>(mapped_nso), mapped_size); ams::patcher::LocateAndApplyIpsPatchesToModule(LoaderSdMountName, NsoPatchesDirectory, NsoPatchesProtectedSize, NsoPatchesProtectedOffset, std::addressof(module_id), reinterpret_cast<u8 *>(mapped_nso), mapped_size);
} }
/* Apply embedded patches. */ /* Apply embedded patches. */
void ApplyEmbeddedPatchesToModule(const u8 *module_id_data, uintptr_t mapped_nso, size_t mapped_size) { void ApplyEmbeddedPatchesToModule(const u8 *module_id_data, uintptr_t mapped_nso, size_t mapped_size) {
/* Make module id. */ /* Make module id. */
ro::ModuleId module_id; ro::ModuleId module_id;
std::memcpy(&module_id.data, module_id_data, sizeof(module_id.data)); std::memcpy(std::addressof(module_id.data), module_id_data, sizeof(module_id.data));
if (IsUsb30ForceEnabled()) { if (IsUsb30ForceEnabled()) {
for (const auto &patch : Usb30ForceEnablePatches) { for (const auto &patch : Usb30ForceEnablePatches) {

17
Source/Atmosphere/ldr_pcv_patch.cpp
View File

@@ -2,8 +2,9 @@
#include <stratosphere.hpp> #include <stratosphere.hpp>
#define VERS 3
#define EMC_OVERCLOCK 1 #define EMC_OVERCLOCK 1
//#define EMC_OVERVOLT 1 //#define EMC_OVERVOLT
//I'm dropping support for Erista on >= HOS 13.0.0, you may port these offsets by yourself. //I'm dropping support for Erista on >= HOS 13.0.0, you may port these offsets by yourself.
//#define ERISTA_SUPPORT //#define ERISTA_SUPPORT
@@ -12,7 +13,8 @@ namespace ams::ldr {
namespace { namespace {
constexpr u32 CopyrightIPSOffset[] = { 0xC6128, 0xCA414, 0xCB90C, 0xCBB8C }; //am_no_copyright port constexpr u32 CopyrightIPSOffset[] = { 0xC6128, 0xCA414, 0xCB90C, 0xCBB8C };
// am_no_copyright port, grab exefs patches instead
constexpr u8 RET0[8] = { 0xE0, 0x03, 0x1F, 0xAA, 0xC0, 0x03, 0x5F, 0xD6 }; constexpr u8 RET0[8] = { 0xE0, 0x03, 0x1F, 0xAA, 0xC0, 0x03, 0x5F, 0xD6 };
// MOV X0, XZR // MOV X0, XZR
@@ -206,7 +208,7 @@ namespace ams::ldr {
{ 0x145FD8, 0x144B98, }, { 0x145FD8, 0x144B98, },
{ 0x143A78, 0x144EB8, }, { 0x143A78, 0x144EB8, },
{ 0x143AB8, 0x144EF8, }, { 0x143AB8, 0x144EF8, },
} };
constexpr u32 EmcVoltageDefOffsets[VERS][2] = { constexpr u32 EmcVoltageDefOffsets[VERS][2] = {
{ 0x145FE4, 0x144BA4, }, { 0x145FE4, 0x144BA4, },
@@ -265,15 +267,14 @@ namespace ams::ldr {
} }
} }
if constexpr(EMC_OVERVOLT) { #ifdef EMC_OVERVOLT
#ifdef ERISTA_SUPPORT #ifdef ERISTA_SUPPORT
if(spl::GetSocType() == spl::SocType_Erista) { if(spl::GetSocType() == spl::SocType_Erista) {
for(u32 j = 0; j < sizeof(Erista::EmcVoltageOffsets[i])/sizeof(u32); j++) { for(u32 j = 0; j < sizeof(Erista::EmcVoltageOffsets[i])/sizeof(u32); j++) {
AMS_ABORT_UNLESS(Erista::EmcVoltageOffsets[i][j] <= mapped_size); AMS_ABORT_UNLESS(Erista::EmcVoltageOffsets[i][j] <= mapped_size);
std::memcpy(mapped_module + Erista::EmcVoltageOffsets[i][j], &Erista::NewEmcVoltage, sizeof(Erista::NewEmcVoltage)); std::memcpy(mapped_module + Erista::EmcVoltageOffsets[i][j], &Erista::NewEmcVoltage, sizeof(Erista::NewEmcVoltage));
} }
} #endif
#endif
else if(spl::GetSocType() == spl::SocType_Mariko) { else if(spl::GetSocType() == spl::SocType_Mariko) {
for(u32 j = 0; j < sizeof(Mariko::EmcVoltageMinOffsets[i])/sizeof(u32); j++) { for(u32 j = 0; j < sizeof(Mariko::EmcVoltageMinOffsets[i])/sizeof(u32); j++) {
AMS_ABORT_UNLESS(Mariko::EmcVoltageMinOffsets[i][j] <= mapped_size); AMS_ABORT_UNLESS(Mariko::EmcVoltageMinOffsets[i][j] <= mapped_size);
@@ -281,7 +282,7 @@ namespace ams::ldr {
std::memcpy(mapped_module + Mariko::EmcVoltageDefOffsets[i][j], &Mariko::EmcVoltageDef, sizeof(Mariko::EmcVoltageDef)); std::memcpy(mapped_module + Mariko::EmcVoltageDefOffsets[i][j], &Mariko::EmcVoltageDef, sizeof(Mariko::EmcVoltageDef));
} }
} }
} #endif
return; return;
} }