Imagelibrary/tinycc
1
0
Fork 0
mirror of https://github.com/TinyCC/tinycc.git synced 2025-11-16 12:34:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix stdarg on x86-64

Browse Source 
this partly reverts 1803762e3 to fix stdarg on x86-64 again.  I've tried
to retain the apple specific changes from that commit.
Also include stdarg.h first in tcc.h, maybe that helps as well.
This commit is contained in:
Michael Matz
2020-04-15 04:13:05 +02:00
parent 1803762e3f
commit 8c6143d86f
5 changed files with 45 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
lib/va_list.c
View File

@@ -2,16 +2,14 @@
#if defined __x86_64__
#include "stdarg.h"
/* Avoid include files, they may not be available when cross compiling */
extern void *memset(void *s, int c, __SIZE_TYPE__ n);
extern void abort(void);
/* This should be in sync with our include/stdarg.h */
#define __VA_GEN_REG 0
#define __VA_FLOAT_REG 1
#define __VA_STACK 2
enum __va_arg_type {
__va_gen_reg, __va_float_reg, __va_stack
};
/* GCC compatible definition of va_list. */
typedef struct {
@@ -24,45 +22,43 @@ typedef struct {
char *reg_save_area;
} __va_list_struct;
void __va_start(va_list ap, void *fp)
void __va_start(__va_list_struct *ap, void *fp)
{
__va_list_struct * _ap = (__va_list_struct*) ap;
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;
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;
}
void *__va_arg(va_list ap,
void *__va_arg(__va_list_struct *ap,
int arg_type,
int size, int align)
{
__va_list_struct * _ap = (__va_list_struct*) ap;
size = (size + 7) & ~7;
align = (align + 7) & ~7;
switch (arg_type) {
case __VA_GEN_REG:
if (_ap->gp_offset + size <= 48) {
_ap->gp_offset += size;
return _ap->reg_save_area + _ap->gp_offset - size;
case __va_gen_reg:
if (ap->gp_offset + size <= 48) {
ap->gp_offset += size;
return ap->reg_save_area + ap->gp_offset - size;
}
goto use_overflow_area;
case __VA_FLOAT_REG:
if (_ap->fp_offset < 128 + 48) {
_ap->fp_offset += 16;
return _ap->reg_save_area + _ap->fp_offset - 16;
case __va_float_reg:
if (ap->fp_offset < 128 + 48) {
ap->fp_offset += 16;
return ap->reg_save_area + ap->fp_offset - 16;
}
size = 8;
goto use_overflow_area;
case __VA_STACK:
case __va_stack:
use_overflow_area:
_ap->overflow_arg_area += size;
_ap->overflow_arg_area = (char*)((long long)(_ap->overflow_arg_area + align - 1) & -align);
return _ap->overflow_arg_area - size;
ap->overflow_arg_area += size;
ap->overflow_arg_area = (char*)((long long)(ap->overflow_arg_area + align - 1) & -align);
return ap->overflow_arg_area - size;
default: /* should never h_appen */
default: /* should never happen */
abort();
return 0;
}