diff --git a/Makefile b/Makefile index 81b706e3..482cac5c 100644 --- a/Makefile +++ b/Makefile @@ -73,7 +73,7 @@ ios := 249 CFLAGS = -g -Os -Wall $(MACHDEP) $(INCLUDE) -DHAVE_CONFIG_H CXXFLAGS = -g -Os -Wall -Wextra -Wno-multichar $(MACHDEP) $(INCLUDE) -DHAVE_CONFIG_H -LDFLAGS = -g $(MACHDEP) -Wl,-Map,$(notdir $@).map,--section-start,.init=0x80A00000,-wrap,malloc,-wrap,free,-wrap,memalign,-wrap,calloc,-wrap,realloc,-wrap,malloc_usable_size -T../scripts/rvl.ld +LDFLAGS = -g $(MACHDEP) -Wl,-Map,$(notdir $@).map,--section-start,.init=0x80A00000,-wrap,malloc,-wrap,free,-wrap,memalign,-wrap,calloc,-wrap,realloc,-wrap,malloc_usable_size #--------------------------------------------------------------------------------- # any extra libraries we wish to link with the project diff --git a/scripts/rvl.ld b/scripts/rvl.ld deleted file mode 100644 index 0fb899fc..00000000 --- a/scripts/rvl.ld +++ /dev/null @@ -1,304 +0,0 @@ -/* - * Linkscript for Wii - */ - -OUTPUT_FORMAT("elf32-powerpc", "elf32-powerpc", "elf32-powerpc"); -OUTPUT_ARCH(powerpc:common); -EXTERN(_start); -ENTRY(_start); - -PHDRS -{ - /*cdat PT_LOAD FLAGS(6);*/ - stub PT_LOAD FLAGS(5); - text PT_LOAD FLAGS(5); - data PT_LOAD FLAGS(6); -} - -SECTIONS -{ - /*. = 0x80004000; - .cdat : - { - KEEP(*(.cdat)) - } :cdat = 0 - __cdat_end = .;*/ - - /* stub is loaded at physical address 0x00003400 (though both 0x80003400 and 0x00003400 are equivalent for IOS) */ - /* This can also be used to load an arbitrary standalone stub at an arbitrary address in memory, for any purpose */ - /* Use -Wl,--section-start,.stub=0xADDRESS to change */ - . = 0x00003400; - - .stub : - { - KEEP(*(.stub)) - } :stub = 0 - - /* default base address */ - /* use -Wl,--section-start,.init=0xADDRESS to change */ - . = 0x80B00000; - - /* Program */ - .init : - { - __init_start = .; - KEEP (*crt0.o(*.init)) - KEEP (*(.init)) - } :text = 0 - .plt : { *(.plt) } - .interp : { *(.interp) } - .hash : { *(.hash) } - .dynsym : { *(.dynsym) } - .dynstr : { *(.dynstr) } - .gnu.version : { *(.gnu.version) } - .gnu.version_d : { *(.gnu.version_d) } - .gnu.version_r : { *(.gnu.version_r) } - .rel.init : { *(.rel.init) } - .rela.init : { *(.rela.init) } - .rel.text : { *(.rel.text .rel.text.* .rel.gnu.linkonce.t.*) } - .rela.text : { *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*) } - .rel.fini : { *(.rel.fini) } - .rela.fini : { *(.rela.fini) } - .rel.rodata : { *(.rel.rodata .rel.rodata.* .rel.gnu.linkonce.r.*) } - .rela.rodata : { *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*) } - .rel.data : { *(.rel.data .rel.data.* .rel.gnu.linkonce.d.*) } - .rela.data : { *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*) } - .rel.tdata : { *(.rel.tdata .rel.tdata.* .rel.gnu.linkonce.td.*) } - .rela.tdata : { *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*) } - .rel.tbss : { *(.rel.tbss .rel.tbss.* .rel.gnu.linkonce.tb.*) } - .rela.tbss : { *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*) } - .rel.ctors : { *(.rel.ctors) } - .rela.ctors : { *(.rela.ctors) } - .rel.dtors : { *(.rel.dtors) } - .rela.dtors : { *(.rela.dtors) } - .rel.got : { *(.rel.got) } - .rela.got : { *(.rela.got) } - .rela.got1 : { *(.rela.got1) } - .rela.got2 : { *(.rela.got2) } - .rel.sdata : { *(.rel.sdata .rel.sdata.* .rel.gnu.linkonce.s.*) } - .rela.sdata : { *(.rela.sdata .rela.sdata.* .rela.gnu.linkonce.s.*) } - .rel.sbss : { *(.rel.sbss .rel.sbss.* .rel.gnu.linkonce.sb.*) } - .rela.sbss : { *(.rela.sbss .rela.sbss.* .rel.gnu.linkonce.sb.*) } - .rel.sdata2 : { *(.rel.sdata2 .rel.sdata2.* .rel.gnu.linkonce.s2.*) } - .rela.sdata2 : { *(.rela.sdata2 .rela.sdata2.* .rela.gnu.linkonce.s2.*) } - .rel.sbss2 : { *(.rel.sbss2 .rel.sbss2.* .rel.gnu.linkonce.sb2.*) } - .rela.sbss2 : { *(.rela.sbss2 .rela.sbss2.* .rela.gnu.linkonce.sb2.*) } - .rel.bss : { *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*) } - .rela.bss : { *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) } - .rel.plt : { *(.rel.plt) } - .rela.plt : { *(.rela.plt) } - - .text : - { - *(.text) - *(.text.*) - /* .gnu.warning sections are handled specially by elf32.em. */ - *(.gnu.warning) - *(.gnu.linkonce.t.*) - . = ALIGN(32); /* REQUIRED. LD is flaky without it. */ - } = 0 - - .fini : - { - KEEP (*(.fini)) - . = ALIGN(32); /* REQUIRED. LD is flaky without it. */ - } = 0 - - PROVIDE (__etext = .); - PROVIDE (_etext = .); - PROVIDE (etext = .); - - .rodata : { *(.rodata) *(.rodata.*) *(.gnu.linkonce.r.*) } :data - .rodata1 : { *(.rodata1) } - .sdata2 : { *(.sdata2) *(.sdata2.*) *(.gnu.linkonce.s2.*) } - .sbss2 : { *(.sbss2) *(.sbss2.*) *(.gnu.linkonce.sb2.*) } - /* Adjust the address for the data segment. We want to adjust up to - the same address within the page on the next page up. */ - /* Ensure the __preinit_array_start label is properly aligned. We - could instead move the label definition inside the section, but - the linker would then create the section even if it turns out to - be empty, which isn't pretty. */ - . = ALIGN(32 / 8); - PROVIDE (__preinit_array_start = .); - .preinit_array : { *(.preinit_array) } - PROVIDE (__preinit_array_end = .); - PROVIDE (__init_array_start = .); - .init_array : { *(.init_array) } - PROVIDE (__init_array_end = .); - PROVIDE (__fini_array_start = .); - .fini_array : { *(.fini_array) } - PROVIDE (__fini_array_end = .); - .data : - { - *(.data) - *(.data.*) - *(.gnu.linkonce.d.*) - SORT(CONSTRUCTORS) - . = ALIGN(32); /* REQUIRED. LD is flaky without it. */ - } - - .data1 : { *(.data1) } - .tdata : { *(.tdata .tdata.* .gnu.linkonce.td.*) } - .tbss : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) } - .eh_frame : { KEEP (*(.eh_frame)) } - .gcc_except_table : { *(.gcc_except_table) } - .fixup : { *(.fixup) } - .got1 : { *(.got1) } - .got2 : { *(.got2) } - .dynamic : { *(.dynamic) } - - .ctors : - { - /* gcc uses crtbegin.o to find the start of - the constructors, so we make sure it is - first. Because this is a wildcard, it - doesn't matter if the user does not - actually link against crtbegin.o; the - linker won't look for a file to match a - wildcard. The wildcard also means that it - doesn't matter which directory crtbegin.o - is in. */ - - KEEP (*crtbegin.o(.ctors)) - - /* We don't want to include the .ctor section from - from the crtend.o file until after the sorted ctors. - The .ctor section from the crtend file contains the - end of ctors marker and it must be last */ - - KEEP (*(EXCLUDE_FILE (*crtend.o ) .ctors)) - KEEP (*(SORT(.ctors.*))) - KEEP (*(.ctors)) - . = ALIGN(32); /* REQUIRED. LD is flaky without it. */ - } - - .dtors : - { - KEEP (*crtbegin.o(.dtors)) - KEEP (*(EXCLUDE_FILE (*crtend.o ) .dtors)) - KEEP (*(SORT(.dtors.*))) - KEEP (*(.dtors)) - . = ALIGN(32); /* REQUIRED. LD is flaky without it. */ - } - - .jcr : { KEEP (*(.jcr)) } - .got : { *(.got.plt) *(.got) } - - - /* We want the small data sections together, so single-instruction offsets - can access them all, and initialized data all before uninitialized, so - we can shorten the on-disk segment size. */ - - .sdata : - { - *(.sdata) - *(.sdata.*) - *(.gnu.linkonce.s.*) - . = ALIGN(32); /* REQUIRED. LD is flaky without it. */ - } - - _edata = .; - PROVIDE (edata = .); - - .sbss : - { - __sbss_start = .; - PROVIDE (__sbss_start = .); - PROVIDE (___sbss_start = .); - *(.dynsbss) - *(.sbss) - *(.sbss.*) - *(.gnu.linkonce.sb.*) - *(.scommon) - PROVIDE (__sbss_end = .); - PROVIDE (___sbss_end = .); - . = ALIGN(32); /* REQUIRED. LD is flaky without it. */ - __sbss_end = .; - } - - .bss : - { - __bss_start = .; - PROVIDE (__bss_start = .); - *(.dynbss) - *(.bss) - *(.bss.*) - *(.gnu.linkonce.b.*) - *(COMMON) - /* Align here to ensure that the .bss section occupies space up to - _end. Align after .bss to ensure correct alignment even if the - .bss section disappears because there are no input sections. */ - - . = ALIGN(32); - - PROVIDE (__bss_end = .); - __bss_end = .; - } - . = ALIGN(32); - _end = .; - PROVIDE(end = .); - /* Stabs debugging sections. */ - .stab 0 : { *(.stab) } - .stabstr 0 : { *(.stabstr) } - .stab.excl 0 : { *(.stab.excl) } - .stab.exclstr 0 : { *(.stab.exclstr) } - .stab.index 0 : { *(.stab.index) } - .stab.indexstr 0 : { *(.stab.indexstr) } - .comment 0 : { *(.comment) } - /* DWARF debug sections. - Symbols in the DWARF debugging sections are relative to the beginning - of the section so we begin them at 0. */ - /* DWARF 1 */ - .debug 0 : { *(.debug) } - .line 0 : { *(.line) } - /* GNU DWARF 1 extensions */ - .debug_srcinfo 0 : { *(.debug_srcinfo) } - .debug_sfnames 0 : { *(.debug_sfnames) } - /* DWARF 1.1 and DWARF 2 */ - .debug_aranges 0 : { *(.debug_aranges) } - .debug_pubnames 0 : { *(.debug_pubnames) } - /* DWARF 2 */ - .debug_info 0 : { *(.debug_info) } - .debug_abbrev 0 : { *(.debug_abbrev) } - .debug_line 0 : { *(.debug_line) } - .debug_frame 0 : { *(.debug_frame) } - .debug_str 0 : { *(.debug_str) } - .debug_loc 0 : { *(.debug_loc) } - .debug_macinfo 0 : { *(.debug_macinfo) } - /* SGI/MIPS DWARF 2 extensions */ - .debug_weaknames 0 : { *(.debug_weaknames) } - .debug_funcnames 0 : { *(.debug_funcnames) } - .debug_typenames 0 : { *(.debug_typenames) } - .debug_varnames 0 : { *(.debug_varnames) } - /* These must appear regardless of . */ -} - -__isIPL = 0; -__stack_addr = (__bss_start + SIZEOF(.bss) + 0x20000 + 7) & (-8); -__stack_end = (__bss_start + SIZEOF(.bss)); -__intrstack_addr = (__stack_addr + 0x4000); -__intrstack_end = (__stack_addr); -__Arena1Lo = (__intrstack_addr + 31) & (-32); -__Arena1Hi = (0x81700000); -__Arena2Lo = (0x90002000); -__Arena2Hi = (0x933E0000); - -__gxregs = (__Arena1Hi + 31) & (-32); -__ipcbufferLo = (0x933e0000); -__ipcbufferHi = (0x93400000); - -/* for backward compatibility with old crt0 */ -PROVIDE (__stack = (0x81700000)); - -PROVIDE(__isIPL = __isIPL); -PROVIDE(__stack_addr = __stack_addr); -PROVIDE(__stack_end = __stack_end); -PROVIDE(__intrstack_addr = __intrstack_addr); -PROVIDE(__intrstack_end = __intrstack_end); -PROVIDE(__Arena1Lo = __Arena1Lo); -PROVIDE(__Arena1Hi = __Arena1Hi); -PROVIDE(__Arena2Lo = __Arena2Lo); -PROVIDE(__Arena2Hi = __Arena2Hi); -PROVIDE(__ipcbufferLo = __ipcbufferLo); -PROVIDE(__ipcbufferHi = __ipcbufferHi); -PROVIDE(__gxregs = __gxregs); diff --git a/source/memory/mem2.cpp b/source/memory/mem2.cpp index a813c749..e09b1481 100644 --- a/source/memory/mem2.cpp +++ b/source/memory/mem2.cpp @@ -14,232 +14,193 @@ #define APPLOADER_END (void *)0x81700000 #endif -#define MAX_MEM1_ARENA_LO ((void *) (((u32)APPLOADER_START)-size)) -#define MEM2_PRIORITY_SIZE 0x1000 - // Forbid the use of MEM2 through malloc u32 MALLOC_MEM2 = 0; - static CMEM2Alloc g_mem2gp; -static CMEM2Alloc g_mem1Lgp; -static CMEM2Alloc g_mem1Ugp; - -extern int __init_start; extern int _end; extern "C" { - void MEM2_init(unsigned int mem2Size) + +extern __typeof(malloc) __real_malloc; +extern __typeof(calloc) __real_calloc; +extern __typeof(realloc) __real_realloc; +extern __typeof(memalign) __real_memalign; +extern __typeof(free) __real_free; +extern __typeof(malloc_usable_size) __real_malloc_usable_size; + + +void *MEM1_alloc(unsigned int s) +{ + return __real_malloc(s); +} + +void *MEM1_realloc(void *p, unsigned int s) +{ + return __real_realloc(p, s); +} + +void MEM1_free(void *p) +{ + __real_free(p); +} + + +void MEM2_init(unsigned int mem2Size) +{ + if(&_end + 0x100 > APPLOADER_START) + gprintf("ZOMG MOVE THE ENTRYPOINT DOWN!\n"); + + g_mem2gp.init(mem2Size); + g_mem2gp.clear(); + + /* Protect space reserved for apploader */ + SYS_SetArena1Hi(APPLOADER_START); +} + +void MEM2_cleanup(void) +{ + g_mem2gp.cleanup(); +} + +void MEM2_clear(void) +{ + g_mem2gp.clear(); +} + +void MEM2_free(void *p) +{ + g_mem2gp.release(p); +} + +void *MEM2_alloc(unsigned int s) +{ + return g_mem2gp.allocate(s); +} + +void *MEM2_realloc(void *p, unsigned int s) +{ + return g_mem2gp.reallocate(p, s); +} + +unsigned int MEM2_usableSize(void *p) +{ + return CMEM2Alloc::usableSize(p); +} + +unsigned int MEM2_freesize() +{ + return g_mem2gp.FreeSize(); +} + +void *__wrap_malloc(size_t size) +{ + void *p; + if ((SYS_GetArena1Lo() >= MAX_MEM1_ARENA_LO) || size >= MEM2_PRIORITY_SIZE) { - if(&_end + 0x100 > APPLOADER_START) gprintf("ZOMG MOVE THE ENTRYPOINT DOWN!\n"); - - g_mem2gp.init(mem2Size); - g_mem2gp.clear(); - - /* If these are used, they must be cleared before running the apploader */ - - /* Below executable */ - g_mem1Lgp.init((void *)0x80004000, &__init_start - 0x100); - g_mem1Lgp.clear(); - - /* Above Executable */ - g_mem1Ugp.init(APPLOADER_START, APPLOADER_END); - g_mem1Ugp.clear(); - - /* Protect space reserved for apploader */ - SYS_SetArena1Hi(APPLOADER_START); + p = MEM2_alloc(size); + if(p != 0) + return p; + return __real_malloc(size); } - - void MEM2_cleanup(void) - { - g_mem2gp.cleanup(); - } - - void MEM2_clear(void) - { - g_mem2gp.clear(); - } - - void MEM1_cleanup(void) - { - g_mem1Lgp.cleanup(); - g_mem1Ugp.cleanup(); - } - - void MEM1_clear(void) - { - g_mem1Lgp.clear(); - g_mem1Ugp.clear(); - } - - void *MEM2_alloc(unsigned int s) - { - return g_mem2gp.allocate(s); - } - - void *MEM1_alloc(unsigned int s) - { - if(g_mem1Lgp.FreeSize() >= s) - return g_mem1Lgp.allocate(s); - if(g_mem1Ugp.FreeSize() >= s) - return g_mem1Ugp.allocate(s); - - return NULL; - } - - void MEM2_free(void *p) - { - g_mem2gp.release(p); - } - - void MEM1_free(void *p) - { - if((u32)p < (u32)&__init_start - 0x100 && (u32)p >= 0x80004000) - g_mem1Lgp.release(p); - else if((u32)p > (u32)APPLOADER_START && (u32)p < (u32)APPLOADER_END) - g_mem1Ugp.release(p); - } - - void *MEM2_realloc(void *p, unsigned int s) - { - return g_mem2gp.reallocate(p, s); - } - - void *MEM1_realloc(void *p, unsigned int s) - { - if((u32)p < (u32)&__init_start - 0x100 && (u32)p >= 0x80004000) - return g_mem1Lgp.reallocate(p, s); - else if((u32)p > (u32)APPLOADER_START && (u32)p < (u32)APPLOADER_END) - return g_mem1Ugp.reallocate(p, s); - - return NULL; - } - - unsigned int MEM2_usableSize(void *p) - { - return CMEM2Alloc::usableSize(p); - } - - unsigned int MEM2_freesize() - { - return g_mem2gp.FreeSize(); - } - - unsigned int MEM1_freesize() - { - return g_mem1Lgp.FreeSize() + g_mem1Ugp.FreeSize(); - } - - extern __typeof(malloc) __real_malloc; - extern __typeof(calloc) __real_calloc; - extern __typeof(realloc) __real_realloc; - extern __typeof(memalign) __real_memalign; - extern __typeof(free) __real_free; - extern __typeof(malloc_usable_size) __real_malloc_usable_size; - - void *__wrap_malloc(size_t size) - { - void *p; - if ((SYS_GetArena1Lo() >= MAX_MEM1_ARENA_LO) || size >= MEM2_PRIORITY_SIZE) - { - p = MEM2_alloc(size); - return p != 0 ? p : __real_malloc(size); - } - p = __real_malloc(size); - return p != 0 ? p : MEM2_alloc(size); - } - - void *__wrap_calloc(size_t n, size_t size) - { - void *p; - if ((SYS_GetArena1Lo() >= MAX_MEM1_ARENA_LO) || (n * size) >= MEM2_PRIORITY_SIZE) - { - p = MEM2_alloc(n * size); - if (p != 0) - { - memset(p, 0, n * size); - return p; - } - return __real_calloc(n, size); - } - - p = __real_calloc(n, size); - if (p != 0) return p; - - p = MEM2_alloc(n * size); - if (p != 0) memset(p, 0, n * size); + p = __real_malloc(size); + if(p != 0) return p; - } + return MEM2_alloc(size); +} - void *__wrap_memalign(size_t a, size_t size) +void *__wrap_calloc(size_t n, size_t size) +{ + void *p; + if ((SYS_GetArena1Lo() >= MAX_MEM1_ARENA_LO) || (n * size) >= MEM2_PRIORITY_SIZE) { - void *p; - if ((SYS_GetArena1Lo() >= MAX_MEM1_ARENA_LO) || size >= MEM2_PRIORITY_SIZE) - { - if (a <= 32 && 32 % a == 0) - { - p = MEM2_alloc(size); - if (p != 0) return p; - } - return __real_memalign(a, size); - } - p = __real_memalign(a, size); - return p != 0 ? p : MEM2_alloc(size); - } - - void __wrap_free(void *p) - { - if(!p) - return; - if(((u32)p < (u32)&__init_start - 0x100 && (u32)p >= (u32)0x80004000) || ((u32)p > (u32)APPLOADER_START && (u32)p < (u32)APPLOADER_END)) - MEM1_free(p); - else if((u32)p & 0x10000000) - MEM2_free(p); - else - __real_free(p); - } - - void *__wrap_realloc(void *p, size_t size) - { - void *n; - // ptr from mem2 - if (((u32)p & 0x10000000) != 0 || (p == 0 && size > MEM2_PRIORITY_SIZE)) - { - n = MEM2_realloc(p, size); - if (n != 0) { - return n; - } - n = __real_malloc(size); - if (n == 0) { - return 0; - } - if (p != 0) - { - memcpy(n, p, MEM2_usableSize(p) < size ? MEM2_usableSize(p) : size); - MEM2_free(p); - } - return n; - } - // ptr from malloc - n = __real_realloc(p, size); - if (n != 0) { - return n; - } - n = MEM2_alloc(size); - if (n == 0) { - return 0; - } + p = MEM2_alloc(n * size); if (p != 0) { - memcpy(n, p, __real_malloc_usable_size(p) < size ? __real_malloc_usable_size(p) : size); - __real_free(p); + memset(p, 0, n * size); + return p; + } + return __real_calloc(n, size); + } + + p = __real_calloc(n, size); + if (p != 0) return p; + + p = MEM2_alloc(n * size); + if (p != 0) + memset(p, 0, n * size); + return p; +} + +void *__wrap_memalign(size_t a, size_t size) +{ + void *p; + if ((SYS_GetArena1Lo() >= MAX_MEM1_ARENA_LO) || size >= MEM2_PRIORITY_SIZE) + { + if (a <= 32 && 32 % a == 0) + { + p = MEM2_alloc(size); + if (p != 0) + return p; + } + return __real_memalign(a, size); + } + p = __real_memalign(a, size); + if(p != 0) + return p; + return MEM2_alloc(size); +} + +void __wrap_free(void *p) +{ + if(!p) + return; + + if (((u32)p & 0x10000000) != 0) + g_mem2gp.release(p); + else + __real_free(p); +} + +void *__wrap_realloc(void *p, size_t size) +{ + void *n; + // ptr from mem2 + if (((u32)p & 0x10000000) != 0 || (p == 0 && size > MEM2_PRIORITY_SIZE)) + { + n = MEM2_realloc(p, size); + if (n != 0) + return n; + n = __real_malloc(size); + if (n == 0) + return 0; + if (p != 0) + { + memcpy(n, p, MEM2_usableSize(p) < size ? MEM2_usableSize(p) : size); + MEM2_free(p); } return n; } - - size_t __wrap_malloc_usable_size(void *p) + // ptr from malloc + n = __real_realloc(p, size); + if (n != 0) + return n; + n = MEM2_alloc(size); + if (n == 0) + return 0; + if (p != 0) { - return ((u32)p & 0x10000000) != 0 ? MEM2_usableSize(p) : __real_malloc_usable_size(p); + memcpy(n, p, __real_malloc_usable_size(p) < size ? __real_malloc_usable_size(p) : size); + __real_free(p); } + return n; +} -} ///extern "C" \ No newline at end of file +size_t __wrap_malloc_usable_size(void *p) +{ + if(((u32)p & 0x10000000) != 0) + return MEM2_usableSize(p); + return __real_malloc_usable_size(p); +} + +} ///extern "C" diff --git a/source/memory/mem2.hpp b/source/memory/mem2.hpp index 0841b9c6..ff39a624 100644 --- a/source/memory/mem2.hpp +++ b/source/memory/mem2.hpp @@ -9,26 +9,30 @@ extern "C" { #endif +#define MAX_MEM1_ARENA_LO ((void *) (((u32)APPLOADER_START)-size)) +#define MEM2_PRIORITY_SIZE 0x1000 + +void *MEM1_alloc(unsigned int s); +void *MEM1_realloc(void *p, unsigned int s); +void MEM1_free(void *p); + void MEM2_init(unsigned int mem2Size); void MEM2_cleanup(void); void MEM2_clear(void); -void MEM1_cleanup(void); -void MEM1_clear(void); -void *MEM2_alloc(unsigned int s); -void *MEM1_alloc(unsigned int s); -void *MEM2_realloc(void *p, unsigned int s); -void *MEM1_realloc(void *p, unsigned int s); void MEM2_free(void *p); -void MEM1_free(void *p); +void *MEM2_alloc(unsigned int s); +void *MEM2_realloc(void *p, unsigned int s); unsigned int MEM2_usableSize(void *p); unsigned int MEM2_freesize(); -unsigned int MEM1_freesize(); #ifdef __cplusplus } #endif - -enum Alloc { ALLOC_MALLOC, ALLOC_MEM2 }; +enum Alloc +{ + ALLOC_MALLOC, + ALLOC_MEM2, +}; #endif // !defined(__MEM2_HPP) \ No newline at end of file