Optimized nanoprintf function pointers, and fixed behaviour of boot_sprintf macro aliases

Author: ZERICO2005

src/libc/fprintf.src

@@ -10,7 +10,26 @@ if HAS_PRINTF
 _fprintf := __fprintf_c
 _vfprintf := __vfprintf_c
 
+	public	_npf_fputc_std
+_npf_fputc_std:
+;	call	__frameset0
+;	ld	hl, (ix + 6)
+;	ld	de, (ix + 9)
+;	ld	(ix + 6), hl
+;	ld	(ix + 9), de
+;	pop	ix
+;	jp	_fputc
+	ld	hl, 9
+	add	hl, sp
+	ld	de, (hl)
+	dec	hl
+	dec	hl
+	dec	hl
+	ld	hl, (hl)
+	jp	_fputc
+
 	extern	__fprintf_c
 	extern	__vfprintf_c
+	extern	_fputc
 
 end if

src/libc/include/stdio.h

@@ -4,7 +4,7 @@
 #include <cdefs.h>
 #include <stdarg.h>
 
-#ifndef HAS_PRINTF
+#if defined(HAS_PRINTF) && HAS_PRINTF == 0
 # include <ti/sprintf.h>
 #endif /* HAS_PRINTF */
 
@@ -159,7 +159,7 @@ namespace std {
 } /* namespace std */
 #endif /* __cplusplus */
 
-#ifndef HAS_PRINTF
+#if defined(HAS_PRINTF) && HAS_PRINTF == 0
 # define snprintf boot_snprintf
 # define asprintf boot_asprintf
 #endif /* HAS_PRINTF */

src/libc/nanoprintf.c

@@ -240,9 +240,40 @@ typedef struct {
   size_t cur;
 } npf_bufputc_ctx_t;
 
-static int npf_parse_format_spec(char const *format, npf_format_spec_t *out_spec);
+#if 0
+
 static void npf_bufputc(int c, void *ctx);
 static void npf_bufputc_nop(int c, void *ctx);
+
+static void npf_bufputc(int c, void *ctx) {
+  npf_bufputc_ctx_t *bpc = (npf_bufputc_ctx_t *)ctx;
+  if (bpc->cur < bpc->len) { bpc->dst[bpc->cur++] = (char)c; }
+}
+
+static void npf_bufputc_nop(int c, void *ctx) { (void)c; (void)ctx; }
+
+static void npf_putc_std(int c, void *ctx) {
+  (void)ctx;
+  outchar(c);
+}
+
+static void npf_fputc_std(int c, void *ctx) {
+  fputc(c, (FILE*)ctx);
+}
+
+#else
+
+void npf_bufputc(int c, void *ctx);
+
+void npf_bufputc_nop(int c, void *ctx) __attribute__((__const__, __leaf__, __nothrow__));
+
+void npf_putc_std(int c, void *ctx);
+
+void npf_fputc_std(int c, void *ctx);
+
+#endif
+
+static int npf_parse_format_spec(char const *format, npf_format_spec_t *out_spec);
 static int npf_itoa_rev(char *buf, npf_int_t i);
 static int npf_utoa_rev(char *buf, npf_uint_t i, unsigned base, unsigned case_adjust);
 
@@ -629,22 +660,6 @@ static int npf_bin_len(npf_uint_t u) {
 }
 #endif
 
