Merge branch 'master' of https://github.com/Atmosphere-NX/Atmosphere into logmanager

libraries/libmesosphere/source/kern_k_light_lock.cpp

@@ -43,7 +43,6 @@ namespace ams::kern {
 
             if (owner_thread->IsSuspended()) {
                 owner_thread->ContinueIfHasKernelWaiters();
-                KScheduler::SetSchedulerUpdateNeeded();
             }
         }
 
@@ -53,6 +52,7 @@ namespace ams::kern {
             KThread *owner_thread = cur_thread->GetLockOwner();
             if (AMS_UNLIKELY(owner_thread)) {
                 owner_thread->RemoveWaiter(cur_thread);
+                KScheduler::SetSchedulerUpdateNeeded();
             }
         }
     }

libraries/libstratosphere/source/fssystem/save/fssystem_buffered_storage.cpp

@@ -899,7 +899,7 @@ namespace ams::fssystem::save {
             const s64 cur_offset_end = offset + *size;
             size_t cur_size = 0;
 
-            if (!util::IsAligned(offset, this->block_size)) {
+            if (!util::IsAligned(cur_offset_end, this->block_size)) {
                 const s64 aligned_size = cur_offset_end - util::AlignDown(cur_offset_end, this->block_size);
                 cur_size = std::min(aligned_size, static_cast<s64>(*size));
             } else if (*size < this->block_size) {

libraries/libstratosphere/source/result/result_on_assertion.cpp

@@ -15,25 +15,12 @@
  */
 #include <stratosphere.hpp>
 
-namespace ams::result {
-
-    extern bool CallFatalOnResultAssertion;
-
-}
-
 namespace ams::result::impl {
 
         NORETURN WEAK_SYMBOL void OnResultAbort(const char *file, int line, const char *func, const char *expr, Result result) {
-            /* Assert that we should call fatal on result assertion. */
+            ::ams::diag::AbortImpl(file, line, func, expr, result.GetValue(), "Result Abort: %203d-%04d", result.GetModule(), result.GetDescription());
-            /* If we shouldn't fatal, this will abort(); */
-            /* If we should, we'll continue onwards. */
-            if (!ams::result::CallFatalOnResultAssertion) {
-                ::ams::diag::AbortImpl(file, line, func, expr, result.GetValue(), "Result Abort: %203d-%04d", result.GetModule(), result.GetDescription());
-            }
-
-            /* TODO: ams::fatal:: */
-            fatalThrow(result.GetValue());
             AMS_INFINITE_LOOP();
+            __builtin_unreachable();
         }
 
         NORETURN WEAK_SYMBOL void OnResultAbort(Result result) {
@@ -41,16 +28,9 @@ namespace ams::result::impl {
         }
 
         NORETURN WEAK_SYMBOL void OnResultAssertion(const char *file, int line, const char *func, const char *expr, Result result) {
-            /* Assert that we should call fatal on result assertion. */
+            ::ams::diag::AssertionFailureImpl(file, line, func, expr, result.GetValue(), "Result Assertion: %203d-%04d", result.GetModule(), result.GetDescription());
-            /* If we shouldn't fatal, this will assert(); */
-            /* If we should, we'll continue onwards. */
-            if (!ams::result::CallFatalOnResultAssertion) {
-                ::ams::diag::AssertionFailureImpl(file, line, func, expr, result.GetValue(), "Result Assertion: %203d-%04d", result.GetModule(), result.GetDescription());
-            }
-
-            /* TODO: ams::fatal:: */
-            fatalThrow(result.GetValue());
             AMS_INFINITE_LOOP();
+            __builtin_unreachable();
         }
 
         NORETURN WEAK_SYMBOL void OnResultAssertion(Result result) {

stratosphere/ams_mitm/source/amsmitm_main.cpp

@@ -47,12 +47,6 @@ namespace ams {
 
     ncm::ProgramId CurrentProgramId = ncm::AtmosphereProgramId::Mitm;
 
-    namespace result {
-
-        bool CallFatalOnResultAssertion = false;
-
-    }
-
     /* Override. */
     void ExceptionHandler(FatalErrorContext *ctx) {
         /* We're bpc-mitm (or ams_mitm, anyway), so manually reboot to fatal error. */

stratosphere/boot/source/boot_main.cpp

@@ -63,12 +63,6 @@ namespace ams {
         boot::RebootForFatalError(ctx);
     }
 
-    namespace result {
-
-        bool CallFatalOnResultAssertion = false;
-
-    }
-
 }
 
 using namespace ams;

stratosphere/boot2/source/boot2_main.cpp

@@ -43,12 +43,6 @@ namespace ams {
 
     ncm::ProgramId CurrentProgramId = ncm::SystemProgramId::Boot2;
 
-    namespace result {
-
-        bool CallFatalOnResultAssertion = false;
-
-    }
-
 }
 
 using namespace ams;

stratosphere/creport/source/creport_main.cpp

@@ -46,12 +46,6 @@ namespace ams {
 
     ncm::ProgramId CurrentProgramId = ncm::SystemProgramId::Creport;
 
-    namespace result {
-
-        bool CallFatalOnResultAssertion = true;
-
-    }
-
 }
 
 using namespace ams;

stratosphere/dmnt/source/dmnt_main.cpp

@@ -41,12 +41,6 @@ namespace ams {
 
     ncm::ProgramId CurrentProgramId = ncm::SystemProgramId::Dmnt;
 
-    namespace result {
-
-        bool CallFatalOnResultAssertion = false;
-
-    }
-
 }
 
 using namespace ams;

stratosphere/eclct.stub/source/eclct_stub.cpp

@@ -38,12 +38,6 @@ namespace ams {
 
     ncm::ProgramId CurrentProgramId = ncm::SystemProgramId::Eclct;
 
-    namespace result {
-
-        bool CallFatalOnResultAssertion = false;
-
-    }
-
 }
 
 using namespace ams;

stratosphere/erpt/source/erpt_main.cpp

@@ -43,12 +43,6 @@ namespace ams {
 
     ncm::ProgramId CurrentProgramId = ncm::SystemProgramId::Erpt;
 
-    namespace result {
-
-        bool CallFatalOnResultAssertion = false;
-
-    }
-
 }
 
 using namespace ams;

stratosphere/fatal/source/fatal_main.cpp

@@ -50,12 +50,6 @@ namespace ams {
 
     ncm::ProgramId CurrentProgramId = ncm::SystemProgramId::Fatal;
 
-    namespace result {
-
-        bool CallFatalOnResultAssertion = false;
-
-    }
-
 }
 
 using namespace ams;

stratosphere/jpegdec/source/jpegdec_main.cpp

@@ -39,12 +39,6 @@ extern "C" {
 namespace ams {
     ncm::ProgramId CurrentProgramId = ncm::SystemProgramId::JpegDec;
 
-    namespace result {
-
-        bool CallFatalOnResultAssertion = true;
-
-    }
-
 }
 
 using namespace ams;

stratosphere/loader/source/ldr_main.cpp

@@ -45,12 +45,6 @@ namespace ams {
 
     ncm::ProgramId CurrentProgramId = ncm::SystemProgramId::Loader;
 
-    namespace result {
-
-        bool CallFatalOnResultAssertion = false;
-
-    }
-
 }
 
 using namespace ams;

stratosphere/ncm/source/ncm_main.cpp

@@ -43,12 +43,6 @@ namespace ams {
 
     ncm::ProgramId CurrentProgramId = ncm::SystemProgramId::Ncm;
 
-    namespace result {
-
-        bool CallFatalOnResultAssertion = false;
-
-    }
-
 }
 
 using namespace ams;

stratosphere/pgl/source/pgl_main.cpp

@@ -43,12 +43,6 @@ namespace ams {
 
     ncm::ProgramId CurrentProgramId = ncm::SystemProgramId::Pgl;
 
-    namespace result {
-
-        bool CallFatalOnResultAssertion = false;
-
-    }
-
 }
 
 using namespace ams;

stratosphere/pm/source/pm_main.cpp

@@ -48,12 +48,6 @@ namespace ams {
 
     ncm::ProgramId CurrentProgramId = ncm::SystemProgramId::Pm;
 
-    namespace result {
-
-        bool CallFatalOnResultAssertion = false;
-
-    }
-
 }
 
 using namespace ams;

stratosphere/ro/source/ro_main.cpp

@@ -40,12 +40,6 @@ namespace ams {
 
     ncm::ProgramId CurrentProgramId = ncm::SystemProgramId::Ro;
 
-    namespace result {
-
-        bool CallFatalOnResultAssertion = true;
-
-    }
-
 }
 
 using namespace ams;

stratosphere/sm/source/sm_main.cpp

@@ -47,12 +47,6 @@ namespace ams {
 
     ncm::ProgramId CurrentProgramId = ncm::SystemProgramId::Sm;
 
-    namespace result {
-
-        bool CallFatalOnResultAssertion = false;
-
-    }
-
 }
 
 using namespace ams;

stratosphere/spl/source/spl_main.cpp

@@ -53,12 +53,6 @@ namespace ams {
 
     ncm::ProgramId CurrentProgramId = ncm::SystemProgramId::Spl;
 
-    namespace result {
-
-        bool CallFatalOnResultAssertion = false;
-
-    }
-
 }
 
 using namespace ams;