make printf functions be chosen by linker

mateoconlechuga · mateoconlechuga · commit 11f4715be9c6 · 2022-05-18T19:03:16.000-06:00
Signed-off-by: mateoconlechuga &lt;matthewwaltzis@gmail.com&gt;
diff --git a/docs/static/printf.rst b/docs/static/printf.rst
@@ -7,7 +7,7 @@ What's the deal with printf?
 ----------------------------
 
 The `printf` and related functions (`sprintf`, `vsprintf`, etc.) are based on a relatively `small implementation <https://github.com/CE-Programming/toolchain/blob/master/src/std/shared/nanoprintf.c>`_.
-However, they contribute around 7.5KiB to the resultant program.
+However, they contribute around 8 KiB to the resultant program.
 It is highly recommended to not use `printf` and related functions at all because of this.
 If you insist on using these functions, this page details how to do so in the next section.
 
diff --git a/src/crt/bshl.src b/src/crt/bshl.src
@@ -5,7 +5,7 @@
 
 if PREFER_OS_CRT
 
-__bshl	:= 000100h
+__bshl := 000100h
 
 else
 
diff --git a/src/crt/iand.src b/src/crt/iand.src
@@ -5,7 +5,7 @@
 
 if PREFER_OS_CRT
 
-__iand	:= 000134h
+__iand := 000134h
 
 else
 
diff --git a/src/crt/idvrmu.src b/src/crt/idvrmu.src
@@ -5,7 +5,7 @@
 
 if PREFER_OS_CRT
 
-__idvrmu	:= 000144h
+__idvrmu := 000144h
 
 else
 
diff --git a/src/crt/imulu.src b/src/crt/imulu.src
@@ -5,8 +5,8 @@
 
 if PREFER_OS_CRT
 
-__imuls	:= 000154h
-__imulu	:= 000158h
+__imuls := 000154h
+__imulu := 000158h
 
 else
 
diff --git a/src/crt/makefile b/src/crt/makefile
@@ -19,7 +19,7 @@ include $(CURDIR)/../common.mk
 BUILD_SRC := $(patsubst %,build/%.src,$(wildcard *.c *.cpp))
 
 EZCFLAGS := -S -ffreestanding -Wall -Wextra -Oz
-EZCFLAGS += -D_EZ80 -DHAS_PRINTF -isystem ../libc/include -mllvm -profile-guided-section-prefix=false
+EZCFLAGS += -D_EZ80 -isystem ../libc/include -mllvm -profile-guided-section-prefix=false
 EZCXXFLAGS := $(EZCFLAGS) -fno-exceptions -fno-rtti
 EZCXXFLAGS += -isystem ../libc/include/c++
 
diff --git a/src/libc/acos.c b/src/libc/acos.c
diff --git a/src/libc/acos.src b/src/libc/acos.src
@@ -5,8 +5,8 @@
 
 if PREFER_OS_LIBC
 
-_acosf	:= 022100h
-_acos	:= _acosf
+_acosf := 022100h
+_acos := _acosf
 
 else
 
diff --git a/src/libc/atof.src b/src/libc/atof.src
@@ -5,8 +5,8 @@
 
 if PREFER_OS_LIBC
 
-_atoff	:= 022110h
-_atof	:= _atoff
+_atoff := 022110h
+_atof := _atoff
 
 else
 
diff --git a/src/libc/ceil.src b/src/libc/ceil.src
@@ -5,8 +5,8 @@
 
 if PREFER_OS_LIBC
 
-_ceilf	:= 022114h
-_ceil	:= _ceilf
+_ceilf := 022114h
+_ceil := _ceilf
 
 else
 
diff --git a/src/libc/cos.src b/src/libc/cos.src
@@ -5,8 +5,8 @@
 
 if PREFER_OS_LIBC
 
-_cosf	:= 02211Ch
-_cos	:= _cosf
+_cosf := 02211Ch
+_cos := _cosf
 
 else
 
diff --git a/src/libc/fabs.src b/src/libc/fabs.src
@@ -5,8 +5,8 @@
 
 if PREFER_OS_LIBC
 
-_fabsf	:= 0220F0h
-_fabs	:= _fabsf
+_fabsf := 0220F0h
+_fabs := _fabsf
 
 else
 
diff --git a/src/libc/include/stdio.h b/src/libc/include/stdio.h
@@ -83,7 +83,6 @@ int putchar(int character);
 
 int puts(const char *str);
 
