ams: revamp assertion system

2020-02-22 23:05:14 -08:00
parent 9572fb2ce3
commit 40400aee1f
168 changed files with 1014 additions and 696 deletions
--- a/libraries/libstratosphere/source/ams/ams_emummc_api.cpp
+++ b/libraries/libstratosphere/source/ams/ams_emummc_api.cpp
@@ -82,7 +82,7 @@ namespace ams::emummc {
                } *paths = reinterpret_cast<decltype(paths)>(&path_storage);

                /* Retrieve paths from secure monitor. */
-                AMS_ASSERT(spl::smc::AtmosphereGetEmummcConfig(&g_exo_config, paths, 0) == spl::smc::Result::Success);
+                AMS_ABORT_UNLESS(spl::smc::AtmosphereGetEmummcConfig(&g_exo_config, paths, 0) == spl::smc::Result::Success);

                const Storage storage = static_cast<Storage>(g_exo_config.base_cfg.type);
                g_is_emummc = g_exo_config.base_cfg.magic == StorageMagic && storage != Storage_Emmc;