1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2024-12-18 08:22:04 +00:00

ams: save 0x11000 of memory in spl via minor tweaks

This commit is contained in:
Michael Scire 2021-01-12 01:27:38 -08:00
parent b8072b1398
commit d2f81d2ca2
2 changed files with 8 additions and 3 deletions

View file

@ -197,10 +197,15 @@ extern "C" {
} }
namespace {
constinit ams::os::Mutex g_abort_lock(true);
}
/* Custom abort handler, so that std::abort will trigger these. */ /* Custom abort handler, so that std::abort will trigger these. */
void abort() { void abort() {
static ams::os::Mutex abort_lock(true); std::scoped_lock lk(g_abort_lock);
std::scoped_lock lk(abort_lock);
ams::AbortImpl(); ams::AbortImpl();
__builtin_unreachable(); __builtin_unreachable();

View file

@ -220,7 +220,7 @@ namespace ams::os::impl {
constexpr size_t ThreadNamePrefixSize = sizeof(ThreadNamePrefix) - 1; constexpr size_t ThreadNamePrefixSize = sizeof(ThreadNamePrefix) - 1;
const u64 func = reinterpret_cast<u64>(thread->function); const u64 func = reinterpret_cast<u64>(thread->function);
static_assert(ThreadNamePrefixSize + sizeof(func) * 2 + 1 <= sizeof(thread->name_buffer)); static_assert(ThreadNamePrefixSize + sizeof(func) * 2 + 1 <= sizeof(thread->name_buffer));
std::snprintf(thread->name_buffer, sizeof(thread->name_buffer), "%s%016lX", ThreadNamePrefix, func); util::SNPrintf(thread->name_buffer, sizeof(thread->name_buffer), "%s%016lX", ThreadNamePrefix, func);
} }
thread->name_pointer = thread->name_buffer; thread->name_pointer = thread->name_buffer;