(WIIU) misc.

This commit is contained in:
aliaspider 2016-10-27 19:53:56 +01:00
parent 02c38d23c1
commit 844c6ed582
2 changed files with 12 additions and 15 deletions

View File

@ -1,2 +1,3 @@
python2 wiiu/wiiload.py retroarch_wiiu.elf sd:/zz.gb export WIILOAD=tcp:10.42.0.170
wiiload retroarch_wiiu.elf
netcat -p 4405 -l 10.42.0.170 netcat -p 4405 -l 10.42.0.170

View File

@ -49,14 +49,14 @@ extern void (* MEMFreeToExpHeap)(int heap, void* ptr);
static int mem1_heap = -1; static int mem1_heap = -1;
static int bucket_heap = -1; static int bucket_heap = -1;
int mem1_heap_handle;
void memoryInitialize(void) void memoryInitialize(void)
{ {
mem1_heap_handle = MEMGetBaseHeapHandle(MEMORY_ARENA_1); int mem1_heap_handle = MEMGetBaseHeapHandle(MEMORY_ARENA_1);
unsigned int mem1_allocatable_size = MEMGetAllocatableSizeForFrmHeapEx(mem1_heap_handle, 4); unsigned int mem1_allocatable_size = MEMGetAllocatableSizeForFrmHeapEx(mem1_heap_handle, 4);
void *mem1_memory = MEMAllocFromFrmHeapEx(mem1_heap_handle, mem1_allocatable_size, 4); void *mem1_memory = MEMAllocFromFrmHeapEx(mem1_heap_handle, mem1_allocatable_size, 4);
if(mem1_memory) if(mem1_memory)
mem1_heap = MEMCreateExpHeapEx(mem1_memory, mem1_allocatable_size, 0); mem1_heap = MEMCreateExpHeapEx(mem1_memory, mem1_allocatable_size, 0);
int bucket_heap_handle = MEMGetBaseHeapHandle(MEMORY_ARENA_FG_BUCKET); int bucket_heap_handle = MEMGetBaseHeapHandle(MEMORY_ARENA_FG_BUCKET);
unsigned int bucket_allocatable_size = MEMGetAllocatableSizeForFrmHeapEx(bucket_heap_handle, 4); unsigned int bucket_allocatable_size = MEMGetAllocatableSizeForFrmHeapEx(bucket_heap_handle, 4);
@ -67,9 +67,10 @@ void memoryInitialize(void)
void memoryRelease(void) void memoryRelease(void)
{ {
MEMDestroyExpHeap(mem1_heap); MEMDestroyExpHeap(mem1_heap);
MEMFreeToFrmHeap(mem1_heap_handle, 3); MEMFreeToFrmHeap(MEMGetBaseHeapHandle(MEMORY_ARENA_1), 3);
mem1_heap = -1; mem1_heap = -1;
MEMDestroyExpHeap(bucket_heap); MEMDestroyExpHeap(bucket_heap);
MEMFreeToFrmHeap(MEMGetBaseHeapHandle(MEMORY_ARENA_FG_BUCKET), 3); MEMFreeToFrmHeap(MEMGetBaseHeapHandle(MEMORY_ARENA_FG_BUCKET), 3);
bucket_heap = -1; bucket_heap = -1;
@ -81,8 +82,6 @@ void memoryRelease(void)
void *__wrap_malloc(size_t size) void *__wrap_malloc(size_t size)
{ {
// pointer to a function resolve // pointer to a function resolve
if(!size)
return NULL;
return ((void * (*)(size_t))(*pMEMAllocFromDefaultHeap))(size); return ((void * (*)(size_t))(*pMEMAllocFromDefaultHeap))(size);
} }
@ -90,9 +89,6 @@ void *__wrap_memalign(size_t align, size_t size)
{ {
if (align < 4) if (align < 4)
align = 4; align = 4;
if(!size)
return NULL;
// pointer to a function resolve // pointer to a function resolve
return ((void * (*)(size_t, size_t))(*pMEMAllocFromDefaultHeapEx))(size, align); return ((void * (*)(size_t, size_t))(*pMEMAllocFromDefaultHeapEx))(size, align);
} }