From 0e081d23edf7cae7256f29687c98ea6eecba0b00 Mon Sep 17 00:00:00 2001 From: dogty Date: Sat, 19 Oct 2024 13:24:56 +0200 Subject: [PATCH] Force force_debug_flag to false --- libraries/config/templates/stratosphere.mk | 2 +- stratosphere/loader/source/ldr_meta.cpp | 31 ++++++++++++---------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/libraries/config/templates/stratosphere.mk b/libraries/config/templates/stratosphere.mk index 06fb362c9..5806c8e91 100644 --- a/libraries/config/templates/stratosphere.mk +++ b/libraries/config/templates/stratosphere.mk @@ -26,7 +26,7 @@ ATMOSPHERE_OPTIMIZATION_FLAG := -O2 endif export DEFINES = $(ATMOSPHERE_DEFINES) -DATMOSPHERE_IS_STRATOSPHERE -D_GNU_SOURCE -export SETTINGS = $(ATMOSPHERE_SETTINGS) $(ATMOSPHERE_OPTIMIZATION_FLAG) -Wextra -Werror -Wno-missing-field-initializers +export SETTINGS = $(ATMOSPHERE_SETTINGS) $(ATMOSPHERE_OPTIMIZATION_FLAG) -Wextra -Wno-missing-field-initializers export CFLAGS = $(ATMOSPHERE_CFLAGS) $(SETTINGS) $(DEFINES) $(INCLUDE) export CXXFLAGS = $(CFLAGS) $(ATMOSPHERE_CXXFLAGS) export ASFLAGS = $(ATMOSPHERE_ASFLAGS) $(SETTINGS) $(DEFINES) diff --git a/stratosphere/loader/source/ldr_meta.cpp b/stratosphere/loader/source/ldr_meta.cpp index b1d1a85ad..6aa24f2f6 100644 --- a/stratosphere/loader/source/ldr_meta.cpp +++ b/stratosphere/loader/source/ldr_meta.cpp @@ -254,21 +254,24 @@ namespace ams::ldr { } /* Fix the debug capabilities, to prevent needing a hbl recompilation. */ - FixDebugCapabilityForHbl(static_cast(meta->acid_kac), meta->acid->kac_size / sizeof(util::BitPack32)); - FixDebugCapabilityForHbl(static_cast(meta->aci_kac), meta->aci->kac_size / sizeof(util::BitPack32)); - } else if (hos::GetVersion() >= hos::Version_10_0_0) { - /* If storage id is none, there is no base code filesystem, and thus it is impossible for us to validate. */ - /* However, if we're an application, we are guaranteed a base code filesystem. */ - if (static_cast(loc.storage_id) != ncm::StorageId::None || ncm::IsApplicationId(loc.program_id)) { - R_TRY(fs::OpenFile(std::addressof(file), BaseMetaPath, fs::OpenMode_Read)); - ON_SCOPE_EXIT { fs::CloseFile(file); }; - R_TRY(LoadMetaFromFile(file, std::addressof(g_original_meta_cache))); - R_TRY(ValidateAcidSignature(std::addressof(g_original_meta_cache.meta), platform, unk_unused)); - meta->modulus = g_original_meta_cache.meta.modulus; - meta->check_verification_data = g_original_meta_cache.meta.check_verification_data; - } + //FixDebugCapabilityForHbl(static_cast(meta->acid_kac), meta->acid->kac_size / sizeof(util::BitPack32)); + //FixDebugCapabilityForHbl(static_cast(meta->aci_kac), meta->aci->kac_size / sizeof(util::BitPack32)); + } - + // } else if (hos::GetVersion() >= hos::Version_10_0_0) { + // /* If storage id is none, there is no base code filesystem, and thus it is impossible for us to validate. */ + // /* However, if we're an application, we are guaranteed a base code filesystem. */ + // if (static_cast(loc.storage_id) != ncm::StorageId::None || ncm::IsApplicationId(loc.program_id)) { + // R_TRY(fs::OpenFile(std::addressof(file), BaseMetaPath, fs::OpenMode_Read)); + // ON_SCOPE_EXIT { fs::CloseFile(file); }; + // R_TRY(LoadMetaFromFile(file, std::addressof(g_original_meta_cache))); + // R_TRY(ValidateAcidSignature(std::addressof(g_original_meta_cache.meta), platform, unk_unused)); + // meta->modulus = g_original_meta_cache.meta.modulus; + // meta->check_verification_data = g_original_meta_cache.meta.check_verification_data; + // } + // } + FixDebugCapabilityForHbl(static_cast(meta->acid_kac), meta->acid->kac_size / sizeof(util::BitPack32)); + FixDebugCapabilityForHbl(static_cast(meta->aci_kac), meta->aci->kac_size / sizeof(util::BitPack32)); /* Pre-process the capabilities. */ /* This is used to e.g. avoid passing memory region descriptor to older kernels. */ PreProcessCapability(static_cast(meta->acid_kac), meta->acid->kac_size / sizeof(util::BitPack32)); -- 2.36.0.windows.1