New implementation of va_list/va_start/var_copy that do not use dynamic memory, with this when compiling fossil-scm with tcc on linux X86_64 it works fine.

1 files changed, 9 insertions, 21 deletions

diff --git a/lib/libtcc1.c b/lib/libtcc1.c
index a5896a4..284965e 100644
--- a/lib/libtcc1.c
+++ b/lib/libtcc1.c
@@ -626,10 +626,12 @@ long long __fixxfdi (long double a1)
 #ifndef __TINYC__
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 #else
 /* Avoid including stdlib.h because it is not easily available when
    cross compiling */
 extern void *malloc(unsigned long long);
+void *memset(void *s, int c, size_t n);
 extern void free(void*);
 extern void abort(void);
 #endif
@@ -638,8 +640,9 @@ enum __va_arg_type {
     __va_gen_reg, __va_float_reg, __va_stack
 };
 
+//This should be in sync with the declaration on our include/stdarg.h
 /* GCC compatible definition of va_list. */
-struct __va_list_struct {
+typedef struct {
     unsigned int gp_offset;
     unsigned int fp_offset;
     union {
@@ -647,24 +650,22 @@ struct __va_list_struct {
         char *overflow_arg_area;
     };
     char *reg_save_area;
-};
+} __va_list_struct;
 
 #undef __va_start
 #undef __va_arg
 #undef __va_copy
 #undef __va_end
 
-void *__va_start(void *fp)
+void __va_start(__va_list_struct *ap, void *fp)
 {
-    struct __va_list_struct *ap =
-        (struct __va_list_struct *)malloc(sizeof(struct __va_list_struct));
-    *ap = *(struct __va_list_struct *)((char *)fp - 16);
+    memset(ap, 0, sizeof(__va_list_struct));
+    *ap = *(__va_list_struct *)((char *)fp - 16);
     ap->overflow_arg_area = (char *)fp + ap->overflow_offset;
     ap->reg_save_area = (char *)fp - 176 - 16;
-    return ap;
 }
 
-void *__va_arg(struct __va_list_struct *ap,
+void *__va_arg(__va_list_struct *ap,
                enum __va_arg_type arg_type,
                int size, int align)
 {
@@ -701,19 +702,6 @@ void *__va_arg(struct __va_list_struct *ap,
     }
 }
 
-void *__va_copy(struct __va_list_struct *src)
-{
-    struct __va_list_struct *dest =
-        (struct __va_list_struct *)malloc(sizeof(struct __va_list_struct));
-    *dest = *src;
-    return dest;
-}
-
-void __va_end(struct __va_list_struct *ap)
-{
-    free(ap);
-}
-
 #endif /* __x86_64__ */
 
 /* Flushing for tccrun */