mirrors/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2024-11-22 20:06:40 +00:00
Code Issues Releases Activity

boot: update for new sf-semantics

Browse source
This commit is contained in:
Michael Scire 2021-01-18 17:22:36 -08:00 committed by SciresM
parent d00ebaa28a
commit f5c6736431
2 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libraries/libvapours/include/vapours/util.hpp
View file

@ -41,8 +41,11 @@
#include <vapours/util/util_overlap.hpp> #include <vapours/util/util_overlap.hpp>
#include <vapours/util/util_string_util.hpp> #include <vapours/util/util_string_util.hpp>
#include <vapours/util/util_string_view.hpp> #include <vapours/util/util_string_view.hpp>
#include <vapours/util/util_mutex_utils.hpp>
#include <vapours/util/util_variadic.hpp> #include <vapours/util/util_variadic.hpp>
#include <vapours/util/util_character_encoding.hpp> #include <vapours/util/util_character_encoding.hpp>
#include <vapours/util/util_format_string.hpp> #include <vapours/util/util_format_string.hpp>
#include <vapours/util/util_range.hpp> #include <vapours/util/util_range.hpp>
#ifdef ATMOSPHERE_IS_STRATOSPHERE
#include <vapours/util/util_mutex_utils.hpp>
#endif

14
stratosphere/boot/source/boot_main.cpp
View file

@ -36,7 +36,7 @@ extern "C" {
u32 __nx_fs_num_sessions = 1; u32 __nx_fs_num_sessions = 1;
/* TODO: Evaluate to what extent this can be reduced further. */ /* TODO: Evaluate to what extent this can be reduced further. */
#define INNER_HEAP_SIZE 0x1000 #define INNER_HEAP_SIZE 0x0
size_t nx_inner_heap_size = INNER_HEAP_SIZE; size_t nx_inner_heap_size = INNER_HEAP_SIZE;
char nx_inner_heap[INNER_HEAP_SIZE]; char nx_inner_heap[INNER_HEAP_SIZE];
@ -145,6 +145,18 @@ void __appExit(void) {
fsExit(); fsExit();
} }
namespace ams {
void *Malloc(size_t size) {
AMS_ABORT("ams::Malloc was called");
}
void Free(void *ptr) {
AMS_ABORT("ams::Free was called");
}
}
void *operator new(size_t size) { void *operator new(size_t size) {
return Allocate(size); return Allocate(size);
} }