-static void npf_bufputc(int c, void *ctx) {
-  npf_bufputc_ctx_t *bpc = (npf_bufputc_ctx_t *)ctx;
-  if (bpc->cur < bpc->len) { bpc->dst[bpc->cur++] = (char)c; }
-}
-
-static void npf_bufputc_nop(int c, void *ctx) { (void)c; (void)ctx; }
-
-static void npf_putc_std(int c, void *ctx) {
-  (void)ctx;
-  outchar(c);
-}
-
-static void npf_fputc_std(int c, void *ctx) {
-  fputc(c, (FILE*)ctx);
-}
-
 typedef struct npf_cnt_putc_ctx {
   npf_putc pc;
   void *ctx;

src/libc/nanoprintf.src

@@ -0,0 +1,45 @@
+	assume	adl=1
+
+	section	.text
+
+	public	_npf_bufputc_nop
+	public	_npf_bufputc
+
+_npf_bufputc:
+;	call	__frameset0
+;	ld	iy, (ix + 9)
+;	ld	de, (iy + 6)
+;	ld	bc, (iy + 3)
+;	push	de
+;	pop	hl
+;	or	a, a
+;	sbc	hl, bc
+;	jr	nc, .finish
+;	ld	a, (ix + 6)
+;	ld	hl, (iy)
+;	push	de
+;	pop	bc
+;	inc	bc
+;	ld	(iy + 6), bc
+;	add	hl, de
+;	ld	(hl), a
+;.finish:
+;	pop	ix
+;	ret
+	ld	iy, 0
+	add	iy, sp
+	ld	a, (iy + 3)
+	ld	iy, (iy + 6)
+	ld	hl, (iy + 6)
+	ld	bc, (iy + 3)
+	sbc	hl, bc	; carry not set
+	ret	nc
+	add	hl, bc
+	ex	de, hl
+	ld	hl, (iy)
+	add	hl, de
+	inc	de
+	ld	(iy + 6), de
+	ld	(hl), a
+_npf_bufputc_nop:
+	ret

src/libc/printf.src

@@ -10,7 +10,21 @@ if HAS_PRINTF
 _printf := __printf_c
 _vprintf := __vprintf_c
 
+	public	_npf_putc_std
+
+_npf_putc_std:
+;	call	__frameset0
+;	ld	a, (ix + 6)
+;	ld	(ix + 6), a
+;	pop	ix
+;	jp	_outchar
+	ld	hl, 6
+	add	hl, sp
+	ld	a, (hl)
+	jp	_outchar
+
 	extern	__printf_c
 	extern	__vprintf_c
+	extern	_outchar
 
 end if

test/standalone/asprintf_fprintf/src/main.c

@@ -19,6 +19,10 @@
  * memccpy
  */
 
+#if defined(sprintf) || defined(snprintf) || defined(asprintf)
+# error "sprintf snprintf asprintf macro aliases need to be disabled"
+#endif
+
 // prevents Clang from replacing function calls with builtins
 #if 1
 
@@ -141,8 +145,9 @@ int nano_tests(void) {
         return __LINE__;
     }
     size_t buf_len = T_strlen(buf);
-    if (buf_len != T_strlen(test_1) || buf_len != (size_t)len) {
-        printf("E: %zu != %zu != %d\n", T_strlen(test_1), buf_len, len);
+    const size_t test_1_len = T_strlen(test_1);
+    if (buf_len != test_1_len || buf_len != (size_t)len) {
+        printf("E: %zu != %zu != %d\n", test_1_len, buf_len, len);
         return __LINE__;
     }
     if (pos != pos_1) {
@@ -154,6 +159,34 @@ int nano_tests(void) {
         printf("cmp: %d\n", cmp);
         return __LINE__;
     }
+    char append[128];
+    int snprintf_test = snprintf(append, 20, "%s", test_1);
+    if (snprintf_test != (int)test_1_len) {
+        printf("sprintf_test: %d != %zu\n", snprintf_test, test_1_len);
+        return __LINE__;
+    }
+    int len_2 = snprintf(append, sizeof(append), "%s", test_1);
+    if (len_2 != (int)test_1_len) {
+        printf("E: %d != %zu\n", len_2, test_1_len);
+        return __LINE__;
+    }
+    char str2[128];
+    char* end;
+    end = T_stpcpy(str2, append);
+    end = T_stpcpy(end, "");
+    end = T_stpcpy(end, "foo");
+    if (*end != '\0') {
+        return __LINE__;
+    }
+    if (end != &str2[pos_2]) {
+        printf("diff %p - %p = %td\n", end, str2, (ptrdiff_t)(end - str2));
+        return __LINE__;
+    }
+    int cmp2 = T_strcmp(str2, test_2);
+    if (cmp2 != 0) {
+        printf("cmp: %d\n", cmp2);
+        return __LINE__;
+    }
     return 0;
 }