From b383fa7ec2fbc0a8b8afc2cc275834420168881a Mon Sep 17 00:00:00 2001 From: Lightos1 <124387232+Lightos1@users.noreply.github.com> Date: Sat, 25 Apr 2026 20:30:46 +0200 Subject: [PATCH] improve alignment --- .../loader/source/oc/pcv/pcv_mariko.cpp | 18 +++++++++--------- .../loader/source/oc/pcv/pcv_mariko.hpp | 10 +++++----- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Source/Atmosphere/stratosphere/loader/source/oc/pcv/pcv_mariko.cpp b/Source/Atmosphere/stratosphere/loader/source/oc/pcv/pcv_mariko.cpp index d6f014a4..364189d1 100644 --- a/Source/Atmosphere/stratosphere/loader/source/oc/pcv/pcv_mariko.cpp +++ b/Source/Atmosphere/stratosphere/loader/source/oc/pcv/pcv_mariko.cpp @@ -776,9 +776,9 @@ namespace ams::ldr::hoc::pcv::mariko { R_SKIP(); } - u32 max0 = 1050; - u32 max1 = 1025; - u32 max2 = 1000; + u32 max0 = 1050; + u32 max1 = 1025; + u32 max2 = 1000; s32 voltAdd = 25 * C.emcDvbShift; if (C.marikoSocVmax && C.marikoSocVmax > 1000) { @@ -865,7 +865,7 @@ namespace ams::ldr::hoc::pcv::mariko { regulator *entry = reinterpret_cast(reinterpret_cast(ptr) - offsetof(regulator, type_2_3.default_uv)); constexpr u32 uv_step = 5'000; - constexpr u32 uv_min = 250'000; + constexpr u32 uv_min = 250'000; auto validator = [entry]() { R_UNLESS(entry->id == 2, ldr::ResultInvalidRegulatorEntry()); @@ -933,7 +933,7 @@ namespace ams::ldr::hoc::pcv::mariko { Result GetSocSpeedo(u32 &socSpeedo) { constexpr u64 FusePhysicalAddress = 0x7000F000; u64 virtualAddress = 0; - constexpr u64 Size = 0x1000; + constexpr u64 Size = 0x1000; u64 outSize; /* TODO: use svc::QueryMemoryMapping instead. */ @@ -941,7 +941,7 @@ namespace ams::ldr::hoc::pcv::mariko { constexpr u32 FuseOffset = 2048; constexpr u32 SocSpeedoOffset = 308; - socSpeedo = *reinterpret_cast(virtualAddress + FuseOffset + SocSpeedoOffset); + socSpeedo = *reinterpret_cast(virtualAddress + FuseOffset + SocSpeedoOffset); R_SUCCEED(); } @@ -974,7 +974,7 @@ namespace ams::ldr::hoc::pcv::mariko { /* A csel instruction is used to select the soc voltage limit register. */ /* We care about its destination register since that is used for verification. */ constexpr u32 VoltageSelectScanLimit = 24; - u32 *selectVoltage = ScanAssembly(writeVoltage, VoltageSelectScanLimit, SocVoltSelectRegisterAsm, AsmCompareCselNoReg); + u32 *selectVoltage = ScanAssembly(writeVoltage, VoltageSelectScanLimit, SocVoltSelectRegisterAsm, AsmCompareCselNoReg); R_UNLESS(selectVoltage != nullptr, ldr::ResultInvalidSocVoltPattern()); /* Todo: check rm and rn? */ u8 selectVoltageRd = asm_get_rd(*selectVoltage); @@ -982,7 +982,7 @@ namespace ams::ldr::hoc::pcv::mariko { /* rdCsel is then multiplied by 1000 to convert to uV. */ /* This is pretty far down the function. */ constexpr u32 MultiplierScanLimit = 200; - u32 *multiplier = ScanAssembly(selectVoltage, MultiplierScanLimit, SocVoltMultiplyVoltsAsm, AsmCompareMullNoReg); + u32 *multiplier = ScanAssembly(selectVoltage, MultiplierScanLimit, SocVoltMultiplyVoltsAsm, AsmCompareMullNoReg); R_UNLESS(multiplier != nullptr, ldr::ResultInvalidSocVoltPattern()); u8 multiplierRn = AsmGetMullRn(*multiplier); u8 multiplierRm = AsmGetMullRm(*multiplier); @@ -1013,7 +1013,7 @@ namespace ams::ldr::hoc::pcv::mariko { /* Adjust processId from 0 to [process id of switch booting this]. */ /* We're overwriting the orr instruction entirly. */ - u32 processId = GetSocProcessId(socSpeedo); + u32 processId = GetSocProcessId(socSpeedo); u32 writeProcessIdPatch = asm_set_rd(asm_set_imm16(SocVoltWriteVoltageAsm, processId), writeProcessIdRd); PATCH_OFFSET(writeProcessId, writeProcessIdPatch); diff --git a/Source/Atmosphere/stratosphere/loader/source/oc/pcv/pcv_mariko.hpp b/Source/Atmosphere/stratosphere/loader/source/oc/pcv/pcv_mariko.hpp index f93cadad..eb234078 100644 --- a/Source/Atmosphere/stratosphere/loader/source/oc/pcv/pcv_mariko.hpp +++ b/Source/Atmosphere/stratosphere/loader/source/oc/pcv/pcv_mariko.hpp @@ -141,8 +141,8 @@ namespace ams::ldr::hoc::pcv::mariko { return asm_compare_no_rd(*ptr, SocVoltCompareSpeedoAsm); } - constexpr u32 SocVoltLimitOfficial = 1050; - constexpr u32 SocVoltLimitMaxDefaultIndex = 17; + constexpr u32 SocVoltLimitOfficial = 1050; + constexpr u32 SocVoltLimitMaxDefaultIndex = 17; static const u32 socVoltLimitArray[DvfsTableEntryCount] = { 637, 650, 675, 700, 725, 750, 775, 800, 825, 850, 875, 900, 925, 950, 975, 1000, 1025, 1050, }; constexpr u32 EmcListDefault[] = { 204000, 1331200, 1600000, }; @@ -151,10 +151,10 @@ namespace ams::ldr::hoc::pcv::mariko { constexpr u32 EmcRateStep = 33'000; constexpr u32 EmcRateStepScale = 33'200; - constexpr u32 EmcClkOSAlt = 1331'200; + constexpr u32 EmcClkOSAlt = 1331'200; constexpr u32 EmcClkPllmLimit = 2133'000'000; - constexpr u32 EmcVddqDefault = 600'000; - constexpr u32 MemVdd2Default = 1100'000; + constexpr u32 EmcVddqDefault = 600'000; + constexpr u32 MemVdd2Default = 1100'000; constexpr u32 MTC_TABLE_REV = 3; constexpr u32 MtcTableCountDefault = 3;