d0p1/tcc-stupidos
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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.

Browse source
This commit is contained in:
mingodad 2014-03-28 20:28:19 +00:00
parent 700c2f769b
commit c025478d7c
2 changed files with 28 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
include/stdarg.h
View file

@ -4,18 +4,28 @@
#ifdef __x86_64__ #ifdef __x86_64__
#ifndef _WIN64 #ifndef _WIN64
typedef void *va_list; //This should be in sync with the declaration on our lib/libtcc1.c
/* GCC compatible definition of va_list. */
typedef struct {
unsigned int gp_offset;
unsigned int fp_offset;
union {
unsigned int overflow_offset;
char *overflow_arg_area;
};
char *reg_save_area;
} __va_list_struct;
va_list __va_start(void *fp); typedef __va_list_struct va_list;
void *__va_arg(va_list ap, int arg_type, int size, int align);
va_list __va_copy(va_list src);
void __va_end(va_list ap);
#define va_start(ap, last) ((ap) = __va_start(__builtin_frame_address(0))) void __va_start(__va_list_struct *ap, void *fp);
void *__va_arg(__va_list_struct *ap, int arg_type, int size, int align);
#define va_start(ap, last) __va_start(&ap, __builtin_frame_address(0))
#define va_arg(ap, type) \ #define va_arg(ap, type) \
(*(type *)(__va_arg(ap, __builtin_va_arg_types(type), sizeof(type), __alignof__(type)))) (*(type *)(__va_arg(&ap, __builtin_va_arg_types(type), sizeof(type), __alignof__(type))))
#define va_copy(dest, src) ((dest) = __va_copy(src)) #define va_copy(dest, src) ((dest) = (src))
#define va_end(ap) __va_end(ap) #define va_end(ap)
#else /* _WIN64 */ #else /* _WIN64 */
typedef char *va_list; typedef char *va_list;

30
lib/libtcc1.c
View file

@ -626,10 +626,12 @@ long long __fixxfdi (long double a1)
#ifndef __TINYC__ #ifndef __TINYC__
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <string.h>
#else #else
/* Avoid including stdlib.h because it is not easily available when /* Avoid including stdlib.h because it is not easily available when
cross compiling */ cross compiling */
extern void *malloc(unsigned long long); extern void *malloc(unsigned long long);
void *memset(void *s, int c, size_t n);
extern void free(void*); extern void free(void*);
extern void abort(void); extern void abort(void);
#endif #endif
@ -638,8 +640,9 @@ enum __va_arg_type {
__va_gen_reg, __va_float_reg, __va_stack __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. */ /* GCC compatible definition of va_list. */
struct __va_list_struct { typedef struct {
unsigned int gp_offset; unsigned int gp_offset;
unsigned int fp_offset; unsigned int fp_offset;
union { union {
@ -647,24 +650,22 @@ struct __va_list_struct {
char *overflow_arg_area; char *overflow_arg_area;
}; };
char *reg_save_area; char *reg_save_area;
}; } __va_list_struct;
#undef __va_start #undef __va_start
#undef __va_arg #undef __va_arg
#undef __va_copy #undef __va_copy
#undef __va_end #undef __va_end
void *__va_start(void *fp) void __va_start(__va_list_struct *ap, void *fp)
{ {
struct __va_list_struct *ap = memset(ap, 0, sizeof(__va_list_struct));
(struct __va_list_struct *)malloc(sizeof(struct __va_list_struct)); *ap = *(__va_list_struct *)((char *)fp - 16);
*ap = *(struct __va_list_struct *)((char *)fp - 16);
ap->overflow_arg_area = (char *)fp + ap->overflow_offset; ap->overflow_arg_area = (char *)fp + ap->overflow_offset;
ap->reg_save_area = (char *)fp - 176 - 16; 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, enum __va_arg_type arg_type,
int size, int align) 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__ */ #endif /* __x86_64__ */
/* Flushing for tccrun */ /* Flushing for tccrun */