reimplemented custom allocator

Author: ZERICO2005

src/libc/allocator/allocator_custom.src

@@ -0,0 +1,23 @@
+	.assume	adl=1
+
+	.section	.text._malloc
+	.global	_malloc
+	.type	_malloc, @function
+_malloc:
+	jp	__custom_malloc
+
+	.section	.text._free
+	.global	_free
+	.type	_free, @function
+_free:
+	jp	__custom_free
+
+	.section	.text._realloc
+	.global	_realloc
+	.type	_realloc, @function
+_realloc:
+	jp	__custom_realloc
+
+	.extern	__custom_malloc
+	.extern	__custom_free
+	.extern	__custom_realloc

src/libc/allocator/allocator_simple.src

@@ -1,6 +1,6 @@
 	.assume	adl=1
 
-	.section	.text._malloc
+	.section	.text
 
 	.global	_malloc
 	.type	_malloc, @function

src/libc/allocator/makefile

@@ -18,7 +18,7 @@ include $(CURDIR)/../../common.mk
 
 .SECONDARY:
 
-all: build/allocator_standard.a build/allocator_simple.a
+all: build/allocator_standard.a build/allocator_simple.a build/allocator_custom.a
 
 # --- allocator_simple
 
@@ -44,12 +44,23 @@ build/allocator_standard.src: allocator_standard.c
 	$(Q)$(call MKDIR,build)
 	$(Q)$(EZCC) $(EZCFLAGS) $< -o $@
 
+# --- allocator_custom
+
+build/allocator_custom.a: build/allocator_custom.o
+	$(Q)$(call MKDIR,build)
+	$(Q)$(EZAR) rcs $@ $^
+
+build/allocator_custom.o: allocator_custom.src
+	$(Q)$(call MKDIR,build)
+	$(Q)$(EZAS) $(EZASFLAGS) $< -o $@
+
 clean:
 	$(Q)$(call RMDIR,build)
 
 install: all
 	$(Q)$(call MKDIR,$(INSTALL_LIBC))
 	$(Q)$(call COPY,$(call NATIVEPATH,build/allocator_simple.a),$(INSTALL_LIBC))
 	$(Q)$(call COPY,$(call NATIVEPATH,build/allocator_standard.a),$(INSTALL_LIBC))
+	$(Q)$(call COPY,$(call NATIVEPATH,build/allocator_custom.a),$(INSTALL_LIBC))
 
 .PHONY: all clean install

src/makefile.mk

@@ -130,9 +130,18 @@ LINKER_SCRIPT ?= $(call FORWARD_PATH,$(CEDEV_TOOLCHAIN)/meta/linker_script.ld)
 # allocator (malloc/realloc/free)
 ifeq ($(ALLOCATOR),STANDARD)
 LIB_ALLOCATOR = $(call FORWARD_PATH,$(CEDEV_TOOLCHAIN)/lib/libc/allocator_standard.a)
-endif
-ifeq ($(ALLOCATOR),SIMPLE)
+else ifeq ($(ALLOCATOR),SIMPLE)
 LIB_ALLOCATOR = $(call FORWARD_PATH,$(CEDEV_TOOLCHAIN)/lib/libc/allocator_simple.a)
+else ifeq ($(ALLOCATOR),CUSTOM)
+LIB_ALLOCATOR = $(call FORWARD_PATH,$(CEDEV_TOOLCHAIN)/lib/libc/allocator_custom.a)
+else
+$(error ALLOCATOR must be one of STANDARD, SIMPLE, or CUSTOM)
+endif
+
+ifeq ($(ALLOCATOR),CUSTOM)
+CUSTOM_ALLOCATOR_SYMBOLS = --undefined __custom_malloc --undefined __custom_free --undefined __custom_realloc
+else
+CUSTOM_ALLOCATOR_SYMBOLS =
 endif
 
 # ensure always a hexadecimal value
@@ -481,7 +490,7 @@ $(OBJDIR)/%.$(CPP_EXTENSION).bc: $$(call UPDIR_RM,$$*).$(CPP_EXTENSION) $(EXTRA_
 	$(Q)$(CC) -MD -c -emit-llvm $(EZCXXFLAGS) $(call QUOTE_ARG,$<) -o $(call QUOTE_ARG,$@)
 
 # crt
-$(OBJDIR)/$(TARGETTMP): $(OBJECTS) $(LIB_ALLOCATOR) $(LIB_PRINTF) $(LIB_CXX) $(LIB_CE) $(LIB_SOFTFLOAT) $(LIB_CRT) $(LIB_C) $(ICON_OBJ) $(EXTRA_LIBS) $(MAKEFILE_LIST) $(DEPS)
+$(OBJDIR)/$(TARGETTMP): $(OBJECTS) $(LIB_PRINTF) $(LIB_CXX) $(LIB_CE) $(LIB_SOFTFLOAT) $(LIB_CRT) $(LIB_C) $(ICON_OBJ) $(EXTRA_LIBS) $(MAKEFILE_LIST) $(DEPS)
 	$(Q)$(call MKDIR,$(@D))
 	$(Q)$(LD) \
 		-i \
@@ -491,6 +500,7 @@ $(OBJDIR)/$(TARGETTMP): $(OBJECTS) $(LIB_ALLOCATOR) $(LIB_PRINTF) $(LIB_CXX) $(L
 		--gc-sections \
 		--omagic \
 		--defsym __TICE__=1 \
+		$(CUSTOM_ALLOCATOR_SYMBOLS) \
 		$(SPRINTF_SYMBOL) \
 		$(LD_DEBUG) \
 		$(EXTRA_PRE_LDFLAGS) \
@@ -499,7 +509,6 @@ $(OBJDIR)/$(TARGETTMP): $(OBJECTS) $(LIB_ALLOCATOR) $(LIB_PRINTF) $(LIB_CXX) $(L
 		$(EXTRA_LIBS) \
 		--whole-archive $(LIB_PRINTF) --no-whole-archive \
 		--start-group \
-		$(LIB_ALLOCATOR) \
 		$(LIB_CRT) \
 		$(LIB_CE) \
 		$(LIB_SOFTFLOAT) \