ncm/build dist: minor fixes

This commit is contained in:
Michael Scire 2020-04-14 10:20:27 -07:00
parent 94b10b5779
commit 6fe8ada37a
2 changed files with 4 additions and 3 deletions

View file

@ -58,6 +58,7 @@ dist-no-debug: all
mkdir atmosphere-$(AMSVER)/switch mkdir atmosphere-$(AMSVER)/switch
mkdir -p atmosphere-$(AMSVER)/atmosphere/contents/0100000000000008 mkdir -p atmosphere-$(AMSVER)/atmosphere/contents/0100000000000008
mkdir -p atmosphere-$(AMSVER)/atmosphere/contents/010000000000000D mkdir -p atmosphere-$(AMSVER)/atmosphere/contents/010000000000000D
mkdir -p atmosphere-$(AMSVER)/atmosphere/contents/010000000000002B
mkdir -p atmosphere-$(AMSVER)/atmosphere/contents/0100000000000032 mkdir -p atmosphere-$(AMSVER)/atmosphere/contents/0100000000000032
mkdir -p atmosphere-$(AMSVER)/atmosphere/contents/0100000000000034 mkdir -p atmosphere-$(AMSVER)/atmosphere/contents/0100000000000034
mkdir -p atmosphere-$(AMSVER)/atmosphere/contents/0100000000000036 mkdir -p atmosphere-$(AMSVER)/atmosphere/contents/0100000000000036

View file

@ -56,18 +56,18 @@ namespace {
void *Allocate(size_t size) { void *Allocate(size_t size) {
void *mem = lmem::AllocateFromExpHeap(g_heap_handle, size); void *mem = lmem::AllocateFromExpHeap(g_heap_handle, size);
GetHeapState().Allocate(size); ncm::GetHeapState().Allocate(size);
return mem; return mem;
} }
void Deallocate(void *p, size_t size) { void Deallocate(void *p, size_t size) {
GetHeapState().Free(size); ncm::GetHeapState().Free(size != 0 ? size : lmem::GetExpHeapMemoryBlockSize(p));
lmem::FreeToExpHeap(g_heap_handle, p); lmem::FreeToExpHeap(g_heap_handle, p);
} }
void InitializeHeap() { void InitializeHeap() {
g_heap_handle = lmem::CreateExpHeap(g_heap_memory, sizeof(g_heap_memory), lmem::CreateOption_None); g_heap_handle = lmem::CreateExpHeap(g_heap_memory, sizeof(g_heap_memory), lmem::CreateOption_None);
GetHeapState().Initialize(g_heap_handle); ncm::GetHeapState().Initialize(g_heap_handle);
} }
} }