-#ifdef HAS_PRINTF
 int printf(const char *__restrict format, ...)
     __attribute__((format(__printf__, 1, 2)));
 
@@ -100,11 +99,7 @@ int snprintf(char* buffer, size_t count, const char *__restrict format, ...)
 int vsnprintf(char* buffer, size_t count, const char *__restrict format,
     va_list va)
     __attribute__((format(__printf__, 3, 0)));
-#else
-#define sprintf __sprintf
-#endif /* HAS_PRINTF */
 
-/* This function is embedded in the OS, but only supports a subset of printf */
 int sprintf(char *__restrict buffer,
     const char *__restrict format, ...)
     __attribute__ ((format (__printf__, 2, 3)));
diff --git a/src/libc/makefile b/src/libc/makefile
@@ -19,7 +19,7 @@ include $(CURDIR)/../common.mk
 BUILD_SRC := $(patsubst %,build/%.src,$(wildcard *.c *.cpp))
 
 EZCFLAGS := -S -ffreestanding -Wall -Wextra -Oz
-EZCFLAGS += -D_EZ80 -DHAS_PRINTF -isystem ../libc/include -isystem ../ce/include -isystem ../fileioc -mllvm -profile-guided-section-prefix=false
+EZCFLAGS += -D_EZ80 -isystem ../libc/include -isystem ../ce/include -isystem ../fileioc -mllvm -profile-guided-section-prefix=false
 EZCXXFLAGS := $(EZCFLAGS) -fno-exceptions -fno-rtti
 EZCXXFLAGS += -isystem ../libcxx/include
 
diff --git a/src/libc/nanoprintf.c b/src/libc/nanoprintf.c
@@ -975,15 +975,15 @@ int npf_vpprintf(npf_putc pc, void *pc_ctx, char const *format, va_list args) {
 #undef NPF_EXTRACT
 #undef NPF_WRITEBACK
 
-int printf(char const *format, ...) {
+int _printf_c(char const *format, ...) {
   va_list val;
   va_start(val, format);
   int const rv = vprintf(format, val);
   va_end(val);
   return rv;
 }
 
-int vsnprintf(char *buffer, size_t bufsz, char const *format, va_list vlist) {
+int _vsnprintf_c(char *buffer, size_t bufsz, char const *format, va_list vlist) {
   npf_bufputc_ctx_t bufputc_ctx;
   bufputc_ctx.dst = buffer;
   bufputc_ctx.len = bufsz;
@@ -1002,25 +1002,25 @@ int vsnprintf(char *buffer, size_t bufsz, char const *format, va_list vlist) {
   return n;
 }
 
-int snprintf(char *buffer, size_t bufsz, const char *format, ...) {
+int _snprintf_c(char *buffer, size_t bufsz, const char *format, ...) {
   va_list val;
   va_start(val, format);
   int const rv = vsnprintf(buffer, bufsz, format, val);
   va_end(val);
   return rv;
 }
 
-int vsprintf(char *buffer, const char *format, va_list vlist)
+int _vsprintf_c(char *buffer, const char *format, va_list vlist)
 {
   return vsnprintf(buffer, (size_t)-1, format, vlist);
 }
 
-int vprintf(const char *format, va_list vlist)
+int _vprintf_c(const char *format, va_list vlist)
 {
   return npf_vpprintf(npf_putc_std, NULL, format, vlist);
 }
 
-int sprintf(char *buffer, const char *format, ...)
+int _sprintf_c(char *buffer, const char *format, ...)
 {
   va_list va;
   va_start(va, format);
diff --git a/src/libc/printf.src b/src/libc/printf.src
@@ -0,0 +1,33 @@
+	assume	adl=1
+
+	section	.text
+	public	_sprintf
+
+if HAS_PRINTF
+
+	public	_printf
+	public	_vprintf
+	public	_vsprintf
+	public	_snprintf
+	public	_vsnprintf
+
+_printf := __printf_c
+_vprintf := __vprintf_c
+_vsprintf := __vsprintf_c
+_snprintf := __snprintf_c
+_vsnprintf := __vsnprintf_c
+_sprintf := __sprintf_c
+
+	extern	__printf_c
+	extern	__vprintf_c
+	extern	__vsprintf_c
+	extern	__snprintf_c
+	extern	__vsnprintf_c
+	extern	__sprintf_c
+
+else
+
+_sprintf := 0000BCh
+
+end if
+
diff --git a/src/libcxx/include/cstdio b/src/libcxx/include/cstdio
@@ -29,14 +29,11 @@ using ::rewind;
 using ::getchar;
 using ::putchar;
 using ::puts;
-
-#ifdef HAS_PRINTF
 using ::printf;
 using ::vprintf;
 using ::vsprintf;
 using ::snprintf;
 using ::vsnprintf;
-#endif // HAS_PRINTF
 using ::sprintf;
 } // namespace std
 
diff --git a/src/libcxx/makefile b/src/libcxx/makefile
@@ -19,7 +19,7 @@ include $(CURDIR)/../common.mk
 BUILD_SRC := $(patsubst %,build/%.src,$(wildcard *.c *.cpp))
 
 EZCFLAGS := -S -ffreestanding -Wall -Wextra -Oz
-EZCFLAGS += -D_EZ80 -DHAS_PRINTF -isystem ../libc/include -isystem ../ce/include -isystem ../fileioc -mllvm -profile-guided-section-prefix=false
+EZCFLAGS += -D_EZ80 -isystem ../libc/include -isystem ../ce/include -isystem ../fileioc -mllvm -profile-guided-section-prefix=false
 EZCXXFLAGS := $(EZCFLAGS) -fno-exceptions -fno-rtti
 EZCXXFLAGS += -isystem ../libcxx/include
 
diff --git a/src/makefile.mk b/src/makefile.mk
@@ -61,6 +61,7 @@ CCDEBUG := -g0
 LDDEBUG := 0
 LDPREFER_OS_CRT := 0
 LDPREFER_OS_LIBC := 0
+LDHAS_PRINTF := 0
 LDHAS_LIBC := 0
 LDHAS_LIBCXX := 0
 
@@ -193,11 +194,6 @@ ifeq ($(OUTPUT_MAP),YES)
 LDMAPFLAG := -i map
 endif
 
-# selectively include embedded printf functionality
-ifeq ($(HAS_PRINTF),YES)
-DEFPRINTF := -DHAS_PRINTF=1
-endif
-
 # support custom file io configuration
 ifeq ($(HAS_CUSTOM_FILE),YES)
 DEFCUSTOMFILE := -DHAS_CUSTOM_FILE=1 -DCUSTOM_FILE_FILE=\"$(CUSTOM_FILE_FILE)\"
@@ -216,11 +212,14 @@ endif
 ifeq ($(HAS_LIBCXX),YES)
 LDHAS_LIBCXX := 1
 endif
+ifeq ($(HAS_PRINTF),YES)
+LDHAS_PRINTF := 1
+endif
 
 # define the c/c++ flags used by clang
 EZINC = -isystem $(call NATIVEPATH,$(CEDEV_TOOLCHAIN)/include) -I$(SRCDIR)
 EZCFLAGS = -nostdinc
-EZCFLAGS += -fno-threadsafe-statics -Xclang -fforce-mangle-main-argc-argv -mllvm -profile-guided-section-prefix=false -D_EZ80 -D$(DEBUGMODE) $(DEFPRINTF) $(DEFCUSTOMFILE) $(CCDEBUG)
+EZCFLAGS += -fno-threadsafe-statics -Xclang -fforce-mangle-main-argc-argv -mllvm -profile-guided-section-prefix=false -D_EZ80 -D$(DEBUGMODE) $(DEFCUSTOMFILE) $(CCDEBUG)
 EZCXXFLAGS = $(EZCFLAGS) -fno-exceptions -fno-use-cxa-atexit $(CXXFLAGS)
 EZCFLAGS += $(CFLAGS)
 
@@ -229,6 +228,7 @@ FASMGFLAGS = \
 	-n \
 	$(call QUOTE_ARG,$(call NATIVEPATH,$(CEDEV_TOOLCHAIN)/meta/ld.alm)) \
 	-i $(call QUOTE_ARG,DEBUG := $(LDDEBUG)) \
+	-i $(call QUOTE_ARG,HAS_PRINTF := $(LDHAS_PRINTF)) \
 	-i $(call QUOTE_ARG,HAS_LIBC := $(LDHAS_LIBC)) \
 	-i $(call QUOTE_ARG,HAS_LIBCXX := $(LDHAS_LIBCXX)) \
 	-i $(call QUOTE_ARG,PREFER_OS_CRT := $(LDPREFER_OS_CRT)) \
