2009-05-05 22:17:11 +04:00
|
|
|
/*
|
|
|
|
* TCC - Tiny C Compiler
|
2015-07-29 23:53:57 +03:00
|
|
|
*
|
2009-05-05 22:17:11 +04:00
|
|
|
* Copyright (c) 2001-2004 Fabrice Bellard
|
|
|
|
*
|
|
|
|
* This library is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
|
|
* License as published by the Free Software Foundation; either
|
|
|
|
* version 2 of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This library is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
* Lesser General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
|
|
* License along with this library; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
|
|
*/
|
|
|
|
|
2019-12-11 02:37:18 +03:00
|
|
|
#define USING_GLOBALS
|
2009-12-20 03:53:49 +03:00
|
|
|
#include "tcc.h"
|
2019-12-11 02:37:18 +03:00
|
|
|
|
2009-12-20 03:53:49 +03:00
|
|
|
/********************************************************/
|
|
|
|
/* global variables */
|
|
|
|
|
|
|
|
/* loc : local variable index
|
|
|
|
ind : output code index
|
|
|
|
rsym: return symbol
|
|
|
|
anon_sym: anonymous symbol index
|
|
|
|
*/
|
|
|
|
ST_DATA int rsym, anon_sym, ind, loc;
|
|
|
|
|
|
|
|
ST_DATA Sym *global_stack;
|
|
|
|
ST_DATA Sym *local_stack;
|
|
|
|
ST_DATA Sym *define_stack;
|
|
|
|
ST_DATA Sym *global_label_stack;
|
|
|
|
ST_DATA Sym *local_label_stack;
|
2018-12-20 12:55:22 +03:00
|
|
|
|
2019-12-11 02:37:18 +03:00
|
|
|
static Sym *sym_free_first;
|
|
|
|
static void **sym_pools;
|
|
|
|
static int nb_sym_pools;
|
|
|
|
|
2019-06-22 14:18:54 +03:00
|
|
|
static Sym *all_cleanups, *pending_gotos;
|
2019-01-28 03:21:38 +03:00
|
|
|
static int local_scope;
|
2016-10-05 19:34:17 +03:00
|
|
|
static int in_sizeof;
|
2019-04-29 14:53:07 +03:00
|
|
|
static int in_generic;
|
2016-10-15 16:55:31 +03:00
|
|
|
static int section_sym;
|
2009-12-20 03:53:49 +03:00
|
|
|
|
2019-12-14 14:31:03 +03:00
|
|
|
ST_DATA SValue *vtop;
|
|
|
|
static SValue _vstack[1 + VSTACK_SIZE];
|
|
|
|
#define vstack (_vstack + 1)
|
2009-12-20 03:53:49 +03:00
|
|
|
|
|
|
|
ST_DATA int const_wanted; /* true if constant wanted */
|
2017-07-16 13:10:00 +03:00
|
|
|
ST_DATA int nocode_wanted; /* no code generation wanted */
|
2020-01-16 01:32:40 +03:00
|
|
|
#define unevalmask 0xffff /* unevaluated subexpression */
|
2017-07-16 13:10:00 +03:00
|
|
|
#define NODATA_WANTED (nocode_wanted > 0) /* no static data output wanted either */
|
|
|
|
#define STATIC_DATA_WANTED (nocode_wanted & 0xC0000000) /* only static data output */
|
2019-04-29 14:53:07 +03:00
|
|
|
|
|
|
|
/* Automagical code suppression ----> */
|
|
|
|
#define CODE_OFF() (nocode_wanted |= 0x20000000)
|
|
|
|
#define CODE_ON() (nocode_wanted &= ~0x20000000)
|
|
|
|
|
|
|
|
/* Clear 'nocode_wanted' at label if it was used */
|
|
|
|
ST_FUNC void gsym(int t) { if (t) { gsym_addr(t, ind); CODE_ON(); }}
|
|
|
|
static int gind(void) { CODE_ON(); return ind; }
|
|
|
|
|
|
|
|
/* Set 'nocode_wanted' after unconditional jumps */
|
|
|
|
static void gjmp_addr_acs(int t) { gjmp_addr(t); CODE_OFF(); }
|
2020-01-21 16:23:57 +03:00
|
|
|
static int gjmp_acs(int t) { t = gjmp(t); CODE_OFF(); return t; }
|
2019-04-29 14:53:07 +03:00
|
|
|
|
|
|
|
/* These are #undef'd at the end of this file */
|
|
|
|
#define gjmp_addr gjmp_addr_acs
|
|
|
|
#define gjmp gjmp_acs
|
|
|
|
/* <---- */
|
|
|
|
|
2009-12-20 03:53:49 +03:00
|
|
|
ST_DATA int global_expr; /* true if compound literals must be allocated globally (used during initializers parsing */
|
|
|
|
ST_DATA CType func_vt; /* current function return type (used by return instruction) */
|
2014-01-06 18:27:39 +04:00
|
|
|
ST_DATA int func_var; /* true if current function is variadic (used by return instruction) */
|
2009-12-20 03:53:49 +03:00
|
|
|
ST_DATA int func_vc;
|
2019-12-14 14:36:12 +03:00
|
|
|
static int last_line_num, new_file, func_ind; /* debug info control */
|
tccpp: fix issues, add tests
* fix some macro expansion issues
* add some pp tests in tests/pp
* improved tcc -E output for better diff'ability
* remove -dD feature (quirky code, exotic feature,
didn't work well)
Based partially on ideas / researches from PipCet
Some issues remain with VA_ARGS macros (if used in a
rather tricky way).
Also, to keep it simple, the pp doesn't automtically
add any extra spaces to separate tokens which otherwise
would form wrong tokens if re-read from tcc -E output
(such as '+' '=') GCC does that, other compilers don't.
* cleanups
- #line 01 "file" / # 01 "file" processing
- #pragma comment(lib,"foo")
- tcc -E: forward some pragmas to output (pack, comment(lib))
- fix macro parameter list parsing mess from
a3fc54345949535524d01319e1ca6378b7c2c201
a715d7143d9d17da17e67fec6af1c01409a71a31
(some coffee might help, next time ;)
- introduce TOK_PPSTR - to have character constants as
written in the file (similar to TOK_PPNUM)
- allow '\' appear in macros
- new functions begin/end_macro to:
- fix switching macro levels during expansion
- allow unget_tok to unget more than one tok
- slight speedup by using bitflags in isidnum_table
Also:
- x86_64.c : fix decl after statements
- i386-gen,c : fix a vstack leak with VLA on windows
- configure/Makefile : build on windows (MSYS) was broken
- tcc_warning: fflush stderr to keep output order (win32)
2015-05-09 15:29:39 +03:00
|
|
|
ST_DATA const char *funcname;
|
2019-12-16 20:51:28 +03:00
|
|
|
ST_DATA CType int_type, func_old_type, char_pointer_type;
|
2009-12-20 03:53:49 +03:00
|
|
|
|
2019-12-16 20:51:28 +03:00
|
|
|
#if PTR_SIZE == 4
|
|
|
|
#define VT_SIZE_T (VT_INT | VT_UNSIGNED)
|
|
|
|
#define VT_PTRDIFF_T VT_INT
|
|
|
|
#elif LONG_SIZE == 4
|
|
|
|
#define VT_SIZE_T (VT_LLONG | VT_UNSIGNED)
|
|
|
|
#define VT_PTRDIFF_T VT_LLONG
|
|
|
|
#else
|
|
|
|
#define VT_SIZE_T (VT_LONG | VT_LLONG | VT_UNSIGNED)
|
|
|
|
#define VT_PTRDIFF_T (VT_LONG | VT_LLONG)
|
|
|
|
#endif
|
2009-12-20 03:53:49 +03:00
|
|
|
|
2016-09-21 18:35:29 +03:00
|
|
|
ST_DATA struct switch_t {
|
|
|
|
struct case_t {
|
2016-11-06 07:02:11 +03:00
|
|
|
int64_t v1, v2;
|
|
|
|
int sym;
|
2016-09-21 18:35:29 +03:00
|
|
|
} **p; int n; /* list of case ranges */
|
|
|
|
int def_sym; /* default symbol */
|
2019-06-22 14:18:54 +03:00
|
|
|
int *bsym;
|
|
|
|
struct scope *scope;
|
2020-01-19 13:15:12 +03:00
|
|
|
struct switch_t *prev;
|
|
|
|
SValue sv;
|
2016-09-21 18:35:29 +03:00
|
|
|
} *cur_switch; /* current switch */
|
|
|
|
|
2020-01-18 00:58:39 +03:00
|
|
|
#define MAX_TEMP_LOCAL_VARIABLE_NUMBER 8
|
2019-01-09 22:32:23 +03:00
|
|
|
/*list of temporary local variables on the stack in current function. */
|
|
|
|
ST_DATA struct temp_local_variable {
|
|
|
|
int location; //offset on stack. Svalue.c.i
|
|
|
|
short size;
|
|
|
|
short align;
|
|
|
|
} arr_temp_local_vars[MAX_TEMP_LOCAL_VARIABLE_NUMBER];
|
|
|
|
short nb_temp_local_vars;
|
2018-12-20 12:55:22 +03:00
|
|
|
|
2019-06-22 14:18:54 +03:00
|
|
|
static struct scope {
|
|
|
|
struct scope *prev;
|
|
|
|
struct { int loc, num; } vla;
|
|
|
|
struct { Sym *s; int n; } cl;
|
|
|
|
int *bsym, *csym;
|
|
|
|
Sym *lstk, *llstk;
|
|
|
|
} *cur_scope, *loop_scope, *root_scope;
|
|
|
|
|
2020-05-05 15:47:00 +03:00
|
|
|
/********************************************************/
|
|
|
|
/* stab debug support */
|
|
|
|
|
|
|
|
static const struct {
|
2020-05-03 12:59:57 +03:00
|
|
|
int type;
|
|
|
|
const char *name;
|
|
|
|
} default_debug[] = {
|
|
|
|
{ VT_INT, "int:t1=r1;-2147483648;2147483647;", },
|
|
|
|
{ VT_BYTE, "char:t2=r2;0;127;", },
|
|
|
|
#if LONG_SIZE == 4
|
|
|
|
{ VT_LONG | VT_INT, "long int:t3=r3;-2147483648;2147483647;", },
|
|
|
|
#else
|
|
|
|
{ VT_LLONG | VT_LONG, "long int:t3=r3;-9223372036854775808;9223372036854775807;", },
|
|
|
|
#endif
|
|
|
|
{ VT_INT | VT_UNSIGNED, "unsigned int:t4=r4;0;4294967295;", },
|
|
|
|
#if LONG_SIZE == 4
|
|
|
|
{ VT_LONG | VT_INT | VT_UNSIGNED, "long unsigned int:t5=r5;0;4294967295;", },
|
|
|
|
#else
|
2020-05-23 21:27:43 +03:00
|
|
|
/* use octal instead of -1 so size_t works (-gstabs+ in gcc) */
|
|
|
|
{ VT_LLONG | VT_LONG | VT_UNSIGNED, "long unsigned int:t5=r5;0;01777777777777777777777;", },
|
2020-05-03 12:59:57 +03:00
|
|
|
#endif
|
|
|
|
{ VT_QLONG, "__int128:t6=r6;0;-1;", },
|
|
|
|
{ VT_QLONG | VT_UNSIGNED, "__int128 unsigned:t7=r7;0;-1;", },
|
|
|
|
{ VT_LLONG, "long long int:t8=r8;-9223372036854775808;9223372036854775807;", },
|
2020-05-23 21:27:43 +03:00
|
|
|
{ VT_LLONG | VT_UNSIGNED, "long long unsigned int:t9=r9;0;01777777777777777777777;", },
|
2020-05-03 12:59:57 +03:00
|
|
|
{ VT_SHORT, "short int:t10=r10;-32768;32767;", },
|
|
|
|
{ VT_SHORT | VT_UNSIGNED, "short unsigned int:t11=r11;0;65535;", },
|
|
|
|
{ VT_BYTE | VT_DEFSIGN, "signed char:t12=r12;-128;127;", },
|
|
|
|
{ VT_BYTE | VT_DEFSIGN | VT_UNSIGNED, "unsigned char:t13=r13;0;255;", },
|
|
|
|
{ VT_FLOAT, "float:t14=r1;4;0;", },
|
|
|
|
{ VT_DOUBLE, "double:t15=r1;8;0;", },
|
|
|
|
{ VT_LDOUBLE, "long double:t16=r1;16;0;", },
|
|
|
|
{ -1, "_Float32:t17=r1;4;0;", },
|
|
|
|
{ -1, "_Float64:t18=r1;8;0;", },
|
|
|
|
{ -1, "_Float128:t19=r1;16;0;", },
|
|
|
|
{ -1, "_Float32x:t20=r1;8;0;", },
|
|
|
|
{ -1, "_Float64x:t21=r1;16;0;", },
|
|
|
|
{ -1, "_Decimal32:t22=r1;4;0;", },
|
|
|
|
{ -1, "_Decimal64:t23=r1;8;0;", },
|
|
|
|
{ -1, "_Decimal128:t24=r1;16;0;", },
|
|
|
|
{ VT_VOID, "void:t25=25", },
|
|
|
|
};
|
|
|
|
|
2020-05-04 09:13:41 +03:00
|
|
|
static int debug_next_type;
|
2020-05-03 12:59:57 +03:00
|
|
|
|
|
|
|
static struct debug_hash {
|
|
|
|
int debug_type;
|
|
|
|
Sym *type;
|
|
|
|
} *debug_hash;
|
|
|
|
|
|
|
|
static int n_debug_hash;
|
|
|
|
|
|
|
|
static struct debug_info {
|
|
|
|
int start;
|
|
|
|
int end;
|
|
|
|
int n_sym;
|
|
|
|
struct debug_sym {
|
|
|
|
int type;
|
|
|
|
unsigned long value;
|
|
|
|
char *str;
|
|
|
|
Section *sec;
|
|
|
|
int sym_index;
|
|
|
|
} *sym;
|
|
|
|
struct debug_info *child, *next, *last, *parent;
|
|
|
|
} *debug_info, *debug_info_root;
|
|
|
|
|
2020-01-21 16:23:57 +03:00
|
|
|
/********************************************************/
|
|
|
|
#if 1
|
|
|
|
#define precedence_parser
|
|
|
|
static void init_prec(void);
|
|
|
|
#endif
|
2019-12-11 02:37:18 +03:00
|
|
|
/********************************************************/
|
|
|
|
#ifndef CONFIG_TCC_ASM
|
|
|
|
ST_FUNC void asm_instr(void)
|
|
|
|
{
|
|
|
|
tcc_error("inline asm() not supported");
|
|
|
|
}
|
|
|
|
ST_FUNC void asm_global_instr(void)
|
|
|
|
{
|
|
|
|
tcc_error("inline asm() not supported");
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2009-12-20 03:53:49 +03:00
|
|
|
/* ------------------------------------------------------------------------- */
|
|
|
|
static void gen_cast(CType *type);
|
2017-07-09 13:34:11 +03:00
|
|
|
static void gen_cast_s(int t);
|
2009-12-20 03:53:49 +03:00
|
|
|
static inline CType *pointed_type(CType *type);
|
|
|
|
static int is_compatible_types(CType *type1, CType *type2);
|
|
|
|
static int parse_btype(CType *type, AttributeDef *ad);
|
2017-03-06 05:25:33 +03:00
|
|
|
static CType *type_decl(CType *type, AttributeDef *ad, int *v, int td);
|
2009-12-20 03:53:49 +03:00
|
|
|
static void parse_expr_type(CType *type);
|
2017-03-12 07:25:09 +03:00
|
|
|
static void init_putv(CType *type, Section *sec, unsigned long c);
|
2019-03-18 05:26:19 +03:00
|
|
|
static void decl_initializer(CType *type, Section *sec, unsigned long c, int flags);
|
2019-06-22 14:18:54 +03:00
|
|
|
static void block(int is_expr);
|
2015-11-20 13:22:56 +03:00
|
|
|
static void decl_initializer_alloc(CType *type, AttributeDef *ad, int r, int has_init, int v, int scope);
|
2017-07-20 23:21:27 +03:00
|
|
|
static void decl(int l);
|
2017-03-11 04:13:59 +03:00
|
|
|
static int decl0(int l, int is_for_loop_init, Sym *);
|
2009-12-20 03:53:49 +03:00
|
|
|
static void expr_eq(void);
|
2011-04-06 20:17:03 +04:00
|
|
|
static void vla_runtime_type_size(CType *type, int *a);
|
2017-07-09 13:38:25 +03:00
|
|
|
static int is_compatible_unqualified_types(CType *type1, CType *type2);
|
2016-11-06 07:02:11 +03:00
|
|
|
static inline int64_t expr_const64(void);
|
2017-07-20 23:21:27 +03:00
|
|
|
static void vpush64(int ty, unsigned long long v);
|
|
|
|
static void vpush(CType *type);
|
|
|
|
static int gvtst(int inv, int t);
|
2016-10-18 00:24:01 +03:00
|
|
|
static void gen_inline_functions(TCCState *s);
|
2019-12-11 02:37:18 +03:00
|
|
|
static void free_inline_functions(TCCState *s);
|
2016-12-09 13:42:41 +03:00
|
|
|
static void skip_or_save_block(TokenString **str);
|
2017-07-09 13:38:59 +03:00
|
|
|
static void gv_dup(void);
|
2019-01-09 22:32:23 +03:00
|
|
|
static int get_temp_local_var(int size,int align);
|
|
|
|
static void clear_temp_local_var_list();
|
2019-12-16 20:51:28 +03:00
|
|
|
static void cast_error(CType *st, CType *dt);
|
2009-12-20 03:53:49 +03:00
|
|
|
|
|
|
|
ST_INLN int is_float(int t)
|
|
|
|
{
|
2019-12-16 20:44:35 +03:00
|
|
|
int bt = t & VT_BTYPE;
|
|
|
|
return bt == VT_LDOUBLE
|
|
|
|
|| bt == VT_DOUBLE
|
|
|
|
|| bt == VT_FLOAT
|
|
|
|
|| bt == VT_QFLOAT;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline int is_integer_btype(int bt)
|
|
|
|
{
|
|
|
|
return bt == VT_BYTE
|
2019-12-16 20:51:28 +03:00
|
|
|
|| bt == VT_BOOL
|
2019-12-16 20:44:35 +03:00
|
|
|
|| bt == VT_SHORT
|
|
|
|
|| bt == VT_INT
|
|
|
|
|| bt == VT_LLONG;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int btype_size(int bt)
|
|
|
|
{
|
|
|
|
return bt == VT_BYTE || bt == VT_BOOL ? 1 :
|
|
|
|
bt == VT_SHORT ? 2 :
|
|
|
|
bt == VT_INT ? 4 :
|
|
|
|
bt == VT_LLONG ? 8 :
|
|
|
|
bt == VT_PTR ? PTR_SIZE : 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* returns function return register from type */
|
|
|
|
static int R_RET(int t)
|
|
|
|
{
|
|
|
|
if (!is_float(t))
|
|
|
|
return REG_IRET;
|
|
|
|
#ifdef TCC_TARGET_X86_64
|
|
|
|
if ((t & VT_BTYPE) == VT_LDOUBLE)
|
|
|
|
return TREG_ST0;
|
|
|
|
#elif defined TCC_TARGET_RISCV64
|
|
|
|
if ((t & VT_BTYPE) == VT_LDOUBLE)
|
|
|
|
return REG_IRET;
|
|
|
|
#endif
|
|
|
|
return REG_FRET;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* returns 2nd function return register, if any */
|
|
|
|
static int R2_RET(int t)
|
|
|
|
{
|
|
|
|
t &= VT_BTYPE;
|
|
|
|
#if PTR_SIZE == 4
|
|
|
|
if (t == VT_LLONG)
|
|
|
|
return REG_IRE2;
|
|
|
|
#elif defined TCC_TARGET_X86_64
|
|
|
|
if (t == VT_QLONG)
|
|
|
|
return REG_IRE2;
|
|
|
|
if (t == VT_QFLOAT)
|
|
|
|
return REG_FRE2;
|
|
|
|
#elif defined TCC_TARGET_RISCV64
|
|
|
|
if (t == VT_LDOUBLE)
|
|
|
|
return REG_IRE2;
|
|
|
|
#endif
|
|
|
|
return VT_CONST;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* returns true for two-word types */
|
|
|
|
#define USING_TWO_WORDS(t) (R2_RET(t) != VT_CONST)
|
|
|
|
|
|
|
|
/* put function return registers to stack value */
|
|
|
|
static void PUT_R_RET(SValue *sv, int t)
|
|
|
|
{
|
|
|
|
sv->r = R_RET(t), sv->r2 = R2_RET(t);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* returns function return register class for type t */
|
|
|
|
static int RC_RET(int t)
|
|
|
|
{
|
|
|
|
return reg_classes[R_RET(t)] & ~(RC_FLOAT | RC_INT);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* returns generic register class for type t */
|
|
|
|
static int RC_TYPE(int t)
|
|
|
|
{
|
|
|
|
if (!is_float(t))
|
|
|
|
return RC_INT;
|
|
|
|
#ifdef TCC_TARGET_X86_64
|
|
|
|
if ((t & VT_BTYPE) == VT_LDOUBLE)
|
|
|
|
return RC_ST0;
|
|
|
|
if ((t & VT_BTYPE) == VT_QFLOAT)
|
|
|
|
return RC_FRET;
|
|
|
|
#elif defined TCC_TARGET_RISCV64
|
|
|
|
if ((t & VT_BTYPE) == VT_LDOUBLE)
|
|
|
|
return RC_INT;
|
|
|
|
#endif
|
|
|
|
return RC_FLOAT;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* returns 2nd register class corresponding to t and rc */
|
|
|
|
static int RC2_TYPE(int t, int rc)
|
|
|
|
{
|
|
|
|
if (!USING_TWO_WORDS(t))
|
|
|
|
return 0;
|
|
|
|
#ifdef RC_IRE2
|
|
|
|
if (rc == RC_IRET)
|
|
|
|
return RC_IRE2;
|
|
|
|
#endif
|
|
|
|
#ifdef RC_FRE2
|
|
|
|
if (rc == RC_FRET)
|
|
|
|
return RC_FRE2;
|
|
|
|
#endif
|
|
|
|
if (rc & RC_FLOAT)
|
|
|
|
return RC_FLOAT;
|
|
|
|
return RC_INT;
|
2009-12-20 03:53:49 +03:00
|
|
|
}
|
|
|
|
|
2011-08-01 03:10:36 +04:00
|
|
|
/* we use our own 'finite' function to avoid potential problems with
|
|
|
|
non standard math libs */
|
|
|
|
/* XXX: endianness dependent */
|
|
|
|
ST_FUNC int ieee_finite(double d)
|
|
|
|
{
|
2014-01-07 17:57:07 +04:00
|
|
|
int p[4];
|
|
|
|
memcpy(p, &d, sizeof(double));
|
2011-08-01 03:10:36 +04:00
|
|
|
return ((unsigned)((p[1] | 0x800fffff) + 1)) >> 31;
|
|
|
|
}
|
|
|
|
|
various stuff
win32/Makefile ("for cygwin") removed
- On cygwin, the normal ./configure && make can be used with either
cygwin's "GCC for Win32 Toolchain"
./configure --cross-prefix=i686-w64-mingw32-
or with an existing tcc:
./configure --cc=<old-tccdir>/tcc.exe
tcctest.c:
- exclude test_high_clobbers() on _WIN64 (does not work)
tests2/95_bitfield.c:
- use 'signed char' for ARM (where default 'char' is unsigned)
tests:
- remove -I "expr" diff option to allow tests with
busybox-diff.
libtcc.c, tcc.c:
- removed -iwithprefix option. It is supposed to be
combined with -iprefix which we don't have either.
tccgen.c:
- fix assignments and return of 'void', as in
void f() {
void *p, *q;
*p = *q:
return *p;
}
This appears to be allowed but should do nothing.
tcc.h, libtcc.c, tccpp.c:
- Revert "Introduce VIP sysinclude paths which are always searched first"
This reverts commit 1d5e386b0a78393ac6b670c209a185849ec798a1.
The patch was giving tcc's system includes priority over -I which
is not how it should be.
tccelf.c:
- add DT_TEXTREL tag only if text relocations are actually
used (which is likely not the case on x86_64)
- prepare_dynamic_rel(): avoid relocation of unresolved
(weak) symbols
tccrun.c:
- for HAVE_SELINUX, use two mappings to the same (real) file.
(it was so once except the RX mapping wasn't used at all).
tccpe.c:
- fix relocation constant used for x86_64 (by Andrei E. Warentin)
- #ifndef _WIN32 do "chmod 755 ..." to get runnable exes on cygwin.
tccasm.c:
- keep forward asm labels static, otherwise they will endup
in dynsym eventually.
configure, Makefile:
- mingw32: respect ./configure options --bindir --docdir --libdir
- allow overriding tcc when building libtcc1.a and libtcc.def with
make XTCC=<tcc program to use>
- use $(wildcard ...) for install to allow installing just
a cross compiler for example
make cross-arm
make install
- use name <target>-libtcc1.a
build-tcc.bat:
- add options: -clean, -b bindir
2017-10-11 19:13:43 +03:00
|
|
|
/* compiling intel long double natively */
|
|
|
|
#if (defined __i386__ || defined __x86_64__) \
|
|
|
|
&& (defined TCC_TARGET_I386 || defined TCC_TARGET_X86_64)
|
|
|
|
# define TCC_IS_NATIVE_387
|
|
|
|
#endif
|
|
|
|
|
2009-12-20 03:53:49 +03:00
|
|
|
ST_FUNC void test_lvalue(void)
|
|
|
|
{
|
|
|
|
if (!(vtop->r & VT_LVAL))
|
|
|
|
expect("lvalue");
|
|
|
|
}
|
|
|
|
|
tccpp: fix issues, add tests
* fix some macro expansion issues
* add some pp tests in tests/pp
* improved tcc -E output for better diff'ability
* remove -dD feature (quirky code, exotic feature,
didn't work well)
Based partially on ideas / researches from PipCet
Some issues remain with VA_ARGS macros (if used in a
rather tricky way).
Also, to keep it simple, the pp doesn't automtically
add any extra spaces to separate tokens which otherwise
would form wrong tokens if re-read from tcc -E output
(such as '+' '=') GCC does that, other compilers don't.
* cleanups
- #line 01 "file" / # 01 "file" processing
- #pragma comment(lib,"foo")
- tcc -E: forward some pragmas to output (pack, comment(lib))
- fix macro parameter list parsing mess from
a3fc54345949535524d01319e1ca6378b7c2c201
a715d7143d9d17da17e67fec6af1c01409a71a31
(some coffee might help, next time ;)
- introduce TOK_PPSTR - to have character constants as
written in the file (similar to TOK_PPNUM)
- allow '\' appear in macros
- new functions begin/end_macro to:
- fix switching macro levels during expansion
- allow unget_tok to unget more than one tok
- slight speedup by using bitflags in isidnum_table
Also:
- x86_64.c : fix decl after statements
- i386-gen,c : fix a vstack leak with VLA on windows
- configure/Makefile : build on windows (MSYS) was broken
- tcc_warning: fflush stderr to keep output order (win32)
2015-05-09 15:29:39 +03:00
|
|
|
ST_FUNC void check_vstack(void)
|
|
|
|
{
|
2019-12-14 14:31:03 +03:00
|
|
|
if (vtop != vstack - 1)
|
2020-05-05 10:00:24 +03:00
|
|
|
tcc_error("internal compiler error: vstack leak (%d)",
|
|
|
|
(int)(vtop - vstack + 1));
|
tccpp: fix issues, add tests
* fix some macro expansion issues
* add some pp tests in tests/pp
* improved tcc -E output for better diff'ability
* remove -dD feature (quirky code, exotic feature,
didn't work well)
Based partially on ideas / researches from PipCet
Some issues remain with VA_ARGS macros (if used in a
rather tricky way).
Also, to keep it simple, the pp doesn't automtically
add any extra spaces to separate tokens which otherwise
would form wrong tokens if re-read from tcc -E output
(such as '+' '=') GCC does that, other compilers don't.
* cleanups
- #line 01 "file" / # 01 "file" processing
- #pragma comment(lib,"foo")
- tcc -E: forward some pragmas to output (pack, comment(lib))
- fix macro parameter list parsing mess from
a3fc54345949535524d01319e1ca6378b7c2c201
a715d7143d9d17da17e67fec6af1c01409a71a31
(some coffee might help, next time ;)
- introduce TOK_PPSTR - to have character constants as
written in the file (similar to TOK_PPNUM)
- allow '\' appear in macros
- new functions begin/end_macro to:
- fix switching macro levels during expansion
- allow unget_tok to unget more than one tok
- slight speedup by using bitflags in isidnum_table
Also:
- x86_64.c : fix decl after statements
- i386-gen,c : fix a vstack leak with VLA on windows
- configure/Makefile : build on windows (MSYS) was broken
- tcc_warning: fflush stderr to keep output order (win32)
2015-05-09 15:29:39 +03:00
|
|
|
}
|
|
|
|
|
2016-10-13 20:21:43 +03:00
|
|
|
/* ------------------------------------------------------------------------- */
|
|
|
|
/* vstack debugging aid */
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
void pv (const char *lbl, int a, int b)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
for (i = a; i < a + b; ++i) {
|
|
|
|
SValue *p = &vtop[-i];
|
|
|
|
printf("%s vtop[-%d] : type.t:%04x r:%04x r2:%04x c.i:%d\n",
|
|
|
|
lbl, i, p->type.t, p->r, p->r2, (int)p->c.i);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2016-10-15 16:55:31 +03:00
|
|
|
/* ------------------------------------------------------------------------- */
|
2017-02-20 20:58:08 +03:00
|
|
|
/* start of translation unit info */
|
|
|
|
ST_FUNC void tcc_debug_start(TCCState *s1)
|
2016-10-15 16:55:31 +03:00
|
|
|
{
|
|
|
|
if (s1->do_debug) {
|
2020-05-03 12:59:57 +03:00
|
|
|
int i;
|
2016-10-15 16:55:31 +03:00
|
|
|
char buf[512];
|
|
|
|
|
|
|
|
/* file info: full path + filename */
|
|
|
|
section_sym = put_elf_sym(symtab_section, 0, 0,
|
|
|
|
ELFW(ST_INFO)(STB_LOCAL, STT_SECTION), 0,
|
|
|
|
text_section->sh_num, NULL);
|
|
|
|
getcwd(buf, sizeof(buf));
|
|
|
|
#ifdef _WIN32
|
|
|
|
normalize_slashes(buf);
|
|
|
|
#endif
|
|
|
|
pstrcat(buf, sizeof(buf), "/");
|
2019-12-11 02:37:18 +03:00
|
|
|
put_stabs_r(s1, buf, N_SO, 0, 0,
|
2016-10-15 16:55:31 +03:00
|
|
|
text_section->data_offset, text_section, section_sym);
|
2019-12-11 02:37:18 +03:00
|
|
|
put_stabs_r(s1, file->prev->filename, N_SO, 0, 0,
|
2016-10-15 16:55:31 +03:00
|
|
|
text_section->data_offset, text_section, section_sym);
|
2020-05-03 12:59:57 +03:00
|
|
|
for (i = 0; i < sizeof (default_debug) / sizeof (default_debug[0]); i++)
|
|
|
|
put_stabs(s1, default_debug[i].name, N_LSYM, 0, 0, 0);
|
2020-05-05 15:47:00 +03:00
|
|
|
|
2019-12-14 14:36:12 +03:00
|
|
|
new_file = last_line_num = 0;
|
|
|
|
func_ind = -1;
|
2020-05-05 15:47:00 +03:00
|
|
|
debug_next_type = sizeof(default_debug) / sizeof(default_debug[0]);
|
|
|
|
debug_hash = NULL;
|
|
|
|
n_debug_hash = 0;
|
|
|
|
|
2019-12-14 14:36:12 +03:00
|
|
|
/* we're currently 'including' the <command line> */
|
|
|
|
tcc_debug_bincl(s1);
|
2016-10-15 16:55:31 +03:00
|
|
|
}
|
2017-02-20 20:58:08 +03:00
|
|
|
|
2016-10-15 16:55:31 +03:00
|
|
|
/* an elf symbol of type STT_FILE must be put so that STB_LOCAL
|
|
|
|
symbols can be safely used */
|
|
|
|
put_elf_sym(symtab_section, 0, 0,
|
|
|
|
ELFW(ST_INFO)(STB_LOCAL, STT_FILE), 0,
|
|
|
|
SHN_ABS, file->filename);
|
2017-02-20 20:58:08 +03:00
|
|
|
}
|
|
|
|
|
2020-05-05 15:47:00 +03:00
|
|
|
static void tcc_debug_stabs (TCCState *s1, const char *str, int type, unsigned long value,
|
2020-05-03 12:59:57 +03:00
|
|
|
Section *sec, int sym_index)
|
|
|
|
{
|
|
|
|
struct debug_sym *s;
|
|
|
|
|
|
|
|
if (debug_info) {
|
|
|
|
debug_info->sym =
|
|
|
|
(struct debug_sym *)tcc_realloc (debug_info->sym,
|
|
|
|
sizeof(struct debug_sym) *
|
|
|
|
(debug_info->n_sym + 1));
|
|
|
|
s = debug_info->sym + debug_info->n_sym++;
|
|
|
|
s->type = type;
|
|
|
|
s->value = value;
|
|
|
|
s->str = tcc_strdup(str);
|
|
|
|
s->sec = sec;
|
|
|
|
s->sym_index = sym_index;
|
|
|
|
}
|
|
|
|
else if (sec)
|
2020-05-05 15:47:00 +03:00
|
|
|
put_stabs_r (s1, str, type, 0, 0, value, sec, sym_index);
|
2020-05-03 12:59:57 +03:00
|
|
|
else
|
2020-05-05 15:47:00 +03:00
|
|
|
put_stabs (s1, str, type, 0, 0, value);
|
2020-05-03 12:59:57 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static void tcc_debug_stabn(int type, int value)
|
|
|
|
{
|
|
|
|
if (type == N_LBRAC) {
|
|
|
|
struct debug_info *info =
|
|
|
|
(struct debug_info *) tcc_mallocz(sizeof (*info));
|
|
|
|
|
|
|
|
info->start = value;
|
|
|
|
info->parent = debug_info;
|
|
|
|
if (debug_info) {
|
|
|
|
if (debug_info->child) {
|
|
|
|
if (debug_info->child->last)
|
|
|
|
debug_info->child->last->next = info;
|
|
|
|
else
|
|
|
|
debug_info->child->next = info;
|
|
|
|
debug_info->child->last = info;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
debug_info->child = info;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
debug_info_root = info;
|
|
|
|
debug_info = info;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
debug_info->end = value;
|
|
|
|
debug_info = debug_info->parent;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-05-05 15:47:00 +03:00
|
|
|
static void tcc_get_debug_info(TCCState *s1, Sym *s, CString *result)
|
2020-05-03 12:59:57 +03:00
|
|
|
{
|
|
|
|
int type;
|
|
|
|
int n = 0;
|
|
|
|
int debug_type = -1;
|
|
|
|
Sym *t = s;
|
|
|
|
CString str;
|
|
|
|
|
|
|
|
for (;;) {
|
|
|
|
type = t->type.t & ~(VT_EXTERN | VT_STATIC | VT_CONSTANT | VT_VOLATILE);
|
|
|
|
if ((type & VT_BTYPE) != VT_BYTE)
|
|
|
|
type &= ~VT_DEFSIGN;
|
|
|
|
if (type == VT_PTR || type == (VT_PTR | VT_ARRAY))
|
|
|
|
n++, t = t->type.ref;
|
|
|
|
else
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if ((type & VT_BTYPE) == VT_STRUCT) {
|
|
|
|
int i;
|
|
|
|
|
|
|
|
t = t->type.ref;
|
|
|
|
for (i = 0; i < n_debug_hash; i++) {
|
|
|
|
if (t == debug_hash[i].type) {
|
|
|
|
debug_type = debug_hash[i].debug_type;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (debug_type == -1) {
|
|
|
|
debug_type = ++debug_next_type;
|
|
|
|
debug_hash = (struct debug_hash *)
|
|
|
|
tcc_realloc (debug_hash,
|
|
|
|
(n_debug_hash + 1) * sizeof(*debug_hash));
|
|
|
|
debug_hash[n_debug_hash].debug_type = debug_type;
|
|
|
|
debug_hash[n_debug_hash++].type = t;
|
|
|
|
cstr_new (&str);
|
|
|
|
cstr_printf (&str, "%s:T%d=%c%d",
|
|
|
|
(t->v & ~SYM_STRUCT) >= SYM_FIRST_ANOM
|
|
|
|
? "" : get_tok_str(t->v & ~SYM_STRUCT, NULL),
|
|
|
|
debug_type,
|
|
|
|
IS_UNION (t->type.t) ? 'u' : 's',
|
|
|
|
t->c);
|
|
|
|
while (t->next) {
|
|
|
|
int pos, size, align;
|
|
|
|
|
|
|
|
t = t->next;
|
|
|
|
cstr_printf (&str, "%s:",
|
|
|
|
(t->v & ~SYM_FIELD) >= SYM_FIRST_ANOM
|
|
|
|
? "" : get_tok_str(t->v & ~SYM_FIELD, NULL));
|
2020-05-05 15:47:00 +03:00
|
|
|
tcc_get_debug_info (s1, t, &str);
|
2020-05-03 12:59:57 +03:00
|
|
|
if (t->type.t & VT_BITFIELD) {
|
|
|
|
pos = t->c * 8 + BIT_POS(t->type.t);
|
|
|
|
size = BIT_SIZE(t->type.t);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
pos = t->c * 8;
|
|
|
|
size = type_size(&t->type, &align) * 8;
|
|
|
|
}
|
|
|
|
cstr_printf (&str, ",%d,%d;", pos, size);
|
|
|
|
}
|
|
|
|
cstr_printf (&str, ";");
|
2020-05-05 15:47:00 +03:00
|
|
|
tcc_debug_stabs(s1, str.data, N_LSYM, 0, NULL, 0);
|
2020-05-03 12:59:57 +03:00
|
|
|
cstr_free (&str);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (IS_ENUM(type)) {
|
|
|
|
Sym *e = t = t->type.ref;
|
|
|
|
|
|
|
|
debug_type = ++debug_next_type;
|
|
|
|
cstr_new (&str);
|
|
|
|
cstr_printf (&str, "%s:T%d=e",
|
|
|
|
(t->v & ~SYM_STRUCT) >= SYM_FIRST_ANOM
|
|
|
|
? "" : get_tok_str(t->v & ~SYM_STRUCT, NULL),
|
|
|
|
debug_type);
|
|
|
|
while (t->next) {
|
|
|
|
t = t->next;
|
|
|
|
cstr_printf (&str, "%s:",
|
|
|
|
(t->v & ~SYM_FIELD) >= SYM_FIRST_ANOM
|
|
|
|
? "" : get_tok_str(t->v & ~SYM_FIELD, NULL));
|
2020-05-05 15:47:00 +03:00
|
|
|
cstr_printf (&str, e->type.t & VT_UNSIGNED ? "%u," : "%d,",
|
|
|
|
(int)t->enum_val);
|
2020-05-03 12:59:57 +03:00
|
|
|
}
|
|
|
|
cstr_printf (&str, ";");
|
2020-05-05 15:47:00 +03:00
|
|
|
tcc_debug_stabs(s1, str.data, N_LSYM, 0, NULL, 0);
|
2020-05-03 12:59:57 +03:00
|
|
|
cstr_free (&str);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
type &= ~VT_STRUCT_MASK;
|
|
|
|
for (debug_type = 1;
|
|
|
|
debug_type <= sizeof(default_debug) / sizeof(default_debug[0]);
|
|
|
|
debug_type++)
|
|
|
|
if (default_debug[debug_type - 1].type == type)
|
|
|
|
break;
|
|
|
|
if (debug_type > sizeof(default_debug) / sizeof(default_debug[0]))
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (n > 0)
|
|
|
|
cstr_printf (result, "%d=", ++debug_next_type);
|
|
|
|
t = s;
|
|
|
|
for (;;) {
|
|
|
|
type = t->type.t & ~(VT_EXTERN | VT_STATIC | VT_CONSTANT | VT_VOLATILE);
|
|
|
|
if ((type & VT_BTYPE) != VT_BYTE)
|
|
|
|
type &= ~VT_DEFSIGN;
|
|
|
|
if (type == VT_PTR)
|
|
|
|
cstr_printf (result, "%d=*", ++debug_next_type);
|
|
|
|
else if (type == (VT_PTR | VT_ARRAY))
|
|
|
|
cstr_printf (result, "%d=ar1;0;%d;",
|
|
|
|
++debug_next_type, t->type.ref->c - 1);
|
|
|
|
else
|
|
|
|
break;
|
|
|
|
t = t->type.ref;
|
|
|
|
}
|
|
|
|
cstr_printf (result, "%d", debug_type);
|
|
|
|
}
|
|
|
|
|
2020-05-05 15:47:00 +03:00
|
|
|
static void tcc_debug_finish (TCCState *s1, struct debug_info *cur)
|
2020-05-03 12:59:57 +03:00
|
|
|
{
|
|
|
|
while (cur) {
|
|
|
|
int i;
|
|
|
|
struct debug_info *next = cur->next;
|
|
|
|
|
|
|
|
for (i = 0; i < cur->n_sym; i++) {
|
|
|
|
struct debug_sym *s = &cur->sym[i];
|
|
|
|
|
|
|
|
if (s->sec)
|
2020-05-05 15:47:00 +03:00
|
|
|
put_stabs_r(s1, s->str, s->type, 0, 0, s->value,
|
2020-05-03 12:59:57 +03:00
|
|
|
s->sec, s->sym_index);
|
|
|
|
else
|
2020-05-05 15:47:00 +03:00
|
|
|
put_stabs(s1, s->str, s->type, 0, 0, s->value);
|
2020-05-03 12:59:57 +03:00
|
|
|
tcc_free (s->str);
|
|
|
|
}
|
|
|
|
tcc_free (cur->sym);
|
2020-05-05 15:47:00 +03:00
|
|
|
put_stabn(s1, N_LBRAC, 0, 0, cur->start);
|
|
|
|
tcc_debug_finish (s1, cur->child);
|
|
|
|
put_stabn(s1, N_RBRAC, 0, 0, cur->end);
|
2020-05-03 12:59:57 +03:00
|
|
|
tcc_free (cur);
|
|
|
|
cur = next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-05-05 15:47:00 +03:00
|
|
|
static void tcc_add_debug_info(TCCState *s1, int param, Sym *s, Sym *e)
|
2020-05-03 12:59:57 +03:00
|
|
|
{
|
2020-05-05 15:47:00 +03:00
|
|
|
CString debug_str;
|
|
|
|
cstr_new (&debug_str);
|
2020-05-03 12:59:57 +03:00
|
|
|
for (; s != e; s = s->prev) {
|
|
|
|
if (!s->v || (s->r & VT_VALMASK) != VT_LOCAL)
|
|
|
|
continue;
|
|
|
|
cstr_reset (&debug_str);
|
|
|
|
cstr_printf (&debug_str, "%s:%s", get_tok_str(s->v, NULL), param ? "p" : "");
|
2020-05-05 15:47:00 +03:00
|
|
|
tcc_get_debug_info(s1, s, &debug_str);
|
|
|
|
tcc_debug_stabs(s1, debug_str.data, param ? N_PSYM : N_LSYM, s->c, NULL, 0);
|
2020-05-03 12:59:57 +03:00
|
|
|
}
|
2020-05-05 15:47:00 +03:00
|
|
|
cstr_free (&debug_str);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void tcc_debug_extern_sym(TCCState *s1, Sym *sym, int sh_num, int sym_bind)
|
|
|
|
{
|
|
|
|
Section *s = s1->sections[sh_num];
|
|
|
|
CString str;
|
|
|
|
|
|
|
|
cstr_new (&str);
|
|
|
|
cstr_printf (&str, "%s:%c",
|
|
|
|
get_tok_str(sym->v, NULL),
|
|
|
|
sym_bind == STB_GLOBAL ? 'G' : local_scope ? 'V' : 'S'
|
|
|
|
);
|
|
|
|
tcc_get_debug_info(s1, sym, &str);
|
|
|
|
if (sym_bind == STB_GLOBAL)
|
|
|
|
tcc_debug_stabs(s1, str.data, N_GSYM, 0, NULL, 0);
|
|
|
|
else
|
|
|
|
tcc_debug_stabs(s1, str.data,
|
|
|
|
(sym->type.t & VT_STATIC) && data_section == s
|
|
|
|
? N_STSYM : N_LCSYM, 0, s, sym->c);
|
|
|
|
cstr_free (&str);
|
2020-05-03 12:59:57 +03:00
|
|
|
}
|
|
|
|
|
2017-02-20 20:58:08 +03:00
|
|
|
/* put end of translation unit info */
|
|
|
|
ST_FUNC void tcc_debug_end(TCCState *s1)
|
|
|
|
{
|
|
|
|
if (!s1->do_debug)
|
|
|
|
return;
|
2019-12-11 02:37:18 +03:00
|
|
|
put_stabs_r(s1, NULL, N_SO, 0, 0,
|
2017-02-20 20:58:08 +03:00
|
|
|
text_section->data_offset, text_section, section_sym);
|
2020-05-03 12:59:57 +03:00
|
|
|
tcc_free(debug_hash);
|
2019-12-14 14:36:12 +03:00
|
|
|
}
|
2017-02-20 20:58:08 +03:00
|
|
|
|
2019-12-14 14:36:12 +03:00
|
|
|
static BufferedFile* put_new_file(TCCState *s1)
|
|
|
|
{
|
|
|
|
BufferedFile *f = file;
|
|
|
|
/* use upper file if from inline ":asm:" */
|
|
|
|
if (f->filename[0] == ':')
|
|
|
|
f = f->prev;
|
|
|
|
if (f && new_file) {
|
|
|
|
put_stabs_r(s1, f->filename, N_SOL, 0, 0, ind, text_section, section_sym);
|
|
|
|
new_file = last_line_num = 0;
|
|
|
|
}
|
|
|
|
return f;
|
2017-02-20 20:58:08 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/* generate line number info */
|
|
|
|
ST_FUNC void tcc_debug_line(TCCState *s1)
|
|
|
|
{
|
2019-12-14 14:36:12 +03:00
|
|
|
BufferedFile *f;
|
2020-01-18 00:58:39 +03:00
|
|
|
if (!s1->do_debug
|
|
|
|
|| cur_text_section != text_section
|
|
|
|
|| !(f = put_new_file(s1))
|
|
|
|
|| last_line_num == f->line_num)
|
2019-12-14 14:36:12 +03:00
|
|
|
return;
|
|
|
|
if (func_ind != -1) {
|
|
|
|
put_stabn(s1, N_SLINE, 0, f->line_num, ind - func_ind);
|
|
|
|
} else {
|
|
|
|
/* from tcc_assemble */
|
|
|
|
put_stabs_r(s1, NULL, N_SLINE, 0, f->line_num, ind, text_section, section_sym);
|
2017-02-20 20:58:08 +03:00
|
|
|
}
|
2019-12-14 14:36:12 +03:00
|
|
|
last_line_num = f->line_num;
|
2017-02-20 20:58:08 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/* put function symbol */
|
|
|
|
ST_FUNC void tcc_debug_funcstart(TCCState *s1, Sym *sym)
|
|
|
|
{
|
2020-05-05 15:47:00 +03:00
|
|
|
CString debug_str;
|
2019-12-14 14:36:12 +03:00
|
|
|
BufferedFile *f;
|
2020-05-05 15:47:00 +03:00
|
|
|
if (!s1->do_debug)
|
2017-02-20 20:58:08 +03:00
|
|
|
return;
|
2020-05-05 15:47:00 +03:00
|
|
|
debug_info_root = NULL;
|
|
|
|
debug_info = NULL;
|
2020-05-03 12:59:57 +03:00
|
|
|
tcc_debug_stabn(N_LBRAC, ind - func_ind);
|
2020-05-05 15:47:00 +03:00
|
|
|
if (!(f = put_new_file(s1)))
|
|
|
|
return;
|
|
|
|
cstr_new (&debug_str);
|
2020-05-03 12:59:57 +03:00
|
|
|
cstr_printf(&debug_str, "%s:%c", funcname, sym->type.t & VT_STATIC ? 'f' : 'F');
|
2020-05-05 15:47:00 +03:00
|
|
|
tcc_get_debug_info(s1, sym->type.ref, &debug_str);
|
2020-05-03 12:59:57 +03:00
|
|
|
put_stabs_r(s1, debug_str.data, N_FUN, 0, f->line_num, 0, cur_text_section, sym->c);
|
2020-05-05 15:47:00 +03:00
|
|
|
cstr_free (&debug_str);
|
|
|
|
|
2019-12-14 14:36:12 +03:00
|
|
|
tcc_debug_line(s1);
|
2017-02-20 20:58:08 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/* put function size */
|
|
|
|
ST_FUNC void tcc_debug_funcend(TCCState *s1, int size)
|
|
|
|
{
|
|
|
|
if (!s1->do_debug)
|
|
|
|
return;
|
2020-05-03 12:59:57 +03:00
|
|
|
tcc_debug_stabn(N_RBRAC, size);
|
2020-05-05 15:47:00 +03:00
|
|
|
tcc_debug_finish (s1, debug_info_root);
|
2019-12-14 14:36:12 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/* put alternative filename */
|
|
|
|
ST_FUNC void tcc_debug_putfile(TCCState *s1, const char *filename)
|
|
|
|
{
|
|
|
|
if (0 == strcmp(file->filename, filename))
|
|
|
|
return;
|
|
|
|
pstrcpy(file->filename, sizeof(file->filename), filename);
|
|
|
|
new_file = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* begin of #include */
|
|
|
|
ST_FUNC void tcc_debug_bincl(TCCState *s1)
|
|
|
|
{
|
|
|
|
if (!s1->do_debug)
|
|
|
|
return;
|
|
|
|
put_stabs(s1, file->filename, N_BINCL, 0, 0, 0);
|
|
|
|
new_file = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* end of #include */
|
|
|
|
ST_FUNC void tcc_debug_eincl(TCCState *s1)
|
|
|
|
{
|
|
|
|
if (!s1->do_debug)
|
|
|
|
return;
|
|
|
|
put_stabn(s1, N_EINCL, 0, 0, 0);
|
|
|
|
new_file = 1;
|
2017-02-20 20:58:08 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/* ------------------------------------------------------------------------- */
|
2019-12-14 14:31:03 +03:00
|
|
|
/* initialize vstack and types. This must be done also for tcc -E */
|
|
|
|
ST_FUNC void tccgen_init(TCCState *s1)
|
2017-02-20 20:58:08 +03:00
|
|
|
{
|
2019-12-14 14:31:03 +03:00
|
|
|
vtop = vstack - 1;
|
|
|
|
memset(vtop, 0, sizeof *vtop);
|
2017-02-20 20:58:08 +03:00
|
|
|
|
|
|
|
/* define some often used types */
|
|
|
|
int_type.t = VT_INT;
|
|
|
|
char_pointer_type.t = VT_BYTE;
|
|
|
|
mk_pointer(&char_pointer_type);
|
|
|
|
func_old_type.t = VT_FUNC;
|
2017-07-09 13:34:11 +03:00
|
|
|
func_old_type.ref = sym_push(SYM_FIELD, &int_type, 0, 0);
|
|
|
|
func_old_type.ref->f.func_call = FUNC_CDECL;
|
|
|
|
func_old_type.ref->f.func_type = FUNC_OLD;
|
2020-01-21 16:23:57 +03:00
|
|
|
#ifdef precedence_parser
|
|
|
|
init_prec();
|
|
|
|
#endif
|
2019-12-14 14:31:03 +03:00
|
|
|
}
|
2017-02-20 20:58:08 +03:00
|
|
|
|
2019-12-14 14:31:03 +03:00
|
|
|
ST_FUNC int tccgen_compile(TCCState *s1)
|
|
|
|
{
|
|
|
|
cur_text_section = NULL;
|
|
|
|
funcname = "";
|
|
|
|
anon_sym = SYM_FIRST_ANOM;
|
|
|
|
section_sym = 0;
|
|
|
|
const_wanted = 0;
|
|
|
|
nocode_wanted = 0x80000000;
|
|
|
|
local_scope = 0;
|
2016-10-15 16:55:31 +03:00
|
|
|
|
2019-12-14 14:31:03 +03:00
|
|
|
tcc_debug_start(s1);
|
2016-10-15 16:55:31 +03:00
|
|
|
#ifdef TCC_TARGET_ARM
|
|
|
|
arm_init(s1);
|
|
|
|
#endif
|
2017-07-20 23:21:27 +03:00
|
|
|
#ifdef INC_DEBUG
|
|
|
|
printf("%s: **** new file\n", file->filename);
|
|
|
|
#endif
|
|
|
|
parse_flags = PARSE_FLAG_PREPROCESS | PARSE_FLAG_TOK_NUM | PARSE_FLAG_TOK_STR;
|
|
|
|
next();
|
|
|
|
decl(VT_CONST);
|
2016-10-18 00:24:01 +03:00
|
|
|
gen_inline_functions(s1);
|
2016-10-15 16:55:31 +03:00
|
|
|
check_vstack();
|
|
|
|
/* end of translation unit info */
|
2017-02-20 20:58:08 +03:00
|
|
|
tcc_debug_end(s1);
|
2017-07-20 23:21:27 +03:00
|
|
|
return 0;
|
2016-10-15 16:55:31 +03:00
|
|
|
}
|
|
|
|
|
2019-12-14 14:31:03 +03:00
|
|
|
ST_FUNC void tccgen_finish(TCCState *s1)
|
2019-12-11 02:37:18 +03:00
|
|
|
{
|
2019-12-14 14:31:03 +03:00
|
|
|
free_inline_functions(s1);
|
|
|
|
sym_pop(&global_stack, NULL, 0);
|
|
|
|
sym_pop(&local_stack, NULL, 0);
|
|
|
|
/* free preprocessor macros */
|
|
|
|
free_defines(NULL);
|
|
|
|
/* free sym_pools */
|
|
|
|
dynarray_reset(&sym_pools, &nb_sym_pools);
|
|
|
|
sym_free_first = NULL;
|
2019-12-11 02:37:18 +03:00
|
|
|
}
|
|
|
|
|
2017-04-04 09:34:52 +03:00
|
|
|
/* ------------------------------------------------------------------------- */
|
2017-11-27 06:03:03 +03:00
|
|
|
ST_FUNC ElfSym *elfsym(Sym *s)
|
|
|
|
{
|
|
|
|
if (!s || !s->c)
|
|
|
|
return NULL;
|
2017-12-12 19:57:20 +03:00
|
|
|
return &((ElfSym *)symtab_section->data)[s->c];
|
2017-11-27 06:03:03 +03:00
|
|
|
}
|
|
|
|
|
2017-05-08 07:38:09 +03:00
|
|
|
/* apply storage attributes to Elf symbol */
|
2017-11-30 17:15:22 +03:00
|
|
|
ST_FUNC void update_storage(Sym *sym)
|
2017-04-04 09:34:52 +03:00
|
|
|
{
|
2017-11-30 17:15:22 +03:00
|
|
|
ElfSym *esym;
|
|
|
|
int sym_bind, old_sym_bind;
|
|
|
|
|
|
|
|
esym = elfsym(sym);
|
2017-11-27 06:03:03 +03:00
|
|
|
if (!esym)
|
2017-04-04 09:34:52 +03:00
|
|
|
return;
|
2017-11-30 17:15:22 +03:00
|
|
|
|
2017-07-09 13:34:11 +03:00
|
|
|
if (sym->a.visibility)
|
2017-04-04 09:34:52 +03:00
|
|
|
esym->st_other = (esym->st_other & ~ELFW(ST_VISIBILITY)(-1))
|
2017-07-09 13:34:11 +03:00
|
|
|
| sym->a.visibility;
|
2017-11-30 17:15:22 +03:00
|
|
|
|
2019-06-22 05:00:52 +03:00
|
|
|
if (sym->type.t & (VT_STATIC | VT_INLINE))
|
2017-11-30 17:15:22 +03:00
|
|
|
sym_bind = STB_LOCAL;
|
|
|
|
else if (sym->a.weak)
|
|
|
|
sym_bind = STB_WEAK;
|
|
|
|
else
|
|
|
|
sym_bind = STB_GLOBAL;
|
|
|
|
old_sym_bind = ELFW(ST_BIND)(esym->st_info);
|
|
|
|
if (sym_bind != old_sym_bind) {
|
|
|
|
esym->st_info = ELFW(ST_INFO)(sym_bind, ELFW(ST_TYPE)(esym->st_info));
|
|
|
|
}
|
|
|
|
|
2017-04-04 09:34:52 +03:00
|
|
|
#ifdef TCC_TARGET_PE
|
2017-07-09 13:34:11 +03:00
|
|
|
if (sym->a.dllimport)
|
|
|
|
esym->st_other |= ST_PE_IMPORT;
|
|
|
|
if (sym->a.dllexport)
|
2017-04-04 09:34:52 +03:00
|
|
|
esym->st_other |= ST_PE_EXPORT;
|
|
|
|
#endif
|
2017-11-30 17:15:22 +03:00
|
|
|
|
2017-07-09 13:34:11 +03:00
|
|
|
#if 0
|
2017-11-30 17:15:22 +03:00
|
|
|
printf("storage %s: bind=%c vis=%d exp=%d imp=%d\n",
|
2017-07-09 13:34:11 +03:00
|
|
|
get_tok_str(sym->v, NULL),
|
2017-11-30 17:15:22 +03:00
|
|
|
sym_bind == STB_WEAK ? 'w' : sym_bind == STB_LOCAL ? 'l' : 'g',
|
2017-07-09 13:34:11 +03:00
|
|
|
sym->a.visibility,
|
|
|
|
sym->a.dllexport,
|
|
|
|
sym->a.dllimport
|
|
|
|
);
|
|
|
|
#endif
|
2017-04-04 09:34:52 +03:00
|
|
|
}
|
|
|
|
|
2016-10-15 16:55:31 +03:00
|
|
|
/* ------------------------------------------------------------------------- */
|
|
|
|
/* update sym->c so that it points to an external symbol in section
|
|
|
|
'section' with value 'value' */
|
|
|
|
|
2017-12-12 19:57:20 +03:00
|
|
|
ST_FUNC void put_extern_sym2(Sym *sym, int sh_num,
|
2016-10-15 16:55:31 +03:00
|
|
|
addr_t value, unsigned long size,
|
|
|
|
int can_add_underscore)
|
|
|
|
{
|
2017-12-12 19:57:20 +03:00
|
|
|
int sym_type, sym_bind, info, other, t;
|
2017-11-27 06:03:03 +03:00
|
|
|
ElfSym *esym;
|
2016-10-15 16:55:31 +03:00
|
|
|
const char *name;
|
|
|
|
char buf1[256];
|
|
|
|
#ifdef CONFIG_TCC_BCHECK
|
|
|
|
char buf[32];
|
|
|
|
#endif
|
|
|
|
if (!sym->c) {
|
|
|
|
name = get_tok_str(sym->v, NULL);
|
|
|
|
#ifdef CONFIG_TCC_BCHECK
|
|
|
|
if (tcc_state->do_bounds_check) {
|
|
|
|
/* XXX: avoid doing that for statics ? */
|
|
|
|
/* if bound checking is activated, we change some function
|
|
|
|
names by adding the "__bound" prefix */
|
|
|
|
switch(sym->v) {
|
|
|
|
#ifdef TCC_TARGET_PE
|
|
|
|
/* XXX: we rely only on malloc hooks */
|
|
|
|
case TOK_malloc:
|
|
|
|
case TOK_free:
|
|
|
|
case TOK_realloc:
|
|
|
|
case TOK_memalign:
|
|
|
|
case TOK_calloc:
|
|
|
|
#endif
|
|
|
|
case TOK_memcpy:
|
|
|
|
case TOK_memmove:
|
|
|
|
case TOK_memset:
|
2019-12-12 22:49:35 +03:00
|
|
|
case TOK_memcmp:
|
2016-10-15 16:55:31 +03:00
|
|
|
case TOK_strlen:
|
|
|
|
case TOK_strcpy:
|
2019-12-12 22:49:35 +03:00
|
|
|
case TOK_strncpy:
|
|
|
|
case TOK_strcmp:
|
|
|
|
case TOK_strncmp:
|
|
|
|
case TOK_strcat:
|
|
|
|
case TOK_strchr:
|
|
|
|
case TOK_strdup:
|
2016-10-15 16:55:31 +03:00
|
|
|
case TOK_alloca:
|
2019-12-10 10:07:25 +03:00
|
|
|
case TOK_mmap:
|
|
|
|
case TOK_munmap:
|
2020-05-23 21:02:41 +03:00
|
|
|
case TOK_longjmp:
|
2020-05-25 13:26:55 +03:00
|
|
|
#ifndef TCC_TARGET_PE
|
|
|
|
case TOK_siglongjmp:
|
|
|
|
#endif
|
2016-10-15 16:55:31 +03:00
|
|
|
strcpy(buf, "__bound_");
|
|
|
|
strcat(buf, name);
|
|
|
|
name = buf;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
2017-04-04 09:34:52 +03:00
|
|
|
t = sym->type.t;
|
|
|
|
if ((t & VT_BTYPE) == VT_FUNC) {
|
|
|
|
sym_type = STT_FUNC;
|
|
|
|
} else if ((t & VT_BTYPE) == VT_VOID) {
|
|
|
|
sym_type = STT_NOTYPE;
|
|
|
|
} else {
|
|
|
|
sym_type = STT_OBJECT;
|
|
|
|
}
|
2019-06-22 05:00:52 +03:00
|
|
|
if (t & (VT_STATIC | VT_INLINE))
|
2017-04-04 09:34:52 +03:00
|
|
|
sym_bind = STB_LOCAL;
|
|
|
|
else
|
|
|
|
sym_bind = STB_GLOBAL;
|
2016-10-15 16:55:31 +03:00
|
|
|
other = 0;
|
|
|
|
#ifdef TCC_TARGET_PE
|
|
|
|
if (sym_type == STT_FUNC && sym->type.ref) {
|
|
|
|
Sym *ref = sym->type.ref;
|
2018-07-22 02:54:01 +03:00
|
|
|
if (ref->a.nodecorate) {
|
|
|
|
can_add_underscore = 0;
|
|
|
|
}
|
2017-07-09 13:34:11 +03:00
|
|
|
if (ref->f.func_call == FUNC_STDCALL && can_add_underscore) {
|
|
|
|
sprintf(buf1, "_%s@%d", name, ref->f.func_args * PTR_SIZE);
|
2016-10-15 16:55:31 +03:00
|
|
|
name = buf1;
|
|
|
|
other |= ST_PE_STDCALL;
|
|
|
|
can_add_underscore = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
if (tcc_state->leading_underscore && can_add_underscore) {
|
|
|
|
buf1[0] = '_';
|
|
|
|
pstrcpy(buf1 + 1, sizeof(buf1) - 1, name);
|
|
|
|
name = buf1;
|
|
|
|
}
|
2017-04-04 09:34:52 +03:00
|
|
|
if (sym->asm_label)
|
2016-10-15 16:55:31 +03:00
|
|
|
name = get_tok_str(sym->asm_label, NULL);
|
|
|
|
info = ELFW(ST_INFO)(sym_bind, sym_type);
|
2017-12-12 19:33:37 +03:00
|
|
|
sym->c = put_elf_sym(symtab_section, value, size, info, other, sh_num, name);
|
2020-05-03 12:59:57 +03:00
|
|
|
|
2020-05-05 15:47:00 +03:00
|
|
|
if (tcc_state->do_debug
|
|
|
|
&& sym_type != STT_FUNC
|
|
|
|
&& sym->v < SYM_FIRST_ANOM)
|
|
|
|
tcc_debug_extern_sym(tcc_state, sym, sh_num, sym_bind);
|
|
|
|
|
2016-10-15 16:55:31 +03:00
|
|
|
} else {
|
2017-11-27 06:03:03 +03:00
|
|
|
esym = elfsym(sym);
|
2016-10-15 16:55:31 +03:00
|
|
|
esym->st_value = value;
|
|
|
|
esym->st_size = size;
|
|
|
|
esym->st_shndx = sh_num;
|
|
|
|
}
|
2017-04-04 09:34:52 +03:00
|
|
|
update_storage(sym);
|
2016-10-15 16:55:31 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
ST_FUNC void put_extern_sym(Sym *sym, Section *section,
|
|
|
|
addr_t value, unsigned long size)
|
|
|
|
{
|
2017-12-12 19:57:20 +03:00
|
|
|
int sh_num = section ? section->sh_num : SHN_UNDEF;
|
|
|
|
put_extern_sym2(sym, sh_num, value, size, 1);
|
2016-10-15 16:55:31 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/* add a new relocation entry to symbol 'sym' in section 's' */
|
|
|
|
ST_FUNC void greloca(Section *s, Sym *sym, unsigned long offset, int type,
|
|
|
|
addr_t addend)
|
|
|
|
{
|
|
|
|
int c = 0;
|
2016-12-18 19:23:33 +03:00
|
|
|
|
|
|
|
if (nocode_wanted && s == cur_text_section)
|
|
|
|
return;
|
|
|
|
|
2016-10-15 16:55:31 +03:00
|
|
|
if (sym) {
|
|
|
|
if (0 == sym->c)
|
|
|
|
put_extern_sym(sym, NULL, 0, 0);
|
|
|
|
c = sym->c;
|
|
|
|
}
|
2016-12-18 19:23:33 +03:00
|
|
|
|
2016-10-15 16:55:31 +03:00
|
|
|
/* now we can add ELF relocation info */
|
|
|
|
put_elf_reloca(symtab_section, s, offset, type, c, addend);
|
|
|
|
}
|
|
|
|
|
2017-05-13 09:59:06 +03:00
|
|
|
#if PTR_SIZE == 4
|
2016-10-15 16:55:31 +03:00
|
|
|
ST_FUNC void greloc(Section *s, Sym *sym, unsigned long offset, int type)
|
|
|
|
{
|
|
|
|
greloca(s, sym, offset, type, 0);
|
|
|
|
}
|
2017-05-13 09:59:06 +03:00
|
|
|
#endif
|
2016-10-15 16:55:31 +03:00
|
|
|
|
2009-12-20 03:53:49 +03:00
|
|
|
/* ------------------------------------------------------------------------- */
|
|
|
|
/* symbol allocator */
|
|
|
|
static Sym *__sym_malloc(void)
|
|
|
|
{
|
|
|
|
Sym *sym_pool, *sym, *last_sym;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
sym_pool = tcc_malloc(SYM_POOL_NB * sizeof(Sym));
|
|
|
|
dynarray_add(&sym_pools, &nb_sym_pools, sym_pool);
|
|
|
|
|
|
|
|
last_sym = sym_free_first;
|
|
|
|
sym = sym_pool;
|
|
|
|
for(i = 0; i < SYM_POOL_NB; i++) {
|
|
|
|
sym->next = last_sym;
|
|
|
|
last_sym = sym;
|
|
|
|
sym++;
|
|
|
|
}
|
|
|
|
sym_free_first = last_sym;
|
|
|
|
return last_sym;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline Sym *sym_malloc(void)
|
|
|
|
{
|
|
|
|
Sym *sym;
|
2016-08-15 06:09:31 +03:00
|
|
|
#ifndef SYM_DEBUG
|
2009-12-20 03:53:49 +03:00
|
|
|
sym = sym_free_first;
|
|
|
|
if (!sym)
|
|
|
|
sym = __sym_malloc();
|
|
|
|
sym_free_first = sym->next;
|
|
|
|
return sym;
|
2016-08-15 06:09:31 +03:00
|
|
|
#else
|
|
|
|
sym = tcc_malloc(sizeof(Sym));
|
|
|
|
return sym;
|
|
|
|
#endif
|
2009-12-20 03:53:49 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
ST_INLN void sym_free(Sym *sym)
|
|
|
|
{
|
2016-08-15 06:09:31 +03:00
|
|
|
#ifndef SYM_DEBUG
|
2009-12-20 03:53:49 +03:00
|
|
|
sym->next = sym_free_first;
|
|
|
|
sym_free_first = sym;
|
2016-08-15 06:09:31 +03:00
|
|
|
#else
|
|
|
|
tcc_free(sym);
|
|
|
|
#endif
|
2009-12-20 03:53:49 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/* push, without hashing */
|
2017-07-09 13:34:11 +03:00
|
|
|
ST_FUNC Sym *sym_push2(Sym **ps, int v, int t, int c)
|
2009-12-20 03:53:49 +03:00
|
|
|
{
|
|
|
|
Sym *s;
|
2016-05-05 11:39:09 +03:00
|
|
|
|
2009-12-20 03:53:49 +03:00
|
|
|
s = sym_malloc();
|
2017-07-09 13:34:11 +03:00
|
|
|
memset(s, 0, sizeof *s);
|
2009-12-20 03:53:49 +03:00
|
|
|
s->v = v;
|
|
|
|
s->type.t = t;
|
|
|
|
s->c = c;
|
|
|
|
/* add in stack */
|
|
|
|
s->prev = *ps;
|
|
|
|
*ps = s;
|
|
|
|
return s;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* find a symbol and return its associated structure. 's' is the top
|
|
|
|
of the symbol stack */
|
|
|
|
ST_FUNC Sym *sym_find2(Sym *s, int v)
|
|
|
|
{
|
|
|
|
while (s) {
|
|
|
|
if (s->v == v)
|
|
|
|
return s;
|
2014-04-07 17:12:08 +04:00
|
|
|
else if (s->v == -1)
|
|
|
|
return NULL;
|
2009-12-20 03:53:49 +03:00
|
|
|
s = s->prev;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* structure lookup */
|
|
|
|
ST_INLN Sym *struct_find(int v)
|
|
|
|
{
|
|
|
|
v -= TOK_IDENT;
|
|
|
|
if ((unsigned)v >= (unsigned)(tok_ident - TOK_IDENT))
|
|
|
|
return NULL;
|
|
|
|
return table_ident[v]->sym_struct;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* find an identifier */
|
|
|
|
ST_INLN Sym *sym_find(int v)
|
|
|
|
{
|
|
|
|
v -= TOK_IDENT;
|
|
|
|
if ((unsigned)v >= (unsigned)(tok_ident - TOK_IDENT))
|
|
|
|
return NULL;
|
|
|
|
return table_ident[v]->sym_identifier;
|
|
|
|
}
|
|
|
|
|
2019-03-08 19:58:25 +03:00
|
|
|
static int sym_scope(Sym *s)
|
|
|
|
{
|
|
|
|
if (IS_ENUM_VAL (s->type.t))
|
|
|
|
return s->type.ref->sym_scope;
|
|
|
|
else
|
|
|
|
return s->sym_scope;
|
|
|
|
}
|
|
|
|
|
2009-12-20 03:53:49 +03:00
|
|
|
/* push a given symbol on the symbol stack */
|
2017-07-09 13:34:11 +03:00
|
|
|
ST_FUNC Sym *sym_push(int v, CType *type, int r, int c)
|
2009-12-20 03:53:49 +03:00
|
|
|
{
|
|
|
|
Sym *s, **ps;
|
|
|
|
TokenSym *ts;
|
|
|
|
|
|
|
|
if (local_stack)
|
|
|
|
ps = &local_stack;
|
|
|
|
else
|
|
|
|
ps = &global_stack;
|
|
|
|
s = sym_push2(ps, v, type->t, c);
|
|
|
|
s->type.ref = type->ref;
|
|
|
|
s->r = r;
|
|
|
|
/* don't record fields or anonymous symbols */
|
|
|
|
/* XXX: simplify */
|
|
|
|
if (!(v & SYM_FIELD) && (v & ~SYM_STRUCT) < SYM_FIRST_ANOM) {
|
|
|
|
/* record symbol in token array */
|
|
|
|
ts = table_ident[(v & ~SYM_STRUCT) - TOK_IDENT];
|
|
|
|
if (v & SYM_STRUCT)
|
|
|
|
ps = &ts->sym_struct;
|
|
|
|
else
|
|
|
|
ps = &ts->sym_identifier;
|
|
|
|
s->prev_tok = *ps;
|
|
|
|
*ps = s;
|
2017-07-09 13:34:11 +03:00
|
|
|
s->sym_scope = local_scope;
|
2019-03-08 19:58:25 +03:00
|
|
|
if (s->prev_tok && sym_scope(s->prev_tok) == s->sym_scope)
|
2016-05-05 21:04:00 +03:00
|
|
|
tcc_error("redeclaration of '%s'",
|
|
|
|
get_tok_str(v & ~SYM_STRUCT, NULL));
|
2009-12-20 03:53:49 +03:00
|
|
|
}
|
|
|
|
return s;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* push a global identifier */
|
2017-11-30 17:15:22 +03:00
|
|
|
ST_FUNC Sym *global_identifier_push(int v, int t, int c)
|
2009-12-20 03:53:49 +03:00
|
|
|
{
|
|
|
|
Sym *s, **ps;
|
2017-11-30 17:15:22 +03:00
|
|
|
s = sym_push2(&global_stack, v, t, c);
|
2019-04-18 04:36:39 +03:00
|
|
|
s->r = VT_CONST | VT_SYM;
|
2009-12-20 03:53:49 +03:00
|
|
|
/* don't record anonymous symbol */
|
|
|
|
if (v < SYM_FIRST_ANOM) {
|
|
|
|
ps = &table_ident[v - TOK_IDENT]->sym_identifier;
|
2019-04-18 04:36:39 +03:00
|
|
|
/* modify the top most local identifier, so that sym_identifier will
|
|
|
|
point to 's' when popped; happens when called from inline asm */
|
2017-11-27 06:03:03 +03:00
|
|
|
while (*ps != NULL && (*ps)->sym_scope)
|
2009-12-20 03:53:49 +03:00
|
|
|
ps = &(*ps)->prev_tok;
|
2017-11-27 06:03:03 +03:00
|
|
|
s->prev_tok = *ps;
|
2009-12-20 03:53:49 +03:00
|
|
|
*ps = s;
|
|
|
|
}
|
|
|
|
return s;
|
|
|
|
}
|
|
|
|
|
2016-08-15 06:09:31 +03:00
|
|
|
/* pop symbols until top reaches 'b'. If KEEP is non-zero don't really
|
|
|
|
pop them yet from the list, but do remove them from the token array. */
|
|
|
|
ST_FUNC void sym_pop(Sym **ptop, Sym *b, int keep)
|
2009-12-20 03:53:49 +03:00
|
|
|
{
|
|
|
|
Sym *s, *ss, **ps;
|
|
|
|
TokenSym *ts;
|
|
|
|
int v;
|
|
|
|
|
|
|
|
s = *ptop;
|
|
|
|
while(s != b) {
|
|
|
|
ss = s->prev;
|
|
|
|
v = s->v;
|
|
|
|
/* remove symbol in token array */
|
|
|
|
/* XXX: simplify */
|
|
|
|
if (!(v & SYM_FIELD) && (v & ~SYM_STRUCT) < SYM_FIRST_ANOM) {
|
|
|
|
ts = table_ident[(v & ~SYM_STRUCT) - TOK_IDENT];
|
|
|
|
if (v & SYM_STRUCT)
|
|
|
|
ps = &ts->sym_struct;
|
|
|
|
else
|
|
|
|
ps = &ts->sym_identifier;
|
|
|
|
*ps = s->prev_tok;
|
|
|
|
}
|
2016-08-15 06:09:31 +03:00
|
|
|
if (!keep)
|
|
|
|
sym_free(s);
|
2009-12-20 03:53:49 +03:00
|
|
|
s = ss;
|
|
|
|
}
|
2016-08-15 06:09:31 +03:00
|
|
|
if (!keep)
|
|
|
|
*ptop = b;
|
2009-12-20 03:53:49 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/* ------------------------------------------------------------------------- */
|
jump optimizations
This unifies VT_CMP with VT_JMP(i) by using mostly VT_CMP
with both a positive and a negative jump target list.
Such we can delay putting the non-inverted or inverted jump
until we can see which one is nore suitable (in most cases).
example:
if (a && b || c && d)
e = 0;
before this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 11 00 00 00 je 27 <main+0x27>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 84 05 00 00 00 je 27 <main+0x27>
22: e9 22 00 00 00 jmp 49 <main+0x49>
27: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
2a: 83 f8 00 cmp $0x0,%eax
2d: 0f 84 11 00 00 00 je 44 <main+0x44>
33: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
36: 83 f8 00 cmp $0x0,%eax
39: 0f 84 05 00 00 00 je 44 <main+0x44>
3f: e9 05 00 00 00 jmp 49 <main+0x49>
44: e9 08 00 00 00 jmp 51 <main+0x51>
49: b8 00 00 00 00 mov $0x0,%eax
4e: 89 45 ec mov %eax,0xffffffec(%ebp)
51: ...
with this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 0c 00 00 00 je 22 <main+0x22>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 85 18 00 00 00 jne 3a <main+0x3a>
22: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
25: 83 f8 00 cmp $0x0,%eax
28: 0f 84 14 00 00 00 je 42 <main+0x42>
2e: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
31: 83 f8 00 cmp $0x0,%eax
34: 0f 84 08 00 00 00 je 42 <main+0x42>
3a: b8 00 00 00 00 mov $0x0,%eax
3f: 89 45 ec mov %eax,0xffffffec(%ebp)
42: ...
2019-06-22 12:45:35 +03:00
|
|
|
static void vcheck_cmp(void)
|
2009-05-05 22:18:10 +04:00
|
|
|
{
|
|
|
|
/* cannot let cpu flags if other instruction are generated. Also
|
|
|
|
avoid leaving VT_JMP anywhere except on the top of the stack
|
2016-12-20 06:49:22 +03:00
|
|
|
because it would complicate the code generator.
|
|
|
|
|
|
|
|
Don't do this when nocode_wanted. vtop might come from
|
|
|
|
!nocode_wanted regions (see 88_codeopt.c) and transforming
|
|
|
|
it to a register without actually generating code is wrong
|
|
|
|
as their value might still be used for real. All values
|
|
|
|
we push under nocode_wanted will eventually be popped
|
|
|
|
again, so that the VT_CMP/VT_JMP value will be in vtop
|
jump optimizations
This unifies VT_CMP with VT_JMP(i) by using mostly VT_CMP
with both a positive and a negative jump target list.
Such we can delay putting the non-inverted or inverted jump
until we can see which one is nore suitable (in most cases).
example:
if (a && b || c && d)
e = 0;
before this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 11 00 00 00 je 27 <main+0x27>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 84 05 00 00 00 je 27 <main+0x27>
22: e9 22 00 00 00 jmp 49 <main+0x49>
27: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
2a: 83 f8 00 cmp $0x0,%eax
2d: 0f 84 11 00 00 00 je 44 <main+0x44>
33: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
36: 83 f8 00 cmp $0x0,%eax
39: 0f 84 05 00 00 00 je 44 <main+0x44>
3f: e9 05 00 00 00 jmp 49 <main+0x49>
44: e9 08 00 00 00 jmp 51 <main+0x51>
49: b8 00 00 00 00 mov $0x0,%eax
4e: 89 45 ec mov %eax,0xffffffec(%ebp)
51: ...
with this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 0c 00 00 00 je 22 <main+0x22>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 85 18 00 00 00 jne 3a <main+0x3a>
22: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
25: 83 f8 00 cmp $0x0,%eax
28: 0f 84 14 00 00 00 je 42 <main+0x42>
2e: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
31: 83 f8 00 cmp $0x0,%eax
34: 0f 84 08 00 00 00 je 42 <main+0x42>
3a: b8 00 00 00 00 mov $0x0,%eax
3f: 89 45 ec mov %eax,0xffffffec(%ebp)
42: ...
2019-06-22 12:45:35 +03:00
|
|
|
when code is unsuppressed again. */
|
2017-02-08 21:45:31 +03:00
|
|
|
|
2020-01-21 16:23:57 +03:00
|
|
|
if (vtop->r == VT_CMP && !nocode_wanted)
|
jump optimizations
This unifies VT_CMP with VT_JMP(i) by using mostly VT_CMP
with both a positive and a negative jump target list.
Such we can delay putting the non-inverted or inverted jump
until we can see which one is nore suitable (in most cases).
example:
if (a && b || c && d)
e = 0;
before this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 11 00 00 00 je 27 <main+0x27>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 84 05 00 00 00 je 27 <main+0x27>
22: e9 22 00 00 00 jmp 49 <main+0x49>
27: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
2a: 83 f8 00 cmp $0x0,%eax
2d: 0f 84 11 00 00 00 je 44 <main+0x44>
33: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
36: 83 f8 00 cmp $0x0,%eax
39: 0f 84 05 00 00 00 je 44 <main+0x44>
3f: e9 05 00 00 00 jmp 49 <main+0x49>
44: e9 08 00 00 00 jmp 51 <main+0x51>
49: b8 00 00 00 00 mov $0x0,%eax
4e: 89 45 ec mov %eax,0xffffffec(%ebp)
51: ...
with this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 0c 00 00 00 je 22 <main+0x22>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 85 18 00 00 00 jne 3a <main+0x3a>
22: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
25: 83 f8 00 cmp $0x0,%eax
28: 0f 84 14 00 00 00 je 42 <main+0x42>
2e: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
31: 83 f8 00 cmp $0x0,%eax
34: 0f 84 08 00 00 00 je 42 <main+0x42>
3a: b8 00 00 00 00 mov $0x0,%eax
3f: 89 45 ec mov %eax,0xffffffec(%ebp)
42: ...
2019-06-22 12:45:35 +03:00
|
|
|
gv(RC_INT);
|
|
|
|
}
|
2017-02-08 21:45:31 +03:00
|
|
|
|
jump optimizations
This unifies VT_CMP with VT_JMP(i) by using mostly VT_CMP
with both a positive and a negative jump target list.
Such we can delay putting the non-inverted or inverted jump
until we can see which one is nore suitable (in most cases).
example:
if (a && b || c && d)
e = 0;
before this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 11 00 00 00 je 27 <main+0x27>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 84 05 00 00 00 je 27 <main+0x27>
22: e9 22 00 00 00 jmp 49 <main+0x49>
27: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
2a: 83 f8 00 cmp $0x0,%eax
2d: 0f 84 11 00 00 00 je 44 <main+0x44>
33: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
36: 83 f8 00 cmp $0x0,%eax
39: 0f 84 05 00 00 00 je 44 <main+0x44>
3f: e9 05 00 00 00 jmp 49 <main+0x49>
44: e9 08 00 00 00 jmp 51 <main+0x51>
49: b8 00 00 00 00 mov $0x0,%eax
4e: 89 45 ec mov %eax,0xffffffec(%ebp)
51: ...
with this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 0c 00 00 00 je 22 <main+0x22>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 85 18 00 00 00 jne 3a <main+0x3a>
22: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
25: 83 f8 00 cmp $0x0,%eax
28: 0f 84 14 00 00 00 je 42 <main+0x42>
2e: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
31: 83 f8 00 cmp $0x0,%eax
34: 0f 84 08 00 00 00 je 42 <main+0x42>
3a: b8 00 00 00 00 mov $0x0,%eax
3f: 89 45 ec mov %eax,0xffffffec(%ebp)
42: ...
2019-06-22 12:45:35 +03:00
|
|
|
static void vsetc(CType *type, int r, CValue *vc)
|
|
|
|
{
|
|
|
|
if (vtop >= vstack + (VSTACK_SIZE - 1))
|
|
|
|
tcc_error("memory full (vstack)");
|
|
|
|
vcheck_cmp();
|
2009-05-05 22:18:10 +04:00
|
|
|
vtop++;
|
|
|
|
vtop->type = *type;
|
|
|
|
vtop->r = r;
|
|
|
|
vtop->r2 = VT_CONST;
|
|
|
|
vtop->c = *vc;
|
2016-10-06 05:05:30 +03:00
|
|
|
vtop->sym = NULL;
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
|
2017-02-08 21:45:31 +03:00
|
|
|
ST_FUNC void vswap(void)
|
|
|
|
{
|
|
|
|
SValue tmp;
|
jump optimizations
This unifies VT_CMP with VT_JMP(i) by using mostly VT_CMP
with both a positive and a negative jump target list.
Such we can delay putting the non-inverted or inverted jump
until we can see which one is nore suitable (in most cases).
example:
if (a && b || c && d)
e = 0;
before this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 11 00 00 00 je 27 <main+0x27>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 84 05 00 00 00 je 27 <main+0x27>
22: e9 22 00 00 00 jmp 49 <main+0x49>
27: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
2a: 83 f8 00 cmp $0x0,%eax
2d: 0f 84 11 00 00 00 je 44 <main+0x44>
33: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
36: 83 f8 00 cmp $0x0,%eax
39: 0f 84 05 00 00 00 je 44 <main+0x44>
3f: e9 05 00 00 00 jmp 49 <main+0x49>
44: e9 08 00 00 00 jmp 51 <main+0x51>
49: b8 00 00 00 00 mov $0x0,%eax
4e: 89 45 ec mov %eax,0xffffffec(%ebp)
51: ...
with this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 0c 00 00 00 je 22 <main+0x22>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 85 18 00 00 00 jne 3a <main+0x3a>
22: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
25: 83 f8 00 cmp $0x0,%eax
28: 0f 84 14 00 00 00 je 42 <main+0x42>
2e: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
31: 83 f8 00 cmp $0x0,%eax
34: 0f 84 08 00 00 00 je 42 <main+0x42>
3a: b8 00 00 00 00 mov $0x0,%eax
3f: 89 45 ec mov %eax,0xffffffec(%ebp)
42: ...
2019-06-22 12:45:35 +03:00
|
|
|
|
|
|
|
vcheck_cmp();
|
2017-02-08 21:45:31 +03:00
|
|
|
tmp = vtop[0];
|
|
|
|
vtop[0] = vtop[-1];
|
|
|
|
vtop[-1] = tmp;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* pop stack value */
|
|
|
|
ST_FUNC void vpop(void)
|
|
|
|
{
|
|
|
|
int v;
|
|
|
|
v = vtop->r & VT_VALMASK;
|
|
|
|
#if defined(TCC_TARGET_I386) || defined(TCC_TARGET_X86_64)
|
|
|
|
/* for x86, we need to pop the FP stack */
|
|
|
|
if (v == TREG_ST0) {
|
|
|
|
o(0xd8dd); /* fstp %st(0) */
|
|
|
|
} else
|
|
|
|
#endif
|
jump optimizations
This unifies VT_CMP with VT_JMP(i) by using mostly VT_CMP
with both a positive and a negative jump target list.
Such we can delay putting the non-inverted or inverted jump
until we can see which one is nore suitable (in most cases).
example:
if (a && b || c && d)
e = 0;
before this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 11 00 00 00 je 27 <main+0x27>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 84 05 00 00 00 je 27 <main+0x27>
22: e9 22 00 00 00 jmp 49 <main+0x49>
27: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
2a: 83 f8 00 cmp $0x0,%eax
2d: 0f 84 11 00 00 00 je 44 <main+0x44>
33: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
36: 83 f8 00 cmp $0x0,%eax
39: 0f 84 05 00 00 00 je 44 <main+0x44>
3f: e9 05 00 00 00 jmp 49 <main+0x49>
44: e9 08 00 00 00 jmp 51 <main+0x51>
49: b8 00 00 00 00 mov $0x0,%eax
4e: 89 45 ec mov %eax,0xffffffec(%ebp)
51: ...
with this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 0c 00 00 00 je 22 <main+0x22>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 85 18 00 00 00 jne 3a <main+0x3a>
22: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
25: 83 f8 00 cmp $0x0,%eax
28: 0f 84 14 00 00 00 je 42 <main+0x42>
2e: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
31: 83 f8 00 cmp $0x0,%eax
34: 0f 84 08 00 00 00 je 42 <main+0x42>
3a: b8 00 00 00 00 mov $0x0,%eax
3f: 89 45 ec mov %eax,0xffffffec(%ebp)
42: ...
2019-06-22 12:45:35 +03:00
|
|
|
if (v == VT_CMP) {
|
2017-02-08 21:45:31 +03:00
|
|
|
/* need to put correct jump if && or || without test */
|
jump optimizations
This unifies VT_CMP with VT_JMP(i) by using mostly VT_CMP
with both a positive and a negative jump target list.
Such we can delay putting the non-inverted or inverted jump
until we can see which one is nore suitable (in most cases).
example:
if (a && b || c && d)
e = 0;
before this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 11 00 00 00 je 27 <main+0x27>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 84 05 00 00 00 je 27 <main+0x27>
22: e9 22 00 00 00 jmp 49 <main+0x49>
27: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
2a: 83 f8 00 cmp $0x0,%eax
2d: 0f 84 11 00 00 00 je 44 <main+0x44>
33: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
36: 83 f8 00 cmp $0x0,%eax
39: 0f 84 05 00 00 00 je 44 <main+0x44>
3f: e9 05 00 00 00 jmp 49 <main+0x49>
44: e9 08 00 00 00 jmp 51 <main+0x51>
49: b8 00 00 00 00 mov $0x0,%eax
4e: 89 45 ec mov %eax,0xffffffec(%ebp)
51: ...
with this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 0c 00 00 00 je 22 <main+0x22>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 85 18 00 00 00 jne 3a <main+0x3a>
22: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
25: 83 f8 00 cmp $0x0,%eax
28: 0f 84 14 00 00 00 je 42 <main+0x42>
2e: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
31: 83 f8 00 cmp $0x0,%eax
34: 0f 84 08 00 00 00 je 42 <main+0x42>
3a: b8 00 00 00 00 mov $0x0,%eax
3f: 89 45 ec mov %eax,0xffffffec(%ebp)
42: ...
2019-06-22 12:45:35 +03:00
|
|
|
gsym(vtop->jtrue);
|
|
|
|
gsym(vtop->jfalse);
|
2017-02-08 21:45:31 +03:00
|
|
|
}
|
|
|
|
vtop--;
|
|
|
|
}
|
|
|
|
|
2010-04-11 03:53:40 +04:00
|
|
|
/* push constant of type "type" with useless value */
|
2019-12-16 20:51:28 +03:00
|
|
|
static void vpush(CType *type)
|
2010-04-11 03:53:40 +04:00
|
|
|
{
|
2017-07-09 13:34:11 +03:00
|
|
|
vset(type, VT_CONST, 0);
|
2010-04-11 03:53:40 +04:00
|
|
|
}
|
|
|
|
|
2019-12-16 20:51:28 +03:00
|
|
|
/* push arbitrary 64bit constant */
|
|
|
|
static void vpush64(int ty, unsigned long long v)
|
2009-05-05 22:18:10 +04:00
|
|
|
{
|
|
|
|
CValue cval;
|
2019-12-16 20:51:28 +03:00
|
|
|
CType ctype;
|
|
|
|
ctype.t = ty;
|
|
|
|
ctype.ref = NULL;
|
2009-05-05 22:18:10 +04:00
|
|
|
cval.i = v;
|
2019-12-16 20:51:28 +03:00
|
|
|
vsetc(&ctype, VT_CONST, &cval);
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
|
2019-12-16 20:51:28 +03:00
|
|
|
/* push integer constant */
|
|
|
|
ST_FUNC void vpushi(int v)
|
2012-04-16 03:13:25 +04:00
|
|
|
{
|
2019-12-16 20:51:28 +03:00
|
|
|
vpush64(VT_INT, v);
|
2012-04-16 03:13:25 +04:00
|
|
|
}
|
|
|
|
|
2019-12-16 20:51:28 +03:00
|
|
|
/* push a pointer sized constant */
|
|
|
|
static void vpushs(addr_t v)
|
2010-05-06 04:19:00 +04:00
|
|
|
{
|
2019-12-16 20:51:28 +03:00
|
|
|
vpush64(VT_SIZE_T, v);
|
2010-05-06 04:19:00 +04:00
|
|
|
}
|
|
|
|
|
2013-02-08 22:07:11 +04:00
|
|
|
/* push long long constant */
|
|
|
|
static inline void vpushll(long long v)
|
|
|
|
{
|
|
|
|
vpush64(VT_LLONG, v);
|
|
|
|
}
|
|
|
|
|
2017-07-09 13:34:11 +03:00
|
|
|
ST_FUNC void vset(CType *type, int r, int v)
|
2017-02-08 21:45:31 +03:00
|
|
|
{
|
|
|
|
CValue cval;
|
|
|
|
cval.i = v;
|
|
|
|
vsetc(type, r, &cval);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void vseti(int r, int v)
|
|
|
|
{
|
|
|
|
CType type;
|
|
|
|
type.t = VT_INT;
|
2017-07-09 13:34:11 +03:00
|
|
|
type.ref = NULL;
|
2017-02-08 21:45:31 +03:00
|
|
|
vset(&type, r, v);
|
|
|
|
}
|
|
|
|
|
|
|
|
ST_FUNC void vpushv(SValue *v)
|
|
|
|
{
|
|
|
|
if (vtop >= vstack + (VSTACK_SIZE - 1))
|
|
|
|
tcc_error("memory full (vstack)");
|
|
|
|
vtop++;
|
|
|
|
*vtop = *v;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void vdup(void)
|
|
|
|
{
|
|
|
|
vpushv(vtop);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* rotate n first stack elements to the bottom
|
|
|
|
I1 ... In -> I2 ... In I1 [top is right]
|
|
|
|
*/
|
|
|
|
ST_FUNC void vrotb(int n)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
SValue tmp;
|
|
|
|
|
jump optimizations
This unifies VT_CMP with VT_JMP(i) by using mostly VT_CMP
with both a positive and a negative jump target list.
Such we can delay putting the non-inverted or inverted jump
until we can see which one is nore suitable (in most cases).
example:
if (a && b || c && d)
e = 0;
before this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 11 00 00 00 je 27 <main+0x27>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 84 05 00 00 00 je 27 <main+0x27>
22: e9 22 00 00 00 jmp 49 <main+0x49>
27: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
2a: 83 f8 00 cmp $0x0,%eax
2d: 0f 84 11 00 00 00 je 44 <main+0x44>
33: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
36: 83 f8 00 cmp $0x0,%eax
39: 0f 84 05 00 00 00 je 44 <main+0x44>
3f: e9 05 00 00 00 jmp 49 <main+0x49>
44: e9 08 00 00 00 jmp 51 <main+0x51>
49: b8 00 00 00 00 mov $0x0,%eax
4e: 89 45 ec mov %eax,0xffffffec(%ebp)
51: ...
with this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 0c 00 00 00 je 22 <main+0x22>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 85 18 00 00 00 jne 3a <main+0x3a>
22: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
25: 83 f8 00 cmp $0x0,%eax
28: 0f 84 14 00 00 00 je 42 <main+0x42>
2e: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
31: 83 f8 00 cmp $0x0,%eax
34: 0f 84 08 00 00 00 je 42 <main+0x42>
3a: b8 00 00 00 00 mov $0x0,%eax
3f: 89 45 ec mov %eax,0xffffffec(%ebp)
42: ...
2019-06-22 12:45:35 +03:00
|
|
|
vcheck_cmp();
|
2017-02-08 21:45:31 +03:00
|
|
|
tmp = vtop[-n + 1];
|
|
|
|
for(i=-n+1;i!=0;i++)
|
|
|
|
vtop[i] = vtop[i+1];
|
|
|
|
vtop[0] = tmp;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* rotate the n elements before entry e towards the top
|
|
|
|
I1 ... In ... -> In I1 ... I(n-1) ... [top is right]
|
|
|
|
*/
|
|
|
|
ST_FUNC void vrote(SValue *e, int n)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
SValue tmp;
|
|
|
|
|
jump optimizations
This unifies VT_CMP with VT_JMP(i) by using mostly VT_CMP
with both a positive and a negative jump target list.
Such we can delay putting the non-inverted or inverted jump
until we can see which one is nore suitable (in most cases).
example:
if (a && b || c && d)
e = 0;
before this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 11 00 00 00 je 27 <main+0x27>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 84 05 00 00 00 je 27 <main+0x27>
22: e9 22 00 00 00 jmp 49 <main+0x49>
27: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
2a: 83 f8 00 cmp $0x0,%eax
2d: 0f 84 11 00 00 00 je 44 <main+0x44>
33: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
36: 83 f8 00 cmp $0x0,%eax
39: 0f 84 05 00 00 00 je 44 <main+0x44>
3f: e9 05 00 00 00 jmp 49 <main+0x49>
44: e9 08 00 00 00 jmp 51 <main+0x51>
49: b8 00 00 00 00 mov $0x0,%eax
4e: 89 45 ec mov %eax,0xffffffec(%ebp)
51: ...
with this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 0c 00 00 00 je 22 <main+0x22>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 85 18 00 00 00 jne 3a <main+0x3a>
22: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
25: 83 f8 00 cmp $0x0,%eax
28: 0f 84 14 00 00 00 je 42 <main+0x42>
2e: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
31: 83 f8 00 cmp $0x0,%eax
34: 0f 84 08 00 00 00 je 42 <main+0x42>
3a: b8 00 00 00 00 mov $0x0,%eax
3f: 89 45 ec mov %eax,0xffffffec(%ebp)
42: ...
2019-06-22 12:45:35 +03:00
|
|
|
vcheck_cmp();
|
2017-02-08 21:45:31 +03:00
|
|
|
tmp = *e;
|
|
|
|
for(i = 0;i < n - 1; i++)
|
|
|
|
e[-i] = e[-i - 1];
|
|
|
|
e[-n + 1] = tmp;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* rotate n first stack elements to the top
|
|
|
|
I1 ... In -> In I1 ... I(n-1) [top is right]
|
|
|
|
*/
|
|
|
|
ST_FUNC void vrott(int n)
|
|
|
|
{
|
|
|
|
vrote(vtop, n);
|
|
|
|
}
|
|
|
|
|
jump optimizations
This unifies VT_CMP with VT_JMP(i) by using mostly VT_CMP
with both a positive and a negative jump target list.
Such we can delay putting the non-inverted or inverted jump
until we can see which one is nore suitable (in most cases).
example:
if (a && b || c && d)
e = 0;
before this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 11 00 00 00 je 27 <main+0x27>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 84 05 00 00 00 je 27 <main+0x27>
22: e9 22 00 00 00 jmp 49 <main+0x49>
27: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
2a: 83 f8 00 cmp $0x0,%eax
2d: 0f 84 11 00 00 00 je 44 <main+0x44>
33: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
36: 83 f8 00 cmp $0x0,%eax
39: 0f 84 05 00 00 00 je 44 <main+0x44>
3f: e9 05 00 00 00 jmp 49 <main+0x49>
44: e9 08 00 00 00 jmp 51 <main+0x51>
49: b8 00 00 00 00 mov $0x0,%eax
4e: 89 45 ec mov %eax,0xffffffec(%ebp)
51: ...
with this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 0c 00 00 00 je 22 <main+0x22>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 85 18 00 00 00 jne 3a <main+0x3a>
22: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
25: 83 f8 00 cmp $0x0,%eax
28: 0f 84 14 00 00 00 je 42 <main+0x42>
2e: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
31: 83 f8 00 cmp $0x0,%eax
34: 0f 84 08 00 00 00 je 42 <main+0x42>
3a: b8 00 00 00 00 mov $0x0,%eax
3f: 89 45 ec mov %eax,0xffffffec(%ebp)
42: ...
2019-06-22 12:45:35 +03:00
|
|
|
/* ------------------------------------------------------------------------- */
|
|
|
|
/* vtop->r = VT_CMP means CPU-flags have been set from comparison or test. */
|
|
|
|
|
|
|
|
/* called from generators to set the result from relational ops */
|
|
|
|
ST_FUNC void vset_VT_CMP(int op)
|
|
|
|
{
|
|
|
|
vtop->r = VT_CMP;
|
|
|
|
vtop->cmp_op = op;
|
|
|
|
vtop->jfalse = 0;
|
|
|
|
vtop->jtrue = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* called once before asking generators to load VT_CMP to a register */
|
|
|
|
static void vset_VT_JMP(void)
|
|
|
|
{
|
|
|
|
int op = vtop->cmp_op;
|
2020-01-21 16:23:57 +03:00
|
|
|
|
jump optimizations
This unifies VT_CMP with VT_JMP(i) by using mostly VT_CMP
with both a positive and a negative jump target list.
Such we can delay putting the non-inverted or inverted jump
until we can see which one is nore suitable (in most cases).
example:
if (a && b || c && d)
e = 0;
before this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 11 00 00 00 je 27 <main+0x27>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 84 05 00 00 00 je 27 <main+0x27>
22: e9 22 00 00 00 jmp 49 <main+0x49>
27: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
2a: 83 f8 00 cmp $0x0,%eax
2d: 0f 84 11 00 00 00 je 44 <main+0x44>
33: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
36: 83 f8 00 cmp $0x0,%eax
39: 0f 84 05 00 00 00 je 44 <main+0x44>
3f: e9 05 00 00 00 jmp 49 <main+0x49>
44: e9 08 00 00 00 jmp 51 <main+0x51>
49: b8 00 00 00 00 mov $0x0,%eax
4e: 89 45 ec mov %eax,0xffffffec(%ebp)
51: ...
with this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 0c 00 00 00 je 22 <main+0x22>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 85 18 00 00 00 jne 3a <main+0x3a>
22: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
25: 83 f8 00 cmp $0x0,%eax
28: 0f 84 14 00 00 00 je 42 <main+0x42>
2e: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
31: 83 f8 00 cmp $0x0,%eax
34: 0f 84 08 00 00 00 je 42 <main+0x42>
3a: b8 00 00 00 00 mov $0x0,%eax
3f: 89 45 ec mov %eax,0xffffffec(%ebp)
42: ...
2019-06-22 12:45:35 +03:00
|
|
|
if (vtop->jtrue || vtop->jfalse) {
|
|
|
|
/* we need to jump to 'mov $0,%R' or 'mov $1,%R' */
|
|
|
|
int inv = op & (op < 2); /* small optimization */
|
2020-01-21 16:23:57 +03:00
|
|
|
vseti(VT_JMP+inv, gvtst(inv, 0));
|
jump optimizations
This unifies VT_CMP with VT_JMP(i) by using mostly VT_CMP
with both a positive and a negative jump target list.
Such we can delay putting the non-inverted or inverted jump
until we can see which one is nore suitable (in most cases).
example:
if (a && b || c && d)
e = 0;
before this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 11 00 00 00 je 27 <main+0x27>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 84 05 00 00 00 je 27 <main+0x27>
22: e9 22 00 00 00 jmp 49 <main+0x49>
27: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
2a: 83 f8 00 cmp $0x0,%eax
2d: 0f 84 11 00 00 00 je 44 <main+0x44>
33: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
36: 83 f8 00 cmp $0x0,%eax
39: 0f 84 05 00 00 00 je 44 <main+0x44>
3f: e9 05 00 00 00 jmp 49 <main+0x49>
44: e9 08 00 00 00 jmp 51 <main+0x51>
49: b8 00 00 00 00 mov $0x0,%eax
4e: 89 45 ec mov %eax,0xffffffec(%ebp)
51: ...
with this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 0c 00 00 00 je 22 <main+0x22>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 85 18 00 00 00 jne 3a <main+0x3a>
22: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
25: 83 f8 00 cmp $0x0,%eax
28: 0f 84 14 00 00 00 je 42 <main+0x42>
2e: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
31: 83 f8 00 cmp $0x0,%eax
34: 0f 84 08 00 00 00 je 42 <main+0x42>
3a: b8 00 00 00 00 mov $0x0,%eax
3f: 89 45 ec mov %eax,0xffffffec(%ebp)
42: ...
2019-06-22 12:45:35 +03:00
|
|
|
} else {
|
|
|
|
/* otherwise convert flags (rsp. 0/1) to register */
|
|
|
|
vtop->c.i = op;
|
|
|
|
if (op < 2) /* doesn't seem to happen */
|
|
|
|
vtop->r = VT_CONST;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Set CPU Flags, doesn't yet jump */
|
|
|
|
static void gvtst_set(int inv, int t)
|
|
|
|
{
|
|
|
|
int *p;
|
2020-01-21 16:23:57 +03:00
|
|
|
|
jump optimizations
This unifies VT_CMP with VT_JMP(i) by using mostly VT_CMP
with both a positive and a negative jump target list.
Such we can delay putting the non-inverted or inverted jump
until we can see which one is nore suitable (in most cases).
example:
if (a && b || c && d)
e = 0;
before this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 11 00 00 00 je 27 <main+0x27>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 84 05 00 00 00 je 27 <main+0x27>
22: e9 22 00 00 00 jmp 49 <main+0x49>
27: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
2a: 83 f8 00 cmp $0x0,%eax
2d: 0f 84 11 00 00 00 je 44 <main+0x44>
33: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
36: 83 f8 00 cmp $0x0,%eax
39: 0f 84 05 00 00 00 je 44 <main+0x44>
3f: e9 05 00 00 00 jmp 49 <main+0x49>
44: e9 08 00 00 00 jmp 51 <main+0x51>
49: b8 00 00 00 00 mov $0x0,%eax
4e: 89 45 ec mov %eax,0xffffffec(%ebp)
51: ...
with this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 0c 00 00 00 je 22 <main+0x22>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 85 18 00 00 00 jne 3a <main+0x3a>
22: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
25: 83 f8 00 cmp $0x0,%eax
28: 0f 84 14 00 00 00 je 42 <main+0x42>
2e: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
31: 83 f8 00 cmp $0x0,%eax
34: 0f 84 08 00 00 00 je 42 <main+0x42>
3a: b8 00 00 00 00 mov $0x0,%eax
3f: 89 45 ec mov %eax,0xffffffec(%ebp)
42: ...
2019-06-22 12:45:35 +03:00
|
|
|
if (vtop->r != VT_CMP) {
|
|
|
|
vpushi(0);
|
|
|
|
gen_op(TOK_NE);
|
2020-01-21 16:23:57 +03:00
|
|
|
if (vtop->r != VT_CMP) /* must be VT_CONST then */
|
2020-01-13 03:06:25 +03:00
|
|
|
vset_VT_CMP(vtop->c.i != 0);
|
jump optimizations
This unifies VT_CMP with VT_JMP(i) by using mostly VT_CMP
with both a positive and a negative jump target list.
Such we can delay putting the non-inverted or inverted jump
until we can see which one is nore suitable (in most cases).
example:
if (a && b || c && d)
e = 0;
before this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 11 00 00 00 je 27 <main+0x27>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 84 05 00 00 00 je 27 <main+0x27>
22: e9 22 00 00 00 jmp 49 <main+0x49>
27: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
2a: 83 f8 00 cmp $0x0,%eax
2d: 0f 84 11 00 00 00 je 44 <main+0x44>
33: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
36: 83 f8 00 cmp $0x0,%eax
39: 0f 84 05 00 00 00 je 44 <main+0x44>
3f: e9 05 00 00 00 jmp 49 <main+0x49>
44: e9 08 00 00 00 jmp 51 <main+0x51>
49: b8 00 00 00 00 mov $0x0,%eax
4e: 89 45 ec mov %eax,0xffffffec(%ebp)
51: ...
with this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 0c 00 00 00 je 22 <main+0x22>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 85 18 00 00 00 jne 3a <main+0x3a>
22: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
25: 83 f8 00 cmp $0x0,%eax
28: 0f 84 14 00 00 00 je 42 <main+0x42>
2e: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
31: 83 f8 00 cmp $0x0,%eax
34: 0f 84 08 00 00 00 je 42 <main+0x42>
3a: b8 00 00 00 00 mov $0x0,%eax
3f: 89 45 ec mov %eax,0xffffffec(%ebp)
42: ...
2019-06-22 12:45:35 +03:00
|
|
|
}
|
2020-01-21 16:23:57 +03:00
|
|
|
|
jump optimizations
This unifies VT_CMP with VT_JMP(i) by using mostly VT_CMP
with both a positive and a negative jump target list.
Such we can delay putting the non-inverted or inverted jump
until we can see which one is nore suitable (in most cases).
example:
if (a && b || c && d)
e = 0;
before this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 11 00 00 00 je 27 <main+0x27>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 84 05 00 00 00 je 27 <main+0x27>
22: e9 22 00 00 00 jmp 49 <main+0x49>
27: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
2a: 83 f8 00 cmp $0x0,%eax
2d: 0f 84 11 00 00 00 je 44 <main+0x44>
33: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
36: 83 f8 00 cmp $0x0,%eax
39: 0f 84 05 00 00 00 je 44 <main+0x44>
3f: e9 05 00 00 00 jmp 49 <main+0x49>
44: e9 08 00 00 00 jmp 51 <main+0x51>
49: b8 00 00 00 00 mov $0x0,%eax
4e: 89 45 ec mov %eax,0xffffffec(%ebp)
51: ...
with this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 0c 00 00 00 je 22 <main+0x22>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 85 18 00 00 00 jne 3a <main+0x3a>
22: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
25: 83 f8 00 cmp $0x0,%eax
28: 0f 84 14 00 00 00 je 42 <main+0x42>
2e: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
31: 83 f8 00 cmp $0x0,%eax
34: 0f 84 08 00 00 00 je 42 <main+0x42>
3a: b8 00 00 00 00 mov $0x0,%eax
3f: 89 45 ec mov %eax,0xffffffec(%ebp)
42: ...
2019-06-22 12:45:35 +03:00
|
|
|
p = inv ? &vtop->jfalse : &vtop->jtrue;
|
|
|
|
*p = gjmp_append(*p, t);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Generate value test
|
|
|
|
*
|
|
|
|
* Generate a test for any value (jump, comparison and integers) */
|
|
|
|
static int gvtst(int inv, int t)
|
|
|
|
{
|
2020-01-13 03:06:25 +03:00
|
|
|
int op, x, u;
|
2020-01-21 16:23:57 +03:00
|
|
|
|
jump optimizations
This unifies VT_CMP with VT_JMP(i) by using mostly VT_CMP
with both a positive and a negative jump target list.
Such we can delay putting the non-inverted or inverted jump
until we can see which one is nore suitable (in most cases).
example:
if (a && b || c && d)
e = 0;
before this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 11 00 00 00 je 27 <main+0x27>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 84 05 00 00 00 je 27 <main+0x27>
22: e9 22 00 00 00 jmp 49 <main+0x49>
27: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
2a: 83 f8 00 cmp $0x0,%eax
2d: 0f 84 11 00 00 00 je 44 <main+0x44>
33: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
36: 83 f8 00 cmp $0x0,%eax
39: 0f 84 05 00 00 00 je 44 <main+0x44>
3f: e9 05 00 00 00 jmp 49 <main+0x49>
44: e9 08 00 00 00 jmp 51 <main+0x51>
49: b8 00 00 00 00 mov $0x0,%eax
4e: 89 45 ec mov %eax,0xffffffec(%ebp)
51: ...
with this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 0c 00 00 00 je 22 <main+0x22>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 85 18 00 00 00 jne 3a <main+0x3a>
22: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
25: 83 f8 00 cmp $0x0,%eax
28: 0f 84 14 00 00 00 je 42 <main+0x42>
2e: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
31: 83 f8 00 cmp $0x0,%eax
34: 0f 84 08 00 00 00 je 42 <main+0x42>
3a: b8 00 00 00 00 mov $0x0,%eax
3f: 89 45 ec mov %eax,0xffffffec(%ebp)
42: ...
2019-06-22 12:45:35 +03:00
|
|
|
gvtst_set(inv, t);
|
2020-01-21 16:23:57 +03:00
|
|
|
t = vtop->jtrue, u = vtop->jfalse;
|
|
|
|
if (inv)
|
|
|
|
x = u, u = t, t = x;
|
|
|
|
op = vtop->cmp_op;
|
jump optimizations
This unifies VT_CMP with VT_JMP(i) by using mostly VT_CMP
with both a positive and a negative jump target list.
Such we can delay putting the non-inverted or inverted jump
until we can see which one is nore suitable (in most cases).
example:
if (a && b || c && d)
e = 0;
before this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 11 00 00 00 je 27 <main+0x27>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 84 05 00 00 00 je 27 <main+0x27>
22: e9 22 00 00 00 jmp 49 <main+0x49>
27: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
2a: 83 f8 00 cmp $0x0,%eax
2d: 0f 84 11 00 00 00 je 44 <main+0x44>
33: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
36: 83 f8 00 cmp $0x0,%eax
39: 0f 84 05 00 00 00 je 44 <main+0x44>
3f: e9 05 00 00 00 jmp 49 <main+0x49>
44: e9 08 00 00 00 jmp 51 <main+0x51>
49: b8 00 00 00 00 mov $0x0,%eax
4e: 89 45 ec mov %eax,0xffffffec(%ebp)
51: ...
with this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 0c 00 00 00 je 22 <main+0x22>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 85 18 00 00 00 jne 3a <main+0x3a>
22: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
25: 83 f8 00 cmp $0x0,%eax
28: 0f 84 14 00 00 00 je 42 <main+0x42>
2e: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
31: 83 f8 00 cmp $0x0,%eax
34: 0f 84 08 00 00 00 je 42 <main+0x42>
3a: b8 00 00 00 00 mov $0x0,%eax
3f: 89 45 ec mov %eax,0xffffffec(%ebp)
42: ...
2019-06-22 12:45:35 +03:00
|
|
|
|
|
|
|
/* jump to the wanted target */
|
|
|
|
if (op > 1)
|
2020-01-21 16:23:57 +03:00
|
|
|
t = gjmp_cond(op ^ inv, t);
|
jump optimizations
This unifies VT_CMP with VT_JMP(i) by using mostly VT_CMP
with both a positive and a negative jump target list.
Such we can delay putting the non-inverted or inverted jump
until we can see which one is nore suitable (in most cases).
example:
if (a && b || c && d)
e = 0;
before this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 11 00 00 00 je 27 <main+0x27>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 84 05 00 00 00 je 27 <main+0x27>
22: e9 22 00 00 00 jmp 49 <main+0x49>
27: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
2a: 83 f8 00 cmp $0x0,%eax
2d: 0f 84 11 00 00 00 je 44 <main+0x44>
33: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
36: 83 f8 00 cmp $0x0,%eax
39: 0f 84 05 00 00 00 je 44 <main+0x44>
3f: e9 05 00 00 00 jmp 49 <main+0x49>
44: e9 08 00 00 00 jmp 51 <main+0x51>
49: b8 00 00 00 00 mov $0x0,%eax
4e: 89 45 ec mov %eax,0xffffffec(%ebp)
51: ...
with this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 0c 00 00 00 je 22 <main+0x22>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 85 18 00 00 00 jne 3a <main+0x3a>
22: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
25: 83 f8 00 cmp $0x0,%eax
28: 0f 84 14 00 00 00 je 42 <main+0x42>
2e: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
31: 83 f8 00 cmp $0x0,%eax
34: 0f 84 08 00 00 00 je 42 <main+0x42>
3a: b8 00 00 00 00 mov $0x0,%eax
3f: 89 45 ec mov %eax,0xffffffec(%ebp)
42: ...
2019-06-22 12:45:35 +03:00
|
|
|
else if (op != inv)
|
|
|
|
t = gjmp(t);
|
|
|
|
/* resolve complementary jumps to here */
|
|
|
|
gsym(u);
|
|
|
|
|
|
|
|
vtop--;
|
|
|
|
return t;
|
|
|
|
}
|
|
|
|
|
2019-12-16 20:51:28 +03:00
|
|
|
/* generate a zero or nozero test */
|
|
|
|
static void gen_test_zero(int op)
|
|
|
|
{
|
|
|
|
if (vtop->r == VT_CMP) {
|
|
|
|
int j;
|
|
|
|
if (op == TOK_EQ) {
|
|
|
|
j = vtop->jfalse;
|
|
|
|
vtop->jfalse = vtop->jtrue;
|
|
|
|
vtop->jtrue = j;
|
|
|
|
vtop->cmp_op ^= 1;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
vpushi(0);
|
|
|
|
gen_op(op);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
jump optimizations
This unifies VT_CMP with VT_JMP(i) by using mostly VT_CMP
with both a positive and a negative jump target list.
Such we can delay putting the non-inverted or inverted jump
until we can see which one is nore suitable (in most cases).
example:
if (a && b || c && d)
e = 0;
before this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 11 00 00 00 je 27 <main+0x27>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 84 05 00 00 00 je 27 <main+0x27>
22: e9 22 00 00 00 jmp 49 <main+0x49>
27: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
2a: 83 f8 00 cmp $0x0,%eax
2d: 0f 84 11 00 00 00 je 44 <main+0x44>
33: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
36: 83 f8 00 cmp $0x0,%eax
39: 0f 84 05 00 00 00 je 44 <main+0x44>
3f: e9 05 00 00 00 jmp 49 <main+0x49>
44: e9 08 00 00 00 jmp 51 <main+0x51>
49: b8 00 00 00 00 mov $0x0,%eax
4e: 89 45 ec mov %eax,0xffffffec(%ebp)
51: ...
with this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 0c 00 00 00 je 22 <main+0x22>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 85 18 00 00 00 jne 3a <main+0x3a>
22: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
25: 83 f8 00 cmp $0x0,%eax
28: 0f 84 14 00 00 00 je 42 <main+0x42>
2e: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
31: 83 f8 00 cmp $0x0,%eax
34: 0f 84 08 00 00 00 je 42 <main+0x42>
3a: b8 00 00 00 00 mov $0x0,%eax
3f: 89 45 ec mov %eax,0xffffffec(%ebp)
42: ...
2019-06-22 12:45:35 +03:00
|
|
|
/* ------------------------------------------------------------------------- */
|
2014-01-12 02:42:58 +04:00
|
|
|
/* push a symbol value of TYPE */
|
|
|
|
static inline void vpushsym(CType *type, Sym *sym)
|
|
|
|
{
|
|
|
|
CValue cval;
|
2015-11-17 22:09:35 +03:00
|
|
|
cval.i = 0;
|
2014-01-12 02:42:58 +04:00
|
|
|
vsetc(type, VT_CONST | VT_SYM, &cval);
|
|
|
|
vtop->sym = sym;
|
|
|
|
}
|
|
|
|
|
2009-05-05 22:18:10 +04:00
|
|
|
/* Return a static symbol pointing to a section */
|
2009-12-20 03:53:49 +03:00
|
|
|
ST_FUNC Sym *get_sym_ref(CType *type, Section *sec, unsigned long offset, unsigned long size)
|
2009-05-05 22:18:10 +04:00
|
|
|
{
|
|
|
|
int v;
|
|
|
|
Sym *sym;
|
|
|
|
|
|
|
|
v = anon_sym++;
|
2019-04-18 04:36:39 +03:00
|
|
|
sym = sym_push(v, type, VT_CONST | VT_SYM, 0);
|
|
|
|
sym->type.t |= VT_STATIC;
|
2009-05-05 22:18:10 +04:00
|
|
|
put_extern_sym(sym, sec, offset, size);
|
|
|
|
return sym;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* push a reference to a section offset by adding a dummy symbol */
|
|
|
|
static void vpush_ref(CType *type, Section *sec, unsigned long offset, unsigned long size)
|
|
|
|
{
|
2015-07-29 23:53:57 +03:00
|
|
|
vpushsym(type, get_sym_ref(type, sec, offset, size));
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/* define a new external reference to a symbol 'v' of type 'u' */
|
2019-04-18 04:36:39 +03:00
|
|
|
ST_FUNC Sym *external_global_sym(int v, CType *type)
|
2009-05-05 22:18:10 +04:00
|
|
|
{
|
|
|
|
Sym *s;
|
|
|
|
|
|
|
|
s = sym_find(v);
|
|
|
|
if (!s) {
|
|
|
|
/* push forward reference */
|
|
|
|
s = global_identifier_push(v, type->t | VT_EXTERN, 0);
|
|
|
|
s->type.ref = type->ref;
|
2017-11-30 17:15:22 +03:00
|
|
|
} else if (IS_ASM_SYM(s)) {
|
|
|
|
s->type.t = type->t | (s->type.t & VT_EXTERN);
|
|
|
|
s->type.ref = type->ref;
|
2017-12-12 19:57:20 +03:00
|
|
|
update_storage(s);
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
return s;
|
|
|
|
}
|
|
|
|
|
2019-01-01 00:00:31 +03:00
|
|
|
/* Merge symbol attributes. */
|
|
|
|
static void merge_symattr(struct SymAttr *sa, struct SymAttr *sa1)
|
|
|
|
{
|
|
|
|
if (sa1->aligned && !sa->aligned)
|
|
|
|
sa->aligned = sa1->aligned;
|
|
|
|
sa->packed |= sa1->packed;
|
|
|
|
sa->weak |= sa1->weak;
|
|
|
|
if (sa1->visibility != STV_DEFAULT) {
|
|
|
|
int vis = sa->visibility;
|
|
|
|
if (vis == STV_DEFAULT
|
|
|
|
|| vis > sa1->visibility)
|
|
|
|
vis = sa1->visibility;
|
|
|
|
sa->visibility = vis;
|
|
|
|
}
|
|
|
|
sa->dllexport |= sa1->dllexport;
|
|
|
|
sa->nodecorate |= sa1->nodecorate;
|
|
|
|
sa->dllimport |= sa1->dllimport;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Merge function attributes. */
|
|
|
|
static void merge_funcattr(struct FuncAttr *fa, struct FuncAttr *fa1)
|
|
|
|
{
|
|
|
|
if (fa1->func_call && !fa->func_call)
|
|
|
|
fa->func_call = fa1->func_call;
|
|
|
|
if (fa1->func_type && !fa->func_type)
|
|
|
|
fa->func_type = fa1->func_type;
|
|
|
|
if (fa1->func_args && !fa->func_args)
|
|
|
|
fa->func_args = fa1->func_args;
|
2020-05-13 12:14:53 +03:00
|
|
|
if (fa1->func_noreturn)
|
|
|
|
fa->func_noreturn = 1;
|
|
|
|
if (fa1->func_ctor)
|
|
|
|
fa->func_ctor = 1;
|
|
|
|
if (fa1->func_dtor)
|
|
|
|
fa->func_dtor = 1;
|
2019-01-01 00:00:31 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Merge attributes. */
|
|
|
|
static void merge_attr(AttributeDef *ad, AttributeDef *ad1)
|
|
|
|
{
|
|
|
|
merge_symattr(&ad->a, &ad1->a);
|
|
|
|
merge_funcattr(&ad->f, &ad1->f);
|
|
|
|
|
|
|
|
if (ad1->section)
|
|
|
|
ad->section = ad1->section;
|
|
|
|
if (ad1->alias_target)
|
|
|
|
ad->alias_target = ad1->alias_target;
|
|
|
|
if (ad1->asm_label)
|
|
|
|
ad->asm_label = ad1->asm_label;
|
|
|
|
if (ad1->attr_mode)
|
|
|
|
ad->attr_mode = ad1->attr_mode;
|
|
|
|
}
|
|
|
|
|
2017-12-03 22:43:48 +03:00
|
|
|
/* Merge some type attributes. */
|
|
|
|
static void patch_type(Sym *sym, CType *type)
|
|
|
|
{
|
2019-06-22 05:00:52 +03:00
|
|
|
if (!(type->t & VT_EXTERN) || IS_ENUM_VAL(sym->type.t)) {
|
2017-12-03 22:43:48 +03:00
|
|
|
if (!(sym->type.t & VT_EXTERN))
|
|
|
|
tcc_error("redefinition of '%s'", get_tok_str(sym->v, NULL));
|
|
|
|
sym->type.t &= ~VT_EXTERN;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (IS_ASM_SYM(sym)) {
|
2017-12-12 19:57:20 +03:00
|
|
|
/* stay static if both are static */
|
|
|
|
sym->type.t = type->t & (sym->type.t | ~VT_STATIC);
|
|
|
|
sym->type.ref = type->ref;
|
|
|
|
}
|
2017-12-03 22:43:48 +03:00
|
|
|
|
2017-12-12 19:57:20 +03:00
|
|
|
if (!is_compatible_types(&sym->type, type)) {
|
2017-12-03 22:43:48 +03:00
|
|
|
tcc_error("incompatible types for redefinition of '%s'",
|
|
|
|
get_tok_str(sym->v, NULL));
|
|
|
|
|
|
|
|
} else if ((sym->type.t & VT_BTYPE) == VT_FUNC) {
|
|
|
|
int static_proto = sym->type.t & VT_STATIC;
|
|
|
|
/* warn if static follows non-static function declaration */
|
2019-06-17 19:28:56 +03:00
|
|
|
if ((type->t & VT_STATIC) && !static_proto
|
|
|
|
/* XXX this test for inline shouldn't be here. Until we
|
|
|
|
implement gnu-inline mode again it silences a warning for
|
|
|
|
mingw caused by our workarounds. */
|
|
|
|
&& !((type->t | sym->type.t) & VT_INLINE))
|
2017-12-03 22:43:48 +03:00
|
|
|
tcc_warning("static storage ignored for redefinition of '%s'",
|
|
|
|
get_tok_str(sym->v, NULL));
|
|
|
|
|
2019-06-22 05:00:52 +03:00
|
|
|
/* set 'inline' if both agree or if one has static */
|
|
|
|
if ((type->t | sym->type.t) & VT_INLINE) {
|
|
|
|
if (!((type->t ^ sym->type.t) & VT_INLINE)
|
|
|
|
|| ((type->t | sym->type.t) & VT_STATIC))
|
|
|
|
static_proto |= VT_INLINE;
|
2019-06-17 04:34:03 +03:00
|
|
|
}
|
2019-06-22 05:00:52 +03:00
|
|
|
|
2017-12-03 22:43:48 +03:00
|
|
|
if (0 == (type->t & VT_EXTERN)) {
|
2020-05-13 12:14:53 +03:00
|
|
|
struct FuncAttr f = sym->type.ref->f;
|
2019-06-22 05:00:52 +03:00
|
|
|
/* put complete type, use static from prototype */
|
|
|
|
sym->type.t = (type->t & ~(VT_STATIC|VT_INLINE)) | static_proto;
|
|
|
|
sym->type.ref = type->ref;
|
2020-05-13 12:14:53 +03:00
|
|
|
merge_funcattr(&sym->type.ref->f, &f);
|
2019-06-22 05:00:52 +03:00
|
|
|
} else {
|
|
|
|
sym->type.t &= ~VT_INLINE | static_proto;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (sym->type.ref->f.func_type == FUNC_OLD
|
|
|
|
&& type->ref->f.func_type != FUNC_OLD) {
|
|
|
|
sym->type.ref = type->ref;
|
2017-12-03 22:43:48 +03:00
|
|
|
}
|
2019-06-22 05:00:52 +03:00
|
|
|
|
2017-12-03 22:43:48 +03:00
|
|
|
} else {
|
|
|
|
if ((sym->type.t & VT_ARRAY) && type->ref->c >= 0) {
|
|
|
|
/* set array size if it was omitted in extern declaration */
|
2019-06-22 05:00:52 +03:00
|
|
|
sym->type.ref->c = type->ref->c;
|
2017-12-03 22:43:48 +03:00
|
|
|
}
|
|
|
|
if ((type->t ^ sym->type.t) & VT_STATIC)
|
|
|
|
tcc_warning("storage mismatch for redefinition of '%s'",
|
|
|
|
get_tok_str(sym->v, NULL));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-04-04 09:34:52 +03:00
|
|
|
/* Merge some storage attributes. */
|
2017-07-09 13:34:11 +03:00
|
|
|
static void patch_storage(Sym *sym, AttributeDef *ad, CType *type)
|
2017-04-04 09:34:52 +03:00
|
|
|
{
|
2017-12-03 22:43:48 +03:00
|
|
|
if (type)
|
|
|
|
patch_type(sym, type);
|
|
|
|
|
2017-04-04 09:34:52 +03:00
|
|
|
#ifdef TCC_TARGET_PE
|
2017-07-09 13:34:11 +03:00
|
|
|
if (sym->a.dllimport != ad->a.dllimport)
|
2017-04-04 09:34:52 +03:00
|
|
|
tcc_error("incompatible dll linkage for redefinition of '%s'",
|
|
|
|
get_tok_str(sym->v, NULL));
|
2017-12-03 22:43:48 +03:00
|
|
|
#endif
|
2019-01-01 00:00:31 +03:00
|
|
|
merge_symattr(&sym->a, &ad->a);
|
2017-07-09 13:34:11 +03:00
|
|
|
if (ad->asm_label)
|
|
|
|
sym->asm_label = ad->asm_label;
|
|
|
|
update_storage(sym);
|
2017-04-04 09:34:52 +03:00
|
|
|
}
|
|
|
|
|
2019-06-22 05:00:52 +03:00
|
|
|
/* copy sym to other stack */
|
|
|
|
static Sym *sym_copy(Sym *s0, Sym **ps)
|
|
|
|
{
|
|
|
|
Sym *s;
|
|
|
|
s = sym_malloc(), *s = *s0;
|
|
|
|
s->prev = *ps, *ps = s;
|
|
|
|
if (s->v < SYM_FIRST_ANOM) {
|
|
|
|
ps = &table_ident[s->v - TOK_IDENT]->sym_identifier;
|
|
|
|
s->prev_tok = *ps, *ps = s;
|
|
|
|
}
|
|
|
|
return s;
|
|
|
|
}
|
|
|
|
|
2019-07-16 18:30:04 +03:00
|
|
|
/* copy s->type.ref to stack 'ps' for VT_FUNC and VT_PTR */
|
|
|
|
static void sym_copy_ref(Sym *s, Sym **ps)
|
2019-06-22 05:00:52 +03:00
|
|
|
{
|
2019-07-16 18:30:04 +03:00
|
|
|
int bt = s->type.t & VT_BTYPE;
|
|
|
|
if (bt == VT_FUNC || bt == VT_PTR) {
|
|
|
|
Sym **sp = &s->type.ref;
|
|
|
|
for (s = *sp, *sp = NULL; s; s = s->next) {
|
|
|
|
Sym *s2 = sym_copy(s, ps);
|
|
|
|
sp = &(*sp = s2)->next;
|
|
|
|
sym_copy_ref(s2, ps);
|
|
|
|
}
|
|
|
|
}
|
2019-06-22 05:00:52 +03:00
|
|
|
}
|
|
|
|
|
2015-11-20 13:22:56 +03:00
|
|
|
/* define a new external reference to a symbol 'v' */
|
2017-07-09 13:34:11 +03:00
|
|
|
static Sym *external_sym(int v, CType *type, int r, AttributeDef *ad)
|
2009-05-05 22:18:10 +04:00
|
|
|
{
|
2019-07-16 18:30:04 +03:00
|
|
|
Sym *s;
|
2019-06-22 05:00:52 +03:00
|
|
|
|
|
|
|
/* look for global symbol */
|
2009-05-05 22:18:10 +04:00
|
|
|
s = sym_find(v);
|
2019-06-22 05:00:52 +03:00
|
|
|
while (s && s->sym_scope)
|
|
|
|
s = s->prev_tok;
|
|
|
|
|
|
|
|
if (!s) {
|
2009-05-05 22:18:10 +04:00
|
|
|
/* push forward reference */
|
2019-06-22 05:00:52 +03:00
|
|
|
s = global_identifier_push(v, type->t, 0);
|
|
|
|
s->r |= r;
|
2017-07-09 13:34:11 +03:00
|
|
|
s->a = ad->a;
|
2019-05-14 22:34:28 +03:00
|
|
|
s->asm_label = ad->asm_label;
|
2019-06-22 05:00:52 +03:00
|
|
|
s->type.ref = type->ref;
|
2019-07-16 18:30:04 +03:00
|
|
|
/* copy type to the global stack */
|
|
|
|
if (local_stack)
|
2019-06-22 05:00:52 +03:00
|
|
|
sym_copy_ref(s, &global_stack);
|
2017-04-04 09:34:52 +03:00
|
|
|
} else {
|
2017-07-09 13:34:11 +03:00
|
|
|
patch_storage(s, ad, type);
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
2019-07-16 18:30:04 +03:00
|
|
|
/* push variables on local_stack if any */
|
|
|
|
if (local_stack && (s->type.t & VT_BTYPE) != VT_FUNC)
|
2019-06-22 05:00:52 +03:00
|
|
|
s = sym_copy(s, &local_stack);
|
2009-05-05 22:18:10 +04:00
|
|
|
return s;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* push a reference to global symbol v */
|
2009-12-20 22:33:41 +03:00
|
|
|
ST_FUNC void vpush_global_sym(CType *type, int v)
|
2009-05-05 22:18:10 +04:00
|
|
|
{
|
2019-04-18 04:36:39 +03:00
|
|
|
vpushsym(type, external_global_sym(v, type));
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
|
tccgen: arm/i386: save_reg_upstack
tccgen.c:gv() when loading long long from lvalue, before
was saving all registers which caused problems in the arm
function call register parameter preparation, as with
void foo(long long y, int x);
int main(void)
{
unsigned int *xx[1], x;
unsigned long long *yy[1], y;
foo(**yy, **xx);
return 0;
}
Now only the modified register is saved if necessary,
as in this case where it is used to store the result
of the post-inc:
long long *p, v, **pp;
v = 1;
p = &v;
p[0]++;
printf("another long long spill test : %lld\n", *p);
i386-gen.c :
- found a similar problem with TOK_UMULL caused by the
vstack juggle in tccgen:gen_opl()
(bug seen only when using EBX as 4th register)
2016-10-04 18:36:51 +03:00
|
|
|
/* save registers up to (vtop - n) stack entry */
|
|
|
|
ST_FUNC void save_regs(int n)
|
|
|
|
{
|
|
|
|
SValue *p, *p1;
|
|
|
|
for(p = vstack, p1 = vtop - n; p <= p1; p++)
|
|
|
|
save_reg(p->r);
|
|
|
|
}
|
|
|
|
|
2009-05-05 22:18:10 +04:00
|
|
|
/* save r to the memory stack, and mark it as being free */
|
2009-12-20 03:53:49 +03:00
|
|
|
ST_FUNC void save_reg(int r)
|
tccgen: arm/i386: save_reg_upstack
tccgen.c:gv() when loading long long from lvalue, before
was saving all registers which caused problems in the arm
function call register parameter preparation, as with
void foo(long long y, int x);
int main(void)
{
unsigned int *xx[1], x;
unsigned long long *yy[1], y;
foo(**yy, **xx);
return 0;
}
Now only the modified register is saved if necessary,
as in this case where it is used to store the result
of the post-inc:
long long *p, v, **pp;
v = 1;
p = &v;
p[0]++;
printf("another long long spill test : %lld\n", *p);
i386-gen.c :
- found a similar problem with TOK_UMULL caused by the
vstack juggle in tccgen:gen_opl()
(bug seen only when using EBX as 4th register)
2016-10-04 18:36:51 +03:00
|
|
|
{
|
|
|
|
save_reg_upstack(r, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* save r to the memory stack, and mark it as being free,
|
|
|
|
if seen up to (vtop - n) stack entry */
|
|
|
|
ST_FUNC void save_reg_upstack(int r, int n)
|
2009-05-05 22:18:10 +04:00
|
|
|
{
|
2019-12-16 20:51:28 +03:00
|
|
|
int l, size, align, bt;
|
tccgen: arm/i386: save_reg_upstack
tccgen.c:gv() when loading long long from lvalue, before
was saving all registers which caused problems in the arm
function call register parameter preparation, as with
void foo(long long y, int x);
int main(void)
{
unsigned int *xx[1], x;
unsigned long long *yy[1], y;
foo(**yy, **xx);
return 0;
}
Now only the modified register is saved if necessary,
as in this case where it is used to store the result
of the post-inc:
long long *p, v, **pp;
v = 1;
p = &v;
p[0]++;
printf("another long long spill test : %lld\n", *p);
i386-gen.c :
- found a similar problem with TOK_UMULL caused by the
vstack juggle in tccgen:gen_opl()
(bug seen only when using EBX as 4th register)
2016-10-04 18:36:51 +03:00
|
|
|
SValue *p, *p1, sv;
|
2009-05-05 22:18:10 +04:00
|
|
|
|
tccgen: arm/i386: save_reg_upstack
tccgen.c:gv() when loading long long from lvalue, before
was saving all registers which caused problems in the arm
function call register parameter preparation, as with
void foo(long long y, int x);
int main(void)
{
unsigned int *xx[1], x;
unsigned long long *yy[1], y;
foo(**yy, **xx);
return 0;
}
Now only the modified register is saved if necessary,
as in this case where it is used to store the result
of the post-inc:
long long *p, v, **pp;
v = 1;
p = &v;
p[0]++;
printf("another long long spill test : %lld\n", *p);
i386-gen.c :
- found a similar problem with TOK_UMULL caused by the
vstack juggle in tccgen:gen_opl()
(bug seen only when using EBX as 4th register)
2016-10-04 18:36:51 +03:00
|
|
|
if ((r &= VT_VALMASK) >= VT_CONST)
|
|
|
|
return;
|
2016-12-18 19:23:33 +03:00
|
|
|
if (nocode_wanted)
|
|
|
|
return;
|
2009-05-05 22:18:10 +04:00
|
|
|
l = 0;
|
tccgen: arm/i386: save_reg_upstack
tccgen.c:gv() when loading long long from lvalue, before
was saving all registers which caused problems in the arm
function call register parameter preparation, as with
void foo(long long y, int x);
int main(void)
{
unsigned int *xx[1], x;
unsigned long long *yy[1], y;
foo(**yy, **xx);
return 0;
}
Now only the modified register is saved if necessary,
as in this case where it is used to store the result
of the post-inc:
long long *p, v, **pp;
v = 1;
p = &v;
p[0]++;
printf("another long long spill test : %lld\n", *p);
i386-gen.c :
- found a similar problem with TOK_UMULL caused by the
vstack juggle in tccgen:gen_opl()
(bug seen only when using EBX as 4th register)
2016-10-04 18:36:51 +03:00
|
|
|
for(p = vstack, p1 = vtop - n; p <= p1; p++) {
|
2019-12-16 20:51:28 +03:00
|
|
|
if ((p->r & VT_VALMASK) == r || p->r2 == r) {
|
2009-05-05 22:18:10 +04:00
|
|
|
/* must save value on stack if not already done */
|
2019-12-16 20:51:28 +03:00
|
|
|
if (!l) {
|
|
|
|
bt = p->type.t & VT_BTYPE;
|
|
|
|
if (bt == VT_VOID)
|
|
|
|
continue;
|
|
|
|
if ((p->r & VT_LVAL) || bt == VT_FUNC)
|
|
|
|
bt = VT_PTR;
|
|
|
|
sv.type.t = bt;
|
|
|
|
size = type_size(&sv.type, &align);
|
|
|
|
l = get_temp_local_var(size,align);
|
2009-05-05 22:18:10 +04:00
|
|
|
sv.r = VT_LOCAL | VT_LVAL;
|
2019-01-09 22:32:23 +03:00
|
|
|
sv.c.i = l;
|
2019-12-16 20:51:28 +03:00
|
|
|
store(p->r & VT_VALMASK, &sv);
|
2009-05-05 22:18:10 +04:00
|
|
|
#if defined(TCC_TARGET_I386) || defined(TCC_TARGET_X86_64)
|
|
|
|
/* x86 specific: need to pop fp register ST0 if saved */
|
|
|
|
if (r == TREG_ST0) {
|
trying to fix the bug of unclean FPU st(0)
Date: Mon, 8 Jun 2009 19:06:56 +0800
From: Soloist Deng <soloist.deng-gmail-com>
Subject: [Tinycc-devel] trying to fix the bug of unclean FPU st(0)
Hi all:
I am using tcc-0.9.25, and the FPU bug brought a big trouble to
me. I read the source and tried to fix it.
Below is my solution.
There are two places where program(`o(0xd9dd)') will generates `fstp
%st(1)': vpop() in tccgen.c:689 and save_reg() in tccgen.c:210.
We should first change both of them to `o(0xd8dd) // fstp %st(0)'.
But these changes are not enough. Let's check the following code.
void foo()
{
double var = 2.7;
var++;
}
Using the changed tcc will generate following machine code:
.text:08000000 public foo
.text:08000000 foo proc near
.text:08000000
.text:08000000 var_18 = qword ptr -18h
.text:08000000 var_10 = qword ptr -10h
.text:08000000 var_8 = qword ptr -8
.text:08000000
.text:08000000 push ebp
.text:08000001 mov ebp, esp
.text:08000003 sub esp, 18h
.text:08000009 nop
.text:0800000A fld L_0
.text:08000010 fst [ebp+var_8]
.text:08000013 fstp st(0)
.text:08000015 fld [ebp+var_8]
.text:08000018 fst [ebp+var_10]
.text:0800001B fstp st(0)
.text:0800001D fst [ebp+var_18]
.text:08000020 fstp st(0)
.text:08000022 fld L_1
.text:08000028 fadd [ebp+var_10]
.text:0800002B fst [ebp+var_8]
.text:0800002E fstp st(0)
.text:08000030 leave
.text:08000031 retn
.text:08000031 foo endp
.text:08000031
.text:08000031 _text ends
--------------------------------------------------
.data:08000040 ; Segment type: Pure data
.data:08000040 ; Segment permissions: Read/Write
.data:08000040 ; Segment alignment '32byte' can not be represented in assembly
.data:08000040 _data segment page public 'DATA' use32
.data:08000040 assume cs:_data
.data:08000040 ;org 8000040h
.data:08000040 L_0 dq 400599999999999Ah
.data:08000048 L_1 dq 3FF0000000000000h
.data:08000048 _data ends
Please notice the code snippet from 0800000A to 08000020
// double var = 2.7; load constant to st(0)
.text:0800000A fld L_0
// double var = 2.7; store st(0) to `var'
.text:08000010 fst [ebp+var_8]
// double var = 2.7; poping st(0) will empty the floating registers stack
.text:08000013 fstp st(0)
After that ,tcc will call `void inc(int post, int c)" in
tccgen.c:2150, and produce 08000015 to 0800001B through the calling
chain (inc ->gv_dup)
// load from `var' to st(0)
.text:08000015 fld [ebp+var_8]
// store st(0) to a temporary location
.text:08000018 fst [ebp+var_10]
// poping st(0) will empty the floating registers stack
.text:0800001B fstp st(0)
And the calling chain
(gen_op('+')->gen_opif('+')->gen_opf('+')->gv(rc=2)->get_reg(rc=2)->save_reg(r=3))
will produce 0800001D to 08000020 .
// store st(0) to a temporary location, but floating stack is empty!
.text:0800001D fst [ebp+var_18]
// poping st(0) will empty the floating registers stack
.text:08000020 fstp st(0)
The `0800001D fst [ebp+var_18]' will store st(0) to a memory
location, but st(0) is empty. That will cause FPU invalid operation
exception(#IE).
Why does tcc do that? Please read `gv_dup' called by `inc' carefully.
Notice these lines:
(1): r = gv(rc);
(2): r1 = get_reg(rc);
(3): sv.r = r;
sv.c.ul = 0;
(4) load(r1, &sv); /* move r to r1 */
(5) vdup();
/* duplicates value */
(6) vtop->r = r1;
(1) let the vtop occupy TREG_ST0, and `r' will be TREG_ST0. (2)
try to get a free floating register,but tcc assume
there is only one, so it wil force vtop goto memory and assign `r1'
with TREG_ST0. When executing (3), it will do nothing
because `r' equals `r1'. (5) duplicates vtop. Then (6) let the new
vtop occupy TREG_ST0, but this will cause problem
because the old vtop has been moved to memory, so the new duplicated
vtop does not reside in TREG_ST0 but also
in memory after that. TREG_ST0 is not occupied but freely availabe
now. `gen_op('+')' need at least one oprand in register,
so it will incorrectly think TREG_ST0 is occupied by vtop and produce
instructions(0800001D and 08000020) to store it to
a temporary memory location.
According program above, if `r' == `r1' it is impossible for the old
vtop to still occupy the `r' register . And `load' will do nothing
too at this condition.
So the `gv_dup' can not promise the semantics that old vtop in one
register and the new duplicated vtop in another register at the same
time.
I changed (6) to
if (r != r1)
{
vtop->r = r1;
}
Then the new generated machine code will be :
.text:08000000 push ebp
.text:08000001 mov ebp, esp
.text:08000003 sub esp, 10h
.text:08000009 nop
.text:0800000A fld L_0
.text:08000010 fst [ebp+var_8]
.text:08000013 fstp st(0)
.text:08000015 fld [ebp+var_8]
.text:08000018 fst [ebp+var_10]
.text:0800001B fstp st(0)
.text:0800001D fld L_1
.text:08000023 fadd [ebp+var_10]
.text:08000026 fst [ebp+var_8]
.text:08000029 fstp st(0)
.text:0800002B leave
.text:0800002C retn
It works well, and will clean the floating registers stack when return.
Finally, I want to know there is any potential problem of this fixing ?
soloist
2009-06-08 21:26:19 +04:00
|
|
|
o(0xd8dd); /* fstp %st(0) */
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
#endif
|
2019-12-16 20:44:35 +03:00
|
|
|
/* special long long case */
|
2019-12-16 20:51:28 +03:00
|
|
|
if (p->r2 < VT_CONST && USING_TWO_WORDS(bt)) {
|
2019-07-18 05:51:52 +03:00
|
|
|
sv.c.i += PTR_SIZE;
|
2009-05-05 22:18:10 +04:00
|
|
|
store(p->r2, &sv);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* mark that stack entry as being saved on the stack */
|
|
|
|
if (p->r & VT_LVAL) {
|
|
|
|
/* also clear the bounded flag because the
|
|
|
|
relocation address of the function was stored in
|
2015-11-17 22:09:35 +03:00
|
|
|
p->c.i */
|
2009-05-05 22:18:10 +04:00
|
|
|
p->r = (p->r & ~(VT_VALMASK | VT_BOUNDED)) | VT_LLOCAL;
|
|
|
|
} else {
|
2019-12-16 20:48:31 +03:00
|
|
|
p->r = VT_LVAL | VT_LOCAL;
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
p->r2 = VT_CONST;
|
2015-11-17 22:09:35 +03:00
|
|
|
p->c.i = l;
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-12-20 03:53:49 +03:00
|
|
|
#ifdef TCC_TARGET_ARM
|
2009-05-05 22:18:10 +04:00
|
|
|
/* find a register of class 'rc2' with at most one reference on stack.
|
|
|
|
* If none, call get_reg(rc) */
|
2009-12-20 03:53:49 +03:00
|
|
|
ST_FUNC int get_reg_ex(int rc, int rc2)
|
2009-05-05 22:18:10 +04:00
|
|
|
{
|
|
|
|
int r;
|
|
|
|
SValue *p;
|
2015-07-29 23:53:57 +03:00
|
|
|
|
2009-05-05 22:18:10 +04:00
|
|
|
for(r=0;r<NB_REGS;r++) {
|
|
|
|
if (reg_classes[r] & rc2) {
|
|
|
|
int n;
|
|
|
|
n=0;
|
|
|
|
for(p = vstack; p <= vtop; p++) {
|
|
|
|
if ((p->r & VT_VALMASK) == r ||
|
2019-12-16 20:48:31 +03:00
|
|
|
p->r2 == r)
|
2009-05-05 22:18:10 +04:00
|
|
|
n++;
|
|
|
|
}
|
|
|
|
if (n <= 1)
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return get_reg(rc);
|
|
|
|
}
|
2009-12-20 03:53:49 +03:00
|
|
|
#endif
|
2009-05-05 22:18:10 +04:00
|
|
|
|
|
|
|
/* find a free register of class 'rc'. If none, save one register */
|
2009-12-20 03:53:49 +03:00
|
|
|
ST_FUNC int get_reg(int rc)
|
2009-05-05 22:18:10 +04:00
|
|
|
{
|
|
|
|
int r;
|
|
|
|
SValue *p;
|
|
|
|
|
|
|
|
/* find a free register */
|
|
|
|
for(r=0;r<NB_REGS;r++) {
|
|
|
|
if (reg_classes[r] & rc) {
|
2016-12-18 19:23:33 +03:00
|
|
|
if (nocode_wanted)
|
|
|
|
return r;
|
2009-05-05 22:18:10 +04:00
|
|
|
for(p=vstack;p<=vtop;p++) {
|
|
|
|
if ((p->r & VT_VALMASK) == r ||
|
2019-12-16 20:48:31 +03:00
|
|
|
p->r2 == r)
|
2009-05-05 22:18:10 +04:00
|
|
|
goto notfound;
|
|
|
|
}
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
notfound: ;
|
|
|
|
}
|
2015-07-29 23:53:57 +03:00
|
|
|
|
2009-05-05 22:18:10 +04:00
|
|
|
/* no register left : free the first one on the stack (VERY
|
|
|
|
IMPORTANT to start from the bottom to ensure that we don't
|
|
|
|
spill registers used in gen_opi()) */
|
|
|
|
for(p=vstack;p<=vtop;p++) {
|
2012-07-12 01:39:05 +04:00
|
|
|
/* look at second register (if long long) */
|
2019-12-16 20:48:31 +03:00
|
|
|
r = p->r2;
|
2009-05-05 22:18:10 +04:00
|
|
|
if (r < VT_CONST && (reg_classes[r] & rc))
|
|
|
|
goto save_found;
|
2012-07-12 01:39:05 +04:00
|
|
|
r = p->r & VT_VALMASK;
|
2009-05-05 22:18:10 +04:00
|
|
|
if (r < VT_CONST && (reg_classes[r] & rc)) {
|
|
|
|
save_found:
|
|
|
|
save_reg(r);
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* Should never comes here */
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2019-01-09 22:32:23 +03:00
|
|
|
/* find a free temporary local variable (return the offset on stack) match the size and align. If none, add new temporary stack variable*/
|
|
|
|
static int get_temp_local_var(int size,int align){
|
|
|
|
int i;
|
|
|
|
struct temp_local_variable *temp_var;
|
|
|
|
int found_var;
|
|
|
|
SValue *p;
|
|
|
|
int r;
|
|
|
|
char free;
|
|
|
|
char found;
|
|
|
|
found=0;
|
|
|
|
for(i=0;i<nb_temp_local_vars;i++){
|
|
|
|
temp_var=&arr_temp_local_vars[i];
|
2020-01-16 03:19:59 +03:00
|
|
|
if(temp_var->size<size||align!=temp_var->align){
|
2019-01-09 22:32:23 +03:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
/*check if temp_var is free*/
|
|
|
|
free=1;
|
|
|
|
for(p=vstack;p<=vtop;p++) {
|
|
|
|
r=p->r&VT_VALMASK;
|
|
|
|
if(r==VT_LOCAL||r==VT_LLOCAL){
|
|
|
|
if(p->c.i==temp_var->location){
|
|
|
|
free=0;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if(free){
|
|
|
|
found_var=temp_var->location;
|
|
|
|
found=1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if(!found){
|
|
|
|
loc = (loc - size) & -align;
|
|
|
|
if(nb_temp_local_vars<MAX_TEMP_LOCAL_VARIABLE_NUMBER){
|
|
|
|
temp_var=&arr_temp_local_vars[i];
|
|
|
|
temp_var->location=loc;
|
|
|
|
temp_var->size=size;
|
|
|
|
temp_var->align=align;
|
|
|
|
nb_temp_local_vars++;
|
|
|
|
}
|
|
|
|
found_var=loc;
|
|
|
|
}
|
|
|
|
return found_var;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void clear_temp_local_var_list(){
|
|
|
|
nb_temp_local_vars=0;
|
|
|
|
}
|
|
|
|
|
2013-04-19 21:31:24 +04:00
|
|
|
/* move register 's' (of type 't') to 'r', and flush previous value of r to memory
|
2009-05-05 22:18:10 +04:00
|
|
|
if needed */
|
2013-04-19 21:31:24 +04:00
|
|
|
static void move_reg(int r, int s, int t)
|
2009-05-05 22:18:10 +04:00
|
|
|
{
|
|
|
|
SValue sv;
|
|
|
|
|
|
|
|
if (r != s) {
|
|
|
|
save_reg(r);
|
2013-04-19 21:31:24 +04:00
|
|
|
sv.type.t = t;
|
|
|
|
sv.type.ref = NULL;
|
2009-05-05 22:18:10 +04:00
|
|
|
sv.r = s;
|
2015-11-17 22:09:35 +03:00
|
|
|
sv.c.i = 0;
|
2009-05-05 22:18:10 +04:00
|
|
|
load(r, &sv);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* get address of vtop (vtop MUST BE an lvalue) */
|
2015-02-13 21:58:31 +03:00
|
|
|
ST_FUNC void gaddrof(void)
|
2009-05-05 22:18:10 +04:00
|
|
|
{
|
|
|
|
vtop->r &= ~VT_LVAL;
|
|
|
|
/* tricky: if saved lvalue, then we can go back to lvalue */
|
|
|
|
if ((vtop->r & VT_VALMASK) == VT_LLOCAL)
|
2019-12-16 20:48:31 +03:00
|
|
|
vtop->r = (vtop->r & ~VT_VALMASK) | VT_LOCAL | VT_LVAL;
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef CONFIG_TCC_BCHECK
|
|
|
|
/* generate lvalue bound code */
|
2009-12-20 03:53:49 +03:00
|
|
|
static void gbound(void)
|
2009-05-05 22:18:10 +04:00
|
|
|
{
|
|
|
|
CType type1;
|
|
|
|
|
|
|
|
vtop->r &= ~VT_MUSTBOUND;
|
|
|
|
/* if lvalue, then use checking code before dereferencing */
|
bcheck cleanup
- revert Makefiles to state before last bcheck additions
Instead, just load bcheck.o explicitly if that is
what is wanted.
- move tcc_add_bcheck() to the <target>-link.c files and
remove revently added arguments. This function is to
support tccelf.c with linking, not for tccgen.c to
support compilation.
- remove -ba option: It said:
"-ba Enable better address checking with bounds checker"
Okay, if it is better then to have it is not an option.
- remove va_copy. It is C99 and we try to stay C89 in tinycc
when possible. For example, MS compilers do not have va_copy.
- win64: revert any 'fixes' to alloca
It was correct as it was before, except for bound_checking
where it was not implemented. This should now work too.
- remove parasitic filename:linenum features
Such feature is already present with rt_printline in
tccrun.c. If it doesn't work it can be fixed.
- revert changes to gen_bounded_ptr_add()
gen_bounded_ptr_add() was working as it should before
(mostly). For the sake of simplicity I switched it to
CDECL. Anyway, FASTCALL means SLOWCALL with tinycc.
In exchange you get one addition which is required for
bounds_cnecking function arguments. The important thing
is to check them *BEFORE* they are loaded into registers.
New function gbound_args() does that.
In any case, code instrumentation with the bounds-check
functions as such now seems to work flawlessly again,
which means when they are inserted as NOPs, any code that
tcc can compile, seems to behave just the same as without
them.
What these functions then do when fully enabled, is a
differnt story. I did not touch this.
2019-12-12 17:45:45 +03:00
|
|
|
if (vtop->r & VT_LVAL) {
|
2009-05-05 22:18:10 +04:00
|
|
|
/* if not VT_BOUNDED value, then make one */
|
|
|
|
if (!(vtop->r & VT_BOUNDED)) {
|
|
|
|
/* must save type because we must set it to int to get pointer */
|
|
|
|
type1 = vtop->type;
|
2015-04-10 15:17:22 +03:00
|
|
|
vtop->type.t = VT_PTR;
|
2009-05-05 22:18:10 +04:00
|
|
|
gaddrof();
|
|
|
|
vpushi(0);
|
|
|
|
gen_bounded_ptr_add();
|
2019-12-16 20:48:31 +03:00
|
|
|
vtop->r |= VT_LVAL;
|
2009-05-05 22:18:10 +04:00
|
|
|
vtop->type = type1;
|
|
|
|
}
|
|
|
|
/* then check for dereferencing */
|
|
|
|
gen_bounded_ptr_deref();
|
|
|
|
}
|
|
|
|
}
|
bcheck cleanup
- revert Makefiles to state before last bcheck additions
Instead, just load bcheck.o explicitly if that is
what is wanted.
- move tcc_add_bcheck() to the <target>-link.c files and
remove revently added arguments. This function is to
support tccelf.c with linking, not for tccgen.c to
support compilation.
- remove -ba option: It said:
"-ba Enable better address checking with bounds checker"
Okay, if it is better then to have it is not an option.
- remove va_copy. It is C99 and we try to stay C89 in tinycc
when possible. For example, MS compilers do not have va_copy.
- win64: revert any 'fixes' to alloca
It was correct as it was before, except for bound_checking
where it was not implemented. This should now work too.
- remove parasitic filename:linenum features
Such feature is already present with rt_printline in
tccrun.c. If it doesn't work it can be fixed.
- revert changes to gen_bounded_ptr_add()
gen_bounded_ptr_add() was working as it should before
(mostly). For the sake of simplicity I switched it to
CDECL. Anyway, FASTCALL means SLOWCALL with tinycc.
In exchange you get one addition which is required for
bounds_cnecking function arguments. The important thing
is to check them *BEFORE* they are loaded into registers.
New function gbound_args() does that.
In any case, code instrumentation with the bounds-check
functions as such now seems to work flawlessly again,
which means when they are inserted as NOPs, any code that
tcc can compile, seems to behave just the same as without
them.
What these functions then do when fully enabled, is a
differnt story. I did not touch this.
2019-12-12 17:45:45 +03:00
|
|
|
|
|
|
|
/* we need to call __bound_ptr_add before we start to load function
|
|
|
|
args into registers */
|
|
|
|
ST_FUNC void gbound_args(int nb_args)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
for (i = 1; i <= nb_args; ++i)
|
|
|
|
if (vtop[1 - i].r & VT_MUSTBOUND) {
|
|
|
|
vrotb(i);
|
|
|
|
gbound();
|
|
|
|
vrott(i);
|
|
|
|
}
|
|
|
|
}
|
2020-01-15 10:53:19 +03:00
|
|
|
|
2020-01-16 03:19:59 +03:00
|
|
|
/* Add bounds for local symbols from S to E (via ->prev) */
|
|
|
|
static void add_local_bounds(Sym *s, Sym *e)
|
|
|
|
{
|
|
|
|
for (; s != e; s = s->prev) {
|
|
|
|
if (!s->v || (s->r & VT_VALMASK) != VT_LOCAL)
|
|
|
|
continue;
|
|
|
|
/* Add arrays/structs/unions because we always take address */
|
|
|
|
if ((s->type.t & VT_ARRAY)
|
|
|
|
|| (s->type.t & VT_BTYPE) == VT_STRUCT
|
|
|
|
|| s->a.addrtaken) {
|
|
|
|
/* add local bound info */
|
|
|
|
int align, size = type_size(&s->type, &align);
|
|
|
|
addr_t *bounds_ptr = section_ptr_add(lbounds_section,
|
|
|
|
2 * sizeof(addr_t));
|
|
|
|
bounds_ptr[0] = s->c;
|
|
|
|
bounds_ptr[1] = size;
|
|
|
|
}
|
|
|
|
}
|
2020-01-15 10:53:19 +03:00
|
|
|
}
|
2020-01-16 03:19:59 +03:00
|
|
|
#endif
|
2020-01-15 10:53:19 +03:00
|
|
|
|
2020-01-16 03:19:59 +03:00
|
|
|
/* Wrapper around sym_pop, that potentially also registers local bounds. */
|
2020-05-05 15:47:00 +03:00
|
|
|
static void pop_local_syms(Sym **ptop, Sym *b, int keep, int ellipsis)
|
2020-01-15 10:53:19 +03:00
|
|
|
{
|
2020-01-16 03:19:59 +03:00
|
|
|
#ifdef CONFIG_TCC_BCHECK
|
2020-05-05 15:47:00 +03:00
|
|
|
if (tcc_state->do_bounds_check && !ellipsis && !keep)
|
2020-01-16 03:19:59 +03:00
|
|
|
add_local_bounds(*ptop, b);
|
2009-05-05 22:18:10 +04:00
|
|
|
#endif
|
2020-05-05 15:47:00 +03:00
|
|
|
if (tcc_state->do_debug)
|
|
|
|
tcc_add_debug_info (tcc_state, !local_scope, *ptop, b);
|
2020-01-16 03:19:59 +03:00
|
|
|
sym_pop(ptop, b, keep);
|
|
|
|
}
|
2009-05-05 22:18:10 +04:00
|
|
|
|
2017-07-09 13:38:59 +03:00
|
|
|
static void incr_bf_adr(int o)
|
|
|
|
{
|
|
|
|
vtop->type = char_pointer_type;
|
|
|
|
gaddrof();
|
2019-12-16 20:48:31 +03:00
|
|
|
vpushs(o);
|
2017-07-09 13:38:59 +03:00
|
|
|
gen_op('+');
|
2019-12-16 20:48:31 +03:00
|
|
|
vtop->type.t = VT_BYTE | VT_UNSIGNED;
|
|
|
|
vtop->r |= VT_LVAL;
|
2017-07-09 13:38:59 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/* single-byte load mode for packed or otherwise unaligned bitfields */
|
|
|
|
static void load_packed_bf(CType *type, int bit_pos, int bit_size)
|
|
|
|
{
|
|
|
|
int n, o, bits;
|
|
|
|
save_reg_upstack(vtop->r, 1);
|
2017-07-14 20:26:01 +03:00
|
|
|
vpush64(type->t & VT_BTYPE, 0); // B X
|
2017-07-09 13:38:59 +03:00
|
|
|
bits = 0, o = bit_pos >> 3, bit_pos &= 7;
|
|
|
|
do {
|
|
|
|
vswap(); // X B
|
|
|
|
incr_bf_adr(o);
|
|
|
|
vdup(); // X B B
|
|
|
|
n = 8 - bit_pos;
|
|
|
|
if (n > bit_size)
|
|
|
|
n = bit_size;
|
|
|
|
if (bit_pos)
|
|
|
|
vpushi(bit_pos), gen_op(TOK_SHR), bit_pos = 0; // X B Y
|
|
|
|
if (n < 8)
|
|
|
|
vpushi((1 << n) - 1), gen_op('&');
|
|
|
|
gen_cast(type);
|
|
|
|
if (bits)
|
|
|
|
vpushi(bits), gen_op(TOK_SHL);
|
|
|
|
vrotb(3); // B Y X
|
|
|
|
gen_op('|'); // B X
|
|
|
|
bits += n, bit_size -= n, o = 1;
|
|
|
|
} while (bit_size);
|
|
|
|
vswap(), vpop();
|
|
|
|
if (!(type->t & VT_UNSIGNED)) {
|
|
|
|
n = ((type->t & VT_BTYPE) == VT_LLONG ? 64 : 32) - bits;
|
|
|
|
vpushi(n), gen_op(TOK_SHL);
|
|
|
|
vpushi(n), gen_op(TOK_SAR);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* single-byte store mode for packed or otherwise unaligned bitfields */
|
2017-07-14 20:26:01 +03:00
|
|
|
static void store_packed_bf(int bit_pos, int bit_size)
|
2017-07-09 13:38:59 +03:00
|
|
|
{
|
|
|
|
int bits, n, o, m, c;
|
|
|
|
|
|
|
|
c = (vtop->r & (VT_VALMASK | VT_LVAL | VT_SYM)) == VT_CONST;
|
|
|
|
vswap(); // X B
|
|
|
|
save_reg_upstack(vtop->r, 1);
|
|
|
|
bits = 0, o = bit_pos >> 3, bit_pos &= 7;
|
|
|
|
do {
|
|
|
|
incr_bf_adr(o); // X B
|
|
|
|
vswap(); //B X
|
|
|
|
c ? vdup() : gv_dup(); // B V X
|
|
|
|
vrott(3); // X B V
|
|
|
|
if (bits)
|
|
|
|
vpushi(bits), gen_op(TOK_SHR);
|
|
|
|
if (bit_pos)
|
|
|
|
vpushi(bit_pos), gen_op(TOK_SHL);
|
|
|
|
n = 8 - bit_pos;
|
|
|
|
if (n > bit_size)
|
|
|
|
n = bit_size;
|
|
|
|
if (n < 8) {
|
|
|
|
m = ((1 << n) - 1) << bit_pos;
|
|
|
|
vpushi(m), gen_op('&'); // X B V1
|
|
|
|
vpushv(vtop-1); // X B V1 B
|
|
|
|
vpushi(m & 0x80 ? ~m & 0x7f : ~m);
|
|
|
|
gen_op('&'); // X B V1 B1
|
|
|
|
gen_op('|'); // X B V2
|
|
|
|
}
|
|
|
|
vdup(), vtop[-1] = vtop[-2]; // X B B V2
|
|
|
|
vstore(), vpop(); // X B
|
|
|
|
bits += n, bit_size -= n, bit_pos = 0, o = 1;
|
|
|
|
} while (bit_size);
|
|
|
|
vpop(), vpop();
|
|
|
|
}
|
|
|
|
|
2017-07-14 20:26:01 +03:00
|
|
|
static int adjust_bf(SValue *sv, int bit_pos, int bit_size)
|
2017-07-09 13:38:59 +03:00
|
|
|
{
|
|
|
|
int t;
|
|
|
|
if (0 == sv->type.ref)
|
|
|
|
return 0;
|
|
|
|
t = sv->type.ref->auxtype;
|
|
|
|
if (t != -1 && t != VT_STRUCT) {
|
|
|
|
sv->type.t = (sv->type.t & ~VT_BTYPE) | t;
|
2019-12-16 20:48:31 +03:00
|
|
|
sv->r |= VT_LVAL;
|
2017-07-09 13:38:59 +03:00
|
|
|
}
|
|
|
|
return t;
|
|
|
|
}
|
|
|
|
|
2009-05-05 22:18:10 +04:00
|
|
|
/* store vtop a register belonging to class 'rc'. lvalues are
|
|
|
|
converted to values. Cannot be used if cannot be converted to
|
|
|
|
register value (such as structures). */
|
2009-12-20 03:53:49 +03:00
|
|
|
ST_FUNC int gv(int rc)
|
2009-05-05 22:18:10 +04:00
|
|
|
{
|
2019-12-16 20:44:35 +03:00
|
|
|
int r, r2, r_ok, r2_ok, rc2, bt;
|
|
|
|
int bit_pos, bit_size, size, align;
|
2009-05-05 22:18:10 +04:00
|
|
|
|
|
|
|
/* NOTE: get_reg can modify vstack[] */
|
|
|
|
if (vtop->type.t & VT_BITFIELD) {
|
|
|
|
CType type;
|
2017-07-09 13:38:59 +03:00
|
|
|
|
|
|
|
bit_pos = BIT_POS(vtop->type.t);
|
|
|
|
bit_size = BIT_SIZE(vtop->type.t);
|
2009-05-05 22:18:10 +04:00
|
|
|
/* remove bit field info to avoid loops */
|
2017-07-09 13:38:59 +03:00
|
|
|
vtop->type.t &= ~VT_STRUCT_MASK;
|
|
|
|
|
|
|
|
type.ref = NULL;
|
|
|
|
type.t = vtop->type.t & VT_UNSIGNED;
|
|
|
|
if ((vtop->type.t & VT_BTYPE) == VT_BOOL)
|
2009-05-05 22:18:10 +04:00
|
|
|
type.t |= VT_UNSIGNED;
|
2017-07-09 13:38:59 +03:00
|
|
|
|
|
|
|
r = adjust_bf(vtop, bit_pos, bit_size);
|
|
|
|
|
|
|
|
if ((vtop->type.t & VT_BTYPE) == VT_LLONG)
|
|
|
|
type.t |= VT_LLONG;
|
|
|
|
else
|
|
|
|
type.t |= VT_INT;
|
|
|
|
|
|
|
|
if (r == VT_STRUCT) {
|
|
|
|
load_packed_bf(&type, bit_pos, bit_size);
|
|
|
|
} else {
|
|
|
|
int bits = (type.t & VT_BTYPE) == VT_LLONG ? 64 : 32;
|
|
|
|
/* cast to int to propagate signedness in following ops */
|
|
|
|
gen_cast(&type);
|
|
|
|
/* generate shifts */
|
|
|
|
vpushi(bits - (bit_pos + bit_size));
|
|
|
|
gen_op(TOK_SHL);
|
|
|
|
vpushi(bits - bit_size);
|
|
|
|
/* NOTE: transformed to SHR if unsigned */
|
|
|
|
gen_op(TOK_SAR);
|
|
|
|
}
|
2009-05-05 22:18:10 +04:00
|
|
|
r = gv(rc);
|
|
|
|
} else {
|
2015-07-29 23:53:57 +03:00
|
|
|
if (is_float(vtop->type.t) &&
|
2009-05-05 22:18:10 +04:00
|
|
|
(vtop->r & (VT_VALMASK | VT_LVAL)) == VT_CONST) {
|
2017-07-23 22:24:11 +03:00
|
|
|
unsigned long offset;
|
2009-05-05 22:18:10 +04:00
|
|
|
/* CPUs usually cannot use float constants, so we store them
|
|
|
|
generically in data segment */
|
|
|
|
size = type_size(&vtop->type, &align);
|
2017-07-23 22:24:11 +03:00
|
|
|
if (NODATA_WANTED)
|
|
|
|
size = 0, align = 1;
|
|
|
|
offset = section_add(data_section, size, align);
|
|
|
|
vpush_ref(&vtop->type, data_section, offset, size);
|
2017-03-12 07:25:09 +03:00
|
|
|
vswap();
|
2017-07-23 22:24:11 +03:00
|
|
|
init_putv(&vtop->type, data_section, offset);
|
2017-03-12 07:25:09 +03:00
|
|
|
vtop->r |= VT_LVAL;
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
#ifdef CONFIG_TCC_BCHECK
|
2015-07-29 23:53:57 +03:00
|
|
|
if (vtop->r & VT_MUSTBOUND)
|
2009-05-05 22:18:10 +04:00
|
|
|
gbound();
|
|
|
|
#endif
|
2019-12-16 20:44:35 +03:00
|
|
|
|
|
|
|
bt = vtop->type.t & VT_BTYPE;
|
|
|
|
|
2019-07-14 06:48:15 +03:00
|
|
|
#ifdef TCC_TARGET_RISCV64
|
|
|
|
/* XXX mega hack */
|
2019-12-16 20:44:35 +03:00
|
|
|
if (bt == VT_LDOUBLE && rc == RC_FLOAT)
|
2019-07-14 06:48:15 +03:00
|
|
|
rc = RC_INT;
|
|
|
|
#endif
|
2019-12-16 20:44:35 +03:00
|
|
|
rc2 = RC2_TYPE(bt, rc);
|
2009-05-05 22:18:10 +04:00
|
|
|
|
|
|
|
/* need to reload if:
|
|
|
|
- constant
|
|
|
|
- lvalue (need to dereference pointer)
|
|
|
|
- already a register, but not in the right class */
|
2019-12-16 20:44:35 +03:00
|
|
|
r = vtop->r & VT_VALMASK;
|
|
|
|
r_ok = !(vtop->r & VT_LVAL) && (r < VT_CONST) && (reg_classes[r] & rc);
|
|
|
|
r2_ok = !rc2 || ((vtop->r2 < VT_CONST) && (reg_classes[vtop->r2] & rc2));
|
|
|
|
|
|
|
|
if (!r_ok || !r2_ok) {
|
|
|
|
if (!r_ok)
|
|
|
|
r = get_reg(rc);
|
|
|
|
if (rc2) {
|
2019-12-16 20:51:28 +03:00
|
|
|
int load_type = (bt == VT_QFLOAT) ? VT_DOUBLE : VT_PTRDIFF_T;
|
2019-12-16 20:44:35 +03:00
|
|
|
int original_type = vtop->type.t;
|
|
|
|
|
|
|
|
/* two register type load :
|
|
|
|
expand to two words temporarily */
|
2009-05-05 22:18:10 +04:00
|
|
|
if ((vtop->r & (VT_VALMASK | VT_LVAL)) == VT_CONST) {
|
|
|
|
/* load constant */
|
2019-12-16 20:44:35 +03:00
|
|
|
unsigned long long ll = vtop->c.i;
|
2015-11-17 22:09:35 +03:00
|
|
|
vtop->c.i = ll; /* first word */
|
2009-05-05 22:18:10 +04:00
|
|
|
load(r, vtop);
|
|
|
|
vtop->r = r; /* save register value */
|
|
|
|
vpushi(ll >> 32); /* second word */
|
2019-12-16 20:44:35 +03:00
|
|
|
} else if (vtop->r & VT_LVAL) {
|
|
|
|
/* We do not want to modifier the long long pointer here.
|
|
|
|
So we save any other instances down the stack */
|
tccgen: arm/i386: save_reg_upstack
tccgen.c:gv() when loading long long from lvalue, before
was saving all registers which caused problems in the arm
function call register parameter preparation, as with
void foo(long long y, int x);
int main(void)
{
unsigned int *xx[1], x;
unsigned long long *yy[1], y;
foo(**yy, **xx);
return 0;
}
Now only the modified register is saved if necessary,
as in this case where it is used to store the result
of the post-inc:
long long *p, v, **pp;
v = 1;
p = &v;
p[0]++;
printf("another long long spill test : %lld\n", *p);
i386-gen.c :
- found a similar problem with TOK_UMULL caused by the
vstack juggle in tccgen:gen_opl()
(bug seen only when using EBX as 4th register)
2016-10-04 18:36:51 +03:00
|
|
|
save_reg_upstack(vtop->r, 1);
|
2009-05-05 22:18:10 +04:00
|
|
|
/* load from memory */
|
2013-04-19 18:33:16 +04:00
|
|
|
vtop->type.t = load_type;
|
2009-05-05 22:18:10 +04:00
|
|
|
load(r, vtop);
|
|
|
|
vdup();
|
|
|
|
vtop[-1].r = r; /* save register value */
|
|
|
|
/* increment pointer to get second word */
|
2019-12-16 20:51:28 +03:00
|
|
|
vtop->type.t = VT_PTRDIFF_T;
|
2009-05-05 22:18:10 +04:00
|
|
|
gaddrof();
|
2019-12-16 20:51:28 +03:00
|
|
|
vpushs(PTR_SIZE);
|
2009-05-05 22:18:10 +04:00
|
|
|
gen_op('+');
|
|
|
|
vtop->r |= VT_LVAL;
|
2013-04-19 18:33:16 +04:00
|
|
|
vtop->type.t = load_type;
|
2009-05-05 22:18:10 +04:00
|
|
|
} else {
|
|
|
|
/* move registers */
|
2019-12-16 20:44:35 +03:00
|
|
|
if (!r_ok)
|
|
|
|
load(r, vtop);
|
|
|
|
if (r2_ok && vtop->r2 < VT_CONST)
|
|
|
|
goto done;
|
2009-05-05 22:18:10 +04:00
|
|
|
vdup();
|
|
|
|
vtop[-1].r = r; /* save register value */
|
|
|
|
vtop->r = vtop[-1].r2;
|
|
|
|
}
|
2012-07-12 01:39:05 +04:00
|
|
|
/* Allocate second register. Here we rely on the fact that
|
|
|
|
get_reg() tries first to free r2 of an SValue. */
|
2009-05-05 22:18:10 +04:00
|
|
|
r2 = get_reg(rc2);
|
|
|
|
load(r2, vtop);
|
|
|
|
vpop();
|
|
|
|
/* write second register */
|
|
|
|
vtop->r2 = r2;
|
2019-12-16 20:44:35 +03:00
|
|
|
done:
|
2013-04-20 01:55:09 +04:00
|
|
|
vtop->type.t = original_type;
|
2009-05-05 22:18:10 +04:00
|
|
|
} else {
|
jump optimizations
This unifies VT_CMP with VT_JMP(i) by using mostly VT_CMP
with both a positive and a negative jump target list.
Such we can delay putting the non-inverted or inverted jump
until we can see which one is nore suitable (in most cases).
example:
if (a && b || c && d)
e = 0;
before this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 11 00 00 00 je 27 <main+0x27>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 84 05 00 00 00 je 27 <main+0x27>
22: e9 22 00 00 00 jmp 49 <main+0x49>
27: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
2a: 83 f8 00 cmp $0x0,%eax
2d: 0f 84 11 00 00 00 je 44 <main+0x44>
33: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
36: 83 f8 00 cmp $0x0,%eax
39: 0f 84 05 00 00 00 je 44 <main+0x44>
3f: e9 05 00 00 00 jmp 49 <main+0x49>
44: e9 08 00 00 00 jmp 51 <main+0x51>
49: b8 00 00 00 00 mov $0x0,%eax
4e: 89 45 ec mov %eax,0xffffffec(%ebp)
51: ...
with this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 0c 00 00 00 je 22 <main+0x22>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 85 18 00 00 00 jne 3a <main+0x3a>
22: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
25: 83 f8 00 cmp $0x0,%eax
28: 0f 84 14 00 00 00 je 42 <main+0x42>
2e: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
31: 83 f8 00 cmp $0x0,%eax
34: 0f 84 08 00 00 00 je 42 <main+0x42>
3a: b8 00 00 00 00 mov $0x0,%eax
3f: 89 45 ec mov %eax,0xffffffec(%ebp)
42: ...
2019-06-22 12:45:35 +03:00
|
|
|
if (vtop->r == VT_CMP)
|
|
|
|
vset_VT_JMP();
|
2009-05-05 22:18:10 +04:00
|
|
|
/* one register type load */
|
|
|
|
load(r, vtop);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
vtop->r = r;
|
|
|
|
#ifdef TCC_TARGET_C67
|
|
|
|
/* uses register pairs for doubles */
|
2019-12-16 20:44:35 +03:00
|
|
|
if (bt == VT_DOUBLE)
|
2009-05-05 22:18:10 +04:00
|
|
|
vtop->r2 = r+1;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* generate vtop[-1] and vtop[0] in resp. classes rc1 and rc2 */
|
2009-12-20 03:53:49 +03:00
|
|
|
ST_FUNC void gv2(int rc1, int rc2)
|
2009-05-05 22:18:10 +04:00
|
|
|
{
|
|
|
|
/* generate more generic register first. But VT_JMP or VT_CMP
|
|
|
|
values must be generated first in all cases to avoid possible
|
|
|
|
reload errors */
|
jump optimizations
This unifies VT_CMP with VT_JMP(i) by using mostly VT_CMP
with both a positive and a negative jump target list.
Such we can delay putting the non-inverted or inverted jump
until we can see which one is nore suitable (in most cases).
example:
if (a && b || c && d)
e = 0;
before this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 11 00 00 00 je 27 <main+0x27>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 84 05 00 00 00 je 27 <main+0x27>
22: e9 22 00 00 00 jmp 49 <main+0x49>
27: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
2a: 83 f8 00 cmp $0x0,%eax
2d: 0f 84 11 00 00 00 je 44 <main+0x44>
33: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
36: 83 f8 00 cmp $0x0,%eax
39: 0f 84 05 00 00 00 je 44 <main+0x44>
3f: e9 05 00 00 00 jmp 49 <main+0x49>
44: e9 08 00 00 00 jmp 51 <main+0x51>
49: b8 00 00 00 00 mov $0x0,%eax
4e: 89 45 ec mov %eax,0xffffffec(%ebp)
51: ...
with this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 0c 00 00 00 je 22 <main+0x22>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 85 18 00 00 00 jne 3a <main+0x3a>
22: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
25: 83 f8 00 cmp $0x0,%eax
28: 0f 84 14 00 00 00 je 42 <main+0x42>
2e: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
31: 83 f8 00 cmp $0x0,%eax
34: 0f 84 08 00 00 00 je 42 <main+0x42>
3a: b8 00 00 00 00 mov $0x0,%eax
3f: 89 45 ec mov %eax,0xffffffec(%ebp)
42: ...
2019-06-22 12:45:35 +03:00
|
|
|
if (vtop->r != VT_CMP && rc1 <= rc2) {
|
2009-05-05 22:18:10 +04:00
|
|
|
vswap();
|
|
|
|
gv(rc1);
|
|
|
|
vswap();
|
|
|
|
gv(rc2);
|
|
|
|
/* test if reload is needed for first register */
|
|
|
|
if ((vtop[-1].r & VT_VALMASK) >= VT_CONST) {
|
|
|
|
vswap();
|
|
|
|
gv(rc1);
|
|
|
|
vswap();
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
gv(rc2);
|
|
|
|
vswap();
|
|
|
|
gv(rc1);
|
|
|
|
vswap();
|
|
|
|
/* test if reload is needed for first register */
|
|
|
|
if ((vtop[0].r & VT_VALMASK) >= VT_CONST) {
|
|
|
|
gv(rc2);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-05-13 09:59:06 +03:00
|
|
|
#if PTR_SIZE == 4
|
2016-10-17 01:57:16 +03:00
|
|
|
/* expand 64bit on stack in two ints */
|
2019-01-08 21:06:26 +03:00
|
|
|
ST_FUNC void lexpand(void)
|
2009-05-05 22:18:10 +04:00
|
|
|
{
|
2016-10-16 20:04:40 +03:00
|
|
|
int u, v;
|
2014-02-06 16:51:47 +04:00
|
|
|
u = vtop->type.t & (VT_DEFSIGN | VT_UNSIGNED);
|
2016-10-16 20:04:40 +03:00
|
|
|
v = vtop->r & (VT_VALMASK | VT_LVAL);
|
|
|
|
if (v == VT_CONST) {
|
|
|
|
vdup();
|
|
|
|
vtop[0].c.i >>= 32;
|
|
|
|
} else if (v == (VT_LVAL|VT_CONST) || v == (VT_LVAL|VT_LOCAL)) {
|
|
|
|
vdup();
|
|
|
|
vtop[0].c.i += 4;
|
|
|
|
} else {
|
|
|
|
gv(RC_INT);
|
|
|
|
vdup();
|
|
|
|
vtop[0].r = vtop[-1].r2;
|
|
|
|
vtop[0].r2 = vtop[-1].r2 = VT_CONST;
|
|
|
|
}
|
|
|
|
vtop[0].type.t = vtop[-1].type.t = VT_INT | u;
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
2016-12-06 02:29:25 +03:00
|
|
|
#endif
|
2009-05-05 22:18:10 +04:00
|
|
|
|
2017-05-13 09:59:06 +03:00
|
|
|
#if PTR_SIZE == 4
|
2009-05-05 22:18:10 +04:00
|
|
|
/* build a long long from two ints */
|
2009-12-20 03:53:49 +03:00
|
|
|
static void lbuild(int t)
|
2009-05-05 22:18:10 +04:00
|
|
|
{
|
|
|
|
gv2(RC_INT, RC_INT);
|
|
|
|
vtop[-1].r2 = vtop[0].r;
|
|
|
|
vtop[-1].type.t = t;
|
|
|
|
vpop();
|
|
|
|
}
|
2016-10-17 01:57:16 +03:00
|
|
|
#endif
|
2009-05-05 22:18:10 +04:00
|
|
|
|
|
|
|
/* convert stack entry to register and duplicate its value in another
|
|
|
|
register */
|
2009-12-20 03:53:49 +03:00
|
|
|
static void gv_dup(void)
|
2009-05-05 22:18:10 +04:00
|
|
|
{
|
2019-12-16 20:44:35 +03:00
|
|
|
int t, rc, r;
|
2009-05-05 22:18:10 +04:00
|
|
|
|
|
|
|
t = vtop->type.t;
|
2017-05-13 09:59:06 +03:00
|
|
|
#if PTR_SIZE == 4
|
2009-05-05 22:18:10 +04:00
|
|
|
if ((t & VT_BTYPE) == VT_LLONG) {
|
2017-07-09 13:38:59 +03:00
|
|
|
if (t & VT_BITFIELD) {
|
|
|
|
gv(RC_INT);
|
|
|
|
t = vtop->type.t;
|
|
|
|
}
|
2009-05-05 22:18:10 +04:00
|
|
|
lexpand();
|
|
|
|
gv_dup();
|
|
|
|
vswap();
|
|
|
|
vrotb(3);
|
|
|
|
gv_dup();
|
|
|
|
vrotb(4);
|
|
|
|
/* stack: H L L1 H1 */
|
|
|
|
lbuild(t);
|
|
|
|
vrotb(3);
|
|
|
|
vrotb(3);
|
|
|
|
vswap();
|
|
|
|
lbuild(t);
|
|
|
|
vswap();
|
2019-12-16 20:44:35 +03:00
|
|
|
return;
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
2019-12-16 20:44:35 +03:00
|
|
|
#endif
|
|
|
|
/* duplicate value */
|
|
|
|
rc = RC_TYPE(t);
|
|
|
|
gv(rc);
|
|
|
|
r = get_reg(rc);
|
|
|
|
vdup();
|
|
|
|
load(r, vtop);
|
|
|
|
vtop->r = r;
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
|
2017-05-13 09:59:06 +03:00
|
|
|
#if PTR_SIZE == 4
|
2009-05-05 22:18:10 +04:00
|
|
|
/* generate CPU independent (unsigned) long long operations */
|
2009-12-20 03:53:49 +03:00
|
|
|
static void gen_opl(int op)
|
2009-05-05 22:18:10 +04:00
|
|
|
{
|
|
|
|
int t, a, b, op1, c, i;
|
|
|
|
int func;
|
|
|
|
unsigned short reg_iret = REG_IRET;
|
2019-12-16 20:44:35 +03:00
|
|
|
unsigned short reg_lret = REG_IRE2;
|
2009-05-05 22:18:10 +04:00
|
|
|
SValue tmp;
|
|
|
|
|
|
|
|
switch(op) {
|
|
|
|
case '/':
|
|
|
|
case TOK_PDIV:
|
|
|
|
func = TOK___divdi3;
|
|
|
|
goto gen_func;
|
|
|
|
case TOK_UDIV:
|
|
|
|
func = TOK___udivdi3;
|
|
|
|
goto gen_func;
|
|
|
|
case '%':
|
|
|
|
func = TOK___moddi3;
|
|
|
|
goto gen_mod_func;
|
|
|
|
case TOK_UMOD:
|
|
|
|
func = TOK___umoddi3;
|
|
|
|
gen_mod_func:
|
|
|
|
#ifdef TCC_ARM_EABI
|
|
|
|
reg_iret = TREG_R2;
|
|
|
|
reg_lret = TREG_R3;
|
|
|
|
#endif
|
|
|
|
gen_func:
|
|
|
|
/* call generic long long function */
|
|
|
|
vpush_global_sym(&func_old_type, func);
|
|
|
|
vrott(3);
|
|
|
|
gfunc_call(2);
|
|
|
|
vpushi(0);
|
|
|
|
vtop->r = reg_iret;
|
|
|
|
vtop->r2 = reg_lret;
|
|
|
|
break;
|
|
|
|
case '^':
|
|
|
|
case '&':
|
|
|
|
case '|':
|
|
|
|
case '*':
|
|
|
|
case '+':
|
|
|
|
case '-':
|
2016-10-13 20:21:43 +03:00
|
|
|
//pv("gen_opl A",0,2);
|
2009-05-05 22:18:10 +04:00
|
|
|
t = vtop->type.t;
|
|
|
|
vswap();
|
|
|
|
lexpand();
|
|
|
|
vrotb(3);
|
|
|
|
lexpand();
|
|
|
|
/* stack: L1 H1 L2 H2 */
|
|
|
|
tmp = vtop[0];
|
|
|
|
vtop[0] = vtop[-3];
|
|
|
|
vtop[-3] = tmp;
|
|
|
|
tmp = vtop[-2];
|
|
|
|
vtop[-2] = vtop[-3];
|
|
|
|
vtop[-3] = tmp;
|
|
|
|
vswap();
|
|
|
|
/* stack: H1 H2 L1 L2 */
|
2016-10-13 20:21:43 +03:00
|
|
|
//pv("gen_opl B",0,4);
|
2009-05-05 22:18:10 +04:00
|
|
|
if (op == '*') {
|
|
|
|
vpushv(vtop - 1);
|
|
|
|
vpushv(vtop - 1);
|
|
|
|
gen_op(TOK_UMULL);
|
|
|
|
lexpand();
|
|
|
|
/* stack: H1 H2 L1 L2 ML MH */
|
|
|
|
for(i=0;i<4;i++)
|
|
|
|
vrotb(6);
|
|
|
|
/* stack: ML MH H1 H2 L1 L2 */
|
|
|
|
tmp = vtop[0];
|
|
|
|
vtop[0] = vtop[-2];
|
|
|
|
vtop[-2] = tmp;
|
|
|
|
/* stack: ML MH H1 L2 H2 L1 */
|
|
|
|
gen_op('*');
|
|
|
|
vrotb(3);
|
|
|
|
vrotb(3);
|
|
|
|
gen_op('*');
|
|
|
|
/* stack: ML MH M1 M2 */
|
|
|
|
gen_op('+');
|
|
|
|
gen_op('+');
|
|
|
|
} else if (op == '+' || op == '-') {
|
|
|
|
/* XXX: add non carry method too (for MIPS or alpha) */
|
|
|
|
if (op == '+')
|
|
|
|
op1 = TOK_ADDC1;
|
|
|
|
else
|
|
|
|
op1 = TOK_SUBC1;
|
|
|
|
gen_op(op1);
|
|
|
|
/* stack: H1 H2 (L1 op L2) */
|
|
|
|
vrotb(3);
|
|
|
|
vrotb(3);
|
|
|
|
gen_op(op1 + 1); /* TOK_xxxC2 */
|
|
|
|
} else {
|
|
|
|
gen_op(op);
|
|
|
|
/* stack: H1 H2 (L1 op L2) */
|
|
|
|
vrotb(3);
|
|
|
|
vrotb(3);
|
|
|
|
/* stack: (L1 op L2) H1 H2 */
|
|
|
|
gen_op(op);
|
|
|
|
/* stack: (L1 op L2) (H1 op H2) */
|
|
|
|
}
|
|
|
|
/* stack: L H */
|
|
|
|
lbuild(t);
|
|
|
|
break;
|
|
|
|
case TOK_SAR:
|
|
|
|
case TOK_SHR:
|
|
|
|
case TOK_SHL:
|
|
|
|
if ((vtop->r & (VT_VALMASK | VT_LVAL | VT_SYM)) == VT_CONST) {
|
|
|
|
t = vtop[-1].type.t;
|
|
|
|
vswap();
|
|
|
|
lexpand();
|
|
|
|
vrotb(3);
|
|
|
|
/* stack: L H shift */
|
|
|
|
c = (int)vtop->c.i;
|
|
|
|
/* constant: simpler */
|
|
|
|
/* NOTE: all comments are for SHL. the other cases are
|
2017-05-08 07:38:09 +03:00
|
|
|
done by swapping words */
|
2009-05-05 22:18:10 +04:00
|
|
|
vpop();
|
|
|
|
if (op != TOK_SHL)
|
|
|
|
vswap();
|
|
|
|
if (c >= 32) {
|
|
|
|
/* stack: L H */
|
|
|
|
vpop();
|
|
|
|
if (c > 32) {
|
|
|
|
vpushi(c - 32);
|
|
|
|
gen_op(op);
|
|
|
|
}
|
|
|
|
if (op != TOK_SAR) {
|
|
|
|
vpushi(0);
|
|
|
|
} else {
|
|
|
|
gv_dup();
|
|
|
|
vpushi(31);
|
|
|
|
gen_op(TOK_SAR);
|
|
|
|
}
|
|
|
|
vswap();
|
|
|
|
} else {
|
|
|
|
vswap();
|
|
|
|
gv_dup();
|
|
|
|
/* stack: H L L */
|
|
|
|
vpushi(c);
|
|
|
|
gen_op(op);
|
|
|
|
vswap();
|
|
|
|
vpushi(32 - c);
|
|
|
|
if (op == TOK_SHL)
|
|
|
|
gen_op(TOK_SHR);
|
|
|
|
else
|
|
|
|
gen_op(TOK_SHL);
|
|
|
|
vrotb(3);
|
|
|
|
/* stack: L L H */
|
|
|
|
vpushi(c);
|
|
|
|
if (op == TOK_SHL)
|
|
|
|
gen_op(TOK_SHL);
|
|
|
|
else
|
|
|
|
gen_op(TOK_SHR);
|
|
|
|
gen_op('|');
|
|
|
|
}
|
|
|
|
if (op != TOK_SHL)
|
|
|
|
vswap();
|
|
|
|
lbuild(t);
|
|
|
|
} else {
|
|
|
|
/* XXX: should provide a faster fallback on x86 ? */
|
|
|
|
switch(op) {
|
|
|
|
case TOK_SAR:
|
|
|
|
func = TOK___ashrdi3;
|
|
|
|
goto gen_func;
|
|
|
|
case TOK_SHR:
|
|
|
|
func = TOK___lshrdi3;
|
|
|
|
goto gen_func;
|
|
|
|
case TOK_SHL:
|
|
|
|
func = TOK___ashldi3;
|
|
|
|
goto gen_func;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
/* compare operations */
|
|
|
|
t = vtop->type.t;
|
|
|
|
vswap();
|
|
|
|
lexpand();
|
|
|
|
vrotb(3);
|
|
|
|
lexpand();
|
|
|
|
/* stack: L1 H1 L2 H2 */
|
|
|
|
tmp = vtop[-1];
|
|
|
|
vtop[-1] = vtop[-2];
|
|
|
|
vtop[-2] = tmp;
|
|
|
|
/* stack: L1 L2 H1 H2 */
|
2018-06-08 16:31:40 +03:00
|
|
|
save_regs(4);
|
2009-05-05 22:18:10 +04:00
|
|
|
/* compare high */
|
|
|
|
op1 = op;
|
|
|
|
/* when values are equal, we need to compare low words. since
|
|
|
|
the jump is inverted, we invert the test too. */
|
|
|
|
if (op1 == TOK_LT)
|
|
|
|
op1 = TOK_LE;
|
|
|
|
else if (op1 == TOK_GT)
|
|
|
|
op1 = TOK_GE;
|
|
|
|
else if (op1 == TOK_ULT)
|
|
|
|
op1 = TOK_ULE;
|
|
|
|
else if (op1 == TOK_UGT)
|
|
|
|
op1 = TOK_UGE;
|
|
|
|
a = 0;
|
|
|
|
b = 0;
|
|
|
|
gen_op(op1);
|
2017-02-13 20:23:43 +03:00
|
|
|
if (op == TOK_NE) {
|
|
|
|
b = gvtst(0, 0);
|
|
|
|
} else {
|
2013-12-31 19:51:20 +04:00
|
|
|
a = gvtst(1, 0);
|
2017-02-13 20:23:43 +03:00
|
|
|
if (op != TOK_EQ) {
|
|
|
|
/* generate non equal test */
|
jump optimizations
This unifies VT_CMP with VT_JMP(i) by using mostly VT_CMP
with both a positive and a negative jump target list.
Such we can delay putting the non-inverted or inverted jump
until we can see which one is nore suitable (in most cases).
example:
if (a && b || c && d)
e = 0;
before this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 11 00 00 00 je 27 <main+0x27>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 84 05 00 00 00 je 27 <main+0x27>
22: e9 22 00 00 00 jmp 49 <main+0x49>
27: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
2a: 83 f8 00 cmp $0x0,%eax
2d: 0f 84 11 00 00 00 je 44 <main+0x44>
33: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
36: 83 f8 00 cmp $0x0,%eax
39: 0f 84 05 00 00 00 je 44 <main+0x44>
3f: e9 05 00 00 00 jmp 49 <main+0x49>
44: e9 08 00 00 00 jmp 51 <main+0x51>
49: b8 00 00 00 00 mov $0x0,%eax
4e: 89 45 ec mov %eax,0xffffffec(%ebp)
51: ...
with this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 0c 00 00 00 je 22 <main+0x22>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 85 18 00 00 00 jne 3a <main+0x3a>
22: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
25: 83 f8 00 cmp $0x0,%eax
28: 0f 84 14 00 00 00 je 42 <main+0x42>
2e: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
31: 83 f8 00 cmp $0x0,%eax
34: 0f 84 08 00 00 00 je 42 <main+0x42>
3a: b8 00 00 00 00 mov $0x0,%eax
3f: 89 45 ec mov %eax,0xffffffec(%ebp)
42: ...
2019-06-22 12:45:35 +03:00
|
|
|
vpushi(0);
|
|
|
|
vset_VT_CMP(TOK_NE);
|
2013-12-31 19:51:20 +04:00
|
|
|
b = gvtst(0, 0);
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
/* compare low. Always unsigned */
|
|
|
|
op1 = op;
|
|
|
|
if (op1 == TOK_LT)
|
|
|
|
op1 = TOK_ULT;
|
|
|
|
else if (op1 == TOK_LE)
|
|
|
|
op1 = TOK_ULE;
|
|
|
|
else if (op1 == TOK_GT)
|
|
|
|
op1 = TOK_UGT;
|
|
|
|
else if (op1 == TOK_GE)
|
|
|
|
op1 = TOK_UGE;
|
|
|
|
gen_op(op1);
|
jump optimizations
This unifies VT_CMP with VT_JMP(i) by using mostly VT_CMP
with both a positive and a negative jump target list.
Such we can delay putting the non-inverted or inverted jump
until we can see which one is nore suitable (in most cases).
example:
if (a && b || c && d)
e = 0;
before this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 11 00 00 00 je 27 <main+0x27>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 84 05 00 00 00 je 27 <main+0x27>
22: e9 22 00 00 00 jmp 49 <main+0x49>
27: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
2a: 83 f8 00 cmp $0x0,%eax
2d: 0f 84 11 00 00 00 je 44 <main+0x44>
33: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
36: 83 f8 00 cmp $0x0,%eax
39: 0f 84 05 00 00 00 je 44 <main+0x44>
3f: e9 05 00 00 00 jmp 49 <main+0x49>
44: e9 08 00 00 00 jmp 51 <main+0x51>
49: b8 00 00 00 00 mov $0x0,%eax
4e: 89 45 ec mov %eax,0xffffffec(%ebp)
51: ...
with this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 0c 00 00 00 je 22 <main+0x22>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 85 18 00 00 00 jne 3a <main+0x3a>
22: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
25: 83 f8 00 cmp $0x0,%eax
28: 0f 84 14 00 00 00 je 42 <main+0x42>
2e: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
31: 83 f8 00 cmp $0x0,%eax
34: 0f 84 08 00 00 00 je 42 <main+0x42>
3a: b8 00 00 00 00 mov $0x0,%eax
3f: 89 45 ec mov %eax,0xffffffec(%ebp)
42: ...
2019-06-22 12:45:35 +03:00
|
|
|
#if 0//def TCC_TARGET_I386
|
|
|
|
if (op == TOK_NE) { gsym(b); break; }
|
|
|
|
if (op == TOK_EQ) { gsym(a); break; }
|
|
|
|
#endif
|
|
|
|
gvtst_set(1, a);
|
|
|
|
gvtst_set(0, b);
|
2009-05-05 22:18:10 +04:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2015-11-17 22:34:31 +03:00
|
|
|
static uint64_t gen_opic_sdiv(uint64_t a, uint64_t b)
|
|
|
|
{
|
|
|
|
uint64_t x = (a >> 63 ? -a : a) / (b >> 63 ? -b : b);
|
|
|
|
return (a ^ b) >> 63 ? -x : x;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int gen_opic_lt(uint64_t a, uint64_t b)
|
|
|
|
{
|
|
|
|
return (a ^ (uint64_t)1 << 63) < (b ^ (uint64_t)1 << 63);
|
|
|
|
}
|
|
|
|
|
2009-05-05 22:18:10 +04:00
|
|
|
/* handle integer constant optimizations and various machine
|
|
|
|
independent opt */
|
2009-12-20 03:53:49 +03:00
|
|
|
static void gen_opic(int op)
|
2009-05-05 22:18:10 +04:00
|
|
|
{
|
2015-11-17 22:34:31 +03:00
|
|
|
SValue *v1 = vtop - 1;
|
|
|
|
SValue *v2 = vtop;
|
|
|
|
int t1 = v1->type.t & VT_BTYPE;
|
|
|
|
int t2 = v2->type.t & VT_BTYPE;
|
|
|
|
int c1 = (v1->r & (VT_VALMASK | VT_LVAL | VT_SYM)) == VT_CONST;
|
|
|
|
int c2 = (v2->r & (VT_VALMASK | VT_LVAL | VT_SYM)) == VT_CONST;
|
|
|
|
uint64_t l1 = c1 ? v1->c.i : 0;
|
|
|
|
uint64_t l2 = c2 ? v2->c.i : 0;
|
|
|
|
int shm = (t1 == VT_LLONG) ? 63 : 31;
|
2009-05-05 22:18:10 +04:00
|
|
|
|
2016-10-04 02:20:33 +03:00
|
|
|
if (t1 != VT_LLONG && (PTR_SIZE != 8 || t1 != VT_PTR))
|
2015-11-17 22:09:35 +03:00
|
|
|
l1 = ((uint32_t)l1 |
|
|
|
|
(v1->type.t & VT_UNSIGNED ? 0 : -(l1 & 0x80000000)));
|
2016-10-04 02:20:33 +03:00
|
|
|
if (t2 != VT_LLONG && (PTR_SIZE != 8 || t2 != VT_PTR))
|
2015-11-17 22:09:35 +03:00
|
|
|
l2 = ((uint32_t)l2 |
|
|
|
|
(v2->type.t & VT_UNSIGNED ? 0 : -(l2 & 0x80000000)));
|
2009-05-05 22:18:10 +04:00
|
|
|
|
|
|
|
if (c1 && c2) {
|
|
|
|
switch(op) {
|
|
|
|
case '+': l1 += l2; break;
|
|
|
|
case '-': l1 -= l2; break;
|
|
|
|
case '&': l1 &= l2; break;
|
|
|
|
case '^': l1 ^= l2; break;
|
|
|
|
case '|': l1 |= l2; break;
|
|
|
|
case '*': l1 *= l2; break;
|
|
|
|
|
|
|
|
case TOK_PDIV:
|
|
|
|
case '/':
|
|
|
|
case '%':
|
|
|
|
case TOK_UDIV:
|
|
|
|
case TOK_UMOD:
|
|
|
|
/* if division by zero, generate explicit division */
|
|
|
|
if (l2 == 0) {
|
2020-01-16 01:32:40 +03:00
|
|
|
if (const_wanted && !(nocode_wanted & unevalmask))
|
2011-08-11 19:07:56 +04:00
|
|
|
tcc_error("division by zero in constant");
|
2009-05-05 22:18:10 +04:00
|
|
|
goto general_case;
|
|
|
|
}
|
|
|
|
switch(op) {
|
2015-11-17 22:34:31 +03:00
|
|
|
default: l1 = gen_opic_sdiv(l1, l2); break;
|
|
|
|
case '%': l1 = l1 - l2 * gen_opic_sdiv(l1, l2); break;
|
|
|
|
case TOK_UDIV: l1 = l1 / l2; break;
|
|
|
|
case TOK_UMOD: l1 = l1 % l2; break;
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
break;
|
2015-11-17 22:34:31 +03:00
|
|
|
case TOK_SHL: l1 <<= (l2 & shm); break;
|
|
|
|
case TOK_SHR: l1 >>= (l2 & shm); break;
|
|
|
|
case TOK_SAR:
|
|
|
|
l1 = (l1 >> 63) ? ~(~l1 >> (l2 & shm)) : l1 >> (l2 & shm);
|
|
|
|
break;
|
2009-05-05 22:18:10 +04:00
|
|
|
/* tests */
|
2015-11-17 22:34:31 +03:00
|
|
|
case TOK_ULT: l1 = l1 < l2; break;
|
|
|
|
case TOK_UGE: l1 = l1 >= l2; break;
|
2009-05-05 22:18:10 +04:00
|
|
|
case TOK_EQ: l1 = l1 == l2; break;
|
|
|
|
case TOK_NE: l1 = l1 != l2; break;
|
2015-11-17 22:34:31 +03:00
|
|
|
case TOK_ULE: l1 = l1 <= l2; break;
|
|
|
|
case TOK_UGT: l1 = l1 > l2; break;
|
|
|
|
case TOK_LT: l1 = gen_opic_lt(l1, l2); break;
|
|
|
|
case TOK_GE: l1 = !gen_opic_lt(l1, l2); break;
|
|
|
|
case TOK_LE: l1 = !gen_opic_lt(l2, l1); break;
|
|
|
|
case TOK_GT: l1 = gen_opic_lt(l2, l1); break;
|
2009-05-05 22:18:10 +04:00
|
|
|
/* logical */
|
|
|
|
case TOK_LAND: l1 = l1 && l2; break;
|
|
|
|
case TOK_LOR: l1 = l1 || l2; break;
|
|
|
|
default:
|
|
|
|
goto general_case;
|
|
|
|
}
|
2016-11-06 07:02:11 +03:00
|
|
|
if (t1 != VT_LLONG && (PTR_SIZE != 8 || t1 != VT_PTR))
|
|
|
|
l1 = ((uint32_t)l1 |
|
|
|
|
(v1->type.t & VT_UNSIGNED ? 0 : -(l1 & 0x80000000)));
|
2015-11-17 22:09:35 +03:00
|
|
|
v1->c.i = l1;
|
2009-05-05 22:18:10 +04:00
|
|
|
vtop--;
|
|
|
|
} else {
|
|
|
|
/* if commutative ops, put c2 as constant */
|
2015-07-29 23:53:57 +03:00
|
|
|
if (c1 && (op == '+' || op == '&' || op == '^' ||
|
2019-08-13 04:21:58 +03:00
|
|
|
op == '|' || op == '*' || op == TOK_EQ || op == TOK_NE)) {
|
2009-05-05 22:18:10 +04:00
|
|
|
vswap();
|
|
|
|
c2 = c1; //c = c1, c1 = c2, c2 = c;
|
|
|
|
l2 = l1; //l = l1, l1 = l2, l2 = l;
|
|
|
|
}
|
tccgen.c: Optimise 0<<x, 0>>x, -1>>x, x&0, x*0, x|-1, x%1.
More precisely, treat (0 << x) and so on as constant expressions, but
not if const_wanted as we do not want to allow "case (x*0):", ...
Do not optimise (0 / x) and (0 % x) here as x might be zero, though
for an architecture that does not generate an exception for division
by zero the back end might choose to optimise those.
2015-03-07 14:25:27 +03:00
|
|
|
if (!const_wanted &&
|
|
|
|
c1 && ((l1 == 0 &&
|
|
|
|
(op == TOK_SHL || op == TOK_SHR || op == TOK_SAR)) ||
|
|
|
|
(l1 == -1 && op == TOK_SAR))) {
|
|
|
|
/* treat (0 << x), (0 >> x) and (-1 >> x) as constant */
|
|
|
|
vtop--;
|
|
|
|
} else if (!const_wanted &&
|
|
|
|
c2 && ((l2 == 0 && (op == '&' || op == '*')) ||
|
2017-07-09 13:07:40 +03:00
|
|
|
(op == '|' &&
|
|
|
|
(l2 == -1 || (l2 == 0xFFFFFFFF && t2 != VT_LLONG))) ||
|
tccgen.c: Optimise 0<<x, 0>>x, -1>>x, x&0, x*0, x|-1, x%1.
More precisely, treat (0 << x) and so on as constant expressions, but
not if const_wanted as we do not want to allow "case (x*0):", ...
Do not optimise (0 / x) and (0 % x) here as x might be zero, though
for an architecture that does not generate an exception for division
by zero the back end might choose to optimise those.
2015-03-07 14:25:27 +03:00
|
|
|
(l2 == 1 && (op == '%' || op == TOK_UMOD)))) {
|
|
|
|
/* treat (x & 0), (x * 0), (x | -1) and (x % 1) as constant */
|
|
|
|
if (l2 == 1)
|
2015-11-17 22:09:35 +03:00
|
|
|
vtop->c.i = 0;
|
tccgen.c: Optimise 0<<x, 0>>x, -1>>x, x&0, x*0, x|-1, x%1.
More precisely, treat (0 << x) and so on as constant expressions, but
not if const_wanted as we do not want to allow "case (x*0):", ...
Do not optimise (0 / x) and (0 % x) here as x might be zero, though
for an architecture that does not generate an exception for division
by zero the back end might choose to optimise those.
2015-03-07 14:25:27 +03:00
|
|
|
vswap();
|
|
|
|
vtop--;
|
|
|
|
} else if (c2 && (((op == '*' || op == '/' || op == TOK_UDIV ||
|
|
|
|
op == TOK_PDIV) &&
|
|
|
|
l2 == 1) ||
|
|
|
|
((op == '+' || op == '-' || op == '|' || op == '^' ||
|
|
|
|
op == TOK_SHL || op == TOK_SHR || op == TOK_SAR) &&
|
|
|
|
l2 == 0) ||
|
|
|
|
(op == '&' &&
|
2017-07-09 13:07:40 +03:00
|
|
|
(l2 == -1 || (l2 == 0xFFFFFFFF && t2 != VT_LLONG))))) {
|
tccgen.c: Optimise 0<<x, 0>>x, -1>>x, x&0, x*0, x|-1, x%1.
More precisely, treat (0 << x) and so on as constant expressions, but
not if const_wanted as we do not want to allow "case (x*0):", ...
Do not optimise (0 / x) and (0 % x) here as x might be zero, though
for an architecture that does not generate an exception for division
by zero the back end might choose to optimise those.
2015-03-07 14:25:27 +03:00
|
|
|
/* filter out NOP operations like x*1, x-0, x&-1... */
|
2009-05-05 22:18:10 +04:00
|
|
|
vtop--;
|
|
|
|
} else if (c2 && (op == '*' || op == TOK_PDIV || op == TOK_UDIV)) {
|
|
|
|
/* try to use shifts instead of muls or divs */
|
|
|
|
if (l2 > 0 && (l2 & (l2 - 1)) == 0) {
|
2015-11-17 22:34:31 +03:00
|
|
|
int n = -1;
|
2009-05-05 22:18:10 +04:00
|
|
|
while (l2) {
|
|
|
|
l2 >>= 1;
|
|
|
|
n++;
|
|
|
|
}
|
2015-11-17 22:09:35 +03:00
|
|
|
vtop->c.i = n;
|
2009-05-05 22:18:10 +04:00
|
|
|
if (op == '*')
|
|
|
|
op = TOK_SHL;
|
|
|
|
else if (op == TOK_PDIV)
|
|
|
|
op = TOK_SAR;
|
|
|
|
else
|
|
|
|
op = TOK_SHR;
|
|
|
|
}
|
|
|
|
goto general_case;
|
|
|
|
} else if (c2 && (op == '+' || op == '-') &&
|
2010-01-14 22:55:51 +03:00
|
|
|
(((vtop[-1].r & (VT_VALMASK | VT_LVAL | VT_SYM)) == (VT_CONST | VT_SYM))
|
|
|
|
|| (vtop[-1].r & (VT_VALMASK | VT_LVAL)) == VT_LOCAL)) {
|
2009-05-05 22:18:10 +04:00
|
|
|
/* symbol + constant case */
|
|
|
|
if (op == '-')
|
|
|
|
l2 = -l2;
|
2016-10-09 01:44:22 +03:00
|
|
|
l2 += vtop[-1].c.i;
|
|
|
|
/* The backends can't always deal with addends to symbols
|
|
|
|
larger than +-1<<31. Don't construct such. */
|
|
|
|
if ((int)l2 != l2)
|
|
|
|
goto general_case;
|
2009-05-05 22:18:10 +04:00
|
|
|
vtop--;
|
2016-10-09 01:44:22 +03:00
|
|
|
vtop->c.i = l2;
|
2009-05-05 22:18:10 +04:00
|
|
|
} else {
|
|
|
|
general_case:
|
|
|
|
/* call low level op generator */
|
2015-02-13 21:58:31 +03:00
|
|
|
if (t1 == VT_LLONG || t2 == VT_LLONG ||
|
|
|
|
(PTR_SIZE == 8 && (t1 == VT_PTR || t2 == VT_PTR)))
|
2009-05-05 22:18:10 +04:00
|
|
|
gen_opl(op);
|
|
|
|
else
|
|
|
|
gen_opi(op);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* generate a floating point operation with constant propagation */
|
2009-12-20 03:53:49 +03:00
|
|
|
static void gen_opif(int op)
|
2009-05-05 22:18:10 +04:00
|
|
|
{
|
|
|
|
int c1, c2;
|
|
|
|
SValue *v1, *v2;
|
2018-06-08 16:31:40 +03:00
|
|
|
#if defined _MSC_VER && defined __x86_64__
|
2017-07-09 13:07:40 +03:00
|
|
|
/* avoid bad optimization with f1 -= f2 for f1:-0.0, f2:0.0 */
|
|
|
|
volatile
|
|
|
|
#endif
|
2009-05-05 22:18:10 +04:00
|
|
|
long double f1, f2;
|
|
|
|
|
|
|
|
v1 = vtop - 1;
|
|
|
|
v2 = vtop;
|
|
|
|
/* currently, we cannot do computations with forward symbols */
|
|
|
|
c1 = (v1->r & (VT_VALMASK | VT_LVAL | VT_SYM)) == VT_CONST;
|
|
|
|
c2 = (v2->r & (VT_VALMASK | VT_LVAL | VT_SYM)) == VT_CONST;
|
|
|
|
if (c1 && c2) {
|
|
|
|
if (v1->type.t == VT_FLOAT) {
|
|
|
|
f1 = v1->c.f;
|
|
|
|
f2 = v2->c.f;
|
|
|
|
} else if (v1->type.t == VT_DOUBLE) {
|
|
|
|
f1 = v1->c.d;
|
|
|
|
f2 = v2->c.d;
|
|
|
|
} else {
|
|
|
|
f1 = v1->c.ld;
|
|
|
|
f2 = v2->c.ld;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* NOTE: we only do constant propagation if finite number (not
|
|
|
|
NaN or infinity) (ANSI spec) */
|
|
|
|
if (!ieee_finite(f1) || !ieee_finite(f2))
|
|
|
|
goto general_case;
|
|
|
|
|
|
|
|
switch(op) {
|
|
|
|
case '+': f1 += f2; break;
|
|
|
|
case '-': f1 -= f2; break;
|
|
|
|
case '*': f1 *= f2; break;
|
2015-07-29 23:53:57 +03:00
|
|
|
case '/':
|
2009-05-05 22:18:10 +04:00
|
|
|
if (f2 == 0.0) {
|
2017-12-25 14:44:29 +03:00
|
|
|
/* If not in initializer we need to potentially generate
|
|
|
|
FP exceptions at runtime, otherwise we want to fold. */
|
|
|
|
if (!const_wanted)
|
|
|
|
goto general_case;
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
2015-07-29 23:53:57 +03:00
|
|
|
f1 /= f2;
|
2009-05-05 22:18:10 +04:00
|
|
|
break;
|
|
|
|
/* XXX: also handles tests ? */
|
|
|
|
default:
|
|
|
|
goto general_case;
|
|
|
|
}
|
|
|
|
/* XXX: overflow test ? */
|
|
|
|
if (v1->type.t == VT_FLOAT) {
|
|
|
|
v1->c.f = f1;
|
|
|
|
} else if (v1->type.t == VT_DOUBLE) {
|
|
|
|
v1->c.d = f1;
|
|
|
|
} else {
|
|
|
|
v1->c.ld = f1;
|
|
|
|
}
|
|
|
|
vtop--;
|
|
|
|
} else {
|
|
|
|
general_case:
|
2016-12-18 19:23:33 +03:00
|
|
|
gen_opf(op);
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-04-15 03:08:09 +03:00
|
|
|
/* print a type. If 'varstr' is not NULL, then the variable is also
|
|
|
|
printed in the type */
|
|
|
|
/* XXX: union */
|
|
|
|
/* XXX: add array and function pointers */
|
|
|
|
static void type_to_str(char *buf, int buf_size,
|
|
|
|
CType *type, const char *varstr)
|
|
|
|
{
|
|
|
|
int bt, v, t;
|
|
|
|
Sym *s, *sa;
|
|
|
|
char buf1[256];
|
|
|
|
const char *tstr;
|
|
|
|
|
|
|
|
t = type->t;
|
|
|
|
bt = t & VT_BTYPE;
|
|
|
|
buf[0] = '\0';
|
|
|
|
|
|
|
|
if (t & VT_EXTERN)
|
|
|
|
pstrcat(buf, buf_size, "extern ");
|
|
|
|
if (t & VT_STATIC)
|
|
|
|
pstrcat(buf, buf_size, "static ");
|
|
|
|
if (t & VT_TYPEDEF)
|
|
|
|
pstrcat(buf, buf_size, "typedef ");
|
|
|
|
if (t & VT_INLINE)
|
|
|
|
pstrcat(buf, buf_size, "inline ");
|
|
|
|
if (t & VT_VOLATILE)
|
|
|
|
pstrcat(buf, buf_size, "volatile ");
|
|
|
|
if (t & VT_CONSTANT)
|
|
|
|
pstrcat(buf, buf_size, "const ");
|
|
|
|
|
|
|
|
if (((t & VT_DEFSIGN) && bt == VT_BYTE)
|
|
|
|
|| ((t & VT_UNSIGNED)
|
|
|
|
&& (bt == VT_SHORT || bt == VT_INT || bt == VT_LLONG)
|
|
|
|
&& !IS_ENUM(t)
|
|
|
|
))
|
|
|
|
pstrcat(buf, buf_size, (t & VT_UNSIGNED) ? "unsigned " : "signed ");
|
|
|
|
|
|
|
|
buf_size -= strlen(buf);
|
|
|
|
buf += strlen(buf);
|
|
|
|
|
|
|
|
switch(bt) {
|
|
|
|
case VT_VOID:
|
|
|
|
tstr = "void";
|
|
|
|
goto add_tstr;
|
|
|
|
case VT_BOOL:
|
|
|
|
tstr = "_Bool";
|
|
|
|
goto add_tstr;
|
|
|
|
case VT_BYTE:
|
|
|
|
tstr = "char";
|
|
|
|
goto add_tstr;
|
|
|
|
case VT_SHORT:
|
|
|
|
tstr = "short";
|
|
|
|
goto add_tstr;
|
|
|
|
case VT_INT:
|
|
|
|
tstr = "int";
|
|
|
|
goto maybe_long;
|
|
|
|
case VT_LLONG:
|
|
|
|
tstr = "long long";
|
|
|
|
maybe_long:
|
|
|
|
if (t & VT_LONG)
|
|
|
|
tstr = "long";
|
|
|
|
if (!IS_ENUM(t))
|
|
|
|
goto add_tstr;
|
|
|
|
tstr = "enum ";
|
|
|
|
goto tstruct;
|
|
|
|
case VT_FLOAT:
|
|
|
|
tstr = "float";
|
|
|
|
goto add_tstr;
|
|
|
|
case VT_DOUBLE:
|
|
|
|
tstr = "double";
|
|
|
|
if (!(t & VT_LONG))
|
|
|
|
goto add_tstr;
|
|
|
|
case VT_LDOUBLE:
|
|
|
|
tstr = "long double";
|
|
|
|
add_tstr:
|
|
|
|
pstrcat(buf, buf_size, tstr);
|
|
|
|
break;
|
|
|
|
case VT_STRUCT:
|
|
|
|
tstr = "struct ";
|
|
|
|
if (IS_UNION(t))
|
|
|
|
tstr = "union ";
|
|
|
|
tstruct:
|
|
|
|
pstrcat(buf, buf_size, tstr);
|
|
|
|
v = type->ref->v & ~SYM_STRUCT;
|
|
|
|
if (v >= SYM_FIRST_ANOM)
|
|
|
|
pstrcat(buf, buf_size, "<anonymous>");
|
|
|
|
else
|
|
|
|
pstrcat(buf, buf_size, get_tok_str(v, NULL));
|
|
|
|
break;
|
|
|
|
case VT_FUNC:
|
|
|
|
s = type->ref;
|
|
|
|
buf1[0]=0;
|
|
|
|
if (varstr && '*' == *varstr) {
|
|
|
|
pstrcat(buf1, sizeof(buf1), "(");
|
|
|
|
pstrcat(buf1, sizeof(buf1), varstr);
|
|
|
|
pstrcat(buf1, sizeof(buf1), ")");
|
|
|
|
}
|
|
|
|
pstrcat(buf1, buf_size, "(");
|
|
|
|
sa = s->next;
|
|
|
|
while (sa != NULL) {
|
|
|
|
char buf2[256];
|
|
|
|
type_to_str(buf2, sizeof(buf2), &sa->type, NULL);
|
|
|
|
pstrcat(buf1, sizeof(buf1), buf2);
|
|
|
|
sa = sa->next;
|
|
|
|
if (sa)
|
|
|
|
pstrcat(buf1, sizeof(buf1), ", ");
|
|
|
|
}
|
|
|
|
if (s->f.func_type == FUNC_ELLIPSIS)
|
|
|
|
pstrcat(buf1, sizeof(buf1), ", ...");
|
|
|
|
pstrcat(buf1, sizeof(buf1), ")");
|
|
|
|
type_to_str(buf, buf_size, &s->type, buf1);
|
|
|
|
goto no_var;
|
|
|
|
case VT_PTR:
|
|
|
|
s = type->ref;
|
|
|
|
if (t & VT_ARRAY) {
|
|
|
|
if (varstr && '*' == *varstr)
|
|
|
|
snprintf(buf1, sizeof(buf1), "(%s)[%d]", varstr, s->c);
|
|
|
|
else
|
|
|
|
snprintf(buf1, sizeof(buf1), "%s[%d]", varstr ? varstr : "", s->c);
|
|
|
|
type_to_str(buf, buf_size, &s->type, buf1);
|
|
|
|
goto no_var;
|
|
|
|
}
|
|
|
|
pstrcpy(buf1, sizeof(buf1), "*");
|
|
|
|
if (t & VT_CONSTANT)
|
|
|
|
pstrcat(buf1, buf_size, "const ");
|
|
|
|
if (t & VT_VOLATILE)
|
|
|
|
pstrcat(buf1, buf_size, "volatile ");
|
|
|
|
if (varstr)
|
|
|
|
pstrcat(buf1, sizeof(buf1), varstr);
|
|
|
|
type_to_str(buf, buf_size, &s->type, buf1);
|
|
|
|
goto no_var;
|
|
|
|
}
|
|
|
|
if (varstr) {
|
|
|
|
pstrcat(buf, buf_size, " ");
|
|
|
|
pstrcat(buf, buf_size, varstr);
|
|
|
|
}
|
|
|
|
no_var: ;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void type_incompatibility_error(CType* st, CType* dt, const char* fmt)
|
|
|
|
{
|
|
|
|
char buf1[256], buf2[256];
|
|
|
|
type_to_str(buf1, sizeof(buf1), st, NULL);
|
|
|
|
type_to_str(buf2, sizeof(buf2), dt, NULL);
|
|
|
|
tcc_error(fmt, buf1, buf2);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void type_incompatibility_warning(CType* st, CType* dt, const char* fmt)
|
|
|
|
{
|
|
|
|
char buf1[256], buf2[256];
|
|
|
|
type_to_str(buf1, sizeof(buf1), st, NULL);
|
|
|
|
type_to_str(buf2, sizeof(buf2), dt, NULL);
|
|
|
|
tcc_warning(fmt, buf1, buf2);
|
|
|
|
}
|
|
|
|
|
2009-05-05 22:18:10 +04:00
|
|
|
static int pointed_size(CType *type)
|
|
|
|
{
|
|
|
|
int align;
|
|
|
|
return type_size(pointed_type(type), &align);
|
|
|
|
}
|
|
|
|
|
2011-04-06 20:17:03 +04:00
|
|
|
static void vla_runtime_pointed_size(CType *type)
|
|
|
|
{
|
|
|
|
int align;
|
|
|
|
vla_runtime_type_size(pointed_type(type), &align);
|
|
|
|
}
|
|
|
|
|
2009-05-05 22:18:10 +04:00
|
|
|
static inline int is_null_pointer(SValue *p)
|
|
|
|
{
|
|
|
|
if ((p->r & (VT_VALMASK | VT_LVAL | VT_SYM)) != VT_CONST)
|
|
|
|
return 0;
|
2015-11-17 22:09:35 +03:00
|
|
|
return ((p->type.t & VT_BTYPE) == VT_INT && (uint32_t)p->c.i == 0) ||
|
|
|
|
((p->type.t & VT_BTYPE) == VT_LLONG && p->c.i == 0) ||
|
|
|
|
((p->type.t & VT_BTYPE) == VT_PTR &&
|
2018-11-28 12:22:37 +03:00
|
|
|
(PTR_SIZE == 4 ? (uint32_t)p->c.i == 0 : p->c.i == 0) &&
|
2018-12-01 01:43:30 +03:00
|
|
|
((pointed_type(&p->type)->t & VT_BTYPE) == VT_VOID) &&
|
|
|
|
0 == (pointed_type(&p->type)->t & (VT_CONSTANT | VT_VOLATILE))
|
2018-11-28 12:22:37 +03:00
|
|
|
);
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
|
2020-01-18 04:36:29 +03:00
|
|
|
/* compare function types. OLD functions match any new functions */
|
|
|
|
static int is_compatible_func(CType *type1, CType *type2)
|
2009-05-05 22:18:10 +04:00
|
|
|
{
|
2020-01-18 04:36:29 +03:00
|
|
|
Sym *s1, *s2;
|
|
|
|
|
|
|
|
s1 = type1->ref;
|
|
|
|
s2 = type2->ref;
|
|
|
|
if (s1->f.func_call != s2->f.func_call)
|
|
|
|
return 0;
|
|
|
|
if (s1->f.func_type != s2->f.func_type
|
|
|
|
&& s1->f.func_type != FUNC_OLD
|
|
|
|
&& s2->f.func_type != FUNC_OLD)
|
|
|
|
return 0;
|
|
|
|
/* we should check the function return type for FUNC_OLD too
|
|
|
|
but that causes problems with the internally used support
|
|
|
|
functions such as TOK_memmove */
|
|
|
|
if (s1->f.func_type == FUNC_OLD && !s1->next)
|
|
|
|
return 1;
|
|
|
|
if (s2->f.func_type == FUNC_OLD && !s2->next)
|
|
|
|
return 1;
|
|
|
|
for (;;) {
|
|
|
|
if (!is_compatible_unqualified_types(&s1->type, &s2->type))
|
|
|
|
return 0;
|
|
|
|
s1 = s1->next;
|
|
|
|
s2 = s2->next;
|
|
|
|
if (!s1)
|
|
|
|
return !s2;
|
|
|
|
if (!s2)
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* return true if type1 and type2 are the same. If unqualified is
|
|
|
|
true, qualifiers on the types are ignored.
|
|
|
|
*/
|
|
|
|
static int compare_types(CType *type1, CType *type2, int unqualified)
|
|
|
|
{
|
|
|
|
int bt1, t1, t2;
|
|
|
|
|
|
|
|
t1 = type1->t & VT_TYPE;
|
|
|
|
t2 = type2->t & VT_TYPE;
|
|
|
|
if (unqualified) {
|
|
|
|
/* strip qualifiers before comparing */
|
|
|
|
t1 &= ~(VT_CONSTANT | VT_VOLATILE);
|
|
|
|
t2 &= ~(VT_CONSTANT | VT_VOLATILE);
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
|
2020-01-18 04:36:29 +03:00
|
|
|
/* Default Vs explicit signedness only matters for char */
|
|
|
|
if ((t1 & VT_BTYPE) != VT_BYTE) {
|
|
|
|
t1 &= ~VT_DEFSIGN;
|
|
|
|
t2 &= ~VT_DEFSIGN;
|
|
|
|
}
|
|
|
|
/* XXX: bitfields ? */
|
|
|
|
if (t1 != t2)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if ((t1 & VT_ARRAY)
|
|
|
|
&& !(type1->ref->c < 0
|
|
|
|
|| type2->ref->c < 0
|
|
|
|
|| type1->ref->c == type2->ref->c))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* test more complicated cases */
|
|
|
|
bt1 = t1 & VT_BTYPE;
|
2009-05-05 22:18:10 +04:00
|
|
|
if (bt1 == VT_PTR) {
|
|
|
|
type1 = pointed_type(type1);
|
|
|
|
type2 = pointed_type(type2);
|
2020-01-18 04:36:29 +03:00
|
|
|
return is_compatible_types(type1, type2);
|
|
|
|
} else if (bt1 == VT_STRUCT) {
|
|
|
|
return (type1->ref == type2->ref);
|
|
|
|
} else if (bt1 == VT_FUNC) {
|
|
|
|
return is_compatible_func(type1, type2);
|
|
|
|
} else if (IS_ENUM(type1->t) || IS_ENUM(type2->t)) {
|
|
|
|
return type1->ref == type2->ref;
|
|
|
|
} else {
|
|
|
|
return 1;
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
2020-01-18 04:36:29 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Check if OP1 and OP2 can be "combined" with operation OP, the combined
|
|
|
|
type is stored in DEST if non-null (except for pointer plus/minus) . */
|
|
|
|
static int combine_types(CType *dest, SValue *op1, SValue *op2, int op)
|
|
|
|
{
|
|
|
|
CType *type1 = &op1->type, *type2 = &op2->type, type;
|
|
|
|
int t1 = type1->t, t2 = type2->t, bt1 = t1 & VT_BTYPE, bt2 = t2 & VT_BTYPE;
|
|
|
|
int ret = 1;
|
|
|
|
|
|
|
|
type.t = VT_VOID;
|
|
|
|
type.ref = NULL;
|
|
|
|
|
|
|
|
if (bt1 == VT_VOID || bt2 == VT_VOID) {
|
|
|
|
ret = op == '?' ? 1 : 0;
|
|
|
|
/* NOTE: as an extension, we accept void on only one side */
|
|
|
|
type.t = VT_VOID;
|
|
|
|
} else if (bt1 == VT_PTR || bt2 == VT_PTR) {
|
|
|
|
if (op == '+') ; /* Handled in caller */
|
|
|
|
/* http://port70.net/~nsz/c/c99/n1256.html#6.5.15p6 */
|
|
|
|
/* If one is a null ptr constant the result type is the other. */
|
|
|
|
else if (is_null_pointer (op2)) type = *type1;
|
|
|
|
else if (is_null_pointer (op1)) type = *type2;
|
|
|
|
else if (bt1 != bt2) {
|
|
|
|
/* accept comparison or cond-expr between pointer and integer
|
|
|
|
with a warning */
|
|
|
|
if ((op == '?' || (op >= TOK_ULT && op <= TOK_LOR))
|
|
|
|
&& (is_integer_btype(bt1) || is_integer_btype(bt2)))
|
|
|
|
tcc_warning("pointer/integer mismatch in %s",
|
|
|
|
op == '?' ? "conditional expression" : "comparison");
|
|
|
|
else if (op != '-' || !is_integer_btype(bt2))
|
|
|
|
ret = 0;
|
|
|
|
type = *(bt1 == VT_PTR ? type1 : type2);
|
|
|
|
} else {
|
|
|
|
CType *pt1 = pointed_type(type1);
|
|
|
|
CType *pt2 = pointed_type(type2);
|
|
|
|
int pbt1 = pt1->t & VT_BTYPE;
|
|
|
|
int pbt2 = pt2->t & VT_BTYPE;
|
|
|
|
int newquals, copied = 0;
|
|
|
|
if (pbt1 != VT_VOID && pbt2 != VT_VOID
|
|
|
|
&& !compare_types(pt1, pt2, 1/*unqualif*/)) {
|
|
|
|
if (op != '?' && (op < TOK_ULT || op > TOK_LOR))
|
|
|
|
ret = 0;
|
|
|
|
else
|
|
|
|
type_incompatibility_warning(type1, type2,
|
|
|
|
op == '?'
|
|
|
|
? "pointer type mismatch in conditional expression ('%s' and '%s')"
|
|
|
|
: "pointer type mismatch in comparison('%s' and '%s')");
|
|
|
|
}
|
|
|
|
if (op == '?') {
|
|
|
|
/* pointers to void get preferred, otherwise the
|
|
|
|
pointed to types minus qualifs should be compatible */
|
|
|
|
type = *((pbt1 == VT_VOID) ? type1 : type2);
|
|
|
|
/* combine qualifs */
|
|
|
|
newquals = ((pt1->t | pt2->t) & (VT_CONSTANT | VT_VOLATILE));
|
|
|
|
if ((~pointed_type(&type)->t & (VT_CONSTANT | VT_VOLATILE))
|
|
|
|
& newquals)
|
|
|
|
{
|
|
|
|
/* copy the pointer target symbol */
|
|
|
|
type.ref = sym_push(SYM_FIELD, &type.ref->type,
|
|
|
|
0, type.ref->c);
|
|
|
|
copied = 1;
|
|
|
|
pointed_type(&type)->t |= newquals;
|
|
|
|
}
|
|
|
|
/* pointers to incomplete arrays get converted to
|
|
|
|
pointers to completed ones if possible */
|
|
|
|
if (pt1->t & VT_ARRAY
|
|
|
|
&& pt2->t & VT_ARRAY
|
|
|
|
&& pointed_type(&type)->ref->c < 0
|
|
|
|
&& (pt1->ref->c > 0 || pt2->ref->c > 0))
|
|
|
|
{
|
|
|
|
if (!copied)
|
|
|
|
type.ref = sym_push(SYM_FIELD, &type.ref->type,
|
|
|
|
0, type.ref->c);
|
|
|
|
pointed_type(&type)->ref =
|
|
|
|
sym_push(SYM_FIELD, &pointed_type(&type)->ref->type,
|
|
|
|
0, pointed_type(&type)->ref->c);
|
|
|
|
pointed_type(&type)->ref->c =
|
|
|
|
0 < pt1->ref->c ? pt1->ref->c : pt2->ref->c;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (op >= TOK_ULT && op <= TOK_LOR)
|
|
|
|
type.t = VT_SIZE_T;
|
|
|
|
} else if (bt1 == VT_STRUCT || bt2 == VT_STRUCT) {
|
|
|
|
if (op != '?' || !compare_types(type1, type2, 1))
|
|
|
|
ret = 0;
|
|
|
|
type = *type1;
|
|
|
|
} else if (is_float(bt1) || is_float(bt2)) {
|
|
|
|
if (bt1 == VT_LDOUBLE || bt2 == VT_LDOUBLE) {
|
|
|
|
type.t = VT_LDOUBLE;
|
|
|
|
} else if (bt1 == VT_DOUBLE || bt2 == VT_DOUBLE) {
|
|
|
|
type.t = VT_DOUBLE;
|
|
|
|
} else {
|
|
|
|
type.t = VT_FLOAT;
|
|
|
|
}
|
|
|
|
} else if (bt1 == VT_LLONG || bt2 == VT_LLONG) {
|
|
|
|
/* cast to biggest op */
|
|
|
|
type.t = VT_LLONG | VT_LONG;
|
|
|
|
if (bt1 == VT_LLONG)
|
|
|
|
type.t &= t1;
|
|
|
|
if (bt2 == VT_LLONG)
|
|
|
|
type.t &= t2;
|
|
|
|
/* convert to unsigned if it does not fit in a long long */
|
|
|
|
if ((t1 & (VT_BTYPE | VT_UNSIGNED | VT_BITFIELD)) == (VT_LLONG | VT_UNSIGNED) ||
|
|
|
|
(t2 & (VT_BTYPE | VT_UNSIGNED | VT_BITFIELD)) == (VT_LLONG | VT_UNSIGNED))
|
|
|
|
type.t |= VT_UNSIGNED;
|
|
|
|
} else {
|
|
|
|
/* integer operations */
|
|
|
|
type.t = VT_INT | (VT_LONG & (t1 | t2));
|
|
|
|
/* convert to unsigned if it does not fit in an integer */
|
|
|
|
if ((t1 & (VT_BTYPE | VT_UNSIGNED | VT_BITFIELD)) == (VT_INT | VT_UNSIGNED) ||
|
|
|
|
(t2 & (VT_BTYPE | VT_UNSIGNED | VT_BITFIELD)) == (VT_INT | VT_UNSIGNED))
|
|
|
|
type.t |= VT_UNSIGNED;
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
2020-01-18 04:36:29 +03:00
|
|
|
if (dest)
|
|
|
|
*dest = type;
|
|
|
|
return ret;
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/* generic gen_op: handles types problems */
|
2009-12-20 03:53:49 +03:00
|
|
|
ST_FUNC void gen_op(int op)
|
2009-05-05 22:18:10 +04:00
|
|
|
{
|
|
|
|
int u, t1, t2, bt1, bt2, t;
|
2020-01-18 04:36:29 +03:00
|
|
|
CType type1, combtype;
|
2009-05-05 22:18:10 +04:00
|
|
|
|
2016-07-14 05:09:49 +03:00
|
|
|
redo:
|
2009-05-05 22:18:10 +04:00
|
|
|
t1 = vtop[-1].type.t;
|
|
|
|
t2 = vtop[0].type.t;
|
|
|
|
bt1 = t1 & VT_BTYPE;
|
|
|
|
bt2 = t2 & VT_BTYPE;
|
2015-07-29 23:53:57 +03:00
|
|
|
|
2020-01-18 04:36:29 +03:00
|
|
|
if (bt1 == VT_FUNC || bt2 == VT_FUNC) {
|
2016-07-14 05:09:49 +03:00
|
|
|
if (bt2 == VT_FUNC) {
|
|
|
|
mk_pointer(&vtop->type);
|
|
|
|
gaddrof();
|
|
|
|
}
|
|
|
|
if (bt1 == VT_FUNC) {
|
|
|
|
vswap();
|
|
|
|
mk_pointer(&vtop->type);
|
|
|
|
gaddrof();
|
|
|
|
vswap();
|
|
|
|
}
|
|
|
|
goto redo;
|
2020-01-18 04:36:29 +03:00
|
|
|
} else if (!combine_types(&combtype, vtop - 1, vtop, op)) {
|
|
|
|
tcc_error_noabort("invalid operand types for binary operation");
|
|
|
|
vpop();
|
2016-05-12 02:12:04 +03:00
|
|
|
} else if (bt1 == VT_PTR || bt2 == VT_PTR) {
|
2009-05-05 22:18:10 +04:00
|
|
|
/* at least one operand is a pointer */
|
2017-05-08 07:38:09 +03:00
|
|
|
/* relational op: must be both pointers */
|
2020-01-18 04:36:29 +03:00
|
|
|
if (op >= TOK_ULT && op <= TOK_LOR)
|
2009-05-05 22:18:10 +04:00
|
|
|
goto std_op;
|
|
|
|
/* if both pointers, then it must be the '-' op */
|
|
|
|
if (bt1 == VT_PTR && bt2 == VT_PTR) {
|
|
|
|
if (op != '-')
|
2011-08-11 19:07:56 +04:00
|
|
|
tcc_error("cannot use pointers here");
|
2011-04-06 20:17:03 +04:00
|
|
|
if (vtop[-1].type.t & VT_VLA) {
|
|
|
|
vla_runtime_pointed_size(&vtop[-1].type);
|
|
|
|
} else {
|
2011-04-12 10:39:27 +04:00
|
|
|
vpushi(pointed_size(&vtop[-1].type));
|
2011-04-06 20:17:03 +04:00
|
|
|
}
|
2011-04-12 10:39:27 +04:00
|
|
|
vrott(3);
|
2009-05-05 22:18:10 +04:00
|
|
|
gen_opic(op);
|
2019-12-16 20:51:28 +03:00
|
|
|
vtop->type.t = VT_PTRDIFF_T;
|
2011-04-12 10:39:27 +04:00
|
|
|
vswap();
|
2009-05-05 22:18:10 +04:00
|
|
|
gen_op(TOK_PDIV);
|
|
|
|
} else {
|
|
|
|
/* exactly one pointer : must be '+' or '-'. */
|
|
|
|
if (op != '-' && op != '+')
|
2011-08-11 19:07:56 +04:00
|
|
|
tcc_error("cannot use pointers here");
|
2009-05-05 22:18:10 +04:00
|
|
|
/* Put pointer as first operand */
|
|
|
|
if (bt2 == VT_PTR) {
|
|
|
|
vswap();
|
2017-02-08 21:45:31 +03:00
|
|
|
t = t1, t1 = t2, t2 = t;
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
2016-10-13 20:21:43 +03:00
|
|
|
#if PTR_SIZE == 4
|
|
|
|
if ((vtop[0].type.t & VT_BTYPE) == VT_LLONG)
|
|
|
|
/* XXX: truncate here because gen_opl can't handle ptr + long long */
|
2017-07-09 13:34:11 +03:00
|
|
|
gen_cast_s(VT_INT);
|
2016-10-13 20:21:43 +03:00
|
|
|
#endif
|
2009-05-05 22:18:10 +04:00
|
|
|
type1 = vtop[-1].type;
|
2011-04-08 12:09:39 +04:00
|
|
|
type1.t &= ~VT_ARRAY;
|
2011-04-06 20:17:03 +04:00
|
|
|
if (vtop[-1].type.t & VT_VLA)
|
|
|
|
vla_runtime_pointed_size(&vtop[-1].type);
|
|
|
|
else {
|
|
|
|
u = pointed_size(&vtop[-1].type);
|
|
|
|
if (u < 0)
|
2011-08-11 19:07:56 +04:00
|
|
|
tcc_error("unknown array element size");
|
2017-05-13 09:59:06 +03:00
|
|
|
#if PTR_SIZE == 8
|
2011-04-06 20:17:03 +04:00
|
|
|
vpushll(u);
|
2009-05-05 22:18:10 +04:00
|
|
|
#else
|
2011-04-06 20:17:03 +04:00
|
|
|
/* XXX: cast to int ? (long long case) */
|
|
|
|
vpushi(u);
|
2009-05-05 22:18:10 +04:00
|
|
|
#endif
|
2011-04-06 20:17:03 +04:00
|
|
|
}
|
2009-05-05 22:18:10 +04:00
|
|
|
gen_op('*');
|
2019-12-12 14:56:06 +03:00
|
|
|
#ifdef CONFIG_TCC_BCHECK
|
bcheck cleanup
- revert Makefiles to state before last bcheck additions
Instead, just load bcheck.o explicitly if that is
what is wanted.
- move tcc_add_bcheck() to the <target>-link.c files and
remove revently added arguments. This function is to
support tccelf.c with linking, not for tccgen.c to
support compilation.
- remove -ba option: It said:
"-ba Enable better address checking with bounds checker"
Okay, if it is better then to have it is not an option.
- remove va_copy. It is C99 and we try to stay C89 in tinycc
when possible. For example, MS compilers do not have va_copy.
- win64: revert any 'fixes' to alloca
It was correct as it was before, except for bound_checking
where it was not implemented. This should now work too.
- remove parasitic filename:linenum features
Such feature is already present with rt_printline in
tccrun.c. If it doesn't work it can be fixed.
- revert changes to gen_bounded_ptr_add()
gen_bounded_ptr_add() was working as it should before
(mostly). For the sake of simplicity I switched it to
CDECL. Anyway, FASTCALL means SLOWCALL with tinycc.
In exchange you get one addition which is required for
bounds_cnecking function arguments. The important thing
is to check them *BEFORE* they are loaded into registers.
New function gbound_args() does that.
In any case, code instrumentation with the bounds-check
functions as such now seems to work flawlessly again,
which means when they are inserted as NOPs, any code that
tcc can compile, seems to behave just the same as without
them.
What these functions then do when fully enabled, is a
differnt story. I did not touch this.
2019-12-12 17:45:45 +03:00
|
|
|
if (tcc_state->do_bounds_check && !const_wanted) {
|
2009-05-05 22:18:10 +04:00
|
|
|
/* if bounded pointers, we generate a special code to
|
|
|
|
test bounds */
|
|
|
|
if (op == '-') {
|
|
|
|
vpushi(0);
|
|
|
|
vswap();
|
|
|
|
gen_op('-');
|
|
|
|
}
|
|
|
|
gen_bounded_ptr_add();
|
|
|
|
} else
|
|
|
|
#endif
|
|
|
|
{
|
|
|
|
gen_opic(op);
|
|
|
|
}
|
|
|
|
/* put again type if gen_opic() swaped operands */
|
|
|
|
vtop->type = type1;
|
|
|
|
}
|
2020-01-18 04:36:29 +03:00
|
|
|
} else {
|
2009-05-05 22:18:10 +04:00
|
|
|
/* floats can only be used for a few operations */
|
2020-01-18 04:36:29 +03:00
|
|
|
if (is_float(combtype.t)
|
|
|
|
&& op != '+' && op != '-' && op != '*' && op != '/'
|
|
|
|
&& (op < TOK_ULT || op > TOK_LOR))
|
2011-08-11 19:07:56 +04:00
|
|
|
tcc_error("invalid operands for binary operation");
|
2020-01-18 04:36:29 +03:00
|
|
|
else if (op == TOK_SHR || op == TOK_SAR || op == TOK_SHL) {
|
|
|
|
t = bt1 == VT_LLONG ? VT_LLONG : VT_INT;
|
|
|
|
if ((t1 & (VT_BTYPE | VT_UNSIGNED | VT_BITFIELD)) == (t | VT_UNSIGNED))
|
|
|
|
t |= VT_UNSIGNED;
|
|
|
|
t |= (VT_LONG & t1);
|
|
|
|
combtype.t = t;
|
|
|
|
}
|
2009-05-05 22:18:10 +04:00
|
|
|
std_op:
|
2020-01-18 04:36:29 +03:00
|
|
|
t = t2 = combtype.t;
|
2009-05-05 22:18:10 +04:00
|
|
|
/* XXX: currently, some unsigned operations are explicit, so
|
|
|
|
we modify them here */
|
|
|
|
if (t & VT_UNSIGNED) {
|
|
|
|
if (op == TOK_SAR)
|
|
|
|
op = TOK_SHR;
|
|
|
|
else if (op == '/')
|
|
|
|
op = TOK_UDIV;
|
|
|
|
else if (op == '%')
|
|
|
|
op = TOK_UMOD;
|
|
|
|
else if (op == TOK_LT)
|
|
|
|
op = TOK_ULT;
|
|
|
|
else if (op == TOK_GT)
|
|
|
|
op = TOK_UGT;
|
|
|
|
else if (op == TOK_LE)
|
|
|
|
op = TOK_ULE;
|
|
|
|
else if (op == TOK_GE)
|
|
|
|
op = TOK_UGE;
|
|
|
|
}
|
|
|
|
vswap();
|
2020-01-18 04:36:29 +03:00
|
|
|
gen_cast_s(t);
|
2009-05-05 22:18:10 +04:00
|
|
|
vswap();
|
|
|
|
/* special case for shifts and long long: we keep the shift as
|
|
|
|
an integer */
|
|
|
|
if (op == TOK_SHR || op == TOK_SAR || op == TOK_SHL)
|
2020-01-18 04:36:29 +03:00
|
|
|
t2 = VT_INT;
|
|
|
|
gen_cast_s(t2);
|
2009-05-05 22:18:10 +04:00
|
|
|
if (is_float(t))
|
|
|
|
gen_opif(op);
|
|
|
|
else
|
|
|
|
gen_opic(op);
|
2020-01-18 04:36:29 +03:00
|
|
|
if (op >= TOK_ULT && op <= TOK_LOR) {
|
2017-05-08 07:38:09 +03:00
|
|
|
/* relational op: the result is an int */
|
2009-05-05 22:18:10 +04:00
|
|
|
vtop->type.t = VT_INT;
|
|
|
|
} else {
|
|
|
|
vtop->type.t = t;
|
|
|
|
}
|
|
|
|
}
|
2015-02-21 01:18:41 +03:00
|
|
|
// Make sure that we have converted to an rvalue:
|
2016-12-18 19:23:33 +03:00
|
|
|
if (vtop->r & VT_LVAL)
|
2015-02-21 01:18:41 +03:00
|
|
|
gv(is_float(vtop->type.t & VT_BTYPE) ? RC_FLOAT : RC_INT);
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
|
2019-12-16 20:44:35 +03:00
|
|
|
#if defined TCC_TARGET_ARM64 || defined TCC_TARGET_RISCV64 || defined TCC_TARGET_ARM
|
|
|
|
#define gen_cvt_itof1 gen_cvt_itof
|
|
|
|
#else
|
2009-05-05 22:18:10 +04:00
|
|
|
/* generic itof for unsigned long long case */
|
2009-12-20 03:53:49 +03:00
|
|
|
static void gen_cvt_itof1(int t)
|
2009-05-05 22:18:10 +04:00
|
|
|
{
|
2015-07-29 23:53:57 +03:00
|
|
|
if ((vtop->type.t & (VT_BTYPE | VT_UNSIGNED)) ==
|
2009-05-05 22:18:10 +04:00
|
|
|
(VT_LLONG | VT_UNSIGNED)) {
|
|
|
|
|
|
|
|
if (t == VT_FLOAT)
|
|
|
|
vpush_global_sym(&func_old_type, TOK___floatundisf);
|
|
|
|
#if LDOUBLE_SIZE != 8
|
|
|
|
else if (t == VT_LDOUBLE)
|
|
|
|
vpush_global_sym(&func_old_type, TOK___floatundixf);
|
|
|
|
#endif
|
|
|
|
else
|
|
|
|
vpush_global_sym(&func_old_type, TOK___floatundidf);
|
|
|
|
vrott(2);
|
|
|
|
gfunc_call(1);
|
|
|
|
vpushi(0);
|
2019-12-16 20:44:35 +03:00
|
|
|
PUT_R_RET(vtop, t);
|
2009-05-05 22:18:10 +04:00
|
|
|
} else {
|
|
|
|
gen_cvt_itof(t);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2019-12-16 20:44:35 +03:00
|
|
|
#if defined TCC_TARGET_ARM64 || defined TCC_TARGET_RISCV64
|
|
|
|
#define gen_cvt_ftoi1 gen_cvt_ftoi
|
|
|
|
#else
|
2009-05-05 22:18:10 +04:00
|
|
|
/* generic ftoi for unsigned long long case */
|
2009-12-20 03:53:49 +03:00
|
|
|
static void gen_cvt_ftoi1(int t)
|
2009-05-05 22:18:10 +04:00
|
|
|
{
|
|
|
|
int st;
|
|
|
|
if (t == (VT_LLONG | VT_UNSIGNED)) {
|
|
|
|
/* not handled natively */
|
|
|
|
st = vtop->type.t & VT_BTYPE;
|
|
|
|
if (st == VT_FLOAT)
|
|
|
|
vpush_global_sym(&func_old_type, TOK___fixunssfdi);
|
|
|
|
#if LDOUBLE_SIZE != 8
|
|
|
|
else if (st == VT_LDOUBLE)
|
|
|
|
vpush_global_sym(&func_old_type, TOK___fixunsxfdi);
|
|
|
|
#endif
|
|
|
|
else
|
|
|
|
vpush_global_sym(&func_old_type, TOK___fixunsdfdi);
|
|
|
|
vrott(2);
|
|
|
|
gfunc_call(1);
|
|
|
|
vpushi(0);
|
2019-12-16 20:44:35 +03:00
|
|
|
PUT_R_RET(vtop, t);
|
2009-05-05 22:18:10 +04:00
|
|
|
} else {
|
|
|
|
gen_cvt_ftoi(t);
|
|
|
|
}
|
|
|
|
}
|
2019-12-16 20:44:35 +03:00
|
|
|
#endif
|
2009-05-05 22:18:10 +04:00
|
|
|
|
2019-12-16 20:51:28 +03:00
|
|
|
/* special delayed cast for char/short */
|
|
|
|
static void force_charshort_cast(void)
|
2009-05-05 22:18:10 +04:00
|
|
|
{
|
2019-12-16 20:51:28 +03:00
|
|
|
int sbt = BFGET(vtop->r, VT_MUSTCAST) == 2 ? VT_LLONG : VT_INT;
|
|
|
|
int dbt = vtop->type.t;
|
|
|
|
vtop->r &= ~VT_MUSTCAST;
|
|
|
|
vtop->type.t = sbt;
|
|
|
|
gen_cast_s(dbt == VT_BOOL ? VT_BYTE|VT_UNSIGNED : dbt);
|
|
|
|
vtop->type.t = dbt;
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
|
2017-07-09 13:34:11 +03:00
|
|
|
static void gen_cast_s(int t)
|
|
|
|
{
|
|
|
|
CType type;
|
|
|
|
type.t = t;
|
|
|
|
type.ref = NULL;
|
|
|
|
gen_cast(&type);
|
|
|
|
}
|
|
|
|
|
2019-12-16 20:51:28 +03:00
|
|
|
/* cast 'vtop' to 'type'. Casting to bitfields is forbidden. */
|
2009-05-05 22:18:10 +04:00
|
|
|
static void gen_cast(CType *type)
|
|
|
|
{
|
2019-12-16 20:51:28 +03:00
|
|
|
int sbt, dbt, sf, df, c;
|
|
|
|
int dbt_bt, sbt_bt, ds, ss, bits, trunc;
|
2009-05-05 22:18:10 +04:00
|
|
|
|
|
|
|
/* special delayed cast for char/short */
|
2019-12-16 20:51:28 +03:00
|
|
|
if (vtop->r & VT_MUSTCAST)
|
|
|
|
force_charshort_cast();
|
2009-05-05 22:18:10 +04:00
|
|
|
|
|
|
|
/* bitfields first get cast to ints */
|
2019-12-16 20:51:28 +03:00
|
|
|
if (vtop->type.t & VT_BITFIELD)
|
2009-05-05 22:18:10 +04:00
|
|
|
gv(RC_INT);
|
|
|
|
|
|
|
|
dbt = type->t & (VT_BTYPE | VT_UNSIGNED);
|
|
|
|
sbt = vtop->type.t & (VT_BTYPE | VT_UNSIGNED);
|
2019-12-16 20:51:28 +03:00
|
|
|
if (sbt == VT_FUNC)
|
|
|
|
sbt = VT_PTR;
|
2009-05-05 22:18:10 +04:00
|
|
|
|
2019-12-16 20:51:28 +03:00
|
|
|
again:
|
2009-05-05 22:18:10 +04:00
|
|
|
if (sbt != dbt) {
|
|
|
|
sf = is_float(sbt);
|
|
|
|
df = is_float(dbt);
|
2019-12-16 20:51:28 +03:00
|
|
|
dbt_bt = dbt & VT_BTYPE;
|
|
|
|
sbt_bt = sbt & VT_BTYPE;
|
|
|
|
|
2009-05-05 22:18:10 +04:00
|
|
|
c = (vtop->r & (VT_VALMASK | VT_LVAL | VT_SYM)) == VT_CONST;
|
various stuff
win32/Makefile ("for cygwin") removed
- On cygwin, the normal ./configure && make can be used with either
cygwin's "GCC for Win32 Toolchain"
./configure --cross-prefix=i686-w64-mingw32-
or with an existing tcc:
./configure --cc=<old-tccdir>/tcc.exe
tcctest.c:
- exclude test_high_clobbers() on _WIN64 (does not work)
tests2/95_bitfield.c:
- use 'signed char' for ARM (where default 'char' is unsigned)
tests:
- remove -I "expr" diff option to allow tests with
busybox-diff.
libtcc.c, tcc.c:
- removed -iwithprefix option. It is supposed to be
combined with -iprefix which we don't have either.
tccgen.c:
- fix assignments and return of 'void', as in
void f() {
void *p, *q;
*p = *q:
return *p;
}
This appears to be allowed but should do nothing.
tcc.h, libtcc.c, tccpp.c:
- Revert "Introduce VIP sysinclude paths which are always searched first"
This reverts commit 1d5e386b0a78393ac6b670c209a185849ec798a1.
The patch was giving tcc's system includes priority over -I which
is not how it should be.
tccelf.c:
- add DT_TEXTREL tag only if text relocations are actually
used (which is likely not the case on x86_64)
- prepare_dynamic_rel(): avoid relocation of unresolved
(weak) symbols
tccrun.c:
- for HAVE_SELINUX, use two mappings to the same (real) file.
(it was so once except the RX mapping wasn't used at all).
tccpe.c:
- fix relocation constant used for x86_64 (by Andrei E. Warentin)
- #ifndef _WIN32 do "chmod 755 ..." to get runnable exes on cygwin.
tccasm.c:
- keep forward asm labels static, otherwise they will endup
in dynsym eventually.
configure, Makefile:
- mingw32: respect ./configure options --bindir --docdir --libdir
- allow overriding tcc when building libtcc1.a and libtcc.def with
make XTCC=<tcc program to use>
- use $(wildcard ...) for install to allow installing just
a cross compiler for example
make cross-arm
make install
- use name <target>-libtcc1.a
build-tcc.bat:
- add options: -clean, -b bindir
2017-10-11 19:13:43 +03:00
|
|
|
#if !defined TCC_IS_NATIVE && !defined TCC_IS_NATIVE_387
|
2019-07-18 05:51:52 +03:00
|
|
|
c &= (dbt != VT_LDOUBLE) | !!nocode_wanted;
|
various stuff
win32/Makefile ("for cygwin") removed
- On cygwin, the normal ./configure && make can be used with either
cygwin's "GCC for Win32 Toolchain"
./configure --cross-prefix=i686-w64-mingw32-
or with an existing tcc:
./configure --cc=<old-tccdir>/tcc.exe
tcctest.c:
- exclude test_high_clobbers() on _WIN64 (does not work)
tests2/95_bitfield.c:
- use 'signed char' for ARM (where default 'char' is unsigned)
tests:
- remove -I "expr" diff option to allow tests with
busybox-diff.
libtcc.c, tcc.c:
- removed -iwithprefix option. It is supposed to be
combined with -iprefix which we don't have either.
tccgen.c:
- fix assignments and return of 'void', as in
void f() {
void *p, *q;
*p = *q:
return *p;
}
This appears to be allowed but should do nothing.
tcc.h, libtcc.c, tccpp.c:
- Revert "Introduce VIP sysinclude paths which are always searched first"
This reverts commit 1d5e386b0a78393ac6b670c209a185849ec798a1.
The patch was giving tcc's system includes priority over -I which
is not how it should be.
tccelf.c:
- add DT_TEXTREL tag only if text relocations are actually
used (which is likely not the case on x86_64)
- prepare_dynamic_rel(): avoid relocation of unresolved
(weak) symbols
tccrun.c:
- for HAVE_SELINUX, use two mappings to the same (real) file.
(it was so once except the RX mapping wasn't used at all).
tccpe.c:
- fix relocation constant used for x86_64 (by Andrei E. Warentin)
- #ifndef _WIN32 do "chmod 755 ..." to get runnable exes on cygwin.
tccasm.c:
- keep forward asm labels static, otherwise they will endup
in dynsym eventually.
configure, Makefile:
- mingw32: respect ./configure options --bindir --docdir --libdir
- allow overriding tcc when building libtcc1.a and libtcc.def with
make XTCC=<tcc program to use>
- use $(wildcard ...) for install to allow installing just
a cross compiler for example
make cross-arm
make install
- use name <target>-libtcc1.a
build-tcc.bat:
- add options: -clean, -b bindir
2017-10-11 19:13:43 +03:00
|
|
|
#endif
|
2009-05-05 22:18:10 +04:00
|
|
|
if (c) {
|
|
|
|
/* constant case: we can do it now */
|
|
|
|
/* XXX: in ISOC, cannot do it if error in convert */
|
|
|
|
if (sbt == VT_FLOAT)
|
|
|
|
vtop->c.ld = vtop->c.f;
|
|
|
|
else if (sbt == VT_DOUBLE)
|
|
|
|
vtop->c.ld = vtop->c.d;
|
|
|
|
|
|
|
|
if (df) {
|
2019-12-16 20:51:28 +03:00
|
|
|
if (sbt_bt == VT_LLONG) {
|
2015-11-17 22:09:35 +03:00
|
|
|
if ((sbt & VT_UNSIGNED) || !(vtop->c.i >> 63))
|
|
|
|
vtop->c.ld = vtop->c.i;
|
2009-05-05 22:18:10 +04:00
|
|
|
else
|
2015-11-17 22:09:35 +03:00
|
|
|
vtop->c.ld = -(long double)-vtop->c.i;
|
2009-05-05 22:18:10 +04:00
|
|
|
} else if(!sf) {
|
2015-11-17 22:09:35 +03:00
|
|
|
if ((sbt & VT_UNSIGNED) || !(vtop->c.i >> 31))
|
|
|
|
vtop->c.ld = (uint32_t)vtop->c.i;
|
2009-05-05 22:18:10 +04:00
|
|
|
else
|
2015-11-17 22:09:35 +03:00
|
|
|
vtop->c.ld = -(long double)-(uint32_t)vtop->c.i;
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
if (dbt == VT_FLOAT)
|
|
|
|
vtop->c.f = (float)vtop->c.ld;
|
|
|
|
else if (dbt == VT_DOUBLE)
|
|
|
|
vtop->c.d = (double)vtop->c.ld;
|
|
|
|
} else if (sf && dbt == VT_BOOL) {
|
|
|
|
vtop->c.i = (vtop->c.ld != 0);
|
|
|
|
} else {
|
|
|
|
if(sf)
|
2015-11-17 22:09:35 +03:00
|
|
|
vtop->c.i = vtop->c.ld;
|
2019-12-16 20:51:28 +03:00
|
|
|
else if (sbt_bt == VT_LLONG || (PTR_SIZE == 8 && sbt == VT_PTR))
|
2015-11-17 22:09:35 +03:00
|
|
|
;
|
2009-05-05 22:18:10 +04:00
|
|
|
else if (sbt & VT_UNSIGNED)
|
2015-11-17 22:09:35 +03:00
|
|
|
vtop->c.i = (uint32_t)vtop->c.i;
|
2019-12-16 20:51:28 +03:00
|
|
|
else
|
|
|
|
vtop->c.i = ((uint32_t)vtop->c.i | -(vtop->c.i & 0x80000000));
|
2009-05-05 22:18:10 +04:00
|
|
|
|
2019-12-16 20:51:28 +03:00
|
|
|
if (dbt_bt == VT_LLONG || (PTR_SIZE == 8 && dbt == VT_PTR))
|
2015-11-17 22:09:35 +03:00
|
|
|
;
|
2009-05-05 22:18:10 +04:00
|
|
|
else if (dbt == VT_BOOL)
|
2015-11-17 22:09:35 +03:00
|
|
|
vtop->c.i = (vtop->c.i != 0);
|
2019-12-16 20:51:28 +03:00
|
|
|
else {
|
|
|
|
uint32_t m = dbt_bt == VT_BYTE ? 0xff :
|
|
|
|
dbt_bt == VT_SHORT ? 0xffff :
|
|
|
|
0xffffffff;
|
2015-11-17 22:09:35 +03:00
|
|
|
vtop->c.i &= m;
|
|
|
|
if (!(dbt & VT_UNSIGNED))
|
|
|
|
vtop->c.i |= -(vtop->c.i & ((m >> 1) + 1));
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
}
|
2019-12-16 20:51:28 +03:00
|
|
|
goto done;
|
|
|
|
|
|
|
|
} else if (dbt == VT_BOOL
|
|
|
|
&& (vtop->r & (VT_VALMASK | VT_LVAL | VT_SYM))
|
|
|
|
== (VT_CONST | VT_SYM)) {
|
|
|
|
/* addresses are considered non-zero (see tcctest.c:sinit23) */
|
2009-05-05 22:18:10 +04:00
|
|
|
vtop->r = VT_CONST;
|
|
|
|
vtop->c.i = 1;
|
2019-12-16 20:51:28 +03:00
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* cannot generate code for global or static initializers */
|
|
|
|
if (STATIC_DATA_WANTED)
|
|
|
|
goto done;
|
|
|
|
|
|
|
|
/* non constant case: generate code */
|
|
|
|
if (dbt == VT_BOOL) {
|
|
|
|
gen_test_zero(TOK_NE);
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (sf || df) {
|
2009-05-05 22:18:10 +04:00
|
|
|
if (sf && df) {
|
|
|
|
/* convert from fp to fp */
|
|
|
|
gen_cvt_ftof(dbt);
|
|
|
|
} else if (df) {
|
|
|
|
/* convert int to fp */
|
|
|
|
gen_cvt_itof1(dbt);
|
2019-12-16 20:51:28 +03:00
|
|
|
} else {
|
2009-05-05 22:18:10 +04:00
|
|
|
/* convert fp to int */
|
2019-12-16 20:51:28 +03:00
|
|
|
sbt = dbt;
|
|
|
|
if (dbt_bt != VT_LLONG && dbt_bt != VT_INT)
|
|
|
|
sbt = VT_INT;
|
|
|
|
gen_cvt_ftoi1(sbt);
|
|
|
|
goto again; /* may need char/short cast */
|
|
|
|
}
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
|
|
|
ds = btype_size(dbt_bt);
|
|
|
|
ss = btype_size(sbt_bt);
|
|
|
|
if (ds == 0 || ss == 0) {
|
|
|
|
if (dbt_bt == VT_VOID)
|
|
|
|
goto done;
|
|
|
|
cast_error(&vtop->type, type);
|
|
|
|
}
|
|
|
|
if (IS_ENUM(type->t) && type->ref->c < 0)
|
|
|
|
tcc_error("cast to incomplete type");
|
|
|
|
|
|
|
|
/* same size and no sign conversion needed */
|
|
|
|
if (ds == ss && ds >= 4)
|
|
|
|
goto done;
|
|
|
|
if (dbt_bt == VT_PTR || sbt_bt == VT_PTR) {
|
|
|
|
tcc_warning("cast between pointer and integer of different size");
|
|
|
|
if (sbt_bt == VT_PTR) {
|
|
|
|
/* put integer type to allow logical operations below */
|
|
|
|
vtop->type.t = (PTR_SIZE == 8 ? VT_LLONG : VT_INT);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* processor allows { int a = 0, b = *(char*)&a; }
|
|
|
|
That means that if we cast to less width, we can just
|
|
|
|
change the type and read it still later. */
|
|
|
|
#define ALLOW_SUBTYPE_ACCESS 1
|
|
|
|
|
|
|
|
if (ALLOW_SUBTYPE_ACCESS && (vtop->r & VT_LVAL)) {
|
|
|
|
/* value still in memory */
|
|
|
|
if (ds <= ss)
|
|
|
|
goto done;
|
|
|
|
/* ss <= 4 here */
|
|
|
|
if (ds <= 4) {
|
|
|
|
gv(RC_INT);
|
|
|
|
goto done; /* no 64bit envolved */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
gv(RC_INT);
|
|
|
|
|
|
|
|
trunc = 0;
|
2017-05-13 09:59:06 +03:00
|
|
|
#if PTR_SIZE == 4
|
2019-12-16 20:51:28 +03:00
|
|
|
if (ds == 8) {
|
|
|
|
/* generate high word */
|
|
|
|
if (sbt & VT_UNSIGNED) {
|
2009-05-05 22:18:10 +04:00
|
|
|
vpushi(0);
|
2019-12-16 20:51:28 +03:00
|
|
|
gv(RC_INT);
|
|
|
|
} else {
|
|
|
|
gv_dup();
|
|
|
|
vpushi(31);
|
|
|
|
gen_op(TOK_SAR);
|
|
|
|
}
|
|
|
|
lbuild(dbt);
|
|
|
|
} else if (ss == 8) {
|
|
|
|
/* from long long: just take low order word */
|
|
|
|
lexpand();
|
|
|
|
vpop();
|
|
|
|
}
|
|
|
|
ss = 4;
|
|
|
|
|
|
|
|
#elif PTR_SIZE == 8
|
|
|
|
if (ds == 8) {
|
|
|
|
/* need to convert from 32bit to 64bit */
|
|
|
|
if (sbt & VT_UNSIGNED) {
|
|
|
|
#if defined(TCC_TARGET_RISCV64)
|
|
|
|
/* RISC-V keeps 32bit vals in registers sign-extended.
|
|
|
|
So here we need a zero-extension. */
|
|
|
|
trunc = 32;
|
2018-03-31 22:52:20 +03:00
|
|
|
#else
|
2019-12-16 20:51:28 +03:00
|
|
|
goto done;
|
2018-03-31 22:52:20 +03:00
|
|
|
#endif
|
2019-12-16 20:51:28 +03:00
|
|
|
} else {
|
|
|
|
gen_cvt_sxtw();
|
|
|
|
goto done;
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
2019-12-16 20:51:28 +03:00
|
|
|
ss = ds, ds = 4, dbt = sbt;
|
|
|
|
} else if (ss == 8) {
|
|
|
|
/* XXX some architectures (e.g. risc-v) would like it
|
|
|
|
better for this merely being a 32-to-64 sign or zero-
|
|
|
|
extension. */
|
|
|
|
trunc = 32; /* zero upper 32 bits */
|
|
|
|
} else {
|
|
|
|
ss = 4;
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
2019-12-16 20:51:28 +03:00
|
|
|
#endif
|
|
|
|
|
|
|
|
if (ds >= ss)
|
|
|
|
goto done;
|
|
|
|
#if defined TCC_TARGET_I386 || defined TCC_TARGET_X86_64 || defined TCC_TARGET_ARM64
|
|
|
|
if (ss == 4) {
|
|
|
|
gen_cvt_csti(dbt);
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
bits = (ss - ds) * 8;
|
|
|
|
/* for unsigned, gen_op will convert SAR to SHR */
|
|
|
|
vtop->type.t = (ss == 8 ? VT_LLONG : VT_INT) | (dbt & VT_UNSIGNED);
|
|
|
|
vpushi(bits);
|
|
|
|
gen_op(TOK_SHL);
|
|
|
|
vpushi(bits - trunc);
|
|
|
|
gen_op(TOK_SAR);
|
|
|
|
vpushi(trunc);
|
|
|
|
gen_op(TOK_SHR);
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
2019-12-16 20:51:28 +03:00
|
|
|
done:
|
2009-05-05 22:18:10 +04:00
|
|
|
vtop->type = *type;
|
2018-11-20 21:24:24 +03:00
|
|
|
vtop->type.t &= ~ ( VT_CONSTANT | VT_VOLATILE | VT_ARRAY );
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
|
2011-04-06 20:17:03 +04:00
|
|
|
/* return type size as known at compile time. Put alignment at 'a' */
|
2009-12-20 03:53:49 +03:00
|
|
|
ST_FUNC int type_size(CType *type, int *a)
|
2009-05-05 22:18:10 +04:00
|
|
|
{
|
|
|
|
Sym *s;
|
|
|
|
int bt;
|
|
|
|
|
|
|
|
bt = type->t & VT_BTYPE;
|
|
|
|
if (bt == VT_STRUCT) {
|
|
|
|
/* struct/union */
|
|
|
|
s = type->ref;
|
2011-03-19 03:47:35 +03:00
|
|
|
*a = s->r;
|
2009-05-05 22:18:10 +04:00
|
|
|
return s->c;
|
|
|
|
} else if (bt == VT_PTR) {
|
2011-04-08 12:09:39 +04:00
|
|
|
if (type->t & VT_ARRAY) {
|
2009-05-05 22:18:10 +04:00
|
|
|
int ts;
|
|
|
|
|
|
|
|
s = type->ref;
|
|
|
|
ts = type_size(&s->type, a);
|
|
|
|
|
|
|
|
if (ts < 0 && s->c < 0)
|
|
|
|
ts = -ts;
|
|
|
|
|
|
|
|
return ts * s->c;
|
|
|
|
} else {
|
|
|
|
*a = PTR_SIZE;
|
|
|
|
return PTR_SIZE;
|
|
|
|
}
|
2019-04-07 04:15:05 +03:00
|
|
|
} else if (IS_ENUM(type->t) && type->ref->c < 0) {
|
2017-07-09 13:38:25 +03:00
|
|
|
return -1; /* incomplete enum */
|
2009-05-05 22:18:10 +04:00
|
|
|
} else if (bt == VT_LDOUBLE) {
|
|
|
|
*a = LDOUBLE_ALIGN;
|
|
|
|
return LDOUBLE_SIZE;
|
|
|
|
} else if (bt == VT_DOUBLE || bt == VT_LLONG) {
|
|
|
|
#ifdef TCC_TARGET_I386
|
|
|
|
#ifdef TCC_TARGET_PE
|
|
|
|
*a = 8;
|
|
|
|
#else
|
|
|
|
*a = 4;
|
|
|
|
#endif
|
|
|
|
#elif defined(TCC_TARGET_ARM)
|
|
|
|
#ifdef TCC_ARM_EABI
|
2015-07-29 23:53:57 +03:00
|
|
|
*a = 8;
|
2009-05-05 22:18:10 +04:00
|
|
|
#else
|
|
|
|
*a = 4;
|
|
|
|
#endif
|
|
|
|
#else
|
|
|
|
*a = 8;
|
|
|
|
#endif
|
|
|
|
return 8;
|
2016-03-24 17:44:01 +03:00
|
|
|
} else if (bt == VT_INT || bt == VT_FLOAT) {
|
2009-05-05 22:18:10 +04:00
|
|
|
*a = 4;
|
|
|
|
return 4;
|
|
|
|
} else if (bt == VT_SHORT) {
|
|
|
|
*a = 2;
|
|
|
|
return 2;
|
2013-04-19 14:08:12 +04:00
|
|
|
} else if (bt == VT_QLONG || bt == VT_QFLOAT) {
|
|
|
|
*a = 8;
|
|
|
|
return 16;
|
2009-05-05 22:18:10 +04:00
|
|
|
} else {
|
|
|
|
/* char, void, function, _Bool */
|
|
|
|
*a = 1;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-04-06 20:17:03 +04:00
|
|
|
/* push type size as known at runtime time on top of value stack. Put
|
|
|
|
alignment at 'a' */
|
|
|
|
ST_FUNC void vla_runtime_type_size(CType *type, int *a)
|
|
|
|
{
|
|
|
|
if (type->t & VT_VLA) {
|
2016-10-09 01:13:31 +03:00
|
|
|
type_size(&type->ref->type, a);
|
2011-04-10 09:52:25 +04:00
|
|
|
vset(&int_type, VT_LOCAL|VT_LVAL, type->ref->c);
|
2011-04-06 20:17:03 +04:00
|
|
|
} else {
|
2011-04-10 09:52:25 +04:00
|
|
|
vpushi(type_size(type, a));
|
2011-04-06 20:17:03 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-05-05 22:18:10 +04:00
|
|
|
/* return the pointed type of t */
|
|
|
|
static inline CType *pointed_type(CType *type)
|
|
|
|
{
|
|
|
|
return &type->ref->type;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* modify type so that its it is a pointer to type. */
|
2009-12-20 03:53:49 +03:00
|
|
|
ST_FUNC void mk_pointer(CType *type)
|
2009-05-05 22:18:10 +04:00
|
|
|
{
|
|
|
|
Sym *s;
|
|
|
|
s = sym_push(SYM_FIELD, type, 0, -1);
|
2017-07-09 13:38:25 +03:00
|
|
|
type->t = VT_PTR | (type->t & VT_STORAGE);
|
2009-05-05 22:18:10 +04:00
|
|
|
type->ref = s;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* return true if type1 and type2 are exactly the same (including
|
2015-07-29 23:53:57 +03:00
|
|
|
qualifiers).
|
2009-05-05 22:18:10 +04:00
|
|
|
*/
|
|
|
|
static int is_compatible_types(CType *type1, CType *type2)
|
|
|
|
{
|
|
|
|
return compare_types(type1,type2,0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* return true if type1 and type2 are the same (ignoring qualifiers).
|
|
|
|
*/
|
2017-07-09 13:38:25 +03:00
|
|
|
static int is_compatible_unqualified_types(CType *type1, CType *type2)
|
2009-05-05 22:18:10 +04:00
|
|
|
{
|
|
|
|
return compare_types(type1,type2,1);
|
|
|
|
}
|
|
|
|
|
2020-02-17 20:25:43 +03:00
|
|
|
static void cast_error(CType *st, CType *dt)
|
|
|
|
{
|
|
|
|
type_incompatibility_error(st, dt, "cannot convert '%s' to '%s'");
|
2019-12-16 20:51:28 +03:00
|
|
|
}
|
|
|
|
|
2019-12-16 20:44:35 +03:00
|
|
|
/* verify type compatibility to store vtop in 'dt' type */
|
|
|
|
static void verify_assign_cast(CType *dt)
|
2009-05-05 22:18:10 +04:00
|
|
|
{
|
2017-09-24 19:57:48 +03:00
|
|
|
CType *st, *type1, *type2;
|
2018-06-01 00:52:07 +03:00
|
|
|
int dbt, sbt, qualwarn, lvl;
|
2009-05-05 22:18:10 +04:00
|
|
|
|
|
|
|
st = &vtop->type; /* source type */
|
|
|
|
dbt = dt->t & VT_BTYPE;
|
|
|
|
sbt = st->t & VT_BTYPE;
|
|
|
|
if (dt->t & VT_CONSTANT)
|
2011-08-11 19:07:56 +04:00
|
|
|
tcc_warning("assignment of read-only location");
|
2009-05-05 22:18:10 +04:00
|
|
|
switch(dbt) {
|
2019-12-16 20:51:28 +03:00
|
|
|
case VT_VOID:
|
|
|
|
if (sbt != dbt)
|
|
|
|
tcc_error("assignment to void expression");
|
|
|
|
break;
|
2009-05-05 22:18:10 +04:00
|
|
|
case VT_PTR:
|
|
|
|
/* special cases for pointers */
|
|
|
|
/* '0' can also be a pointer */
|
|
|
|
if (is_null_pointer(vtop))
|
2018-06-01 00:52:07 +03:00
|
|
|
break;
|
2009-05-05 22:18:10 +04:00
|
|
|
/* accept implicit pointer to integer cast with warning */
|
|
|
|
if (is_integer_btype(sbt)) {
|
2011-08-11 19:07:56 +04:00
|
|
|
tcc_warning("assignment makes pointer from integer without a cast");
|
2018-06-01 00:52:07 +03:00
|
|
|
break;
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
type1 = pointed_type(dt);
|
2018-06-01 00:52:07 +03:00
|
|
|
if (sbt == VT_PTR)
|
|
|
|
type2 = pointed_type(st);
|
|
|
|
else if (sbt == VT_FUNC)
|
|
|
|
type2 = st; /* a function is implicitly a function pointer */
|
|
|
|
else
|
2009-05-05 22:18:10 +04:00
|
|
|
goto error;
|
2018-06-01 00:52:07 +03:00
|
|
|
if (is_compatible_types(type1, type2))
|
|
|
|
break;
|
|
|
|
for (qualwarn = lvl = 0;; ++lvl) {
|
|
|
|
if (((type2->t & VT_CONSTANT) && !(type1->t & VT_CONSTANT)) ||
|
|
|
|
((type2->t & VT_VOLATILE) && !(type1->t & VT_VOLATILE)))
|
|
|
|
qualwarn = 1;
|
|
|
|
dbt = type1->t & (VT_BTYPE|VT_LONG);
|
|
|
|
sbt = type2->t & (VT_BTYPE|VT_LONG);
|
|
|
|
if (dbt != VT_PTR || sbt != VT_PTR)
|
|
|
|
break;
|
|
|
|
type1 = pointed_type(type1);
|
|
|
|
type2 = pointed_type(type2);
|
|
|
|
}
|
|
|
|
if (!is_compatible_unqualified_types(type1, type2)) {
|
|
|
|
if ((dbt == VT_VOID || sbt == VT_VOID) && lvl == 0) {
|
|
|
|
/* void * can match anything */
|
|
|
|
} else if (dbt == sbt
|
|
|
|
&& is_integer_btype(sbt & VT_BTYPE)
|
|
|
|
&& IS_ENUM(type1->t) + IS_ENUM(type2->t)
|
|
|
|
+ !!((type1->t ^ type2->t) & VT_UNSIGNED) < 2) {
|
2016-08-07 03:15:34 +03:00
|
|
|
/* Like GCC don't warn by default for merely changes
|
|
|
|
in pointer target signedness. Do warn for different
|
|
|
|
base types, though, in particular for unsigned enums
|
|
|
|
and signed int targets. */
|
2018-06-01 00:52:07 +03:00
|
|
|
} else {
|
|
|
|
tcc_warning("assignment from incompatible pointer type");
|
|
|
|
break;
|
|
|
|
}
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
2018-06-01 00:52:07 +03:00
|
|
|
if (qualwarn)
|
2011-08-11 19:07:56 +04:00
|
|
|
tcc_warning("assignment discards qualifiers from pointer target type");
|
2009-05-05 22:18:10 +04:00
|
|
|
break;
|
|
|
|
case VT_BYTE:
|
|
|
|
case VT_SHORT:
|
|
|
|
case VT_INT:
|
|
|
|
case VT_LLONG:
|
|
|
|
if (sbt == VT_PTR || sbt == VT_FUNC) {
|
2011-08-11 19:07:56 +04:00
|
|
|
tcc_warning("assignment makes integer from pointer without a cast");
|
2016-05-25 19:52:08 +03:00
|
|
|
} else if (sbt == VT_STRUCT) {
|
|
|
|
goto case_VT_STRUCT;
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
/* XXX: more tests */
|
|
|
|
break;
|
|
|
|
case VT_STRUCT:
|
2016-05-25 19:52:08 +03:00
|
|
|
case_VT_STRUCT:
|
2017-09-24 19:57:48 +03:00
|
|
|
if (!is_compatible_unqualified_types(dt, st)) {
|
2019-12-16 20:51:28 +03:00
|
|
|
error:
|
|
|
|
cast_error(st, dt);
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
2019-12-16 20:44:35 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static void gen_assign_cast(CType *dt)
|
|
|
|
{
|
|
|
|
verify_assign_cast(dt);
|
2009-05-05 22:18:10 +04:00
|
|
|
gen_cast(dt);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* store vtop in lvalue pushed on stack */
|
2009-12-20 03:53:49 +03:00
|
|
|
ST_FUNC void vstore(void)
|
2009-05-05 22:18:10 +04:00
|
|
|
{
|
2019-12-16 20:44:35 +03:00
|
|
|
int sbt, dbt, ft, r, size, align, bit_size, bit_pos, delayed_cast;
|
2009-05-05 22:18:10 +04:00
|
|
|
|
|
|
|
ft = vtop[-1].type.t;
|
|
|
|
sbt = vtop->type.t & VT_BTYPE;
|
|
|
|
dbt = ft & VT_BTYPE;
|
2019-12-16 20:44:35 +03:00
|
|
|
|
|
|
|
verify_assign_cast(&vtop[-1].type);
|
2009-05-05 22:18:10 +04:00
|
|
|
|
|
|
|
if (sbt == VT_STRUCT) {
|
|
|
|
/* if structure, only generate pointer */
|
|
|
|
/* structure assignment : generate memcpy */
|
|
|
|
/* XXX: optimize if small size */
|
|
|
|
size = type_size(&vtop->type, &align);
|
|
|
|
|
2009-11-30 21:33:44 +03:00
|
|
|
/* destination */
|
|
|
|
vswap();
|
2020-01-18 00:58:39 +03:00
|
|
|
#ifdef CONFIG_TCC_BCHECK
|
|
|
|
if (vtop->r & VT_MUSTBOUND)
|
|
|
|
gbound(); /* check would be wrong after gaddrof() */
|
|
|
|
#endif
|
2009-11-30 21:33:44 +03:00
|
|
|
vtop->type.t = VT_PTR;
|
|
|
|
gaddrof();
|
|
|
|
|
|
|
|
/* address of memcpy() */
|
2009-05-05 22:18:10 +04:00
|
|
|
#ifdef TCC_ARM_EABI
|
|
|
|
if(!(align & 7))
|
|
|
|
vpush_global_sym(&func_old_type, TOK_memcpy8);
|
|
|
|
else if(!(align & 3))
|
|
|
|
vpush_global_sym(&func_old_type, TOK_memcpy4);
|
|
|
|
else
|
|
|
|
#endif
|
2015-11-04 23:23:17 +03:00
|
|
|
/* Use memmove, rather than memcpy, as dest and src may be same: */
|
|
|
|
vpush_global_sym(&func_old_type, TOK_memmove);
|
2009-05-05 22:18:10 +04:00
|
|
|
|
2009-11-30 21:33:44 +03:00
|
|
|
vswap();
|
2009-05-05 22:18:10 +04:00
|
|
|
/* source */
|
|
|
|
vpushv(vtop - 2);
|
2020-01-18 00:58:39 +03:00
|
|
|
#ifdef CONFIG_TCC_BCHECK
|
|
|
|
if (vtop->r & VT_MUSTBOUND)
|
|
|
|
gbound();
|
|
|
|
#endif
|
2009-05-05 22:18:10 +04:00
|
|
|
vtop->type.t = VT_PTR;
|
|
|
|
gaddrof();
|
|
|
|
/* type size */
|
|
|
|
vpushi(size);
|
|
|
|
gfunc_call(3);
|
|
|
|
/* leave source on stack */
|
2019-12-16 20:44:35 +03:00
|
|
|
|
2009-05-05 22:18:10 +04:00
|
|
|
} else if (ft & VT_BITFIELD) {
|
|
|
|
/* bitfield store handling */
|
2014-09-23 14:30:08 +04:00
|
|
|
|
|
|
|
/* save lvalue as expression result (example: s.b = s.a = n;) */
|
|
|
|
vdup(), vtop[-1] = vtop[-2];
|
|
|
|
|
2017-07-09 13:38:59 +03:00
|
|
|
bit_pos = BIT_POS(ft);
|
|
|
|
bit_size = BIT_SIZE(ft);
|
2009-05-05 22:18:10 +04:00
|
|
|
/* remove bit field info to avoid loops */
|
2017-07-09 13:38:59 +03:00
|
|
|
vtop[-1].type.t = ft & ~VT_STRUCT_MASK;
|
2009-05-05 22:18:10 +04:00
|
|
|
|
2019-12-16 20:44:35 +03:00
|
|
|
if (dbt == VT_BOOL) {
|
2009-05-05 22:18:10 +04:00
|
|
|
gen_cast(&vtop[-1].type);
|
|
|
|
vtop[-1].type.t = (vtop[-1].type.t & ~VT_BTYPE) | (VT_BYTE | VT_UNSIGNED);
|
|
|
|
}
|
2017-07-09 13:38:59 +03:00
|
|
|
r = adjust_bf(vtop - 1, bit_pos, bit_size);
|
2019-12-16 20:44:35 +03:00
|
|
|
if (dbt != VT_BOOL) {
|
|
|
|
gen_cast(&vtop[-1].type);
|
|
|
|
dbt = vtop[-1].type.t & VT_BTYPE;
|
|
|
|
}
|
2017-07-09 13:38:59 +03:00
|
|
|
if (r == VT_STRUCT) {
|
|
|
|
store_packed_bf(bit_pos, bit_size);
|
|
|
|
} else {
|
|
|
|
unsigned long long mask = (1ULL << bit_size) - 1;
|
2019-12-16 20:44:35 +03:00
|
|
|
if (dbt != VT_BOOL) {
|
2017-07-09 13:38:59 +03:00
|
|
|
/* mask source */
|
2019-12-16 20:44:35 +03:00
|
|
|
if (dbt == VT_LLONG)
|
2017-07-09 13:38:59 +03:00
|
|
|
vpushll(mask);
|
|
|
|
else
|
|
|
|
vpushi((unsigned)mask);
|
|
|
|
gen_op('&');
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
2017-07-09 13:38:59 +03:00
|
|
|
/* shift source */
|
|
|
|
vpushi(bit_pos);
|
|
|
|
gen_op(TOK_SHL);
|
|
|
|
vswap();
|
|
|
|
/* duplicate destination */
|
|
|
|
vdup();
|
|
|
|
vrott(3);
|
|
|
|
/* load destination, mask and or with source */
|
2019-12-16 20:44:35 +03:00
|
|
|
if (dbt == VT_LLONG)
|
2017-07-09 13:38:59 +03:00
|
|
|
vpushll(~(mask << bit_pos));
|
|
|
|
else
|
|
|
|
vpushi(~((unsigned)mask << bit_pos));
|
2009-05-05 22:18:10 +04:00
|
|
|
gen_op('&');
|
2017-07-09 13:38:59 +03:00
|
|
|
gen_op('|');
|
|
|
|
/* store result */
|
|
|
|
vstore();
|
|
|
|
/* ... and discard */
|
|
|
|
vpop();
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
various stuff
win32/Makefile ("for cygwin") removed
- On cygwin, the normal ./configure && make can be used with either
cygwin's "GCC for Win32 Toolchain"
./configure --cross-prefix=i686-w64-mingw32-
or with an existing tcc:
./configure --cc=<old-tccdir>/tcc.exe
tcctest.c:
- exclude test_high_clobbers() on _WIN64 (does not work)
tests2/95_bitfield.c:
- use 'signed char' for ARM (where default 'char' is unsigned)
tests:
- remove -I "expr" diff option to allow tests with
busybox-diff.
libtcc.c, tcc.c:
- removed -iwithprefix option. It is supposed to be
combined with -iprefix which we don't have either.
tccgen.c:
- fix assignments and return of 'void', as in
void f() {
void *p, *q;
*p = *q:
return *p;
}
This appears to be allowed but should do nothing.
tcc.h, libtcc.c, tccpp.c:
- Revert "Introduce VIP sysinclude paths which are always searched first"
This reverts commit 1d5e386b0a78393ac6b670c209a185849ec798a1.
The patch was giving tcc's system includes priority over -I which
is not how it should be.
tccelf.c:
- add DT_TEXTREL tag only if text relocations are actually
used (which is likely not the case on x86_64)
- prepare_dynamic_rel(): avoid relocation of unresolved
(weak) symbols
tccrun.c:
- for HAVE_SELINUX, use two mappings to the same (real) file.
(it was so once except the RX mapping wasn't used at all).
tccpe.c:
- fix relocation constant used for x86_64 (by Andrei E. Warentin)
- #ifndef _WIN32 do "chmod 755 ..." to get runnable exes on cygwin.
tccasm.c:
- keep forward asm labels static, otherwise they will endup
in dynsym eventually.
configure, Makefile:
- mingw32: respect ./configure options --bindir --docdir --libdir
- allow overriding tcc when building libtcc1.a and libtcc.def with
make XTCC=<tcc program to use>
- use $(wildcard ...) for install to allow installing just
a cross compiler for example
make cross-arm
make install
- use name <target>-libtcc1.a
build-tcc.bat:
- add options: -clean, -b bindir
2017-10-11 19:13:43 +03:00
|
|
|
} else if (dbt == VT_VOID) {
|
|
|
|
--vtop;
|
2009-05-05 22:18:10 +04:00
|
|
|
} else {
|
2019-12-16 20:44:35 +03:00
|
|
|
/* optimize char/short casts */
|
|
|
|
delayed_cast = 0;
|
|
|
|
if ((dbt == VT_BYTE || dbt == VT_SHORT)
|
|
|
|
&& is_integer_btype(sbt)
|
|
|
|
) {
|
|
|
|
if ((vtop->r & VT_MUSTCAST)
|
|
|
|
&& btype_size(dbt) > btype_size(sbt)
|
|
|
|
)
|
2019-12-16 20:51:28 +03:00
|
|
|
force_charshort_cast();
|
2019-12-16 20:44:35 +03:00
|
|
|
delayed_cast = 1;
|
|
|
|
} else {
|
|
|
|
gen_cast(&vtop[-1].type);
|
|
|
|
}
|
|
|
|
|
2009-05-05 22:18:10 +04:00
|
|
|
#ifdef CONFIG_TCC_BCHECK
|
2015-03-10 18:23:00 +03:00
|
|
|
/* bound check case */
|
|
|
|
if (vtop[-1].r & VT_MUSTBOUND) {
|
|
|
|
vswap();
|
|
|
|
gbound();
|
|
|
|
vswap();
|
|
|
|
}
|
2009-05-05 22:18:10 +04:00
|
|
|
#endif
|
2019-12-16 20:44:35 +03:00
|
|
|
gv(RC_TYPE(dbt)); /* generate value */
|
|
|
|
|
|
|
|
if (delayed_cast) {
|
2019-12-16 20:51:28 +03:00
|
|
|
vtop->r |= BFVAL(VT_MUSTCAST, (sbt == VT_LLONG) + 1);
|
2019-12-16 20:44:35 +03:00
|
|
|
//tcc_warning("deley cast %x -> %x", sbt, dbt);
|
|
|
|
vtop->type.t = ft & VT_TYPE;
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
2019-12-16 20:44:35 +03:00
|
|
|
|
2009-05-05 22:18:10 +04:00
|
|
|
/* if lvalue was saved on stack, must read it */
|
|
|
|
if ((vtop[-1].r & VT_VALMASK) == VT_LLOCAL) {
|
|
|
|
SValue sv;
|
2019-12-16 20:44:35 +03:00
|
|
|
r = get_reg(RC_INT);
|
2019-12-16 20:51:28 +03:00
|
|
|
sv.type.t = VT_PTRDIFF_T;
|
2009-05-05 22:18:10 +04:00
|
|
|
sv.r = VT_LOCAL | VT_LVAL;
|
2015-11-17 22:09:35 +03:00
|
|
|
sv.c.i = vtop[-1].c.i;
|
2019-12-16 20:44:35 +03:00
|
|
|
load(r, &sv);
|
|
|
|
vtop[-1].r = r | VT_LVAL;
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
2019-12-16 20:44:35 +03:00
|
|
|
|
|
|
|
r = vtop->r & VT_VALMASK;
|
|
|
|
/* two word case handling :
|
|
|
|
store second register at word + 4 (or +8 for x86-64) */
|
|
|
|
if (USING_TWO_WORDS(dbt)) {
|
2019-12-16 20:51:28 +03:00
|
|
|
int load_type = (dbt == VT_QFLOAT) ? VT_DOUBLE : VT_PTRDIFF_T;
|
2013-04-19 18:33:16 +04:00
|
|
|
vtop[-1].type.t = load_type;
|
|
|
|
store(r, vtop - 1);
|
2009-05-05 22:18:10 +04:00
|
|
|
vswap();
|
|
|
|
/* convert to int to increment easily */
|
2019-12-16 20:51:28 +03:00
|
|
|
vtop->type.t = VT_PTRDIFF_T;
|
2009-05-05 22:18:10 +04:00
|
|
|
gaddrof();
|
2019-12-16 20:44:35 +03:00
|
|
|
vpushs(PTR_SIZE);
|
2009-05-05 22:18:10 +04:00
|
|
|
gen_op('+');
|
|
|
|
vtop->r |= VT_LVAL;
|
|
|
|
vswap();
|
2013-04-19 18:33:16 +04:00
|
|
|
vtop[-1].type.t = load_type;
|
2009-05-05 22:18:10 +04:00
|
|
|
/* XXX: it works because r2 is spilled last ! */
|
|
|
|
store(vtop->r2, vtop - 1);
|
2013-04-19 18:33:16 +04:00
|
|
|
} else {
|
2019-12-16 20:44:35 +03:00
|
|
|
/* single word */
|
2013-04-19 18:33:16 +04:00
|
|
|
store(r, vtop - 1);
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
vswap();
|
|
|
|
vtop--; /* NOT vpop() because on x86 it would flush the fp stack */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* post defines POST/PRE add. c is the token ++ or -- */
|
2009-12-20 03:53:49 +03:00
|
|
|
ST_FUNC void inc(int post, int c)
|
2009-05-05 22:18:10 +04:00
|
|
|
{
|
|
|
|
test_lvalue();
|
|
|
|
vdup(); /* save lvalue */
|
|
|
|
if (post) {
|
2016-12-18 19:23:33 +03:00
|
|
|
gv_dup(); /* duplicate value */
|
2009-05-05 22:18:10 +04:00
|
|
|
vrotb(3);
|
|
|
|
vrotb(3);
|
|
|
|
}
|
|
|
|
/* add constant */
|
2015-07-29 23:53:57 +03:00
|
|
|
vpushi(c - TOK_MID);
|
2009-05-05 22:18:10 +04:00
|
|
|
gen_op('+');
|
|
|
|
vstore(); /* store value */
|
|
|
|
if (post)
|
|
|
|
vpop(); /* if post op, return saved value */
|
|
|
|
}
|
|
|
|
|
2016-07-11 17:42:18 +03:00
|
|
|
ST_FUNC void parse_mult_str (CString *astr, const char *msg)
|
2016-06-27 21:10:53 +03:00
|
|
|
{
|
|
|
|
/* read the string */
|
|
|
|
if (tok != TOK_STR)
|
|
|
|
expect(msg);
|
|
|
|
cstr_new(astr);
|
|
|
|
while (tok == TOK_STR) {
|
|
|
|
/* XXX: add \0 handling too ? */
|
|
|
|
cstr_cat(astr, tokc.str.data, -1);
|
|
|
|
next();
|
|
|
|
}
|
|
|
|
cstr_ccat(astr, '\0');
|
|
|
|
}
|
|
|
|
|
2016-10-09 03:41:34 +03:00
|
|
|
/* If I is >= 1 and a power of two, returns log2(i)+1.
|
|
|
|
If I is 0 returns 0. */
|
|
|
|
static int exact_log2p1(int i)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
if (!i)
|
|
|
|
return 0;
|
|
|
|
for (ret = 1; i >= 1 << 8; ret += 8)
|
|
|
|
i >>= 8;
|
|
|
|
if (i >= 1 << 4)
|
|
|
|
ret += 4, i >>= 4;
|
|
|
|
if (i >= 1 << 2)
|
|
|
|
ret += 2, i >>= 2;
|
|
|
|
if (i >= 1 << 1)
|
|
|
|
ret++;
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2017-07-09 13:34:11 +03:00
|
|
|
/* Parse __attribute__((...)) GNUC extension. */
|
2009-05-05 22:18:10 +04:00
|
|
|
static void parse_attribute(AttributeDef *ad)
|
|
|
|
{
|
|
|
|
int t, n;
|
2016-06-27 21:10:53 +03:00
|
|
|
CString astr;
|
2015-07-29 23:53:57 +03:00
|
|
|
|
2017-07-09 13:34:11 +03:00
|
|
|
redo:
|
|
|
|
if (tok != TOK_ATTRIBUTE1 && tok != TOK_ATTRIBUTE2)
|
|
|
|
return;
|
2009-05-05 22:18:10 +04:00
|
|
|
next();
|
|
|
|
skip('(');
|
|
|
|
skip('(');
|
|
|
|
while (tok != ')') {
|
|
|
|
if (tok < TOK_IDENT)
|
|
|
|
expect("attribute name");
|
|
|
|
t = tok;
|
|
|
|
next();
|
|
|
|
switch(t) {
|
2018-12-20 12:55:22 +03:00
|
|
|
case TOK_CLEANUP1:
|
|
|
|
case TOK_CLEANUP2:
|
|
|
|
{
|
|
|
|
Sym *s;
|
|
|
|
|
|
|
|
skip('(');
|
|
|
|
s = sym_find(tok);
|
|
|
|
if (!s) {
|
|
|
|
tcc_warning("implicit declaration of function '%s'",
|
|
|
|
get_tok_str(tok, &tokc));
|
2019-04-18 04:36:39 +03:00
|
|
|
s = external_global_sym(tok, &func_old_type);
|
2020-02-08 01:23:31 +03:00
|
|
|
}
|
2020-02-18 23:11:49 +03:00
|
|
|
else if ((s->type.t & VT_BTYPE) == VT_FUNC) {
|
2020-02-08 01:23:31 +03:00
|
|
|
ad->cleanup_func = s;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
tcc_error("'%s' is not declared as function", get_tok_str(tok, &tokc));
|
|
|
|
}
|
2018-12-20 12:55:22 +03:00
|
|
|
ad->cleanup_func = s;
|
|
|
|
next();
|
|
|
|
skip(')');
|
|
|
|
break;
|
|
|
|
}
|
2019-10-29 09:02:58 +03:00
|
|
|
case TOK_CONSTRUCTOR1:
|
|
|
|
case TOK_CONSTRUCTOR2:
|
2020-01-18 00:58:39 +03:00
|
|
|
ad->f.func_ctor = 1;
|
2019-10-29 09:02:58 +03:00
|
|
|
break;
|
|
|
|
case TOK_DESTRUCTOR1:
|
|
|
|
case TOK_DESTRUCTOR2:
|
2020-01-18 00:58:39 +03:00
|
|
|
ad->f.func_dtor = 1;
|
2019-10-29 09:02:58 +03:00
|
|
|
break;
|
2009-05-05 22:18:10 +04:00
|
|
|
case TOK_SECTION1:
|
|
|
|
case TOK_SECTION2:
|
|
|
|
skip('(');
|
2016-06-27 21:10:53 +03:00
|
|
|
parse_mult_str(&astr, "section name");
|
|
|
|
ad->section = find_section(tcc_state, (char *)astr.data);
|
2009-05-05 22:18:10 +04:00
|
|
|
skip(')');
|
2016-06-27 21:10:53 +03:00
|
|
|
cstr_free(&astr);
|
2009-05-05 22:18:10 +04:00
|
|
|
break;
|
2011-03-03 12:58:45 +03:00
|
|
|
case TOK_ALIAS1:
|
|
|
|
case TOK_ALIAS2:
|
|
|
|
skip('(');
|
2016-06-27 21:10:53 +03:00
|
|
|
parse_mult_str(&astr, "alias(\"target\")");
|
2011-03-03 12:58:45 +03:00
|
|
|
ad->alias_target = /* save string as token, for later */
|
2016-06-27 21:10:53 +03:00
|
|
|
tok_alloc((char*)astr.data, astr.size-1)->tok;
|
2011-03-03 12:58:45 +03:00
|
|
|
skip(')');
|
2016-06-27 21:10:53 +03:00
|
|
|
cstr_free(&astr);
|
2011-03-03 12:58:45 +03:00
|
|
|
break;
|
2015-07-29 23:53:57 +03:00
|
|
|
case TOK_VISIBILITY1:
|
|
|
|
case TOK_VISIBILITY2:
|
2014-04-14 04:53:11 +04:00
|
|
|
skip('(');
|
2016-06-27 21:10:53 +03:00
|
|
|
parse_mult_str(&astr,
|
|
|
|
"visibility(\"default|hidden|internal|protected\")");
|
|
|
|
if (!strcmp (astr.data, "default"))
|
2015-07-29 23:53:57 +03:00
|
|
|
ad->a.visibility = STV_DEFAULT;
|
2016-06-27 21:10:53 +03:00
|
|
|
else if (!strcmp (astr.data, "hidden"))
|
2015-07-29 23:53:57 +03:00
|
|
|
ad->a.visibility = STV_HIDDEN;
|
2016-06-27 21:10:53 +03:00
|
|
|
else if (!strcmp (astr.data, "internal"))
|
2015-07-29 23:53:57 +03:00
|
|
|
ad->a.visibility = STV_INTERNAL;
|
2016-06-27 21:10:53 +03:00
|
|
|
else if (!strcmp (astr.data, "protected"))
|
2015-07-29 23:53:57 +03:00
|
|
|
ad->a.visibility = STV_PROTECTED;
|
|
|
|
else
|
2014-04-14 04:53:11 +04:00
|
|
|
expect("visibility(\"default|hidden|internal|protected\")");
|
|
|
|
skip(')');
|
2016-06-27 21:10:53 +03:00
|
|
|
cstr_free(&astr);
|
2014-04-14 04:53:11 +04:00
|
|
|
break;
|
2009-05-05 22:18:10 +04:00
|
|
|
case TOK_ALIGNED1:
|
|
|
|
case TOK_ALIGNED2:
|
|
|
|
if (tok == '(') {
|
|
|
|
next();
|
|
|
|
n = expr_const();
|
2015-07-29 23:53:57 +03:00
|
|
|
if (n <= 0 || (n & (n - 1)) != 0)
|
2011-08-11 19:07:56 +04:00
|
|
|
tcc_error("alignment must be a positive power of two");
|
2009-05-05 22:18:10 +04:00
|
|
|
skip(')');
|
|
|
|
} else {
|
|
|
|
n = MAX_ALIGN;
|
|
|
|
}
|
2016-10-09 03:41:34 +03:00
|
|
|
ad->a.aligned = exact_log2p1(n);
|
|
|
|
if (n != 1 << (ad->a.aligned - 1))
|
|
|
|
tcc_error("alignment of %d is larger than implemented", n);
|
2009-05-05 22:18:10 +04:00
|
|
|
break;
|
|
|
|
case TOK_PACKED1:
|
|
|
|
case TOK_PACKED2:
|
2014-01-07 17:57:07 +04:00
|
|
|
ad->a.packed = 1;
|
2009-05-05 22:18:10 +04:00
|
|
|
break;
|
2010-02-27 19:37:59 +03:00
|
|
|
case TOK_WEAK1:
|
|
|
|
case TOK_WEAK2:
|
2014-01-07 17:57:07 +04:00
|
|
|
ad->a.weak = 1;
|
2010-02-27 19:37:59 +03:00
|
|
|
break;
|
2009-05-05 22:18:10 +04:00
|
|
|
case TOK_UNUSED1:
|
|
|
|
case TOK_UNUSED2:
|
|
|
|
/* currently, no need to handle it because tcc does not
|
|
|
|
track unused objects */
|
|
|
|
break;
|
|
|
|
case TOK_NORETURN1:
|
|
|
|
case TOK_NORETURN2:
|
2019-04-29 14:53:07 +03:00
|
|
|
ad->f.func_noreturn = 1;
|
2009-05-05 22:18:10 +04:00
|
|
|
break;
|
|
|
|
case TOK_CDECL1:
|
|
|
|
case TOK_CDECL2:
|
|
|
|
case TOK_CDECL3:
|
2017-07-09 13:34:11 +03:00
|
|
|
ad->f.func_call = FUNC_CDECL;
|
2009-05-05 22:18:10 +04:00
|
|
|
break;
|
|
|
|
case TOK_STDCALL1:
|
|
|
|
case TOK_STDCALL2:
|
|
|
|
case TOK_STDCALL3:
|
2017-07-09 13:34:11 +03:00
|
|
|
ad->f.func_call = FUNC_STDCALL;
|
2009-05-05 22:18:10 +04:00
|
|
|
break;
|
|
|
|
#ifdef TCC_TARGET_I386
|
|
|
|
case TOK_REGPARM1:
|
|
|
|
case TOK_REGPARM2:
|
|
|
|
skip('(');
|
|
|
|
n = expr_const();
|
2015-07-29 23:53:57 +03:00
|
|
|
if (n > 3)
|
2009-05-05 22:18:10 +04:00
|
|
|
n = 3;
|
|
|
|
else if (n < 0)
|
|
|
|
n = 0;
|
|
|
|
if (n > 0)
|
2017-07-09 13:34:11 +03:00
|
|
|
ad->f.func_call = FUNC_FASTCALL1 + n - 1;
|
2009-05-05 22:18:10 +04:00
|
|
|
skip(')');
|
|
|
|
break;
|
|
|
|
case TOK_FASTCALL1:
|
|
|
|
case TOK_FASTCALL2:
|
|
|
|
case TOK_FASTCALL3:
|
2017-07-09 13:34:11 +03:00
|
|
|
ad->f.func_call = FUNC_FASTCALLW;
|
2015-07-29 23:53:57 +03:00
|
|
|
break;
|
2009-05-05 22:18:10 +04:00
|
|
|
#endif
|
2010-01-27 00:56:22 +03:00
|
|
|
case TOK_MODE:
|
|
|
|
skip('(');
|
|
|
|
switch(tok) {
|
|
|
|
case TOK_MODE_DI:
|
2017-07-09 13:34:11 +03:00
|
|
|
ad->attr_mode = VT_LLONG + 1;
|
2010-01-27 00:56:22 +03:00
|
|
|
break;
|
2016-10-15 17:01:16 +03:00
|
|
|
case TOK_MODE_QI:
|
2017-07-09 13:34:11 +03:00
|
|
|
ad->attr_mode = VT_BYTE + 1;
|
2016-10-15 17:01:16 +03:00
|
|
|
break;
|
2010-01-27 00:56:22 +03:00
|
|
|
case TOK_MODE_HI:
|
2017-07-09 13:34:11 +03:00
|
|
|
ad->attr_mode = VT_SHORT + 1;
|
2010-01-27 00:56:22 +03:00
|
|
|
break;
|
|
|
|
case TOK_MODE_SI:
|
2016-10-15 17:01:16 +03:00
|
|
|
case TOK_MODE_word:
|
2017-07-09 13:34:11 +03:00
|
|
|
ad->attr_mode = VT_INT + 1;
|
2010-01-27 00:56:22 +03:00
|
|
|
break;
|
|
|
|
default:
|
2011-08-11 19:07:56 +04:00
|
|
|
tcc_warning("__mode__(%s) not supported\n", get_tok_str(tok, NULL));
|
2010-01-27 00:56:22 +03:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
next();
|
|
|
|
skip(')');
|
|
|
|
break;
|
2009-05-05 22:18:10 +04:00
|
|
|
case TOK_DLLEXPORT:
|
2017-07-09 13:34:11 +03:00
|
|
|
ad->a.dllexport = 1;
|
2009-05-05 22:18:10 +04:00
|
|
|
break;
|
2018-07-22 02:54:01 +03:00
|
|
|
case TOK_NODECORATE:
|
|
|
|
ad->a.nodecorate = 1;
|
|
|
|
break;
|
2009-11-13 19:14:05 +03:00
|
|
|
case TOK_DLLIMPORT:
|
2017-07-09 13:34:11 +03:00
|
|
|
ad->a.dllimport = 1;
|
2009-11-13 19:14:05 +03:00
|
|
|
break;
|
2009-05-05 22:18:10 +04:00
|
|
|
default:
|
|
|
|
if (tcc_state->warn_unsupported)
|
2011-08-11 19:07:56 +04:00
|
|
|
tcc_warning("'%s' attribute ignored", get_tok_str(t, NULL));
|
2009-05-05 22:18:10 +04:00
|
|
|
/* skip parameters */
|
|
|
|
if (tok == '(') {
|
|
|
|
int parenthesis = 0;
|
|
|
|
do {
|
2015-07-29 23:53:57 +03:00
|
|
|
if (tok == '(')
|
2009-05-05 22:18:10 +04:00
|
|
|
parenthesis++;
|
2015-07-29 23:53:57 +03:00
|
|
|
else if (tok == ')')
|
2009-05-05 22:18:10 +04:00
|
|
|
parenthesis--;
|
|
|
|
next();
|
|
|
|
} while (parenthesis && tok != -1);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (tok != ',')
|
|
|
|
break;
|
|
|
|
next();
|
|
|
|
}
|
|
|
|
skip(')');
|
|
|
|
skip(')');
|
2017-07-09 13:34:11 +03:00
|
|
|
goto redo;
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
|
2019-04-11 01:30:41 +03:00
|
|
|
static Sym * find_field (CType *type, int v, int *cumofs)
|
2016-08-01 23:11:49 +03:00
|
|
|
{
|
|
|
|
Sym *s = type->ref;
|
|
|
|
v |= SYM_FIELD;
|
|
|
|
while ((s = s->next) != NULL) {
|
2016-10-09 01:52:57 +03:00
|
|
|
if ((s->v & SYM_FIELD) &&
|
|
|
|
(s->type.t & VT_BTYPE) == VT_STRUCT &&
|
|
|
|
(s->v & ~SYM_FIELD) >= SYM_FIRST_ANOM) {
|
2019-04-11 01:30:41 +03:00
|
|
|
Sym *ret = find_field (&s->type, v, cumofs);
|
|
|
|
if (ret) {
|
|
|
|
*cumofs += s->c;
|
2016-08-01 23:11:49 +03:00
|
|
|
return ret;
|
2019-04-11 01:30:41 +03:00
|
|
|
}
|
2016-08-01 23:11:49 +03:00
|
|
|
}
|
|
|
|
if (s->v == v)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return s;
|
|
|
|
}
|
|
|
|
|
2016-10-02 22:37:58 +03:00
|
|
|
static void struct_layout(CType *type, AttributeDef *ad)
|
|
|
|
{
|
2017-07-09 13:38:59 +03:00
|
|
|
int size, align, maxalign, offset, c, bit_pos, bit_size;
|
|
|
|
int packed, a, bt, prevbt, prev_bit_size;
|
2016-11-11 19:33:31 +03:00
|
|
|
int pcc = !tcc_state->ms_bitfields;
|
2017-07-09 13:38:59 +03:00
|
|
|
int pragma_pack = *tcc_state->pack_stack_ptr;
|
2016-10-02 22:37:58 +03:00
|
|
|
Sym *f;
|
2017-07-09 13:38:59 +03:00
|
|
|
|
|
|
|
maxalign = 1;
|
2016-10-02 22:37:58 +03:00
|
|
|
offset = 0;
|
|
|
|
c = 0;
|
2016-10-09 01:52:57 +03:00
|
|
|
bit_pos = 0;
|
2016-11-07 21:36:21 +03:00
|
|
|
prevbt = VT_STRUCT; /* make it never match */
|
2016-11-28 22:27:42 +03:00
|
|
|
prev_bit_size = 0;
|
2017-07-09 13:38:59 +03:00
|
|
|
|
|
|
|
//#define BF_DEBUG
|
2017-05-09 19:10:02 +03:00
|
|
|
|
2016-10-02 22:37:58 +03:00
|
|
|
for (f = type->ref->next; f; f = f->next) {
|
2017-07-16 13:10:00 +03:00
|
|
|
if (f->type.t & VT_BITFIELD)
|
2017-07-09 13:38:59 +03:00
|
|
|
bit_size = BIT_SIZE(f->type.t);
|
2017-07-16 13:10:00 +03:00
|
|
|
else
|
2017-07-09 13:38:59 +03:00
|
|
|
bit_size = -1;
|
|
|
|
size = type_size(&f->type, &align);
|
|
|
|
a = f->a.aligned ? 1 << (f->a.aligned - 1) : 0;
|
|
|
|
packed = 0;
|
|
|
|
|
|
|
|
if (pcc && bit_size == 0) {
|
|
|
|
/* in pcc mode, packing does not affect zero-width bitfields */
|
|
|
|
|
|
|
|
} else {
|
|
|
|
/* in pcc mode, attribute packed overrides if set. */
|
|
|
|
if (pcc && (f->a.packed || ad->a.packed))
|
|
|
|
align = packed = 1;
|
|
|
|
|
|
|
|
/* pragma pack overrides align if lesser and packs bitfields always */
|
|
|
|
if (pragma_pack) {
|
|
|
|
packed = 1;
|
|
|
|
if (pragma_pack < align)
|
|
|
|
align = pragma_pack;
|
|
|
|
/* in pcc mode pragma pack also overrides individual align */
|
|
|
|
if (pcc && pragma_pack < a)
|
|
|
|
a = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* some individual align was specified */
|
|
|
|
if (a)
|
|
|
|
align = a;
|
|
|
|
|
|
|
|
if (type->ref->type.t == VT_UNION) {
|
2016-11-28 22:54:59 +03:00
|
|
|
if (pcc && bit_size >= 0)
|
2017-07-09 13:38:59 +03:00
|
|
|
size = (bit_size + 7) >> 3;
|
2016-11-28 22:54:59 +03:00
|
|
|
offset = 0;
|
|
|
|
if (size > c)
|
2017-07-09 13:38:59 +03:00
|
|
|
c = size;
|
|
|
|
|
2016-11-28 22:54:59 +03:00
|
|
|
} else if (bit_size < 0) {
|
2017-07-09 13:38:59 +03:00
|
|
|
if (pcc)
|
|
|
|
c += (bit_pos + 7) >> 3;
|
|
|
|
c = (c + align - 1) & -align;
|
2016-11-28 22:54:59 +03:00
|
|
|
offset = c;
|
|
|
|
if (size > 0)
|
2017-07-09 13:38:59 +03:00
|
|
|
c += size;
|
2016-10-09 01:52:57 +03:00
|
|
|
bit_pos = 0;
|
2017-07-09 13:38:59 +03:00
|
|
|
prevbt = VT_STRUCT;
|
|
|
|
prev_bit_size = 0;
|
|
|
|
|
2016-10-09 01:52:57 +03:00
|
|
|
} else {
|
|
|
|
/* A bit-field. Layout is more complicated. There are two
|
2017-07-09 13:38:59 +03:00
|
|
|
options: PCC (GCC) compatible and MS compatible */
|
|
|
|
if (pcc) {
|
|
|
|
/* In PCC layout a bit-field is placed adjacent to the
|
|
|
|
preceding bit-fields, except if:
|
|
|
|
- it has zero-width
|
|
|
|
- an individual alignment was given
|
|
|
|
- it would overflow its base type container and
|
|
|
|
there is no packing */
|
|
|
|
if (bit_size == 0) {
|
|
|
|
new_field:
|
|
|
|
c = (c + ((bit_pos + 7) >> 3) + align - 1) & -align;
|
2016-10-09 01:52:57 +03:00
|
|
|
bit_pos = 0;
|
2017-07-09 13:38:59 +03:00
|
|
|
} else if (f->a.aligned) {
|
|
|
|
goto new_field;
|
|
|
|
} else if (!packed) {
|
|
|
|
int a8 = align * 8;
|
|
|
|
int ofs = ((c * 8 + bit_pos) % a8 + bit_size + a8 - 1) / a8;
|
|
|
|
if (ofs > size / align)
|
|
|
|
goto new_field;
|
|
|
|
}
|
|
|
|
|
2017-07-16 13:10:00 +03:00
|
|
|
/* in pcc mode, long long bitfields have type int if they fit */
|
|
|
|
if (size == 8 && bit_size <= 32)
|
|
|
|
f->type.t = (f->type.t & ~VT_BTYPE) | VT_INT, size = 4;
|
|
|
|
|
2017-07-14 20:26:01 +03:00
|
|
|
while (bit_pos >= align * 8)
|
|
|
|
c += align, bit_pos -= align * 8;
|
2017-07-09 13:38:59 +03:00
|
|
|
offset = c;
|
2017-07-14 20:26:01 +03:00
|
|
|
|
2016-10-09 01:52:57 +03:00
|
|
|
/* In PCC layout named bit-fields influence the alignment
|
|
|
|
of the containing struct using the base types alignment,
|
2017-07-09 13:38:59 +03:00
|
|
|
except for packed fields (which here have correct align). */
|
2017-07-23 22:24:11 +03:00
|
|
|
if (f->v & SYM_FIRST_ANOM
|
|
|
|
// && bit_size // ??? gcc on ARM/rpi does that
|
|
|
|
)
|
2017-07-09 13:38:59 +03:00
|
|
|
align = 1;
|
2017-07-23 22:24:11 +03:00
|
|
|
|
2016-10-09 01:52:57 +03:00
|
|
|
} else {
|
2016-11-07 21:36:21 +03:00
|
|
|
bt = f->type.t & VT_BTYPE;
|
2017-07-09 13:38:59 +03:00
|
|
|
if ((bit_pos + bit_size > size * 8)
|
|
|
|
|| (bit_size > 0) == (bt != prevbt)
|
|
|
|
) {
|
|
|
|
c = (c + align - 1) & -align;
|
2016-11-07 21:36:21 +03:00
|
|
|
offset = c;
|
|
|
|
bit_pos = 0;
|
|
|
|
/* In MS bitfield mode a bit-field run always uses
|
2016-11-28 22:54:59 +03:00
|
|
|
at least as many bits as the underlying type.
|
|
|
|
To start a new run it's also required that this
|
|
|
|
or the last bit-field had non-zero width. */
|
2016-11-28 22:27:42 +03:00
|
|
|
if (bit_size || prev_bit_size)
|
2017-07-09 13:38:59 +03:00
|
|
|
c += size;
|
2016-11-07 21:36:21 +03:00
|
|
|
}
|
2016-11-28 22:54:59 +03:00
|
|
|
/* In MS layout the records alignment is normally
|
|
|
|
influenced by the field, except for a zero-width
|
|
|
|
field at the start of a run (but by further zero-width
|
|
|
|
fields it is again). */
|
|
|
|
if (bit_size == 0 && prevbt != bt)
|
2017-07-09 13:38:59 +03:00
|
|
|
align = 1;
|
2016-11-07 21:36:21 +03:00
|
|
|
prevbt = bt;
|
2017-07-09 13:38:59 +03:00
|
|
|
prev_bit_size = bit_size;
|
2016-10-09 01:52:57 +03:00
|
|
|
}
|
2017-07-09 13:38:59 +03:00
|
|
|
|
2016-10-09 01:52:57 +03:00
|
|
|
f->type.t = (f->type.t & ~(0x3f << VT_STRUCT_SHIFT))
|
|
|
|
| (bit_pos << VT_STRUCT_SHIFT);
|
|
|
|
bit_pos += bit_size;
|
2016-10-02 22:37:58 +03:00
|
|
|
}
|
2016-11-28 22:54:59 +03:00
|
|
|
if (align > maxalign)
|
2017-07-09 13:38:59 +03:00
|
|
|
maxalign = align;
|
|
|
|
|
|
|
|
#ifdef BF_DEBUG
|
|
|
|
printf("set field %s offset %-2d size %-2d align %-2d",
|
|
|
|
get_tok_str(f->v & ~SYM_FIELD, NULL), offset, size, align);
|
2016-10-02 22:37:58 +03:00
|
|
|
if (f->type.t & VT_BITFIELD) {
|
2017-07-09 13:38:59 +03:00
|
|
|
printf(" pos %-2d bits %-2d",
|
|
|
|
BIT_POS(f->type.t),
|
|
|
|
BIT_SIZE(f->type.t)
|
|
|
|
);
|
2016-10-02 22:37:58 +03:00
|
|
|
}
|
|
|
|
printf("\n");
|
|
|
|
#endif
|
|
|
|
|
2019-04-11 01:30:41 +03:00
|
|
|
f->c = offset;
|
2016-10-02 22:37:58 +03:00
|
|
|
f->r = 0;
|
|
|
|
}
|
2017-07-09 13:38:59 +03:00
|
|
|
|
|
|
|
if (pcc)
|
|
|
|
c += (bit_pos + 7) >> 3;
|
|
|
|
|
2017-07-14 20:26:01 +03:00
|
|
|
/* store size and alignment */
|
|
|
|
a = bt = ad->a.aligned ? 1 << (ad->a.aligned - 1) : 1;
|
2017-07-09 13:38:59 +03:00
|
|
|
if (a < maxalign)
|
|
|
|
a = maxalign;
|
2017-07-14 20:26:01 +03:00
|
|
|
type->ref->r = a;
|
2017-07-23 22:24:11 +03:00
|
|
|
if (pragma_pack && pragma_pack < maxalign && 0 == pcc) {
|
2017-07-14 20:26:01 +03:00
|
|
|
/* can happen if individual align for some member was given. In
|
|
|
|
this case MSVC ignores maxalign when aligning the size */
|
|
|
|
a = pragma_pack;
|
|
|
|
if (a < bt)
|
|
|
|
a = bt;
|
|
|
|
}
|
2017-07-09 13:38:59 +03:00
|
|
|
c = (c + a - 1) & -a;
|
|
|
|
type->ref->c = c;
|
|
|
|
|
|
|
|
#ifdef BF_DEBUG
|
|
|
|
printf("struct size %-2d align %-2d\n\n", c, a), fflush(stdout);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* check whether we can access bitfields by their type */
|
|
|
|
for (f = type->ref->next; f; f = f->next) {
|
|
|
|
int s, px, cx, c0;
|
|
|
|
CType t;
|
|
|
|
|
|
|
|
if (0 == (f->type.t & VT_BITFIELD))
|
|
|
|
continue;
|
|
|
|
f->type.ref = f;
|
|
|
|
f->auxtype = -1;
|
|
|
|
bit_size = BIT_SIZE(f->type.t);
|
|
|
|
if (bit_size == 0)
|
|
|
|
continue;
|
|
|
|
bit_pos = BIT_POS(f->type.t);
|
|
|
|
size = type_size(&f->type, &align);
|
|
|
|
if (bit_pos + bit_size <= size * 8 && f->c + size <= c)
|
|
|
|
continue;
|
|
|
|
|
2017-09-25 04:03:26 +03:00
|
|
|
/* try to access the field using a different type */
|
2017-07-09 13:38:59 +03:00
|
|
|
c0 = -1, s = align = 1;
|
2020-05-23 21:27:43 +03:00
|
|
|
t.t = VT_BYTE;
|
2017-07-09 13:38:59 +03:00
|
|
|
for (;;) {
|
|
|
|
px = f->c * 8 + bit_pos;
|
|
|
|
cx = (px >> 3) & -align;
|
|
|
|
px = px - (cx << 3);
|
|
|
|
if (c0 == cx)
|
|
|
|
break;
|
|
|
|
s = (px + bit_size + 7) >> 3;
|
|
|
|
if (s > 4) {
|
|
|
|
t.t = VT_LLONG;
|
|
|
|
} else if (s > 2) {
|
|
|
|
t.t = VT_INT;
|
|
|
|
} else if (s > 1) {
|
|
|
|
t.t = VT_SHORT;
|
|
|
|
} else {
|
|
|
|
t.t = VT_BYTE;
|
|
|
|
}
|
|
|
|
s = type_size(&t, &align);
|
|
|
|
c0 = cx;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (px + bit_size <= s * 8 && cx + s <= c) {
|
|
|
|
/* update offset and bit position */
|
|
|
|
f->c = cx;
|
|
|
|
bit_pos = px;
|
|
|
|
f->type.t = (f->type.t & ~(0x3f << VT_STRUCT_SHIFT))
|
|
|
|
| (bit_pos << VT_STRUCT_SHIFT);
|
|
|
|
if (s != size)
|
|
|
|
f->auxtype = t.t;
|
2017-07-14 20:26:01 +03:00
|
|
|
#ifdef BF_DEBUG
|
|
|
|
printf("FIX field %s offset %-2d size %-2d align %-2d "
|
|
|
|
"pos %-2d bits %-2d\n",
|
|
|
|
get_tok_str(f->v & ~SYM_FIELD, NULL),
|
|
|
|
cx, s, align, px, bit_size);
|
|
|
|
#endif
|
2017-07-09 13:38:59 +03:00
|
|
|
} else {
|
|
|
|
/* fall back to load/store single-byte wise */
|
|
|
|
f->auxtype = VT_STRUCT;
|
|
|
|
#ifdef BF_DEBUG
|
2017-07-14 20:26:01 +03:00
|
|
|
printf("FIX field %s : load byte-wise\n",
|
|
|
|
get_tok_str(f->v & ~SYM_FIELD, NULL));
|
2017-07-09 13:38:59 +03:00
|
|
|
#endif
|
2017-07-14 20:26:01 +03:00
|
|
|
}
|
2017-07-09 13:38:59 +03:00
|
|
|
}
|
2016-10-02 22:37:58 +03:00
|
|
|
}
|
|
|
|
|
2017-07-09 13:38:25 +03:00
|
|
|
/* enum/struct/union declaration. u is VT_ENUM/VT_STRUCT/VT_UNION */
|
2017-07-09 13:34:11 +03:00
|
|
|
static void struct_decl(CType *type, int u)
|
2009-05-05 22:18:10 +04:00
|
|
|
{
|
2017-07-09 13:38:59 +03:00
|
|
|
int v, c, size, align, flexible;
|
2016-11-28 22:54:59 +03:00
|
|
|
int bit_size, bsize, bt;
|
2016-10-02 22:37:58 +03:00
|
|
|
Sym *s, *ss, **ps;
|
2017-07-09 13:34:11 +03:00
|
|
|
AttributeDef ad, ad1;
|
2009-05-05 22:18:10 +04:00
|
|
|
CType type1, btype;
|
|
|
|
|
2017-07-09 13:34:11 +03:00
|
|
|
memset(&ad, 0, sizeof ad);
|
2009-05-05 22:18:10 +04:00
|
|
|
next();
|
2017-07-09 13:34:11 +03:00
|
|
|
parse_attribute(&ad);
|
2009-05-05 22:18:10 +04:00
|
|
|
if (tok != '{') {
|
|
|
|
v = tok;
|
|
|
|
next();
|
|
|
|
/* struct already defined ? return it */
|
|
|
|
if (v < TOK_IDENT)
|
|
|
|
expect("struct/union/enum name");
|
|
|
|
s = struct_find(v);
|
2017-07-09 13:34:11 +03:00
|
|
|
if (s && (s->sym_scope == local_scope || tok != '{')) {
|
2017-07-09 13:38:25 +03:00
|
|
|
if (u == s->type.t)
|
|
|
|
goto do_decl;
|
|
|
|
if (u == VT_ENUM && IS_ENUM(s->type.t))
|
|
|
|
goto do_decl;
|
|
|
|
tcc_error("redefinition of '%s'", get_tok_str(v, NULL));
|
2016-03-24 17:44:01 +03:00
|
|
|
}
|
2009-05-05 22:18:10 +04:00
|
|
|
} else {
|
|
|
|
v = anon_sym++;
|
|
|
|
}
|
2016-07-31 07:18:45 +03:00
|
|
|
/* Record the original enum/struct/union token. */
|
2017-07-10 23:20:34 +03:00
|
|
|
type1.t = u == VT_ENUM ? u | VT_INT | VT_UNSIGNED : u;
|
2013-07-24 19:06:13 +04:00
|
|
|
type1.ref = NULL;
|
2009-05-05 22:18:10 +04:00
|
|
|
/* we put an undefined size for struct/union */
|
|
|
|
s = sym_push(v | SYM_STRUCT, &type1, 0, -1);
|
|
|
|
s->r = 0; /* default alignment is zero as gcc */
|
2017-07-09 13:34:11 +03:00
|
|
|
do_decl:
|
2017-07-09 13:38:25 +03:00
|
|
|
type->t = s->type.t;
|
2009-05-05 22:18:10 +04:00
|
|
|
type->ref = s;
|
2017-07-09 13:34:11 +03:00
|
|
|
|
2009-05-05 22:18:10 +04:00
|
|
|
if (tok == '{') {
|
|
|
|
next();
|
|
|
|
if (s->c != -1)
|
2011-08-11 19:07:56 +04:00
|
|
|
tcc_error("struct/union/enum already defined");
|
2019-04-07 04:15:05 +03:00
|
|
|
s->c = -2;
|
2009-05-05 22:18:10 +04:00
|
|
|
/* cannot be empty */
|
|
|
|
/* non empty enums are not allowed */
|
2017-07-09 13:38:25 +03:00
|
|
|
ps = &s->next;
|
2017-07-09 13:34:11 +03:00
|
|
|
if (u == VT_ENUM) {
|
2017-07-09 13:38:25 +03:00
|
|
|
long long ll = 0, pl = 0, nl = 0;
|
|
|
|
CType t;
|
|
|
|
t.ref = s;
|
|
|
|
/* enum symbols have static storage */
|
|
|
|
t.t = VT_INT|VT_STATIC|VT_ENUM_VAL;
|
2009-05-05 22:18:10 +04:00
|
|
|
for(;;) {
|
|
|
|
v = tok;
|
|
|
|
if (v < TOK_UIDENT)
|
|
|
|
expect("identifier");
|
2013-09-21 00:49:49 +04:00
|
|
|
ss = sym_find(v);
|
2014-03-31 18:58:17 +04:00
|
|
|
if (ss && !local_stack)
|
2013-09-21 00:49:49 +04:00
|
|
|
tcc_error("redefinition of enumerator '%s'",
|
|
|
|
get_tok_str(v, NULL));
|
2009-05-05 22:18:10 +04:00
|
|
|
next();
|
|
|
|
if (tok == '=') {
|
|
|
|
next();
|
2017-07-09 13:38:25 +03:00
|
|
|
ll = expr_const64();
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
2017-07-09 13:38:25 +03:00
|
|
|
ss = sym_push(v, &t, VT_CONST, 0);
|
|
|
|
ss->enum_val = ll;
|
|
|
|
*ps = ss, ps = &ss->next;
|
|
|
|
if (ll < nl)
|
|
|
|
nl = ll;
|
|
|
|
if (ll > pl)
|
|
|
|
pl = ll;
|
2009-05-05 22:18:10 +04:00
|
|
|
if (tok != ',')
|
|
|
|
break;
|
|
|
|
next();
|
2017-07-09 13:38:25 +03:00
|
|
|
ll++;
|
2009-05-05 22:18:10 +04:00
|
|
|
/* NOTE: we accept a trailing comma */
|
|
|
|
if (tok == '}')
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
skip('}');
|
2017-07-09 13:38:25 +03:00
|
|
|
/* set integral type of the enum */
|
|
|
|
t.t = VT_INT;
|
2017-07-10 23:20:34 +03:00
|
|
|
if (nl >= 0) {
|
2017-07-09 13:38:25 +03:00
|
|
|
if (pl != (unsigned)pl)
|
2017-09-24 19:57:48 +03:00
|
|
|
t.t = (LONG_SIZE==8 ? VT_LLONG|VT_LONG : VT_LLONG);
|
2017-07-09 13:38:25 +03:00
|
|
|
t.t |= VT_UNSIGNED;
|
|
|
|
} else if (pl != (int)pl || nl != (int)nl)
|
2017-09-24 19:57:48 +03:00
|
|
|
t.t = (LONG_SIZE==8 ? VT_LLONG|VT_LONG : VT_LLONG);
|
2017-07-09 13:38:25 +03:00
|
|
|
s->type.t = type->t = t.t | VT_ENUM;
|
|
|
|
s->c = 0;
|
|
|
|
/* set type for enum members */
|
|
|
|
for (ss = s->next; ss; ss = ss->next) {
|
|
|
|
ll = ss->enum_val;
|
|
|
|
if (ll == (int)ll) /* default is int if it fits */
|
|
|
|
continue;
|
|
|
|
if (t.t & VT_UNSIGNED) {
|
|
|
|
ss->type.t |= VT_UNSIGNED;
|
|
|
|
if (ll == (unsigned)ll)
|
|
|
|
continue;
|
|
|
|
}
|
2017-09-24 19:57:48 +03:00
|
|
|
ss->type.t = (ss->type.t & ~VT_BTYPE)
|
|
|
|
| (LONG_SIZE==8 ? VT_LLONG|VT_LONG : VT_LLONG);
|
2017-07-09 13:38:25 +03:00
|
|
|
}
|
2009-05-05 22:18:10 +04:00
|
|
|
} else {
|
2017-07-09 13:38:25 +03:00
|
|
|
c = 0;
|
2013-10-06 16:43:16 +04:00
|
|
|
flexible = 0;
|
2009-05-05 22:18:10 +04:00
|
|
|
while (tok != '}') {
|
2016-06-28 16:09:40 +03:00
|
|
|
if (!parse_btype(&btype, &ad1)) {
|
|
|
|
skip(';');
|
|
|
|
continue;
|
|
|
|
}
|
2009-05-05 22:18:10 +04:00
|
|
|
while (1) {
|
2015-07-29 23:53:57 +03:00
|
|
|
if (flexible)
|
|
|
|
tcc_error("flexible array member '%s' not at the end of struct",
|
2013-10-06 16:43:16 +04:00
|
|
|
get_tok_str(v, NULL));
|
2009-05-05 22:18:10 +04:00
|
|
|
bit_size = -1;
|
|
|
|
v = 0;
|
|
|
|
type1 = btype;
|
|
|
|
if (tok != ':') {
|
2017-03-06 05:25:33 +03:00
|
|
|
if (tok != ';')
|
|
|
|
type_decl(&type1, &ad1, &v, TYPE_DIRECT);
|
2015-04-10 06:31:58 +03:00
|
|
|
if (v == 0) {
|
2015-07-29 23:53:57 +03:00
|
|
|
if ((type1.t & VT_BTYPE) != VT_STRUCT)
|
|
|
|
expect("identifier");
|
|
|
|
else {
|
|
|
|
int v = btype.ref->v;
|
|
|
|
if (!(v & SYM_FIELD) && (v & ~SYM_STRUCT) < SYM_FIRST_ANOM) {
|
|
|
|
if (tcc_state->ms_extensions == 0)
|
|
|
|
expect("identifier");
|
|
|
|
}
|
|
|
|
}
|
2015-04-10 06:31:58 +03:00
|
|
|
}
|
2013-10-06 16:43:16 +04:00
|
|
|
if (type_size(&type1, &align) < 0) {
|
2017-07-09 13:34:11 +03:00
|
|
|
if ((u == VT_STRUCT) && (type1.t & VT_ARRAY) && c)
|
2015-07-29 23:53:57 +03:00
|
|
|
flexible = 1;
|
|
|
|
else
|
|
|
|
tcc_error("field '%s' has incomplete type",
|
|
|
|
get_tok_str(v, NULL));
|
2013-10-06 16:43:16 +04:00
|
|
|
}
|
2009-05-05 22:18:10 +04:00
|
|
|
if ((type1.t & VT_BTYPE) == VT_FUNC ||
|
2018-08-03 23:39:00 +03:00
|
|
|
(type1.t & VT_BTYPE) == VT_VOID ||
|
2017-03-11 04:13:59 +03:00
|
|
|
(type1.t & VT_STORAGE))
|
2015-07-29 23:53:57 +03:00
|
|
|
tcc_error("invalid type for '%s'",
|
2009-05-05 22:18:10 +04:00
|
|
|
get_tok_str(v, NULL));
|
|
|
|
}
|
|
|
|
if (tok == ':') {
|
|
|
|
next();
|
|
|
|
bit_size = expr_const();
|
|
|
|
/* XXX: handle v = 0 case for messages */
|
|
|
|
if (bit_size < 0)
|
2015-07-29 23:53:57 +03:00
|
|
|
tcc_error("negative width in bit-field '%s'",
|
2009-05-05 22:18:10 +04:00
|
|
|
get_tok_str(v, NULL));
|
|
|
|
if (v && bit_size == 0)
|
2015-07-29 23:53:57 +03:00
|
|
|
tcc_error("zero width for bit-field '%s'",
|
2009-05-05 22:18:10 +04:00
|
|
|
get_tok_str(v, NULL));
|
2017-07-09 13:34:11 +03:00
|
|
|
parse_attribute(&ad1);
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
size = type_size(&type1, &align);
|
|
|
|
if (bit_size >= 0) {
|
|
|
|
bt = type1.t & VT_BTYPE;
|
2015-07-29 23:53:57 +03:00
|
|
|
if (bt != VT_INT &&
|
|
|
|
bt != VT_BYTE &&
|
2009-05-05 22:18:10 +04:00
|
|
|
bt != VT_SHORT &&
|
|
|
|
bt != VT_BOOL &&
|
|
|
|
bt != VT_LLONG)
|
2011-08-11 19:07:56 +04:00
|
|
|
tcc_error("bitfields must have scalar type");
|
2009-05-05 22:18:10 +04:00
|
|
|
bsize = size * 8;
|
|
|
|
if (bit_size > bsize) {
|
2011-08-11 19:07:56 +04:00
|
|
|
tcc_error("width of '%s' exceeds its type",
|
2009-05-05 22:18:10 +04:00
|
|
|
get_tok_str(v, NULL));
|
2017-07-09 13:38:59 +03:00
|
|
|
} else if (bit_size == bsize
|
|
|
|
&& !ad.a.packed && !ad1.a.packed) {
|
2009-05-05 22:18:10 +04:00
|
|
|
/* no need for bit fields */
|
2016-11-28 22:54:59 +03:00
|
|
|
;
|
2017-07-09 13:38:59 +03:00
|
|
|
} else if (bit_size == 64) {
|
|
|
|
tcc_error("field width 64 not implemented");
|
2009-05-05 22:18:10 +04:00
|
|
|
} else {
|
2017-07-09 13:38:25 +03:00
|
|
|
type1.t = (type1.t & ~VT_STRUCT_MASK)
|
|
|
|
| VT_BITFIELD
|
|
|
|
| (bit_size << (VT_STRUCT_SHIFT + 6));
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
if (v != 0 || (type1.t & VT_BTYPE) == VT_STRUCT) {
|
2016-10-02 22:37:58 +03:00
|
|
|
/* Remember we've seen a real field to check
|
|
|
|
for placement of flexible array member. */
|
|
|
|
c = 1;
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
2016-11-28 22:54:59 +03:00
|
|
|
/* If member is a struct or bit-field, enforce
|
|
|
|
placing into the struct (as anonymous). */
|
|
|
|
if (v == 0 &&
|
|
|
|
((type1.t & VT_BTYPE) == VT_STRUCT ||
|
|
|
|
bit_size >= 0)) {
|
2016-08-01 23:11:49 +03:00
|
|
|
v = anon_sym++;
|
|
|
|
}
|
|
|
|
if (v) {
|
2017-07-09 13:38:59 +03:00
|
|
|
ss = sym_push(v | SYM_FIELD, &type1, 0, 0);
|
|
|
|
ss->a = ad1.a;
|
2009-05-05 22:18:10 +04:00
|
|
|
*ps = ss;
|
|
|
|
ps = &ss->next;
|
|
|
|
}
|
|
|
|
if (tok == ';' || tok == TOK_EOF)
|
|
|
|
break;
|
|
|
|
skip(',');
|
|
|
|
}
|
|
|
|
skip(';');
|
|
|
|
}
|
|
|
|
skip('}');
|
2017-07-09 13:34:11 +03:00
|
|
|
parse_attribute(&ad);
|
2020-02-18 23:11:49 +03:00
|
|
|
if (ad.cleanup_func) {
|
2020-02-09 20:21:59 +03:00
|
|
|
tcc_warning("attribute '__cleanup__' ignored on type");
|
|
|
|
}
|
|
|
|
struct_layout(type, &ad);
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-07-14 18:42:48 +03:00
|
|
|
static void sym_to_attr(AttributeDef *ad, Sym *s)
|
|
|
|
{
|
2019-01-01 00:00:31 +03:00
|
|
|
merge_symattr(&ad->a, &s->a);
|
|
|
|
merge_funcattr(&ad->f, &s->f);
|
2017-07-14 18:42:48 +03:00
|
|
|
}
|
|
|
|
|
2016-01-11 10:51:58 +03:00
|
|
|
/* Add type qualifiers to a type. If the type is an array then the qualifiers
|
|
|
|
are added to the element type, copied because it could be a typedef. */
|
|
|
|
static void parse_btype_qualify(CType *type, int qualifiers)
|
|
|
|
{
|
|
|
|
while (type->t & VT_ARRAY) {
|
|
|
|
type->ref = sym_push(SYM_FIELD, &type->ref->type, 0, type->ref->c);
|
|
|
|
type = &type->ref->type;
|
|
|
|
}
|
|
|
|
type->t |= qualifiers;
|
|
|
|
}
|
|
|
|
|
2009-05-05 22:18:10 +04:00
|
|
|
/* return 0 if no type declaration. otherwise, return the basic type
|
2015-07-29 23:53:57 +03:00
|
|
|
and skip it.
|
2009-05-05 22:18:10 +04:00
|
|
|
*/
|
|
|
|
static int parse_btype(CType *type, AttributeDef *ad)
|
|
|
|
{
|
2019-04-29 14:53:07 +03:00
|
|
|
int t, u, bt, st, type_found, typespec_found, g, n;
|
2009-05-05 22:18:10 +04:00
|
|
|
Sym *s;
|
|
|
|
CType type1;
|
|
|
|
|
|
|
|
memset(ad, 0, sizeof(AttributeDef));
|
|
|
|
type_found = 0;
|
|
|
|
typespec_found = 0;
|
2017-07-09 13:34:11 +03:00
|
|
|
t = VT_INT;
|
|
|
|
bt = st = -1;
|
|
|
|
type->ref = NULL;
|
|
|
|
|
2009-05-05 22:18:10 +04:00
|
|
|
while(1) {
|
|
|
|
switch(tok) {
|
|
|
|
case TOK_EXTENSION:
|
|
|
|
/* currently, we really ignore extension */
|
|
|
|
next();
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/* basic types */
|
|
|
|
case TOK_CHAR:
|
|
|
|
u = VT_BYTE;
|
|
|
|
basic_type:
|
|
|
|
next();
|
|
|
|
basic_type1:
|
2017-07-25 23:04:24 +03:00
|
|
|
if (u == VT_SHORT || u == VT_LONG) {
|
2017-07-09 13:34:11 +03:00
|
|
|
if (st != -1 || (bt != -1 && bt != VT_INT))
|
|
|
|
tmbt: tcc_error("too many basic types");
|
|
|
|
st = u;
|
|
|
|
} else {
|
|
|
|
if (bt != -1 || (st != -1 && u != VT_INT))
|
|
|
|
goto tmbt;
|
|
|
|
bt = u;
|
|
|
|
}
|
|
|
|
if (u != VT_INT)
|
2017-09-24 19:57:48 +03:00
|
|
|
t = (t & ~(VT_BTYPE|VT_LONG)) | u;
|
2009-05-05 22:18:10 +04:00
|
|
|
typespec_found = 1;
|
|
|
|
break;
|
|
|
|
case TOK_VOID:
|
|
|
|
u = VT_VOID;
|
|
|
|
goto basic_type;
|
|
|
|
case TOK_SHORT:
|
|
|
|
u = VT_SHORT;
|
|
|
|
goto basic_type;
|
|
|
|
case TOK_INT:
|
2014-03-24 19:28:56 +04:00
|
|
|
u = VT_INT;
|
|
|
|
goto basic_type;
|
2019-03-20 22:03:27 +03:00
|
|
|
case TOK_ALIGNAS:
|
|
|
|
{ int n;
|
2019-04-08 21:58:49 +03:00
|
|
|
AttributeDef ad1;
|
|
|
|
next();
|
|
|
|
skip('(');
|
|
|
|
memset(&ad1, 0, sizeof(AttributeDef));
|
|
|
|
if (parse_btype(&type1, &ad1)) {
|
|
|
|
type_decl(&type1, &ad1, &n, TYPE_ABSTRACT);
|
|
|
|
if (ad1.a.aligned)
|
|
|
|
n = 1 << (ad1.a.aligned - 1);
|
|
|
|
else
|
|
|
|
type_size(&type1, &n);
|
|
|
|
} else {
|
|
|
|
n = expr_const();
|
|
|
|
if (n <= 0 || (n & (n - 1)) != 0)
|
2019-03-20 22:03:27 +03:00
|
|
|
tcc_error("alignment must be a positive power of two");
|
2019-04-08 21:58:49 +03:00
|
|
|
}
|
|
|
|
skip(')');
|
|
|
|
ad->a.aligned = exact_log2p1(n);
|
2019-03-20 22:03:27 +03:00
|
|
|
}
|
2019-04-08 21:58:49 +03:00
|
|
|
continue;
|
2009-05-05 22:18:10 +04:00
|
|
|
case TOK_LONG:
|
|
|
|
if ((t & VT_BTYPE) == VT_DOUBLE) {
|
2017-09-24 19:57:48 +03:00
|
|
|
t = (t & ~(VT_BTYPE|VT_LONG)) | VT_LDOUBLE;
|
|
|
|
} else if ((t & (VT_BTYPE|VT_LONG)) == VT_LONG) {
|
|
|
|
t = (t & ~(VT_BTYPE|VT_LONG)) | VT_LLONG;
|
2009-05-05 22:18:10 +04:00
|
|
|
} else {
|
2017-07-25 23:04:24 +03:00
|
|
|
u = VT_LONG;
|
|
|
|
goto basic_type;
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
2017-07-09 13:34:11 +03:00
|
|
|
next();
|
2009-05-05 22:18:10 +04:00
|
|
|
break;
|
2015-02-13 21:58:31 +03:00
|
|
|
#ifdef TCC_TARGET_ARM64
|
|
|
|
case TOK_UINT128:
|
|
|
|
/* GCC's __uint128_t appears in some Linux header files. Make it a
|
|
|
|
synonym for long double to get the size and alignment right. */
|
|
|
|
u = VT_LDOUBLE;
|
|
|
|
goto basic_type;
|
|
|
|
#endif
|
2009-05-05 22:18:10 +04:00
|
|
|
case TOK_BOOL:
|
|
|
|
u = VT_BOOL;
|
|
|
|
goto basic_type;
|
|
|
|
case TOK_FLOAT:
|
|
|
|
u = VT_FLOAT;
|
|
|
|
goto basic_type;
|
|
|
|
case TOK_DOUBLE:
|
2017-09-24 19:57:48 +03:00
|
|
|
if ((t & (VT_BTYPE|VT_LONG)) == VT_LONG) {
|
|
|
|
t = (t & ~(VT_BTYPE|VT_LONG)) | VT_LDOUBLE;
|
2009-05-05 22:18:10 +04:00
|
|
|
} else {
|
|
|
|
u = VT_DOUBLE;
|
2017-07-09 13:34:11 +03:00
|
|
|
goto basic_type;
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
2017-07-09 13:34:11 +03:00
|
|
|
next();
|
2009-05-05 22:18:10 +04:00
|
|
|
break;
|
|
|
|
case TOK_ENUM:
|
2017-07-09 13:34:11 +03:00
|
|
|
struct_decl(&type1, VT_ENUM);
|
2009-05-05 22:18:10 +04:00
|
|
|
basic_type2:
|
|
|
|
u = type1.t;
|
|
|
|
type->ref = type1.ref;
|
|
|
|
goto basic_type1;
|
|
|
|
case TOK_STRUCT:
|
2017-07-09 13:34:11 +03:00
|
|
|
struct_decl(&type1, VT_STRUCT);
|
|
|
|
goto basic_type2;
|
2009-05-05 22:18:10 +04:00
|
|
|
case TOK_UNION:
|
2017-07-09 13:34:11 +03:00
|
|
|
struct_decl(&type1, VT_UNION);
|
2009-05-05 22:18:10 +04:00
|
|
|
goto basic_type2;
|
|
|
|
|
|
|
|
/* type modifiers */
|
|
|
|
case TOK_CONST1:
|
|
|
|
case TOK_CONST2:
|
|
|
|
case TOK_CONST3:
|
2016-01-11 10:51:58 +03:00
|
|
|
type->t = t;
|
|
|
|
parse_btype_qualify(type, VT_CONSTANT);
|
|
|
|
t = type->t;
|
2009-05-05 22:18:10 +04:00
|
|
|
next();
|
|
|
|
break;
|
|
|
|
case TOK_VOLATILE1:
|
|
|
|
case TOK_VOLATILE2:
|
|
|
|
case TOK_VOLATILE3:
|
2016-01-11 10:51:58 +03:00
|
|
|
type->t = t;
|
|
|
|
parse_btype_qualify(type, VT_VOLATILE);
|
|
|
|
t = type->t;
|
2009-05-05 22:18:10 +04:00
|
|
|
next();
|
|
|
|
break;
|
|
|
|
case TOK_SIGNED1:
|
|
|
|
case TOK_SIGNED2:
|
|
|
|
case TOK_SIGNED3:
|
2014-02-06 16:51:47 +04:00
|
|
|
if ((t & (VT_DEFSIGN|VT_UNSIGNED)) == (VT_DEFSIGN|VT_UNSIGNED))
|
|
|
|
tcc_error("signed and unsigned modifier");
|
|
|
|
t |= VT_DEFSIGN;
|
2009-05-05 22:18:10 +04:00
|
|
|
next();
|
2017-07-09 13:34:11 +03:00
|
|
|
typespec_found = 1;
|
2009-05-05 22:18:10 +04:00
|
|
|
break;
|
|
|
|
case TOK_REGISTER:
|
|
|
|
case TOK_AUTO:
|
|
|
|
case TOK_RESTRICT1:
|
|
|
|
case TOK_RESTRICT2:
|
|
|
|
case TOK_RESTRICT3:
|
|
|
|
next();
|
|
|
|
break;
|
|
|
|
case TOK_UNSIGNED:
|
2014-02-06 16:51:47 +04:00
|
|
|
if ((t & (VT_DEFSIGN|VT_UNSIGNED)) == VT_DEFSIGN)
|
|
|
|
tcc_error("signed and unsigned modifier");
|
|
|
|
t |= VT_DEFSIGN | VT_UNSIGNED;
|
2009-05-05 22:18:10 +04:00
|
|
|
next();
|
|
|
|
typespec_found = 1;
|
|
|
|
break;
|
|
|
|
|
|
|
|
/* storage */
|
|
|
|
case TOK_EXTERN:
|
2017-04-04 09:34:52 +03:00
|
|
|
g = VT_EXTERN;
|
|
|
|
goto storage;
|
2009-05-05 22:18:10 +04:00
|
|
|
case TOK_STATIC:
|
2017-04-04 09:34:52 +03:00
|
|
|
g = VT_STATIC;
|
|
|
|
goto storage;
|
2009-05-05 22:18:10 +04:00
|
|
|
case TOK_TYPEDEF:
|
2017-04-04 09:34:52 +03:00
|
|
|
g = VT_TYPEDEF;
|
|
|
|
goto storage;
|
|
|
|
storage:
|
|
|
|
if (t & (VT_EXTERN|VT_STATIC|VT_TYPEDEF) & ~g)
|
|
|
|
tcc_error("multiple storage classes");
|
|
|
|
t |= g;
|
2009-05-05 22:18:10 +04:00
|
|
|
next();
|
|
|
|
break;
|
|
|
|
case TOK_INLINE1:
|
|
|
|
case TOK_INLINE2:
|
|
|
|
case TOK_INLINE3:
|
|
|
|
t |= VT_INLINE;
|
|
|
|
next();
|
|
|
|
break;
|
2019-03-20 22:03:27 +03:00
|
|
|
case TOK_NORETURN3:
|
|
|
|
next();
|
2019-09-08 18:35:15 +03:00
|
|
|
ad->f.func_noreturn = 1;
|
2019-03-20 22:03:27 +03:00
|
|
|
break;
|
2009-05-05 22:18:10 +04:00
|
|
|
/* GNUC attribute */
|
|
|
|
case TOK_ATTRIBUTE1:
|
|
|
|
case TOK_ATTRIBUTE2:
|
|
|
|
parse_attribute(ad);
|
2017-07-09 13:34:11 +03:00
|
|
|
if (ad->attr_mode) {
|
|
|
|
u = ad->attr_mode -1;
|
2017-09-24 19:57:48 +03:00
|
|
|
t = (t & ~(VT_BTYPE|VT_LONG)) | u;
|
2010-01-27 00:56:22 +03:00
|
|
|
}
|
2018-07-28 19:55:54 +03:00
|
|
|
continue;
|
2009-05-05 22:18:10 +04:00
|
|
|
/* GNUC typeof */
|
|
|
|
case TOK_TYPEOF1:
|
|
|
|
case TOK_TYPEOF2:
|
|
|
|
case TOK_TYPEOF3:
|
|
|
|
next();
|
|
|
|
parse_expr_type(&type1);
|
2011-03-07 09:32:35 +03:00
|
|
|
/* remove all storage modifiers except typedef */
|
|
|
|
type1.t &= ~(VT_STORAGE&~VT_TYPEDEF);
|
2017-07-14 18:42:48 +03:00
|
|
|
if (type1.ref)
|
|
|
|
sym_to_attr(ad, type1.ref);
|
2009-05-05 22:18:10 +04:00
|
|
|
goto basic_type2;
|
|
|
|
default:
|
2014-03-24 19:28:56 +04:00
|
|
|
if (typespec_found)
|
2009-05-05 22:18:10 +04:00
|
|
|
goto the_end;
|
|
|
|
s = sym_find(tok);
|
|
|
|
if (!s || !(s->type.t & VT_TYPEDEF))
|
|
|
|
goto the_end;
|
2019-04-29 14:53:07 +03:00
|
|
|
|
|
|
|
n = tok, next();
|
|
|
|
if (tok == ':' && !in_generic) {
|
|
|
|
/* ignore if it's a label */
|
|
|
|
unget_tok(n);
|
|
|
|
goto the_end;
|
|
|
|
}
|
|
|
|
|
2017-09-24 19:57:48 +03:00
|
|
|
t &= ~(VT_BTYPE|VT_LONG);
|
2017-07-09 13:34:11 +03:00
|
|
|
u = t & ~(VT_CONSTANT | VT_VOLATILE), t ^= u;
|
|
|
|
type->t = (s->type.t & ~VT_TYPEDEF) | u;
|
2016-01-11 10:51:58 +03:00
|
|
|
type->ref = s->type.ref;
|
2017-07-09 13:34:11 +03:00
|
|
|
if (t)
|
|
|
|
parse_btype_qualify(type, t);
|
2016-01-11 10:51:58 +03:00
|
|
|
t = type->t;
|
2017-07-09 13:34:11 +03:00
|
|
|
/* get attributes from typedef */
|
2017-07-14 18:42:48 +03:00
|
|
|
sym_to_attr(ad, s);
|
2009-05-05 22:18:10 +04:00
|
|
|
typespec_found = 1;
|
2017-07-09 13:34:11 +03:00
|
|
|
st = bt = -2;
|
2009-05-05 22:18:10 +04:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
type_found = 1;
|
|
|
|
}
|
|
|
|
the_end:
|
|
|
|
if (tcc_state->char_is_unsigned) {
|
2014-02-06 16:51:47 +04:00
|
|
|
if ((t & (VT_DEFSIGN|VT_BTYPE)) == VT_BYTE)
|
2009-05-05 22:18:10 +04:00
|
|
|
t |= VT_UNSIGNED;
|
|
|
|
}
|
2017-09-24 19:57:48 +03:00
|
|
|
/* VT_LONG is used just as a modifier for VT_INT / VT_LLONG */
|
|
|
|
bt = t & (VT_BTYPE|VT_LONG);
|
|
|
|
if (bt == VT_LONG)
|
|
|
|
t |= LONG_SIZE == 8 ? VT_LLONG : VT_INT;
|
|
|
|
#ifdef TCC_TARGET_PE
|
|
|
|
if (bt == VT_LDOUBLE)
|
2020-02-23 02:11:03 +03:00
|
|
|
t = (t & ~(VT_BTYPE|VT_LONG)) | (VT_DOUBLE|VT_LONG);
|
2009-05-05 22:18:10 +04:00
|
|
|
#endif
|
|
|
|
type->t = t;
|
|
|
|
return type_found;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* convert a function parameter type (array to pointer and function to
|
|
|
|
function pointer) */
|
|
|
|
static inline void convert_parameter_type(CType *pt)
|
|
|
|
{
|
|
|
|
/* remove const and volatile qualifiers (XXX: const could be used
|
|
|
|
to indicate a const function parameter */
|
|
|
|
pt->t &= ~(VT_CONSTANT | VT_VOLATILE);
|
|
|
|
/* array must be transformed to pointer according to ANSI C */
|
|
|
|
pt->t &= ~VT_ARRAY;
|
|
|
|
if ((pt->t & VT_BTYPE) == VT_FUNC) {
|
|
|
|
mk_pointer(pt);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-09-14 21:17:39 +04:00
|
|
|
ST_FUNC void parse_asm_str(CString *astr)
|
|
|
|
{
|
|
|
|
skip('(');
|
2016-06-27 21:10:53 +03:00
|
|
|
parse_mult_str(astr, "string constant");
|
2010-09-14 21:17:39 +04:00
|
|
|
}
|
|
|
|
|
2015-11-20 13:22:56 +03:00
|
|
|
/* Parse an asm label and return the token */
|
|
|
|
static int asm_label_instr(void)
|
2010-09-14 21:17:39 +04:00
|
|
|
{
|
2015-11-20 13:22:56 +03:00
|
|
|
int v;
|
|
|
|
CString astr;
|
|
|
|
|
2010-09-14 21:17:39 +04:00
|
|
|
next();
|
2015-11-20 13:22:56 +03:00
|
|
|
parse_asm_str(&astr);
|
2010-09-14 21:17:39 +04:00
|
|
|
skip(')');
|
|
|
|
#ifdef ASM_DEBUG
|
2015-11-20 13:22:56 +03:00
|
|
|
printf("asm_alias: \"%s\"\n", (char *)astr.data);
|
2010-09-14 21:17:39 +04:00
|
|
|
#endif
|
2015-11-20 13:22:56 +03:00
|
|
|
v = tok_alloc(astr.data, astr.size - 1)->tok;
|
|
|
|
cstr_free(&astr);
|
|
|
|
return v;
|
2010-09-14 21:17:39 +04:00
|
|
|
}
|
|
|
|
|
2017-03-06 05:25:33 +03:00
|
|
|
static int post_type(CType *type, AttributeDef *ad, int storage, int td)
|
2009-05-05 22:18:10 +04:00
|
|
|
{
|
2019-06-24 11:28:36 +03:00
|
|
|
int n, l, t1, arg_size, align, unused_align;
|
2009-05-05 22:18:10 +04:00
|
|
|
Sym **plast, *s, *first;
|
|
|
|
AttributeDef ad1;
|
|
|
|
CType pt;
|
|
|
|
|
2011-03-08 23:56:13 +03:00
|
|
|
if (tok == '(') {
|
2017-03-06 05:25:33 +03:00
|
|
|
/* function type, or recursive declarator (return if so) */
|
2011-03-08 23:56:13 +03:00
|
|
|
next();
|
2017-03-06 05:25:33 +03:00
|
|
|
if (td && !(td & TYPE_ABSTRACT))
|
|
|
|
return 0;
|
|
|
|
if (tok == ')')
|
|
|
|
l = 0;
|
|
|
|
else if (parse_btype(&pt, &ad1))
|
|
|
|
l = FUNC_NEW;
|
2019-01-01 00:00:31 +03:00
|
|
|
else if (td) {
|
|
|
|
merge_attr (ad, &ad1);
|
|
|
|
return 0;
|
|
|
|
} else
|
2017-03-06 05:25:33 +03:00
|
|
|
l = FUNC_OLD;
|
2011-03-08 23:56:13 +03:00
|
|
|
first = NULL;
|
|
|
|
plast = &first;
|
|
|
|
arg_size = 0;
|
2017-03-06 05:25:33 +03:00
|
|
|
if (l) {
|
2011-03-08 23:56:13 +03:00
|
|
|
for(;;) {
|
|
|
|
/* read param name and compute offset */
|
|
|
|
if (l != FUNC_OLD) {
|
|
|
|
if ((pt.t & VT_BTYPE) == VT_VOID && tok == ')')
|
|
|
|
break;
|
|
|
|
type_decl(&pt, &ad1, &n, TYPE_DIRECT | TYPE_ABSTRACT);
|
|
|
|
if ((pt.t & VT_BTYPE) == VT_VOID)
|
2011-08-11 19:07:56 +04:00
|
|
|
tcc_error("parameter declared as void");
|
2011-03-08 23:56:13 +03:00
|
|
|
} else {
|
|
|
|
n = tok;
|
|
|
|
if (n < TOK_UIDENT)
|
|
|
|
expect("identifier");
|
2017-03-11 04:13:59 +03:00
|
|
|
pt.t = VT_VOID; /* invalid type */
|
2018-06-08 16:31:40 +03:00
|
|
|
pt.ref = NULL;
|
2011-03-08 23:56:13 +03:00
|
|
|
next();
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
2011-03-08 23:56:13 +03:00
|
|
|
convert_parameter_type(&pt);
|
2018-06-01 00:51:51 +03:00
|
|
|
arg_size += (type_size(&pt, &align) + PTR_SIZE - 1) / PTR_SIZE;
|
2011-03-08 23:56:13 +03:00
|
|
|
s = sym_push(n | SYM_FIELD, &pt, 0, 0);
|
|
|
|
*plast = s;
|
|
|
|
plast = &s->next;
|
|
|
|
if (tok == ')')
|
2009-05-05 22:18:10 +04:00
|
|
|
break;
|
2011-03-08 23:56:13 +03:00
|
|
|
skip(',');
|
|
|
|
if (l == FUNC_NEW && tok == TOK_DOTS) {
|
|
|
|
l = FUNC_ELLIPSIS;
|
|
|
|
next();
|
|
|
|
break;
|
|
|
|
}
|
2017-03-06 05:25:33 +03:00
|
|
|
if (l == FUNC_NEW && !parse_btype(&pt, &ad1))
|
|
|
|
tcc_error("invalid type");
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
2017-03-06 05:25:33 +03:00
|
|
|
} else
|
|
|
|
/* if no parameters, then old type prototype */
|
2011-03-08 23:56:13 +03:00
|
|
|
l = FUNC_OLD;
|
|
|
|
skip(')');
|
|
|
|
/* NOTE: const is ignored in returned type as it has a special
|
|
|
|
meaning in gcc / C++ */
|
2015-07-29 23:53:57 +03:00
|
|
|
type->t &= ~VT_CONSTANT;
|
2011-03-08 23:56:13 +03:00
|
|
|
/* some ancient pre-K&R C allows a function to return an array
|
2015-07-29 23:53:57 +03:00
|
|
|
and the array brackets to be put after the arguments, such
|
2011-03-09 02:12:09 +03:00
|
|
|
that "int c()[]" means something like "int[] c()" */
|
|
|
|
if (tok == '[') {
|
|
|
|
next();
|
|
|
|
skip(']'); /* only handle simple "[]" */
|
2017-05-05 23:01:02 +03:00
|
|
|
mk_pointer(type);
|
2011-03-09 02:12:09 +03:00
|
|
|
}
|
2011-03-08 23:56:13 +03:00
|
|
|
/* we push a anonymous symbol which will contain the function prototype */
|
2017-07-09 13:34:11 +03:00
|
|
|
ad->f.func_args = arg_size;
|
|
|
|
ad->f.func_type = l;
|
|
|
|
s = sym_push(SYM_FIELD, type, 0, 0);
|
2014-01-07 17:57:07 +04:00
|
|
|
s->a = ad->a;
|
2017-07-09 13:34:11 +03:00
|
|
|
s->f = ad->f;
|
2011-03-08 23:56:13 +03:00
|
|
|
s->next = first;
|
2011-04-06 23:08:50 +04:00
|
|
|
type->t = VT_FUNC;
|
2011-03-08 23:56:13 +03:00
|
|
|
type->ref = s;
|
|
|
|
} else if (tok == '[') {
|
2016-09-04 00:55:54 +03:00
|
|
|
int saved_nocode_wanted = nocode_wanted;
|
2011-03-08 23:56:13 +03:00
|
|
|
/* array definition */
|
2009-05-05 22:18:10 +04:00
|
|
|
next();
|
2018-03-23 15:19:58 +03:00
|
|
|
while (1) {
|
|
|
|
/* XXX The optional type-quals and static should only be accepted
|
|
|
|
in parameter decls. The '*' as well, and then even only
|
|
|
|
in prototypes (not function defs). */
|
|
|
|
switch (tok) {
|
|
|
|
case TOK_RESTRICT1: case TOK_RESTRICT2: case TOK_RESTRICT3:
|
|
|
|
case TOK_CONST1:
|
|
|
|
case TOK_VOLATILE1:
|
|
|
|
case TOK_STATIC:
|
|
|
|
case '*':
|
|
|
|
next();
|
|
|
|
continue;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
2011-03-08 23:56:13 +03:00
|
|
|
n = -1;
|
2011-04-06 23:08:50 +04:00
|
|
|
t1 = 0;
|
2011-03-08 23:56:13 +03:00
|
|
|
if (tok != ']') {
|
2016-09-04 00:55:54 +03:00
|
|
|
if (!local_stack || (storage & VT_STATIC))
|
|
|
|
vpushi(expr_const());
|
|
|
|
else {
|
|
|
|
/* VLAs (which can only happen with local_stack && !VT_STATIC)
|
|
|
|
length must always be evaluated, even under nocode_wanted,
|
|
|
|
so that its size slot is initialized (e.g. under sizeof
|
|
|
|
or typeof). */
|
|
|
|
nocode_wanted = 0;
|
|
|
|
gexpr();
|
|
|
|
}
|
2011-04-06 20:17:03 +04:00
|
|
|
if ((vtop->r & (VT_VALMASK | VT_LVAL | VT_SYM)) == VT_CONST) {
|
|
|
|
n = vtop->c.i;
|
|
|
|
if (n < 0)
|
2011-08-11 19:07:56 +04:00
|
|
|
tcc_error("invalid array size");
|
2011-04-06 20:17:03 +04:00
|
|
|
} else {
|
|
|
|
if (!is_integer_btype(vtop->type.t & VT_BTYPE))
|
2011-08-11 19:07:56 +04:00
|
|
|
tcc_error("size of variable length array should be an integer");
|
2019-04-07 05:09:25 +03:00
|
|
|
n = 0;
|
2011-04-06 23:08:50 +04:00
|
|
|
t1 = VT_VLA;
|
2011-04-06 20:17:03 +04:00
|
|
|
}
|
2011-03-08 23:56:13 +03:00
|
|
|
}
|
|
|
|
skip(']');
|
|
|
|
/* parse next post type */
|
2017-03-06 05:25:33 +03:00
|
|
|
post_type(type, ad, storage, 0);
|
2019-06-24 11:28:36 +03:00
|
|
|
|
|
|
|
if ((type->t & VT_BTYPE) == VT_FUNC)
|
2013-09-19 20:58:46 +04:00
|
|
|
tcc_error("declaration of an array of functions");
|
2019-06-24 11:28:36 +03:00
|
|
|
if ((type->t & VT_BTYPE) == VT_VOID
|
|
|
|
|| type_size(type, &unused_align) < 0)
|
|
|
|
tcc_error("declaration of an array of incomplete type elements");
|
|
|
|
|
2011-04-06 20:17:03 +04:00
|
|
|
t1 |= type->t & VT_VLA;
|
2019-06-24 11:28:36 +03:00
|
|
|
|
2011-04-10 09:52:25 +04:00
|
|
|
if (t1 & VT_VLA) {
|
2019-04-07 05:09:25 +03:00
|
|
|
if (n < 0)
|
|
|
|
tcc_error("need explicit inner array size in VLAs");
|
2011-04-10 09:52:25 +04:00
|
|
|
loc -= type_size(&int_type, &align);
|
|
|
|
loc &= -align;
|
|
|
|
n = loc;
|
|
|
|
|
|
|
|
vla_runtime_type_size(type, &align);
|
|
|
|
gen_op('*');
|
2015-04-28 12:23:29 +03:00
|
|
|
vset(&int_type, VT_LOCAL|VT_LVAL, n);
|
2011-04-10 09:52:25 +04:00
|
|
|
vswap();
|
|
|
|
vstore();
|
|
|
|
}
|
|
|
|
if (n != -1)
|
|
|
|
vpop();
|
2016-09-04 00:55:54 +03:00
|
|
|
nocode_wanted = saved_nocode_wanted;
|
2015-07-29 23:53:57 +03:00
|
|
|
|
2011-04-06 20:17:03 +04:00
|
|
|
/* we push an anonymous symbol which will contain the array
|
2011-03-08 23:56:13 +03:00
|
|
|
element type */
|
|
|
|
s = sym_push(SYM_FIELD, type, 0, n);
|
2011-04-08 12:09:39 +04:00
|
|
|
type->t = (t1 ? VT_VLA : VT_ARRAY) | VT_PTR;
|
2011-03-08 23:56:13 +03:00
|
|
|
type->ref = s;
|
|
|
|
}
|
2017-03-06 05:25:33 +03:00
|
|
|
return 1;
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
|
2017-03-06 05:25:33 +03:00
|
|
|
/* Parse a type declarator (except basic type), and return the type
|
2009-05-05 22:18:10 +04:00
|
|
|
in 'type'. 'td' is a bitmask indicating which kind of type decl is
|
|
|
|
expected. 'type' should contain the basic type. 'ad' is the
|
|
|
|
attribute definition of the basic type. It can be modified by
|
2017-03-06 05:25:33 +03:00
|
|
|
type_decl(). If this (possibly abstract) declarator is a pointer chain
|
|
|
|
it returns the innermost pointed to type (equals *type, but is a different
|
|
|
|
pointer), otherwise returns type itself, that's used for recursive calls. */
|
|
|
|
static CType *type_decl(CType *type, AttributeDef *ad, int *v, int td)
|
2009-05-05 22:18:10 +04:00
|
|
|
{
|
2017-03-06 05:25:33 +03:00
|
|
|
CType *post, *ret;
|
2013-01-06 20:20:44 +04:00
|
|
|
int qualifiers, storage;
|
|
|
|
|
2017-03-06 05:25:33 +03:00
|
|
|
/* recursive type, remove storage bits first, apply them later again */
|
|
|
|
storage = type->t & VT_STORAGE;
|
|
|
|
type->t &= ~VT_STORAGE;
|
|
|
|
post = ret = type;
|
2017-07-09 13:38:25 +03:00
|
|
|
|
2009-05-05 22:18:10 +04:00
|
|
|
while (tok == '*') {
|
|
|
|
qualifiers = 0;
|
|
|
|
redo:
|
|
|
|
next();
|
|
|
|
switch(tok) {
|
|
|
|
case TOK_CONST1:
|
|
|
|
case TOK_CONST2:
|
|
|
|
case TOK_CONST3:
|
|
|
|
qualifiers |= VT_CONSTANT;
|
|
|
|
goto redo;
|
|
|
|
case TOK_VOLATILE1:
|
|
|
|
case TOK_VOLATILE2:
|
|
|
|
case TOK_VOLATILE3:
|
|
|
|
qualifiers |= VT_VOLATILE;
|
|
|
|
goto redo;
|
|
|
|
case TOK_RESTRICT1:
|
|
|
|
case TOK_RESTRICT2:
|
|
|
|
case TOK_RESTRICT3:
|
|
|
|
goto redo;
|
2016-07-15 18:56:20 +03:00
|
|
|
/* XXX: clarify attribute handling */
|
|
|
|
case TOK_ATTRIBUTE1:
|
|
|
|
case TOK_ATTRIBUTE2:
|
|
|
|
parse_attribute(ad);
|
|
|
|
break;
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
mk_pointer(type);
|
|
|
|
type->t |= qualifiers;
|
2017-03-06 05:25:33 +03:00
|
|
|
if (ret == type)
|
|
|
|
/* innermost pointed to type is the one for the first derivation */
|
|
|
|
ret = pointed_type(type);
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
2017-02-27 04:22:28 +03:00
|
|
|
|
2009-05-05 22:18:10 +04:00
|
|
|
if (tok == '(') {
|
2017-03-06 05:25:33 +03:00
|
|
|
/* This is possibly a parameter type list for abstract declarators
|
|
|
|
('int ()'), use post_type for testing this. */
|
|
|
|
if (!post_type(type, ad, 0, td)) {
|
|
|
|
/* It's not, so it's a nested declarator, and the post operations
|
|
|
|
apply to the innermost pointed to type (if any). */
|
|
|
|
/* XXX: this is not correct to modify 'ad' at this point, but
|
|
|
|
the syntax is not clear */
|
2017-07-09 13:34:11 +03:00
|
|
|
parse_attribute(ad);
|
2017-03-06 05:25:33 +03:00
|
|
|
post = type_decl(type, ad, v, td);
|
|
|
|
skip(')');
|
2019-03-12 19:27:15 +03:00
|
|
|
} else
|
|
|
|
goto abstract;
|
2017-03-06 05:25:33 +03:00
|
|
|
} else if (tok >= TOK_IDENT && (td & TYPE_DIRECT)) {
|
|
|
|
/* type identifier */
|
|
|
|
*v = tok;
|
|
|
|
next();
|
2009-05-05 22:18:10 +04:00
|
|
|
} else {
|
2019-03-12 19:27:15 +03:00
|
|
|
abstract:
|
2017-03-06 05:25:33 +03:00
|
|
|
if (!(td & TYPE_ABSTRACT))
|
|
|
|
expect("identifier");
|
|
|
|
*v = 0;
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
2017-03-06 05:25:33 +03:00
|
|
|
post_type(post, ad, storage, 0);
|
2017-07-09 13:34:11 +03:00
|
|
|
parse_attribute(ad);
|
2017-04-04 09:34:52 +03:00
|
|
|
type->t |= storage;
|
2017-03-06 05:25:33 +03:00
|
|
|
return ret;
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/* indirection with full error checking and bound check */
|
2009-12-20 03:53:49 +03:00
|
|
|
ST_FUNC void indir(void)
|
2009-05-05 22:18:10 +04:00
|
|
|
{
|
|
|
|
if ((vtop->type.t & VT_BTYPE) != VT_PTR) {
|
|
|
|
if ((vtop->type.t & VT_BTYPE) == VT_FUNC)
|
|
|
|
return;
|
|
|
|
expect("pointer");
|
|
|
|
}
|
2016-12-18 19:23:33 +03:00
|
|
|
if (vtop->r & VT_LVAL)
|
2009-05-05 22:18:10 +04:00
|
|
|
gv(RC_INT);
|
|
|
|
vtop->type = *pointed_type(&vtop->type);
|
|
|
|
/* Arrays and functions are never lvalues */
|
2019-12-16 20:48:31 +03:00
|
|
|
if (!(vtop->type.t & (VT_ARRAY | VT_VLA))
|
2009-05-05 22:18:10 +04:00
|
|
|
&& (vtop->type.t & VT_BTYPE) != VT_FUNC) {
|
2019-12-16 20:48:31 +03:00
|
|
|
vtop->r |= VT_LVAL;
|
2009-05-05 22:18:10 +04:00
|
|
|
/* if bound checking, the referenced pointer must be checked */
|
2009-12-20 00:22:43 +03:00
|
|
|
#ifdef CONFIG_TCC_BCHECK
|
2009-05-11 20:45:44 +04:00
|
|
|
if (tcc_state->do_bounds_check)
|
2009-05-05 22:18:10 +04:00
|
|
|
vtop->r |= VT_MUSTBOUND;
|
2009-12-20 00:22:43 +03:00
|
|
|
#endif
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* pass a parameter to a function and do type checking and casting */
|
|
|
|
static void gfunc_param_typed(Sym *func, Sym *arg)
|
|
|
|
{
|
|
|
|
int func_type;
|
|
|
|
CType type;
|
|
|
|
|
2017-07-09 13:34:11 +03:00
|
|
|
func_type = func->f.func_type;
|
2009-05-05 22:18:10 +04:00
|
|
|
if (func_type == FUNC_OLD ||
|
|
|
|
(func_type == FUNC_ELLIPSIS && arg == NULL)) {
|
|
|
|
/* default casting : only need to convert float to double */
|
|
|
|
if ((vtop->type.t & VT_BTYPE) == VT_FLOAT) {
|
2017-07-09 13:34:11 +03:00
|
|
|
gen_cast_s(VT_DOUBLE);
|
2014-02-04 16:54:28 +04:00
|
|
|
} else if (vtop->type.t & VT_BITFIELD) {
|
|
|
|
type.t = vtop->type.t & (VT_BTYPE | VT_UNSIGNED);
|
2016-08-15 19:54:11 +03:00
|
|
|
type.ref = vtop->type.ref;
|
2014-02-04 16:54:28 +04:00
|
|
|
gen_cast(&type);
|
2019-12-16 20:51:28 +03:00
|
|
|
} else if (vtop->r & VT_MUSTCAST) {
|
|
|
|
force_charshort_cast();
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
} else if (arg == NULL) {
|
2011-08-11 19:07:56 +04:00
|
|
|
tcc_error("too many arguments to function");
|
2009-05-05 22:18:10 +04:00
|
|
|
} else {
|
|
|
|
type = arg->type;
|
|
|
|
type.t &= ~VT_CONSTANT; /* need to do that to avoid false warning */
|
|
|
|
gen_assign_cast(&type);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-07-20 23:21:27 +03:00
|
|
|
/* parse an expression and return its type without any side effect. */
|
|
|
|
static void expr_type(CType *type, void (*expr_fn)(void))
|
2017-02-27 05:34:33 +03:00
|
|
|
{
|
|
|
|
nocode_wanted++;
|
2017-07-20 23:21:27 +03:00
|
|
|
expr_fn();
|
2017-02-27 05:34:33 +03:00
|
|
|
*type = vtop->type;
|
|
|
|
vpop();
|
|
|
|
nocode_wanted--;
|
|
|
|
}
|
|
|
|
|
2009-05-05 22:18:10 +04:00
|
|
|
/* parse an expression of the form '(type)' or '(expr)' and return its
|
|
|
|
type */
|
|
|
|
static void parse_expr_type(CType *type)
|
|
|
|
{
|
|
|
|
int n;
|
|
|
|
AttributeDef ad;
|
|
|
|
|
|
|
|
skip('(');
|
|
|
|
if (parse_btype(type, &ad)) {
|
|
|
|
type_decl(type, &ad, &n, TYPE_ABSTRACT);
|
|
|
|
} else {
|
2017-07-20 23:21:27 +03:00
|
|
|
expr_type(type, gexpr);
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
skip(')');
|
|
|
|
}
|
|
|
|
|
|
|
|
static void parse_type(CType *type)
|
|
|
|
{
|
|
|
|
AttributeDef ad;
|
|
|
|
int n;
|
|
|
|
|
|
|
|
if (!parse_btype(type, &ad)) {
|
|
|
|
expect("type");
|
|
|
|
}
|
|
|
|
type_decl(type, &ad, &n, TYPE_ABSTRACT);
|
|
|
|
}
|
|
|
|
|
2017-02-27 04:22:28 +03:00
|
|
|
static void parse_builtin_params(int nc, const char *args)
|
|
|
|
{
|
|
|
|
char c, sep = '(';
|
|
|
|
CType t;
|
|
|
|
if (nc)
|
|
|
|
nocode_wanted++;
|
|
|
|
next();
|
|
|
|
while ((c = *args++)) {
|
|
|
|
skip(sep);
|
|
|
|
sep = ',';
|
|
|
|
switch (c) {
|
|
|
|
case 'e': expr_eq(); continue;
|
|
|
|
case 't': parse_type(&t); vpush(&t); continue;
|
|
|
|
default: tcc_error("internal error"); break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
skip(')');
|
|
|
|
if (nc)
|
|
|
|
nocode_wanted--;
|
|
|
|
}
|
|
|
|
|
2009-12-20 03:53:49 +03:00
|
|
|
ST_FUNC void unary(void)
|
2009-05-05 22:18:10 +04:00
|
|
|
{
|
2010-04-11 03:53:40 +04:00
|
|
|
int n, t, align, size, r, sizeof_caller;
|
2009-05-05 22:18:10 +04:00
|
|
|
CType type;
|
|
|
|
Sym *s;
|
|
|
|
AttributeDef ad;
|
|
|
|
|
2020-01-18 00:58:39 +03:00
|
|
|
/* generate line number info */
|
|
|
|
if (tcc_state->do_debug)
|
|
|
|
tcc_debug_line(tcc_state);
|
|
|
|
|
2010-04-11 03:53:40 +04:00
|
|
|
sizeof_caller = in_sizeof;
|
|
|
|
in_sizeof = 0;
|
2017-07-09 13:34:11 +03:00
|
|
|
type.ref = NULL;
|
2009-05-05 22:18:10 +04:00
|
|
|
/* XXX: GCC 2.95.3 does not generate a table although it should be
|
|
|
|
better here */
|
|
|
|
tok_next:
|
|
|
|
switch(tok) {
|
|
|
|
case TOK_EXTENSION:
|
|
|
|
next();
|
|
|
|
goto tok_next;
|
2017-09-24 19:57:48 +03:00
|
|
|
case TOK_LCHAR:
|
|
|
|
#ifdef TCC_TARGET_PE
|
|
|
|
t = VT_SHORT|VT_UNSIGNED;
|
|
|
|
goto push_tokc;
|
|
|
|
#endif
|
2009-05-05 22:18:10 +04:00
|
|
|
case TOK_CINT:
|
2015-07-29 23:53:57 +03:00
|
|
|
case TOK_CCHAR:
|
2017-03-06 23:45:41 +03:00
|
|
|
t = VT_INT;
|
|
|
|
push_tokc:
|
|
|
|
type.t = t;
|
|
|
|
vsetc(&type, VT_CONST, &tokc);
|
2009-05-05 22:18:10 +04:00
|
|
|
next();
|
|
|
|
break;
|
|
|
|
case TOK_CUINT:
|
2017-03-06 23:45:41 +03:00
|
|
|
t = VT_INT | VT_UNSIGNED;
|
|
|
|
goto push_tokc;
|
2009-05-05 22:18:10 +04:00
|
|
|
case TOK_CLLONG:
|
2017-03-06 23:45:41 +03:00
|
|
|
t = VT_LLONG;
|
|
|
|
goto push_tokc;
|
2009-05-05 22:18:10 +04:00
|
|
|
case TOK_CULLONG:
|
2017-03-12 07:25:09 +03:00
|
|
|
t = VT_LLONG | VT_UNSIGNED;
|
2017-03-06 23:45:41 +03:00
|
|
|
goto push_tokc;
|
2009-05-05 22:18:10 +04:00
|
|
|
case TOK_CFLOAT:
|
2017-03-06 23:45:41 +03:00
|
|
|
t = VT_FLOAT;
|
|
|
|
goto push_tokc;
|
2009-05-05 22:18:10 +04:00
|
|
|
case TOK_CDOUBLE:
|
2017-03-06 23:45:41 +03:00
|
|
|
t = VT_DOUBLE;
|
|
|
|
goto push_tokc;
|
2009-05-05 22:18:10 +04:00
|
|
|
case TOK_CLDOUBLE:
|
2017-03-06 23:45:41 +03:00
|
|
|
t = VT_LDOUBLE;
|
|
|
|
goto push_tokc;
|
mutiples fix for _Generic
* check that _Generic don't match unsigned char * with char *
this case is usefull as with -funsigned-char, 'char *' are unsigned
* change VT_LONG so it's now a qualifier
VT_LONG are never use for code generation, but only durring parsing state,
in _Generic we need to be able to make diference between
'long' and 'long long'
So VT_LONG is now use as a type qualifier, it's old behaviour is still
here, but we can keep trace of what was a long and what wasn't
* add TOK_CLONG and TOK_CULONG
tcc was directly converting value like '7171L' into TOK_CLLONG or
TOK_CINT depending of the machine architecture.
because of that, we was unable to make diference between a long and a
long long, which doesn't work with _Generic.
So now 7171L is a TOK_CLONG, and we can handle _Generic properly
* check that _Generic can make diference between long and long long
* uncomment "type match twice" as it should now pass tests on any platforms
* add inside_generic global
the point of this variable is to use VT_LONG in comparaison only
when we are evaluating a _Generic.
problem is with my lastest patchs tcc can now make the diference between
a 'long long' and a 'long', but in 64 bit stddef.h typedef uint64_t as
typedef signed long long int int64_t and stdint.h as unsigned long int, so tcc
break when stdint.h and stddef.h are include together.
Another solution woud be to modifie include/stddef.h so it define uint64_t as
unsigned long int when processor is 64 bit, but this could break some
legacy code, so for now, VT_LONG are use only inside generc.
* check that _Generic parse first argument correctly
* check that _Generic evaluate correctly exresion like "f() / 2"
2017-07-10 18:44:53 +03:00
|
|
|
case TOK_CLONG:
|
2017-09-24 19:57:48 +03:00
|
|
|
t = (LONG_SIZE == 8 ? VT_LLONG : VT_INT) | VT_LONG;
|
|
|
|
goto push_tokc;
|
mutiples fix for _Generic
* check that _Generic don't match unsigned char * with char *
this case is usefull as with -funsigned-char, 'char *' are unsigned
* change VT_LONG so it's now a qualifier
VT_LONG are never use for code generation, but only durring parsing state,
in _Generic we need to be able to make diference between
'long' and 'long long'
So VT_LONG is now use as a type qualifier, it's old behaviour is still
here, but we can keep trace of what was a long and what wasn't
* add TOK_CLONG and TOK_CULONG
tcc was directly converting value like '7171L' into TOK_CLLONG or
TOK_CINT depending of the machine architecture.
because of that, we was unable to make diference between a long and a
long long, which doesn't work with _Generic.
So now 7171L is a TOK_CLONG, and we can handle _Generic properly
* check that _Generic can make diference between long and long long
* uncomment "type match twice" as it should now pass tests on any platforms
* add inside_generic global
the point of this variable is to use VT_LONG in comparaison only
when we are evaluating a _Generic.
problem is with my lastest patchs tcc can now make the diference between
a 'long long' and a 'long', but in 64 bit stddef.h typedef uint64_t as
typedef signed long long int int64_t and stdint.h as unsigned long int, so tcc
break when stdint.h and stddef.h are include together.
Another solution woud be to modifie include/stddef.h so it define uint64_t as
unsigned long int when processor is 64 bit, but this could break some
legacy code, so for now, VT_LONG are use only inside generc.
* check that _Generic parse first argument correctly
* check that _Generic evaluate correctly exresion like "f() / 2"
2017-07-10 18:44:53 +03:00
|
|
|
case TOK_CULONG:
|
2017-09-24 19:57:48 +03:00
|
|
|
t = (LONG_SIZE == 8 ? VT_LLONG : VT_INT) | VT_LONG | VT_UNSIGNED;
|
mutiples fix for _Generic
* check that _Generic don't match unsigned char * with char *
this case is usefull as with -funsigned-char, 'char *' are unsigned
* change VT_LONG so it's now a qualifier
VT_LONG are never use for code generation, but only durring parsing state,
in _Generic we need to be able to make diference between
'long' and 'long long'
So VT_LONG is now use as a type qualifier, it's old behaviour is still
here, but we can keep trace of what was a long and what wasn't
* add TOK_CLONG and TOK_CULONG
tcc was directly converting value like '7171L' into TOK_CLLONG or
TOK_CINT depending of the machine architecture.
because of that, we was unable to make diference between a long and a
long long, which doesn't work with _Generic.
So now 7171L is a TOK_CLONG, and we can handle _Generic properly
* check that _Generic can make diference between long and long long
* uncomment "type match twice" as it should now pass tests on any platforms
* add inside_generic global
the point of this variable is to use VT_LONG in comparaison only
when we are evaluating a _Generic.
problem is with my lastest patchs tcc can now make the diference between
a 'long long' and a 'long', but in 64 bit stddef.h typedef uint64_t as
typedef signed long long int int64_t and stdint.h as unsigned long int, so tcc
break when stdint.h and stddef.h are include together.
Another solution woud be to modifie include/stddef.h so it define uint64_t as
unsigned long int when processor is 64 bit, but this could break some
legacy code, so for now, VT_LONG are use only inside generc.
* check that _Generic parse first argument correctly
* check that _Generic evaluate correctly exresion like "f() / 2"
2017-07-10 18:44:53 +03:00
|
|
|
goto push_tokc;
|
2009-05-05 22:18:10 +04:00
|
|
|
case TOK___FUNCTION__:
|
|
|
|
if (!gnu_ext)
|
|
|
|
goto tok_identifier;
|
|
|
|
/* fall thru */
|
|
|
|
case TOK___FUNC__:
|
|
|
|
{
|
|
|
|
void *ptr;
|
|
|
|
int len;
|
|
|
|
/* special function name identifier */
|
|
|
|
len = strlen(funcname) + 1;
|
|
|
|
/* generate char[len] type */
|
|
|
|
type.t = VT_BYTE;
|
|
|
|
mk_pointer(&type);
|
|
|
|
type.t |= VT_ARRAY;
|
|
|
|
type.ref->c = len;
|
|
|
|
vpush_ref(&type, data_section, data_section->data_offset, len);
|
2017-07-16 13:10:00 +03:00
|
|
|
if (!NODATA_WANTED) {
|
|
|
|
ptr = section_ptr_add(data_section, len);
|
|
|
|
memcpy(ptr, funcname, len);
|
|
|
|
}
|
2009-05-05 22:18:10 +04:00
|
|
|
next();
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case TOK_LSTR:
|
|
|
|
#ifdef TCC_TARGET_PE
|
|
|
|
t = VT_SHORT | VT_UNSIGNED;
|
|
|
|
#else
|
|
|
|
t = VT_INT;
|
|
|
|
#endif
|
|
|
|
goto str_init;
|
|
|
|
case TOK_STR:
|
|
|
|
/* string parsing */
|
|
|
|
t = VT_BYTE;
|
2017-07-09 13:07:40 +03:00
|
|
|
if (tcc_state->char_is_unsigned)
|
|
|
|
t = VT_BYTE | VT_UNSIGNED;
|
2009-05-05 22:18:10 +04:00
|
|
|
str_init:
|
2017-07-04 17:37:49 +03:00
|
|
|
if (tcc_state->warn_write_strings)
|
|
|
|
t |= VT_CONSTANT;
|
2009-05-05 22:18:10 +04:00
|
|
|
type.t = t;
|
|
|
|
mk_pointer(&type);
|
|
|
|
type.t |= VT_ARRAY;
|
|
|
|
memset(&ad, 0, sizeof(AttributeDef));
|
2015-11-20 13:22:56 +03:00
|
|
|
decl_initializer_alloc(&type, &ad, VT_CONST, 2, 0, 0);
|
2009-05-05 22:18:10 +04:00
|
|
|
break;
|
|
|
|
case '(':
|
|
|
|
next();
|
|
|
|
/* cast ? */
|
|
|
|
if (parse_btype(&type, &ad)) {
|
|
|
|
type_decl(&type, &ad, &n, TYPE_ABSTRACT);
|
|
|
|
skip(')');
|
|
|
|
/* check ISOC99 compound literal */
|
|
|
|
if (tok == '{') {
|
|
|
|
/* data is allocated locally by default */
|
|
|
|
if (global_expr)
|
|
|
|
r = VT_CONST;
|
|
|
|
else
|
|
|
|
r = VT_LOCAL;
|
|
|
|
/* all except arrays are lvalues */
|
|
|
|
if (!(type.t & VT_ARRAY))
|
2019-12-16 20:48:31 +03:00
|
|
|
r |= VT_LVAL;
|
2009-05-05 22:18:10 +04:00
|
|
|
memset(&ad, 0, sizeof(AttributeDef));
|
2015-11-20 13:22:56 +03:00
|
|
|
decl_initializer_alloc(&type, &ad, r, 1, 0, 0);
|
2009-05-05 22:18:10 +04:00
|
|
|
} else {
|
2010-04-11 03:53:40 +04:00
|
|
|
if (sizeof_caller) {
|
|
|
|
vpush(&type);
|
|
|
|
return;
|
|
|
|
}
|
2009-05-05 22:18:10 +04:00
|
|
|
unary();
|
|
|
|
gen_cast(&type);
|
|
|
|
}
|
|
|
|
} else if (tok == '{') {
|
2016-12-20 06:49:22 +03:00
|
|
|
int saved_nocode_wanted = nocode_wanted;
|
2020-01-16 01:32:40 +03:00
|
|
|
if (const_wanted && !(nocode_wanted & unevalmask))
|
2015-11-26 15:24:34 +03:00
|
|
|
tcc_error("expected constant");
|
2009-05-05 22:18:10 +04:00
|
|
|
/* save all registers */
|
2016-12-18 19:23:33 +03:00
|
|
|
save_regs(0);
|
2009-05-05 22:18:10 +04:00
|
|
|
/* statement expression : we do not accept break/continue
|
2016-12-20 06:49:22 +03:00
|
|
|
inside as GCC does. We do retain the nocode_wanted state,
|
|
|
|
as statement expressions can't ever be entered from the
|
|
|
|
outside, so any reactivation of code emission (from labels
|
|
|
|
or loop heads) can be disabled again after the end of it. */
|
2019-06-22 14:18:54 +03:00
|
|
|
block(1);
|
2016-12-20 06:49:22 +03:00
|
|
|
nocode_wanted = saved_nocode_wanted;
|
2009-05-05 22:18:10 +04:00
|
|
|
skip(')');
|
|
|
|
} else {
|
|
|
|
gexpr();
|
|
|
|
skip(')');
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case '*':
|
|
|
|
next();
|
|
|
|
unary();
|
|
|
|
indir();
|
|
|
|
break;
|
|
|
|
case '&':
|
|
|
|
next();
|
|
|
|
unary();
|
|
|
|
/* functions names must be treated as function pointers,
|
|
|
|
except for unary '&' and sizeof. Since we consider that
|
|
|
|
functions are not lvalues, we only have to handle it
|
|
|
|
there and in function calls. */
|
|
|
|
/* arrays can also be used although they are not lvalues */
|
|
|
|
if ((vtop->type.t & VT_BTYPE) != VT_FUNC &&
|
2017-02-19 06:25:46 +03:00
|
|
|
!(vtop->type.t & VT_ARRAY))
|
2009-05-05 22:18:10 +04:00
|
|
|
test_lvalue();
|
2020-01-16 03:19:59 +03:00
|
|
|
if (vtop->sym)
|
|
|
|
vtop->sym->a.addrtaken = 1;
|
2009-05-05 22:18:10 +04:00
|
|
|
mk_pointer(&vtop->type);
|
|
|
|
gaddrof();
|
|
|
|
break;
|
|
|
|
case '!':
|
|
|
|
next();
|
|
|
|
unary();
|
2019-12-16 20:51:28 +03:00
|
|
|
gen_test_zero(TOK_EQ);
|
2009-05-05 22:18:10 +04:00
|
|
|
break;
|
|
|
|
case '~':
|
|
|
|
next();
|
|
|
|
unary();
|
|
|
|
vpushi(-1);
|
|
|
|
gen_op('^');
|
|
|
|
break;
|
|
|
|
case '+':
|
|
|
|
next();
|
|
|
|
unary();
|
|
|
|
if ((vtop->type.t & VT_BTYPE) == VT_PTR)
|
2011-08-11 19:07:56 +04:00
|
|
|
tcc_error("pointer not accepted for unary plus");
|
2014-01-12 07:44:27 +04:00
|
|
|
/* In order to force cast, we add zero, except for floating point
|
2015-07-29 23:53:57 +03:00
|
|
|
where we really need an noop (otherwise -0.0 will be transformed
|
|
|
|
into +0.0). */
|
|
|
|
if (!is_float(vtop->type.t)) {
|
|
|
|
vpushi(0);
|
|
|
|
gen_op('+');
|
|
|
|
}
|
2009-05-05 22:18:10 +04:00
|
|
|
break;
|
|
|
|
case TOK_SIZEOF:
|
|
|
|
case TOK_ALIGNOF1:
|
|
|
|
case TOK_ALIGNOF2:
|
2018-12-12 21:53:58 +03:00
|
|
|
case TOK_ALIGNOF3:
|
2009-05-05 22:18:10 +04:00
|
|
|
t = tok;
|
|
|
|
next();
|
2010-04-11 03:53:40 +04:00
|
|
|
in_sizeof++;
|
2017-07-20 23:21:27 +03:00
|
|
|
expr_type(&type, unary); /* Perform a in_sizeof = 0; */
|
jump optimizations
This unifies VT_CMP with VT_JMP(i) by using mostly VT_CMP
with both a positive and a negative jump target list.
Such we can delay putting the non-inverted or inverted jump
until we can see which one is nore suitable (in most cases).
example:
if (a && b || c && d)
e = 0;
before this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 11 00 00 00 je 27 <main+0x27>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 84 05 00 00 00 je 27 <main+0x27>
22: e9 22 00 00 00 jmp 49 <main+0x49>
27: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
2a: 83 f8 00 cmp $0x0,%eax
2d: 0f 84 11 00 00 00 je 44 <main+0x44>
33: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
36: 83 f8 00 cmp $0x0,%eax
39: 0f 84 05 00 00 00 je 44 <main+0x44>
3f: e9 05 00 00 00 jmp 49 <main+0x49>
44: e9 08 00 00 00 jmp 51 <main+0x51>
49: b8 00 00 00 00 mov $0x0,%eax
4e: 89 45 ec mov %eax,0xffffffec(%ebp)
51: ...
with this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 0c 00 00 00 je 22 <main+0x22>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 85 18 00 00 00 jne 3a <main+0x3a>
22: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
25: 83 f8 00 cmp $0x0,%eax
28: 0f 84 14 00 00 00 je 42 <main+0x42>
2e: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
31: 83 f8 00 cmp $0x0,%eax
34: 0f 84 08 00 00 00 je 42 <main+0x42>
3a: b8 00 00 00 00 mov $0x0,%eax
3f: 89 45 ec mov %eax,0xffffffec(%ebp)
42: ...
2019-06-22 12:45:35 +03:00
|
|
|
s = NULL;
|
|
|
|
if (vtop[1].r & VT_SYM)
|
|
|
|
s = vtop[1].sym; /* hack: accessing previous vtop */
|
2011-04-08 12:09:39 +04:00
|
|
|
size = type_size(&type, &align);
|
2017-07-09 13:38:59 +03:00
|
|
|
if (s && s->a.aligned)
|
|
|
|
align = 1 << (s->a.aligned - 1);
|
2009-05-05 22:18:10 +04:00
|
|
|
if (t == TOK_SIZEOF) {
|
2011-04-06 20:17:03 +04:00
|
|
|
if (!(type.t & VT_VLA)) {
|
|
|
|
if (size < 0)
|
2011-08-11 19:07:56 +04:00
|
|
|
tcc_error("sizeof applied to an incomplete type");
|
2012-04-16 03:13:25 +04:00
|
|
|
vpushs(size);
|
2011-04-08 12:09:39 +04:00
|
|
|
} else {
|
|
|
|
vla_runtime_type_size(&type, &align);
|
2011-04-06 20:17:03 +04:00
|
|
|
}
|
2009-05-05 22:18:10 +04:00
|
|
|
} else {
|
2012-04-16 03:13:25 +04:00
|
|
|
vpushs(align);
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
vtop->type.t |= VT_UNSIGNED;
|
|
|
|
break;
|
|
|
|
|
2016-04-16 12:41:53 +03:00
|
|
|
case TOK_builtin_expect:
|
2017-02-27 04:22:28 +03:00
|
|
|
/* __builtin_expect is a no-op for now */
|
|
|
|
parse_builtin_params(0, "ee");
|
|
|
|
vpop();
|
2016-04-16 12:41:53 +03:00
|
|
|
break;
|
2009-05-05 22:18:10 +04:00
|
|
|
case TOK_builtin_types_compatible_p:
|
2017-02-27 04:22:28 +03:00
|
|
|
parse_builtin_params(0, "tt");
|
|
|
|
vtop[-1].type.t &= ~(VT_CONSTANT | VT_VOLATILE);
|
|
|
|
vtop[0].type.t &= ~(VT_CONSTANT | VT_VOLATILE);
|
|
|
|
n = is_compatible_types(&vtop[-1].type, &vtop[0].type);
|
|
|
|
vtop -= 2;
|
|
|
|
vpushi(n);
|
2009-05-05 22:18:10 +04:00
|
|
|
break;
|
2016-07-13 16:11:40 +03:00
|
|
|
case TOK_builtin_choose_expr:
|
|
|
|
{
|
2016-11-06 07:02:11 +03:00
|
|
|
int64_t c;
|
2016-07-13 16:11:40 +03:00
|
|
|
next();
|
|
|
|
skip('(');
|
2016-11-06 07:02:11 +03:00
|
|
|
c = expr_const64();
|
2016-07-13 16:11:40 +03:00
|
|
|
skip(',');
|
|
|
|
if (!c) {
|
2016-12-18 20:58:33 +03:00
|
|
|
nocode_wanted++;
|
2016-07-13 16:11:40 +03:00
|
|
|
}
|
|
|
|
expr_eq();
|
|
|
|
if (!c) {
|
|
|
|
vpop();
|
2016-12-18 20:58:33 +03:00
|
|
|
nocode_wanted--;
|
2016-07-13 16:11:40 +03:00
|
|
|
}
|
|
|
|
skip(',');
|
|
|
|
if (c) {
|
2016-12-18 20:58:33 +03:00
|
|
|
nocode_wanted++;
|
2016-07-13 16:11:40 +03:00
|
|
|
}
|
|
|
|
expr_eq();
|
|
|
|
if (c) {
|
|
|
|
vpop();
|
2016-12-18 20:58:33 +03:00
|
|
|
nocode_wanted--;
|
2016-07-13 16:11:40 +03:00
|
|
|
}
|
|
|
|
skip(')');
|
|
|
|
}
|
|
|
|
break;
|
2009-05-05 22:18:10 +04:00
|
|
|
case TOK_builtin_constant_p:
|
2017-02-27 04:22:28 +03:00
|
|
|
parse_builtin_params(1, "e");
|
|
|
|
n = (vtop->r & (VT_VALMASK | VT_LVAL | VT_SYM)) == VT_CONST;
|
|
|
|
vtop--;
|
|
|
|
vpushi(n);
|
2009-05-05 22:18:10 +04:00
|
|
|
break;
|
|
|
|
case TOK_builtin_frame_address:
|
2015-03-07 00:01:14 +03:00
|
|
|
case TOK_builtin_return_address:
|
2009-05-05 22:18:10 +04:00
|
|
|
{
|
2015-03-07 00:01:14 +03:00
|
|
|
int tok1 = tok;
|
Add support for __builtin_frame_address(level)
Continuing d6072d37 (Add __builtin_frame_address(0)) implement
__builtin_frame_address for levels greater than zero, in order for
tinycc to be able to compile its own lib/bcheck.c after
cffb7af9 (lib/bcheck: Prevent __bound_local_new / __bound_local_delete
from being miscompiled).
I'm new to the internals, and used the most simple way to do it.
Generated code is not very good for levels >= 2, compare
gcc tcc
level=0 mov %ebp,%eax lea 0x0(%ebp),%eax
level=1 mov 0x0(%ebp),%eax mov 0x0(%ebp),%eax
level=2 mov 0x0(%ebp),%eax mov 0x0(%ebp),%eax
mov (%eax),%eax mov %eax,-0x10(%ebp)
mov -0x10(%ebp),%eax
mov (%eax),%eax
level=3 mov 0x0(%ebp),%eax mov 0x0(%ebp),%eax
mov (%eax),%eax mov (%eax),%ecx
mov (%eax),%eax mov (%ecx),%eax
But this is still an improvement and for bcheck we need level=1 for
which the code is good.
For the tests I had to force gcc use -O0 to not inline the functions.
And -fno-omit-frame-pointer just in case.
If someone knows how to improve the generated code - help is
appreciated.
Thanks,
Kirill
Cc: Michael Matz <matz@suse.de>
Cc: Shinichiro Hamaji <shinichiro.hamaji@gmail.com>
2012-11-15 03:31:49 +04:00
|
|
|
int level;
|
2009-05-05 22:18:10 +04:00
|
|
|
next();
|
|
|
|
skip('(');
|
2015-11-17 22:09:35 +03:00
|
|
|
if (tok != TOK_CINT) {
|
2015-03-07 00:01:14 +03:00
|
|
|
tcc_error("%s only takes positive integers",
|
|
|
|
tok1 == TOK_builtin_return_address ?
|
|
|
|
"__builtin_return_address" :
|
|
|
|
"__builtin_frame_address");
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
2015-11-17 22:09:35 +03:00
|
|
|
level = (uint32_t)tokc.i;
|
2009-05-05 22:18:10 +04:00
|
|
|
next();
|
|
|
|
skip(')');
|
|
|
|
type.t = VT_VOID;
|
|
|
|
mk_pointer(&type);
|
Add support for __builtin_frame_address(level)
Continuing d6072d37 (Add __builtin_frame_address(0)) implement
__builtin_frame_address for levels greater than zero, in order for
tinycc to be able to compile its own lib/bcheck.c after
cffb7af9 (lib/bcheck: Prevent __bound_local_new / __bound_local_delete
from being miscompiled).
I'm new to the internals, and used the most simple way to do it.
Generated code is not very good for levels >= 2, compare
gcc tcc
level=0 mov %ebp,%eax lea 0x0(%ebp),%eax
level=1 mov 0x0(%ebp),%eax mov 0x0(%ebp),%eax
level=2 mov 0x0(%ebp),%eax mov 0x0(%ebp),%eax
mov (%eax),%eax mov %eax,-0x10(%ebp)
mov -0x10(%ebp),%eax
mov (%eax),%eax
level=3 mov 0x0(%ebp),%eax mov 0x0(%ebp),%eax
mov (%eax),%eax mov (%eax),%ecx
mov (%eax),%eax mov (%ecx),%eax
But this is still an improvement and for bcheck we need level=1 for
which the code is good.
For the tests I had to force gcc use -O0 to not inline the functions.
And -fno-omit-frame-pointer just in case.
If someone knows how to improve the generated code - help is
appreciated.
Thanks,
Kirill
Cc: Michael Matz <matz@suse.de>
Cc: Shinichiro Hamaji <shinichiro.hamaji@gmail.com>
2012-11-15 03:31:49 +04:00
|
|
|
vset(&type, VT_LOCAL, 0); /* local frame */
|
|
|
|
while (level--) {
|
|
|
|
mk_pointer(&vtop->type);
|
|
|
|
indir(); /* -> parent frame */
|
|
|
|
}
|
2015-03-07 00:01:14 +03:00
|
|
|
if (tok1 == TOK_builtin_return_address) {
|
|
|
|
// assume return address is just above frame pointer on stack
|
|
|
|
vpushi(PTR_SIZE);
|
|
|
|
gen_op('+');
|
|
|
|
mk_pointer(&vtop->type);
|
|
|
|
indir();
|
|
|
|
}
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
break;
|
2019-07-21 04:25:12 +03:00
|
|
|
#ifdef TCC_TARGET_RISCV64
|
|
|
|
case TOK_builtin_va_start:
|
|
|
|
parse_builtin_params(0, "ee");
|
|
|
|
r = vtop->r & VT_VALMASK;
|
|
|
|
if (r == VT_LLOCAL)
|
|
|
|
r = VT_LOCAL;
|
|
|
|
if (r != VT_LOCAL)
|
|
|
|
tcc_error("__builtin_va_start expects a local variable");
|
2019-07-22 21:37:42 +03:00
|
|
|
gen_va_start();
|
2019-07-21 04:25:12 +03:00
|
|
|
vstore();
|
|
|
|
break;
|
|
|
|
#endif
|
2013-04-24 05:19:15 +04:00
|
|
|
#ifdef TCC_TARGET_X86_64
|
|
|
|
#ifdef TCC_TARGET_PE
|
|
|
|
case TOK_builtin_va_start:
|
2017-02-27 04:22:28 +03:00
|
|
|
parse_builtin_params(0, "ee");
|
2017-05-07 13:41:29 +03:00
|
|
|
r = vtop->r & VT_VALMASK;
|
|
|
|
if (r == VT_LLOCAL)
|
|
|
|
r = VT_LOCAL;
|
|
|
|
if (r != VT_LOCAL)
|
|
|
|
tcc_error("__builtin_va_start expects a local variable");
|
|
|
|
vtop->r = r;
|
2017-02-27 04:22:28 +03:00
|
|
|
vtop->type = char_pointer_type;
|
|
|
|
vtop->c.i += 8;
|
|
|
|
vstore();
|
2013-04-24 05:19:15 +04:00
|
|
|
break;
|
|
|
|
#else
|
2010-12-28 13:32:40 +03:00
|
|
|
case TOK_builtin_va_arg_types:
|
2017-02-27 04:22:28 +03:00
|
|
|
parse_builtin_params(0, "t");
|
|
|
|
vpushi(classify_x86_64_va_arg(&vtop->type));
|
|
|
|
vswap();
|
|
|
|
vpop();
|
2017-12-25 23:32:27 +03:00
|
|
|
break;
|
2013-04-24 05:19:15 +04:00
|
|
|
#endif
|
2009-05-05 22:18:10 +04:00
|
|
|
#endif
|
2015-02-13 21:58:31 +03:00
|
|
|
|
|
|
|
#ifdef TCC_TARGET_ARM64
|
2017-12-25 23:32:27 +03:00
|
|
|
case TOK_builtin_va_start: {
|
2017-02-27 04:22:28 +03:00
|
|
|
parse_builtin_params(0, "ee");
|
2015-02-13 21:58:31 +03:00
|
|
|
//xx check types
|
|
|
|
gen_va_start();
|
|
|
|
vpushi(0);
|
|
|
|
vtop->type.t = VT_VOID;
|
|
|
|
break;
|
|
|
|
}
|
2017-12-25 23:32:27 +03:00
|
|
|
case TOK_builtin_va_arg: {
|
2017-02-27 04:22:28 +03:00
|
|
|
parse_builtin_params(0, "et");
|
|
|
|
type = vtop->type;
|
|
|
|
vpop();
|
2015-02-13 21:58:31 +03:00
|
|
|
//xx check types
|
|
|
|
gen_va_arg(&type);
|
|
|
|
vtop->type = type;
|
|
|
|
break;
|
|
|
|
}
|
2015-03-08 03:10:44 +03:00
|
|
|
case TOK___arm64_clear_cache: {
|
2017-02-27 04:22:28 +03:00
|
|
|
parse_builtin_params(0, "ee");
|
2015-03-08 03:10:44 +03:00
|
|
|
gen_clear_cache();
|
|
|
|
vpushi(0);
|
|
|
|
vtop->type.t = VT_VOID;
|
|
|
|
break;
|
|
|
|
}
|
2015-02-13 21:58:31 +03:00
|
|
|
#endif
|
2015-03-10 18:23:00 +03:00
|
|
|
/* pre operations */
|
2009-05-05 22:18:10 +04:00
|
|
|
case TOK_INC:
|
|
|
|
case TOK_DEC:
|
|
|
|
t = tok;
|
|
|
|
next();
|
|
|
|
unary();
|
|
|
|
inc(0, t);
|
|
|
|
break;
|
|
|
|
case '-':
|
|
|
|
next();
|
|
|
|
unary();
|
2014-01-04 08:56:14 +04:00
|
|
|
t = vtop->type.t & VT_BTYPE;
|
2015-07-29 23:53:57 +03:00
|
|
|
if (is_float(t)) {
|
2014-01-12 07:44:27 +04:00
|
|
|
/* In IEEE negate(x) isn't subtract(0,x), but rather
|
2015-07-29 23:53:57 +03:00
|
|
|
subtract(-0, x). */
|
|
|
|
vpush(&vtop->type);
|
|
|
|
if (t == VT_FLOAT)
|
2017-02-08 21:45:31 +03:00
|
|
|
vtop->c.f = -1.0 * 0.0;
|
2015-07-29 23:53:57 +03:00
|
|
|
else if (t == VT_DOUBLE)
|
2017-02-08 21:45:31 +03:00
|
|
|
vtop->c.d = -1.0 * 0.0;
|
2019-07-22 07:45:03 +03:00
|
|
|
else
|
2017-02-08 21:45:31 +03:00
|
|
|
vtop->c.ld = -1.0 * 0.0;
|
2015-07-29 23:53:57 +03:00
|
|
|
} else
|
|
|
|
vpushi(0);
|
|
|
|
vswap();
|
|
|
|
gen_op('-');
|
2009-05-05 22:18:10 +04:00
|
|
|
break;
|
|
|
|
case TOK_LAND:
|
|
|
|
if (!gnu_ext)
|
|
|
|
goto tok_identifier;
|
|
|
|
next();
|
|
|
|
/* allow to take the address of a label */
|
|
|
|
if (tok < TOK_UIDENT)
|
|
|
|
expect("label identifier");
|
|
|
|
s = label_find(tok);
|
|
|
|
if (!s) {
|
|
|
|
s = label_push(&global_label_stack, tok, LABEL_FORWARD);
|
|
|
|
} else {
|
|
|
|
if (s->r == LABEL_DECLARED)
|
|
|
|
s->r = LABEL_FORWARD;
|
|
|
|
}
|
|
|
|
if (!s->type.t) {
|
|
|
|
s->type.t = VT_VOID;
|
|
|
|
mk_pointer(&s->type);
|
|
|
|
s->type.t |= VT_STATIC;
|
|
|
|
}
|
2014-04-04 22:18:39 +04:00
|
|
|
vpushsym(&s->type, s);
|
2009-05-05 22:18:10 +04:00
|
|
|
next();
|
|
|
|
break;
|
2017-02-27 04:22:28 +03:00
|
|
|
|
2016-12-09 13:42:41 +03:00
|
|
|
case TOK_GENERIC:
|
|
|
|
{
|
|
|
|
CType controlling_type;
|
|
|
|
int has_default = 0;
|
|
|
|
int has_match = 0;
|
|
|
|
int learn = 0;
|
|
|
|
TokenString *str = NULL;
|
2018-11-13 14:51:16 +03:00
|
|
|
int saved_const_wanted = const_wanted;
|
2016-12-09 13:42:41 +03:00
|
|
|
|
|
|
|
next();
|
|
|
|
skip('(');
|
2018-11-13 14:51:16 +03:00
|
|
|
const_wanted = 0;
|
2017-07-20 23:21:27 +03:00
|
|
|
expr_type(&controlling_type, expr_eq);
|
mutiples fix for _Generic
* check that _Generic don't match unsigned char * with char *
this case is usefull as with -funsigned-char, 'char *' are unsigned
* change VT_LONG so it's now a qualifier
VT_LONG are never use for code generation, but only durring parsing state,
in _Generic we need to be able to make diference between
'long' and 'long long'
So VT_LONG is now use as a type qualifier, it's old behaviour is still
here, but we can keep trace of what was a long and what wasn't
* add TOK_CLONG and TOK_CULONG
tcc was directly converting value like '7171L' into TOK_CLLONG or
TOK_CINT depending of the machine architecture.
because of that, we was unable to make diference between a long and a
long long, which doesn't work with _Generic.
So now 7171L is a TOK_CLONG, and we can handle _Generic properly
* check that _Generic can make diference between long and long long
* uncomment "type match twice" as it should now pass tests on any platforms
* add inside_generic global
the point of this variable is to use VT_LONG in comparaison only
when we are evaluating a _Generic.
problem is with my lastest patchs tcc can now make the diference between
a 'long long' and a 'long', but in 64 bit stddef.h typedef uint64_t as
typedef signed long long int int64_t and stdint.h as unsigned long int, so tcc
break when stdint.h and stddef.h are include together.
Another solution woud be to modifie include/stddef.h so it define uint64_t as
unsigned long int when processor is 64 bit, but this could break some
legacy code, so for now, VT_LONG are use only inside generc.
* check that _Generic parse first argument correctly
* check that _Generic evaluate correctly exresion like "f() / 2"
2017-07-10 18:44:53 +03:00
|
|
|
controlling_type.t &= ~(VT_CONSTANT | VT_VOLATILE | VT_ARRAY);
|
2018-03-16 02:26:16 +03:00
|
|
|
if ((controlling_type.t & VT_BTYPE) == VT_FUNC)
|
|
|
|
mk_pointer(&controlling_type);
|
2018-11-13 14:51:16 +03:00
|
|
|
const_wanted = saved_const_wanted;
|
2016-12-09 13:42:41 +03:00
|
|
|
for (;;) {
|
|
|
|
learn = 0;
|
|
|
|
skip(',');
|
|
|
|
if (tok == TOK_DEFAULT) {
|
|
|
|
if (has_default)
|
|
|
|
tcc_error("too many 'default'");
|
2017-07-20 23:21:27 +03:00
|
|
|
has_default = 1;
|
|
|
|
if (!has_match)
|
2016-12-09 13:42:41 +03:00
|
|
|
learn = 1;
|
|
|
|
next();
|
|
|
|
} else {
|
2017-07-20 23:21:27 +03:00
|
|
|
AttributeDef ad_tmp;
|
2016-12-09 13:42:41 +03:00
|
|
|
int itmp;
|
2017-07-20 23:21:27 +03:00
|
|
|
CType cur_type;
|
2019-04-29 14:53:07 +03:00
|
|
|
|
|
|
|
in_generic++;
|
2016-12-09 13:42:41 +03:00
|
|
|
parse_btype(&cur_type, &ad_tmp);
|
2019-04-29 14:53:07 +03:00
|
|
|
in_generic--;
|
|
|
|
|
2016-12-09 13:42:41 +03:00
|
|
|
type_decl(&cur_type, &ad_tmp, &itmp, TYPE_ABSTRACT);
|
|
|
|
if (compare_types(&controlling_type, &cur_type, 0)) {
|
|
|
|
if (has_match) {
|
mutiples fix for _Generic
* check that _Generic don't match unsigned char * with char *
this case is usefull as with -funsigned-char, 'char *' are unsigned
* change VT_LONG so it's now a qualifier
VT_LONG are never use for code generation, but only durring parsing state,
in _Generic we need to be able to make diference between
'long' and 'long long'
So VT_LONG is now use as a type qualifier, it's old behaviour is still
here, but we can keep trace of what was a long and what wasn't
* add TOK_CLONG and TOK_CULONG
tcc was directly converting value like '7171L' into TOK_CLLONG or
TOK_CINT depending of the machine architecture.
because of that, we was unable to make diference between a long and a
long long, which doesn't work with _Generic.
So now 7171L is a TOK_CLONG, and we can handle _Generic properly
* check that _Generic can make diference between long and long long
* uncomment "type match twice" as it should now pass tests on any platforms
* add inside_generic global
the point of this variable is to use VT_LONG in comparaison only
when we are evaluating a _Generic.
problem is with my lastest patchs tcc can now make the diference between
a 'long long' and a 'long', but in 64 bit stddef.h typedef uint64_t as
typedef signed long long int int64_t and stdint.h as unsigned long int, so tcc
break when stdint.h and stddef.h are include together.
Another solution woud be to modifie include/stddef.h so it define uint64_t as
unsigned long int when processor is 64 bit, but this could break some
legacy code, so for now, VT_LONG are use only inside generc.
* check that _Generic parse first argument correctly
* check that _Generic evaluate correctly exresion like "f() / 2"
2017-07-10 18:44:53 +03:00
|
|
|
tcc_error("type match twice");
|
2016-12-09 13:42:41 +03:00
|
|
|
}
|
|
|
|
has_match = 1;
|
|
|
|
learn = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
skip(':');
|
|
|
|
if (learn) {
|
2017-07-20 23:21:27 +03:00
|
|
|
if (str)
|
|
|
|
tok_str_free(str);
|
2016-12-09 13:42:41 +03:00
|
|
|
skip_or_save_block(&str);
|
|
|
|
} else {
|
|
|
|
skip_or_save_block(NULL);
|
|
|
|
}
|
2017-07-20 23:21:27 +03:00
|
|
|
if (tok == ')')
|
2016-12-09 13:42:41 +03:00
|
|
|
break;
|
|
|
|
}
|
2017-07-20 23:21:27 +03:00
|
|
|
if (!str) {
|
|
|
|
char buf[60];
|
|
|
|
type_to_str(buf, sizeof buf, &controlling_type, NULL);
|
|
|
|
tcc_error("type '%s' does not match any association", buf);
|
2016-12-09 13:42:41 +03:00
|
|
|
}
|
|
|
|
begin_macro(str, 1);
|
|
|
|
next();
|
|
|
|
expr_eq();
|
2017-07-20 23:21:27 +03:00
|
|
|
if (tok != TOK_EOF)
|
|
|
|
expect(",");
|
2016-12-09 13:42:41 +03:00
|
|
|
end_macro();
|
2017-07-20 23:21:27 +03:00
|
|
|
next();
|
2016-12-09 13:42:41 +03:00
|
|
|
break;
|
|
|
|
}
|
2010-05-06 04:19:00 +04:00
|
|
|
// special qnan , snan and infinity values
|
|
|
|
case TOK___NAN__:
|
2017-12-24 15:16:09 +03:00
|
|
|
n = 0x7fc00000;
|
|
|
|
special_math_val:
|
|
|
|
vpushi(n);
|
|
|
|
vtop->type.t = VT_FLOAT;
|
2010-05-06 04:19:00 +04:00
|
|
|
next();
|
|
|
|
break;
|
|
|
|
case TOK___SNAN__:
|
2017-12-24 15:16:09 +03:00
|
|
|
n = 0x7f800001;
|
|
|
|
goto special_math_val;
|
2010-05-06 04:19:00 +04:00
|
|
|
case TOK___INF__:
|
2017-12-24 15:16:09 +03:00
|
|
|
n = 0x7f800000;
|
|
|
|
goto special_math_val;
|
2010-05-06 04:19:00 +04:00
|
|
|
|
2009-05-05 22:18:10 +04:00
|
|
|
default:
|
|
|
|
tok_identifier:
|
|
|
|
t = tok;
|
|
|
|
next();
|
|
|
|
if (t < TOK_UIDENT)
|
|
|
|
expect("identifier");
|
|
|
|
s = sym_find(t);
|
2017-11-30 17:15:22 +03:00
|
|
|
if (!s || IS_ASM_SYM(s)) {
|
2014-04-06 12:59:40 +04:00
|
|
|
const char *name = get_tok_str(t, NULL);
|
2009-05-05 22:18:10 +04:00
|
|
|
if (tok != '(')
|
2014-04-06 12:59:40 +04:00
|
|
|
tcc_error("'%s' undeclared", name);
|
2009-05-05 22:18:10 +04:00
|
|
|
/* for simple function calls, we tolerate undeclared
|
|
|
|
external reference to int() function */
|
2014-04-06 12:59:40 +04:00
|
|
|
if (tcc_state->warn_implicit_function_declaration
|
|
|
|
#ifdef TCC_TARGET_PE
|
|
|
|
/* people must be warned about using undeclared WINAPI functions
|
|
|
|
(which usually start with uppercase letter) */
|
|
|
|
|| (name[0] >= 'A' && name[0] <= 'Z')
|
|
|
|
#endif
|
|
|
|
)
|
|
|
|
tcc_warning("implicit declaration of function '%s'", name);
|
2019-04-18 04:36:39 +03:00
|
|
|
s = external_global_sym(t, &func_old_type);
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
2017-02-13 20:23:43 +03:00
|
|
|
|
|
|
|
r = s->r;
|
|
|
|
/* A symbol that has a register is a local register variable,
|
|
|
|
which starts out as VT_LOCAL value. */
|
|
|
|
if ((r & VT_VALMASK) < VT_CONST)
|
|
|
|
r = (r & ~VT_VALMASK) | VT_LOCAL;
|
|
|
|
|
2011-04-10 09:52:25 +04:00
|
|
|
vset(&s->type, r, s->c);
|
2016-10-06 05:05:30 +03:00
|
|
|
/* Point to s as backpointer (even without r&VT_SYM).
|
|
|
|
Will be used by at least the x86 inline asm parser for
|
|
|
|
regvars. */
|
|
|
|
vtop->sym = s;
|
2017-07-09 13:38:25 +03:00
|
|
|
|
|
|
|
if (r & VT_SYM) {
|
2015-11-17 22:09:35 +03:00
|
|
|
vtop->c.i = 0;
|
2017-07-09 13:38:25 +03:00
|
|
|
} else if (r == VT_CONST && IS_ENUM_VAL(s->type.t)) {
|
|
|
|
vtop->c.i = s->enum_val;
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
2015-07-29 23:53:57 +03:00
|
|
|
|
2009-05-05 22:18:10 +04:00
|
|
|
/* post operations */
|
|
|
|
while (1) {
|
|
|
|
if (tok == TOK_INC || tok == TOK_DEC) {
|
|
|
|
inc(1, tok);
|
|
|
|
next();
|
2015-09-25 01:44:23 +03:00
|
|
|
} else if (tok == '.' || tok == TOK_ARROW || tok == TOK_CDOUBLE) {
|
2019-04-11 01:30:41 +03:00
|
|
|
int qualifiers, cumofs = 0;
|
2015-07-29 23:53:57 +03:00
|
|
|
/* field */
|
|
|
|
if (tok == TOK_ARROW)
|
2009-05-05 22:18:10 +04:00
|
|
|
indir();
|
2009-06-16 00:26:44 +04:00
|
|
|
qualifiers = vtop->type.t & (VT_CONSTANT | VT_VOLATILE);
|
2009-05-05 22:18:10 +04:00
|
|
|
test_lvalue();
|
|
|
|
gaddrof();
|
|
|
|
/* expect pointer on structure */
|
2020-02-18 23:11:49 +03:00
|
|
|
if ((vtop->type.t & VT_BTYPE) != VT_STRUCT) {
|
2020-02-17 20:25:43 +03:00
|
|
|
char got[256];
|
|
|
|
type_to_str(got, sizeof got, &vtop->type, NULL);
|
|
|
|
tcc_error("expected struct or union but not '%s'", got);
|
|
|
|
}
|
2015-09-25 01:44:23 +03:00
|
|
|
if (tok == TOK_CDOUBLE)
|
|
|
|
expect("field name");
|
|
|
|
next();
|
2015-09-25 02:31:34 +03:00
|
|
|
if (tok == TOK_CINT || tok == TOK_CUINT)
|
|
|
|
expect("field name");
|
2019-04-11 01:30:41 +03:00
|
|
|
s = find_field(&vtop->type, tok, &cumofs);
|
2009-05-05 22:18:10 +04:00
|
|
|
if (!s)
|
2015-11-20 13:22:56 +03:00
|
|
|
tcc_error("field not found: %s", get_tok_str(tok & ~SYM_FIELD, &tokc));
|
2009-05-05 22:18:10 +04:00
|
|
|
/* add field offset to pointer */
|
|
|
|
vtop->type = char_pointer_type; /* change type to 'char *' */
|
2019-04-11 01:30:41 +03:00
|
|
|
vpushi(cumofs + s->c);
|
2009-05-05 22:18:10 +04:00
|
|
|
gen_op('+');
|
|
|
|
/* change type to field type, and set to lvalue */
|
|
|
|
vtop->type = s->type;
|
2009-06-16 00:26:44 +04:00
|
|
|
vtop->type.t |= qualifiers;
|
2009-05-05 22:18:10 +04:00
|
|
|
/* an array is never an lvalue */
|
|
|
|
if (!(vtop->type.t & VT_ARRAY)) {
|
2019-12-16 20:48:31 +03:00
|
|
|
vtop->r |= VT_LVAL;
|
2009-12-20 00:22:43 +03:00
|
|
|
#ifdef CONFIG_TCC_BCHECK
|
2009-05-05 22:18:10 +04:00
|
|
|
/* if bound checking, the referenced pointer must be checked */
|
2020-01-18 00:58:39 +03:00
|
|
|
if (tcc_state->do_bounds_check)
|
2009-05-05 22:18:10 +04:00
|
|
|
vtop->r |= VT_MUSTBOUND;
|
2009-12-20 00:22:43 +03:00
|
|
|
#endif
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
next();
|
|
|
|
} else if (tok == '[') {
|
|
|
|
next();
|
|
|
|
gexpr();
|
|
|
|
gen_op('+');
|
|
|
|
indir();
|
|
|
|
skip(']');
|
|
|
|
} else if (tok == '(') {
|
|
|
|
SValue ret;
|
|
|
|
Sym *sa;
|
2015-03-09 02:19:59 +03:00
|
|
|
int nb_args, ret_nregs, ret_align, regsize, variadic;
|
2009-05-05 22:18:10 +04:00
|
|
|
|
|
|
|
/* function call */
|
|
|
|
if ((vtop->type.t & VT_BTYPE) != VT_FUNC) {
|
|
|
|
/* pointer test (no array accepted) */
|
|
|
|
if ((vtop->type.t & (VT_BTYPE | VT_ARRAY)) == VT_PTR) {
|
|
|
|
vtop->type = *pointed_type(&vtop->type);
|
|
|
|
if ((vtop->type.t & VT_BTYPE) != VT_FUNC)
|
|
|
|
goto error_func;
|
|
|
|
} else {
|
|
|
|
error_func:
|
|
|
|
expect("function pointer");
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
vtop->r &= ~VT_LVAL; /* no lvalue */
|
|
|
|
}
|
|
|
|
/* get return type */
|
|
|
|
s = vtop->type.ref;
|
|
|
|
next();
|
|
|
|
sa = s->next; /* first parameter */
|
2017-02-13 20:23:43 +03:00
|
|
|
nb_args = regsize = 0;
|
2009-05-05 22:18:10 +04:00
|
|
|
ret.r2 = VT_CONST;
|
|
|
|
/* compute first implicit argument if a structure is returned */
|
|
|
|
if ((s->type.t & VT_BTYPE) == VT_STRUCT) {
|
2017-07-09 13:34:11 +03:00
|
|
|
variadic = (s->f.func_type == FUNC_ELLIPSIS);
|
2015-07-29 23:57:41 +03:00
|
|
|
ret_nregs = gfunc_sret(&s->type, variadic, &ret.type,
|
|
|
|
&ret_align, ®size);
|
2019-08-10 22:21:43 +03:00
|
|
|
if (ret_nregs <= 0) {
|
2013-04-18 20:27:34 +04:00
|
|
|
/* get some space for the returned structure */
|
|
|
|
size = type_size(&s->type, &align);
|
2015-02-13 21:58:31 +03:00
|
|
|
#ifdef TCC_TARGET_ARM64
|
|
|
|
/* On arm64, a small struct is return in registers.
|
|
|
|
It is much easier to write it to memory if we know
|
|
|
|
that we are allowed to write some extra bytes, so
|
|
|
|
round the allocated space up to a power of 2: */
|
|
|
|
if (size < 16)
|
|
|
|
while (size & (size - 1))
|
|
|
|
size = (size | (size - 1)) + 1;
|
|
|
|
#endif
|
2013-04-18 20:27:34 +04:00
|
|
|
loc = (loc - size) & -align;
|
|
|
|
ret.type = s->type;
|
|
|
|
ret.r = VT_LOCAL | VT_LVAL;
|
|
|
|
/* pass it as 'int' to avoid structure arg passing
|
|
|
|
problems */
|
|
|
|
vseti(VT_LOCAL, loc);
|
|
|
|
ret.c = vtop->c;
|
2019-08-10 22:21:43 +03:00
|
|
|
if (ret_nregs < 0)
|
|
|
|
vtop--;
|
|
|
|
else
|
|
|
|
nb_args++;
|
2013-04-18 20:27:34 +04:00
|
|
|
}
|
2009-05-05 22:18:10 +04:00
|
|
|
} else {
|
2013-12-16 18:38:10 +04:00
|
|
|
ret_nregs = 1;
|
2013-04-18 20:27:34 +04:00
|
|
|
ret.type = s->type;
|
|
|
|
}
|
|
|
|
|
2019-08-10 22:21:43 +03:00
|
|
|
if (ret_nregs > 0) {
|
2009-05-05 22:18:10 +04:00
|
|
|
/* return in register */
|
|
|
|
ret.c.i = 0;
|
2019-12-16 20:44:35 +03:00
|
|
|
PUT_R_RET(&ret, ret.type.t);
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
if (tok != ')') {
|
|
|
|
for(;;) {
|
|
|
|
expr_eq();
|
|
|
|
gfunc_param_typed(s, sa);
|
|
|
|
nb_args++;
|
|
|
|
if (sa)
|
|
|
|
sa = sa->next;
|
|
|
|
if (tok == ')')
|
|
|
|
break;
|
|
|
|
skip(',');
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (sa)
|
2011-08-11 19:07:56 +04:00
|
|
|
tcc_error("too few arguments to function");
|
2009-05-05 22:18:10 +04:00
|
|
|
skip(')');
|
2020-05-23 21:02:41 +03:00
|
|
|
#ifdef CONFIG_TCC_BCHECK
|
|
|
|
if (tcc_state->do_bounds_check &&
|
|
|
|
(nb_args == 1 || nb_args == 2) &&
|
|
|
|
(vtop[-nb_args].r & VT_SYM) &&
|
|
|
|
(vtop[-nb_args].sym->v == TOK_setjmp ||
|
2020-05-25 13:26:55 +03:00
|
|
|
vtop[-nb_args].sym->v == TOK__setjmp
|
|
|
|
#ifndef TCC_TARGET_PE
|
|
|
|
|| vtop[-nb_args].sym->v == TOK_sigsetjmp
|
|
|
|
|| vtop[-nb_args].sym->v == TOK___sigsetjmp
|
|
|
|
#endif
|
|
|
|
)) {
|
2020-05-23 21:02:41 +03:00
|
|
|
vpush_global_sym(&func_old_type, TOK___bound_setjmp);
|
|
|
|
vpushv(vtop - nb_args);
|
|
|
|
if (nb_args == 2)
|
|
|
|
vpushv(vtop - nb_args);
|
|
|
|
gfunc_call(nb_args);
|
|
|
|
}
|
|
|
|
#endif
|
2016-12-18 19:23:33 +03:00
|
|
|
gfunc_call(nb_args);
|
2013-12-16 18:38:10 +04:00
|
|
|
|
2019-08-10 22:21:43 +03:00
|
|
|
if (ret_nregs < 0) {
|
|
|
|
vsetc(&ret.type, ret.r, &ret.c);
|
|
|
|
#ifdef TCC_TARGET_RISCV64
|
|
|
|
arch_transfer_ret_regs(1);
|
|
|
|
#endif
|
|
|
|
} else {
|
|
|
|
/* return value */
|
|
|
|
for (r = ret.r + ret_nregs + !ret_nregs; r-- > ret.r;) {
|
|
|
|
vsetc(&ret.type, r, &ret.c);
|
|
|
|
vtop->r2 = ret.r2; /* Loop only happens when r2 is VT_CONST */
|
|
|
|
}
|
2013-12-16 18:38:10 +04:00
|
|
|
|
2019-08-10 22:21:43 +03:00
|
|
|
/* handle packed struct return */
|
|
|
|
if (((s->type.t & VT_BTYPE) == VT_STRUCT) && ret_nregs) {
|
|
|
|
int addr, offset;
|
|
|
|
|
|
|
|
size = type_size(&s->type, &align);
|
|
|
|
/* We're writing whole regs often, make sure there's enough
|
|
|
|
space. Assume register size is power of 2. */
|
|
|
|
if (regsize > align)
|
|
|
|
align = regsize;
|
|
|
|
loc = (loc - size) & -align;
|
|
|
|
addr = loc;
|
|
|
|
offset = 0;
|
|
|
|
for (;;) {
|
|
|
|
vset(&ret.type, VT_LOCAL | VT_LVAL, addr + offset);
|
|
|
|
vswap();
|
|
|
|
vstore();
|
|
|
|
vtop--;
|
|
|
|
if (--ret_nregs == 0)
|
|
|
|
break;
|
|
|
|
offset += regsize;
|
|
|
|
}
|
|
|
|
vset(&s->type, VT_LOCAL | VT_LVAL, addr);
|
2013-11-22 05:27:15 +04:00
|
|
|
}
|
2019-09-23 18:45:39 +03:00
|
|
|
|
|
|
|
/* Promote char/short return values. This is matters only
|
Adjust return value promotion for some archs
this is a bit complicated: for i386 and x86-64 we really need to
extend return values ourself, as the common code now does. For arm64
this at least preserves old behaviour. For riscv64 we don't have to
extend ourself but can expect things to be extended up to int (this
matters for var-args tests, when the sign-extension to int64 needs to
happen explicitely). As the extensions are useless, don't do them.
And for arm32 we actually can't express GCC behaviour: the callee side
expects the return value to be correctly extended to int32, but
remembers the original type. In case the ultimate target type for the
call result is only int, no further extension is done. But in case
the target type is e.g. int64 an extension happens, but not from int32
but from the original type. We don't know the ultimate target type,
so we have to choose a type to put into vtop:
* original type (plus VT_MUSTCAST) - this looses when the ultimate
target is int (GCC: no cast, TCC: a cast)
* int (without MUSTCAST) - this looses when the ultimate target is
int64 (GCC: cast from original type, TCC: cast from int)
This difference can only be seen with undefined sources, like the
testcases, so it doesn't seem worthwhile to try an make it work, just
disable the test on arm and choose the second variant as that generates
less code.
2019-12-17 03:46:06 +03:00
|
|
|
for calling function that were not compiled by TCC and
|
|
|
|
only on some architectures. For those where it doesn't
|
|
|
|
matter we expect things to be already promoted to int,
|
|
|
|
but not larger. */
|
2019-09-23 18:45:39 +03:00
|
|
|
t = s->type.t & VT_BTYPE;
|
Adjust return value promotion for some archs
this is a bit complicated: for i386 and x86-64 we really need to
extend return values ourself, as the common code now does. For arm64
this at least preserves old behaviour. For riscv64 we don't have to
extend ourself but can expect things to be extended up to int (this
matters for var-args tests, when the sign-extension to int64 needs to
happen explicitely). As the extensions are useless, don't do them.
And for arm32 we actually can't express GCC behaviour: the callee side
expects the return value to be correctly extended to int32, but
remembers the original type. In case the ultimate target type for the
call result is only int, no further extension is done. But in case
the target type is e.g. int64 an extension happens, but not from int32
but from the original type. We don't know the ultimate target type,
so we have to choose a type to put into vtop:
* original type (plus VT_MUSTCAST) - this looses when the ultimate
target is int (GCC: no cast, TCC: a cast)
* int (without MUSTCAST) - this looses when the ultimate target is
int64 (GCC: cast from original type, TCC: cast from int)
This difference can only be seen with undefined sources, like the
testcases, so it doesn't seem worthwhile to try an make it work, just
disable the test on arm and choose the second variant as that generates
less code.
2019-12-17 03:46:06 +03:00
|
|
|
if (t == VT_BYTE || t == VT_SHORT || t == VT_BOOL) {
|
|
|
|
#ifdef PROMOTE_RET
|
2019-09-23 18:45:39 +03:00
|
|
|
vtop->r |= BFVAL(VT_MUSTCAST, 1);
|
Adjust return value promotion for some archs
this is a bit complicated: for i386 and x86-64 we really need to
extend return values ourself, as the common code now does. For arm64
this at least preserves old behaviour. For riscv64 we don't have to
extend ourself but can expect things to be extended up to int (this
matters for var-args tests, when the sign-extension to int64 needs to
happen explicitely). As the extensions are useless, don't do them.
And for arm32 we actually can't express GCC behaviour: the callee side
expects the return value to be correctly extended to int32, but
remembers the original type. In case the ultimate target type for the
call result is only int, no further extension is done. But in case
the target type is e.g. int64 an extension happens, but not from int32
but from the original type. We don't know the ultimate target type,
so we have to choose a type to put into vtop:
* original type (plus VT_MUSTCAST) - this looses when the ultimate
target is int (GCC: no cast, TCC: a cast)
* int (without MUSTCAST) - this looses when the ultimate target is
int64 (GCC: cast from original type, TCC: cast from int)
This difference can only be seen with undefined sources, like the
testcases, so it doesn't seem worthwhile to try an make it work, just
disable the test on arm and choose the second variant as that generates
less code.
2019-12-17 03:46:06 +03:00
|
|
|
#else
|
|
|
|
vtop->type.t = VT_INT;
|
|
|
|
#endif
|
|
|
|
}
|
2013-04-18 20:27:34 +04:00
|
|
|
}
|
2019-04-29 14:53:07 +03:00
|
|
|
if (s->f.func_noreturn)
|
|
|
|
CODE_OFF();
|
2009-05-05 22:18:10 +04:00
|
|
|
} else {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-01-21 16:23:57 +03:00
|
|
|
#ifndef precedence_parser /* original top-down parser */
|
|
|
|
|
|
|
|
static void expr_prod(void)
|
2020-01-13 03:06:25 +03:00
|
|
|
{
|
2020-01-21 16:23:57 +03:00
|
|
|
int t;
|
|
|
|
|
|
|
|
unary();
|
|
|
|
while ((t = tok) == '*' || t == '/' || t == '%') {
|
|
|
|
next();
|
|
|
|
unary();
|
|
|
|
gen_op(t);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void expr_sum(void)
|
|
|
|
{
|
|
|
|
int t;
|
|
|
|
|
|
|
|
expr_prod();
|
|
|
|
while ((t = tok) == '+' || t == '-') {
|
|
|
|
next();
|
|
|
|
expr_prod();
|
|
|
|
gen_op(t);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void expr_shift(void)
|
|
|
|
{
|
|
|
|
int t;
|
|
|
|
|
|
|
|
expr_sum();
|
|
|
|
while ((t = tok) == TOK_SHL || t == TOK_SAR) {
|
|
|
|
next();
|
|
|
|
expr_sum();
|
|
|
|
gen_op(t);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void expr_cmp(void)
|
|
|
|
{
|
|
|
|
int t;
|
|
|
|
|
|
|
|
expr_shift();
|
|
|
|
while (((t = tok) >= TOK_ULE && t <= TOK_GT) ||
|
|
|
|
t == TOK_ULT || t == TOK_UGE) {
|
|
|
|
next();
|
|
|
|
expr_shift();
|
|
|
|
gen_op(t);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void expr_cmpeq(void)
|
|
|
|
{
|
|
|
|
int t;
|
|
|
|
|
|
|
|
expr_cmp();
|
|
|
|
while ((t = tok) == TOK_EQ || t == TOK_NE) {
|
|
|
|
next();
|
|
|
|
expr_cmp();
|
|
|
|
gen_op(t);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void expr_and(void)
|
|
|
|
{
|
|
|
|
expr_cmpeq();
|
|
|
|
while (tok == '&') {
|
|
|
|
next();
|
|
|
|
expr_cmpeq();
|
|
|
|
gen_op('&');
|
2020-01-13 03:06:25 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-01-21 16:23:57 +03:00
|
|
|
static void expr_xor(void)
|
|
|
|
{
|
|
|
|
expr_and();
|
|
|
|
while (tok == '^') {
|
|
|
|
next();
|
|
|
|
expr_and();
|
|
|
|
gen_op('^');
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void expr_or(void)
|
|
|
|
{
|
|
|
|
expr_xor();
|
|
|
|
while (tok == '|') {
|
|
|
|
next();
|
|
|
|
expr_xor();
|
|
|
|
gen_op('|');
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void expr_landor(int op);
|
|
|
|
|
|
|
|
static void expr_land(void)
|
|
|
|
{
|
|
|
|
expr_or();
|
|
|
|
if (tok == TOK_LAND)
|
|
|
|
expr_landor(tok);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void expr_lor(void)
|
|
|
|
{
|
|
|
|
expr_land();
|
|
|
|
if (tok == TOK_LOR)
|
|
|
|
expr_landor(tok);
|
|
|
|
}
|
|
|
|
|
|
|
|
# define expr_landor_next(op) op == TOK_LAND ? expr_or() : expr_land()
|
|
|
|
#else /* defined precedence_parser */
|
|
|
|
# define expr_landor_next(op) unary(), expr_infix(precedence(op) + 1)
|
|
|
|
# define expr_lor() unary(), expr_infix(1)
|
|
|
|
|
2017-01-17 05:56:42 +03:00
|
|
|
static int precedence(int tok)
|
|
|
|
{
|
|
|
|
switch (tok) {
|
2020-01-13 03:06:25 +03:00
|
|
|
case TOK_LOR: return 1;
|
|
|
|
case TOK_LAND: return 2;
|
|
|
|
case '|': return 3;
|
|
|
|
case '^': return 4;
|
|
|
|
case '&': return 5;
|
|
|
|
case TOK_EQ: case TOK_NE: return 6;
|
|
|
|
relat: case TOK_ULT: case TOK_UGE: return 7;
|
|
|
|
case TOK_SHL: case TOK_SAR: return 8;
|
|
|
|
case '+': case '-': return 9;
|
|
|
|
case '*': case '/': case '%': return 10;
|
2017-01-17 05:56:42 +03:00
|
|
|
default:
|
|
|
|
if (tok >= TOK_ULE && tok <= TOK_GT)
|
|
|
|
goto relat;
|
|
|
|
return 0;
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
}
|
2017-01-17 05:56:42 +03:00
|
|
|
static unsigned char prec[256];
|
2020-01-21 16:23:57 +03:00
|
|
|
static void init_prec(void)
|
2009-05-05 22:18:10 +04:00
|
|
|
{
|
2017-01-17 05:56:42 +03:00
|
|
|
int i;
|
|
|
|
for (i = 0; i < 256; i++)
|
|
|
|
prec[i] = precedence(i);
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
2017-01-17 05:56:42 +03:00
|
|
|
#define precedence(i) ((unsigned)i < 256 ? prec[i] : 0)
|
2009-05-05 22:18:10 +04:00
|
|
|
|
2020-01-21 16:23:57 +03:00
|
|
|
static void expr_landor(int op);
|
2019-04-29 14:53:07 +03:00
|
|
|
|
2020-01-13 03:06:25 +03:00
|
|
|
static void expr_infix(int p)
|
2016-09-04 06:23:57 +03:00
|
|
|
{
|
2020-01-13 03:06:25 +03:00
|
|
|
int t = tok, p2;
|
|
|
|
while ((p2 = precedence(t)) >= p) {
|
|
|
|
if (t == TOK_LOR || t == TOK_LAND) {
|
2020-01-21 16:23:57 +03:00
|
|
|
expr_landor(t);
|
2020-01-13 03:06:25 +03:00
|
|
|
} else {
|
|
|
|
next();
|
|
|
|
unary();
|
|
|
|
if (precedence(tok) > p2)
|
|
|
|
expr_infix(p2 + 1);
|
|
|
|
gen_op(t);
|
|
|
|
}
|
|
|
|
t = tok;
|
2016-09-04 06:23:57 +03:00
|
|
|
}
|
|
|
|
}
|
2020-01-21 16:23:57 +03:00
|
|
|
#endif
|
|
|
|
|
|
|
|
/* Assuming vtop is a value used in a conditional context
|
|
|
|
(i.e. compared with zero) return 0 if it's false, 1 if
|
|
|
|
true and -1 if it can't be statically determined. */
|
|
|
|
static int condition_3way(void)
|
|
|
|
{
|
|
|
|
int c = -1;
|
|
|
|
if ((vtop->r & (VT_VALMASK | VT_LVAL)) == VT_CONST &&
|
|
|
|
(!(vtop->r & VT_SYM) || !vtop->sym->a.weak)) {
|
|
|
|
vdup();
|
|
|
|
gen_cast_s(VT_BOOL);
|
|
|
|
c = vtop->c.i;
|
|
|
|
vpop();
|
|
|
|
}
|
|
|
|
return c;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void expr_landor(int op)
|
|
|
|
{
|
|
|
|
int t = 0, cc = 1, f = 0, i = op == TOK_LAND, c;
|
|
|
|
for(;;) {
|
|
|
|
c = f ? i : condition_3way();
|
|
|
|
if (c < 0)
|
|
|
|
save_regs(1), cc = 0;
|
|
|
|
else if (c != i)
|
|
|
|
nocode_wanted++, f = 1;
|
|
|
|
if (tok != op)
|
|
|
|
break;
|
|
|
|
if (c < 0)
|
|
|
|
t = gvtst(i, t);
|
|
|
|
else
|
|
|
|
vpop();
|
|
|
|
next();
|
|
|
|
expr_landor_next(op);
|
|
|
|
}
|
|
|
|
if (cc || f) {
|
|
|
|
vpop();
|
|
|
|
vpushi(i ^ f);
|
|
|
|
gsym(t);
|
|
|
|
nocode_wanted -= f;
|
|
|
|
} else {
|
|
|
|
gvtst_set(i, t);
|
|
|
|
}
|
|
|
|
}
|
2016-09-04 06:23:57 +03:00
|
|
|
|
jump optimizations
This unifies VT_CMP with VT_JMP(i) by using mostly VT_CMP
with both a positive and a negative jump target list.
Such we can delay putting the non-inverted or inverted jump
until we can see which one is nore suitable (in most cases).
example:
if (a && b || c && d)
e = 0;
before this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 11 00 00 00 je 27 <main+0x27>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 84 05 00 00 00 je 27 <main+0x27>
22: e9 22 00 00 00 jmp 49 <main+0x49>
27: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
2a: 83 f8 00 cmp $0x0,%eax
2d: 0f 84 11 00 00 00 je 44 <main+0x44>
33: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
36: 83 f8 00 cmp $0x0,%eax
39: 0f 84 05 00 00 00 je 44 <main+0x44>
3f: e9 05 00 00 00 jmp 49 <main+0x49>
44: e9 08 00 00 00 jmp 51 <main+0x51>
49: b8 00 00 00 00 mov $0x0,%eax
4e: 89 45 ec mov %eax,0xffffffec(%ebp)
51: ...
with this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 0c 00 00 00 je 22 <main+0x22>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 85 18 00 00 00 jne 3a <main+0x3a>
22: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
25: 83 f8 00 cmp $0x0,%eax
28: 0f 84 14 00 00 00 je 42 <main+0x42>
2e: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
31: 83 f8 00 cmp $0x0,%eax
34: 0f 84 08 00 00 00 je 42 <main+0x42>
3a: b8 00 00 00 00 mov $0x0,%eax
3f: 89 45 ec mov %eax,0xffffffec(%ebp)
42: ...
2019-06-22 12:45:35 +03:00
|
|
|
static int is_cond_bool(SValue *sv)
|
|
|
|
{
|
|
|
|
if ((sv->r & (VT_VALMASK | VT_LVAL | VT_SYM)) == VT_CONST
|
|
|
|
&& (sv->type.t & VT_BTYPE) == VT_INT)
|
|
|
|
return (unsigned)sv->c.i < 2;
|
|
|
|
if (sv->r == VT_CMP)
|
|
|
|
return 1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2010-10-25 18:40:30 +04:00
|
|
|
static void expr_cond(void)
|
2009-05-05 22:18:10 +04:00
|
|
|
{
|
2020-01-18 04:36:29 +03:00
|
|
|
int tt, u, r1, r2, rc, t1, t2, islv, c, g;
|
2009-05-05 22:18:10 +04:00
|
|
|
SValue sv;
|
2020-01-18 04:36:29 +03:00
|
|
|
CType type;
|
2019-04-29 14:53:07 +03:00
|
|
|
int ncw_prev;
|
2009-05-05 22:18:10 +04:00
|
|
|
|
2020-01-21 16:23:57 +03:00
|
|
|
expr_lor();
|
2015-11-20 03:24:46 +03:00
|
|
|
if (tok == '?') {
|
|
|
|
next();
|
2016-09-04 06:23:57 +03:00
|
|
|
c = condition_3way();
|
2016-12-18 20:55:55 +03:00
|
|
|
g = (tok == ':' && gnu_ext);
|
2019-04-29 14:53:07 +03:00
|
|
|
tt = 0;
|
|
|
|
if (!g) {
|
|
|
|
if (c < 0) {
|
|
|
|
save_regs(1);
|
|
|
|
tt = gvtst(1, 0);
|
|
|
|
} else {
|
|
|
|
vpop();
|
|
|
|
}
|
|
|
|
} else if (c < 0) {
|
2016-12-18 20:55:55 +03:00
|
|
|
/* needed to avoid having different registers saved in
|
|
|
|
each branch */
|
2016-12-19 02:27:08 +03:00
|
|
|
save_regs(1);
|
2019-04-29 14:53:07 +03:00
|
|
|
gv_dup();
|
|
|
|
tt = gvtst(0, 0);
|
2016-12-18 20:55:55 +03:00
|
|
|
}
|
|
|
|
|
2020-01-18 04:36:29 +03:00
|
|
|
ncw_prev = nocode_wanted;
|
|
|
|
if (c == 0)
|
|
|
|
nocode_wanted++;
|
|
|
|
if (!g)
|
|
|
|
gexpr();
|
jump optimizations
This unifies VT_CMP with VT_JMP(i) by using mostly VT_CMP
with both a positive and a negative jump target list.
Such we can delay putting the non-inverted or inverted jump
until we can see which one is nore suitable (in most cases).
example:
if (a && b || c && d)
e = 0;
before this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 11 00 00 00 je 27 <main+0x27>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 84 05 00 00 00 je 27 <main+0x27>
22: e9 22 00 00 00 jmp 49 <main+0x49>
27: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
2a: 83 f8 00 cmp $0x0,%eax
2d: 0f 84 11 00 00 00 je 44 <main+0x44>
33: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
36: 83 f8 00 cmp $0x0,%eax
39: 0f 84 05 00 00 00 je 44 <main+0x44>
3f: e9 05 00 00 00 jmp 49 <main+0x49>
44: e9 08 00 00 00 jmp 51 <main+0x51>
49: b8 00 00 00 00 mov $0x0,%eax
4e: 89 45 ec mov %eax,0xffffffec(%ebp)
51: ...
with this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 0c 00 00 00 je 22 <main+0x22>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 85 18 00 00 00 jne 3a <main+0x3a>
22: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
25: 83 f8 00 cmp $0x0,%eax
28: 0f 84 14 00 00 00 je 42 <main+0x42>
2e: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
31: 83 f8 00 cmp $0x0,%eax
34: 0f 84 08 00 00 00 je 42 <main+0x42>
3a: b8 00 00 00 00 mov $0x0,%eax
3f: 89 45 ec mov %eax,0xffffffec(%ebp)
42: ...
2019-06-22 12:45:35 +03:00
|
|
|
|
2020-01-18 04:36:29 +03:00
|
|
|
if (c < 0 && vtop->r == VT_CMP) {
|
|
|
|
t1 = gvtst(0, 0);
|
|
|
|
vpushi(0);
|
|
|
|
gvtst_set(0, t1);
|
|
|
|
gv(RC_INT);
|
|
|
|
}
|
2016-12-18 20:58:33 +03:00
|
|
|
|
2020-01-18 04:36:29 +03:00
|
|
|
if ((vtop->type.t & VT_BTYPE) == VT_FUNC)
|
|
|
|
mk_pointer(&vtop->type);
|
|
|
|
sv = *vtop; /* save value to handle it later */
|
|
|
|
vtop--; /* no vpop so that FP stack is not flushed */
|
2009-05-05 22:18:10 +04:00
|
|
|
|
2020-01-18 04:36:29 +03:00
|
|
|
if (g) {
|
|
|
|
u = tt;
|
|
|
|
} else if (c < 0) {
|
|
|
|
u = gjmp(0);
|
|
|
|
gsym(tt);
|
|
|
|
} else
|
|
|
|
u = 0;
|
|
|
|
|
|
|
|
nocode_wanted = ncw_prev;
|
|
|
|
if (c == 1)
|
|
|
|
nocode_wanted++;
|
|
|
|
skip(':');
|
|
|
|
expr_cond();
|
|
|
|
|
|
|
|
if (c < 0 && is_cond_bool(vtop) && is_cond_bool(&sv)) {
|
|
|
|
if (sv.r == VT_CMP) {
|
|
|
|
t1 = sv.jtrue;
|
|
|
|
t2 = u;
|
2020-02-17 20:25:43 +03:00
|
|
|
} else {
|
2020-01-18 04:36:29 +03:00
|
|
|
t1 = gvtst(0, 0);
|
|
|
|
t2 = gjmp(0);
|
|
|
|
gsym(u);
|
|
|
|
vpushv(&sv);
|
2016-03-13 05:32:18 +03:00
|
|
|
}
|
2020-01-18 04:36:29 +03:00
|
|
|
gvtst_set(0, t1);
|
|
|
|
gvtst_set(1, t2);
|
|
|
|
nocode_wanted = ncw_prev;
|
|
|
|
// tcc_warning("two conditions expr_cond");
|
|
|
|
return;
|
|
|
|
}
|
2016-12-18 20:55:55 +03:00
|
|
|
|
2020-01-18 04:36:29 +03:00
|
|
|
if ((vtop->type.t & VT_BTYPE) == VT_FUNC)
|
|
|
|
mk_pointer(&vtop->type);
|
|
|
|
|
|
|
|
/* cast operands to correct type according to ISOC rules */
|
|
|
|
if (!combine_types(&type, &sv, vtop, '?'))
|
|
|
|
type_incompatibility_error(&sv.type, &vtop->type,
|
|
|
|
"type mismatch in conditional expression (have '%s' and '%s')");
|
|
|
|
/* keep structs lvalue by transforming `(expr ? a : b)` to `*(expr ? &a : &b)` so
|
|
|
|
that `(expr ? a : b).mem` does not error with "lvalue expected" */
|
|
|
|
islv = (vtop->r & VT_LVAL) && (sv.r & VT_LVAL) && VT_STRUCT == (type.t & VT_BTYPE);
|
|
|
|
|
|
|
|
/* now we convert second operand */
|
|
|
|
if (c != 1) {
|
|
|
|
gen_cast(&type);
|
|
|
|
if (islv) {
|
|
|
|
mk_pointer(&vtop->type);
|
|
|
|
gaddrof();
|
|
|
|
} else if (VT_STRUCT == (vtop->type.t & VT_BTYPE))
|
|
|
|
gaddrof();
|
|
|
|
}
|
2016-12-18 20:55:55 +03:00
|
|
|
|
2020-01-18 04:36:29 +03:00
|
|
|
rc = RC_TYPE(type.t);
|
|
|
|
/* for long longs, we use fixed registers to avoid having
|
|
|
|
to handle a complicated move */
|
|
|
|
if (USING_TWO_WORDS(type.t))
|
|
|
|
rc = RC_RET(type.t);
|
2016-12-18 20:55:55 +03:00
|
|
|
|
2020-01-18 04:36:29 +03:00
|
|
|
tt = r2 = 0;
|
|
|
|
if (c < 0) {
|
|
|
|
r2 = gv(rc);
|
|
|
|
tt = gjmp(0);
|
|
|
|
}
|
|
|
|
gsym(u);
|
|
|
|
nocode_wanted = ncw_prev;
|
2016-12-18 20:55:55 +03:00
|
|
|
|
2020-01-18 04:36:29 +03:00
|
|
|
/* this is horrible, but we must also convert first
|
|
|
|
operand */
|
|
|
|
if (c != 0) {
|
|
|
|
*vtop = sv;
|
|
|
|
gen_cast(&type);
|
|
|
|
if (islv) {
|
|
|
|
mk_pointer(&vtop->type);
|
|
|
|
gaddrof();
|
|
|
|
} else if (VT_STRUCT == (vtop->type.t & VT_BTYPE))
|
|
|
|
gaddrof();
|
|
|
|
}
|
2019-04-29 14:53:07 +03:00
|
|
|
|
2020-01-18 04:36:29 +03:00
|
|
|
if (c < 0) {
|
|
|
|
r1 = gv(rc);
|
|
|
|
move_reg(r2, r1, islv ? VT_PTR : type.t);
|
|
|
|
vtop->r = r2;
|
|
|
|
gsym(tt);
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
2020-01-18 04:36:29 +03:00
|
|
|
|
|
|
|
if (islv)
|
|
|
|
indir();
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-10-25 18:40:30 +04:00
|
|
|
static void expr_eq(void)
|
|
|
|
{
|
|
|
|
int t;
|
2015-07-29 23:53:57 +03:00
|
|
|
|
2010-10-25 18:40:30 +04:00
|
|
|
expr_cond();
|
2020-01-21 16:23:57 +03:00
|
|
|
if ((t = tok) == '='
|
|
|
|
|| (t >= TOK_A_MOD && t <= TOK_A_DIV)
|
|
|
|
|| t == TOK_A_XOR || t == TOK_A_OR
|
|
|
|
|| t == TOK_A_SHL || t == TOK_A_SAR) {
|
2010-10-25 18:40:30 +04:00
|
|
|
test_lvalue();
|
|
|
|
next();
|
|
|
|
if (t == '=') {
|
|
|
|
expr_eq();
|
|
|
|
} else {
|
|
|
|
vdup();
|
|
|
|
expr_eq();
|
|
|
|
gen_op(t & 0x7f);
|
|
|
|
}
|
|
|
|
vstore();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-12-20 03:53:49 +03:00
|
|
|
ST_FUNC void gexpr(void)
|
2009-05-05 22:18:10 +04:00
|
|
|
{
|
|
|
|
while (1) {
|
|
|
|
expr_eq();
|
|
|
|
if (tok != ',')
|
|
|
|
break;
|
|
|
|
vpop();
|
|
|
|
next();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* parse a constant expression and return value in vtop. */
|
|
|
|
static void expr_const1(void)
|
|
|
|
{
|
2016-12-18 20:58:33 +03:00
|
|
|
const_wanted++;
|
2020-01-16 01:32:40 +03:00
|
|
|
nocode_wanted += unevalmask + 1;
|
2010-10-25 18:40:30 +04:00
|
|
|
expr_cond();
|
2020-01-16 01:32:40 +03:00
|
|
|
nocode_wanted -= unevalmask + 1;
|
2016-12-18 20:58:33 +03:00
|
|
|
const_wanted--;
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/* parse an integer constant and return its value. */
|
2016-11-06 07:02:11 +03:00
|
|
|
static inline int64_t expr_const64(void)
|
2009-05-05 22:18:10 +04:00
|
|
|
{
|
2016-11-06 07:02:11 +03:00
|
|
|
int64_t c;
|
2009-05-05 22:18:10 +04:00
|
|
|
expr_const1();
|
|
|
|
if ((vtop->r & (VT_VALMASK | VT_LVAL | VT_SYM)) != VT_CONST)
|
|
|
|
expect("constant expression");
|
|
|
|
c = vtop->c.i;
|
|
|
|
vpop();
|
|
|
|
return c;
|
|
|
|
}
|
|
|
|
|
2016-11-06 07:02:11 +03:00
|
|
|
/* parse an integer constant and return its value.
|
|
|
|
Complain if it doesn't fit 32bit (signed or unsigned). */
|
|
|
|
ST_FUNC int expr_const(void)
|
|
|
|
{
|
|
|
|
int c;
|
|
|
|
int64_t wc = expr_const64();
|
|
|
|
c = wc;
|
|
|
|
if (c != wc && (unsigned)c != wc)
|
|
|
|
tcc_error("constant exceeds 32 bit");
|
|
|
|
return c;
|
|
|
|
}
|
|
|
|
|
2019-04-29 14:53:07 +03:00
|
|
|
/* ------------------------------------------------------------------------- */
|
|
|
|
/* return from function */
|
2009-05-05 22:18:10 +04:00
|
|
|
|
2017-02-08 21:45:31 +03:00
|
|
|
#ifndef TCC_TARGET_ARM64
|
|
|
|
static void gfunc_return(CType *func_type)
|
|
|
|
{
|
|
|
|
if ((func_type->t & VT_BTYPE) == VT_STRUCT) {
|
|
|
|
CType type, ret_type;
|
|
|
|
int ret_align, ret_nregs, regsize;
|
|
|
|
ret_nregs = gfunc_sret(func_type, func_var, &ret_type,
|
|
|
|
&ret_align, ®size);
|
2019-08-10 22:21:43 +03:00
|
|
|
if (ret_nregs < 0) {
|
|
|
|
#ifdef TCC_TARGET_RISCV64
|
|
|
|
arch_transfer_ret_regs(0);
|
|
|
|
#endif
|
|
|
|
} else if (0 == ret_nregs) {
|
2017-02-08 21:45:31 +03:00
|
|
|
/* if returning structure, must copy it to implicit
|
|
|
|
first pointer arg location */
|
|
|
|
type = *func_type;
|
|
|
|
mk_pointer(&type);
|
|
|
|
vset(&type, VT_LOCAL | VT_LVAL, func_vc);
|
|
|
|
indir();
|
|
|
|
vswap();
|
|
|
|
/* copy structure value to pointer */
|
|
|
|
vstore();
|
|
|
|
} else {
|
|
|
|
/* returning structure packed into registers */
|
2019-12-16 20:44:35 +03:00
|
|
|
int size, addr, align, rc;
|
2017-02-08 21:45:31 +03:00
|
|
|
size = type_size(func_type,&align);
|
|
|
|
if ((vtop->r != (VT_LOCAL | VT_LVAL) ||
|
|
|
|
(vtop->c.i & (ret_align-1)))
|
|
|
|
&& (align & (ret_align-1))) {
|
|
|
|
loc = (loc - size) & -ret_align;
|
|
|
|
addr = loc;
|
|
|
|
type = *func_type;
|
|
|
|
vset(&type, VT_LOCAL | VT_LVAL, addr);
|
|
|
|
vswap();
|
|
|
|
vstore();
|
|
|
|
vpop();
|
|
|
|
vset(&ret_type, VT_LOCAL | VT_LVAL, addr);
|
|
|
|
}
|
|
|
|
vtop->type = ret_type;
|
2019-12-16 20:44:35 +03:00
|
|
|
rc = RC_RET(ret_type.t);
|
2017-02-08 21:45:31 +03:00
|
|
|
if (ret_nregs == 1)
|
2019-12-16 20:44:35 +03:00
|
|
|
gv(rc);
|
2017-02-08 21:45:31 +03:00
|
|
|
else {
|
|
|
|
for (;;) {
|
|
|
|
vdup();
|
2019-12-16 20:44:35 +03:00
|
|
|
gv(rc);
|
2017-02-08 21:45:31 +03:00
|
|
|
vpop();
|
|
|
|
if (--ret_nregs == 0)
|
|
|
|
break;
|
|
|
|
/* We assume that when a structure is returned in multiple
|
|
|
|
registers, their classes are consecutive values of the
|
|
|
|
suite s(n) = 2^n */
|
2019-12-16 20:44:35 +03:00
|
|
|
rc <<= 1;
|
2017-02-08 21:45:31 +03:00
|
|
|
vtop->c.i += regsize;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
2019-12-16 20:44:35 +03:00
|
|
|
gv(RC_RET(func_type->t));
|
2017-02-08 21:45:31 +03:00
|
|
|
}
|
|
|
|
vtop--; /* NOT vpop() because on x86 it would flush the fp stack */
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2019-06-22 14:18:54 +03:00
|
|
|
static void check_func_return(void)
|
|
|
|
{
|
|
|
|
if ((func_vt.t & VT_BTYPE) == VT_VOID)
|
|
|
|
return;
|
|
|
|
if (!strcmp (funcname, "main")
|
|
|
|
&& (func_vt.t & VT_BTYPE) == VT_INT) {
|
|
|
|
/* main returns 0 by default */
|
|
|
|
vpushi(0);
|
|
|
|
gen_assign_cast(&func_vt);
|
|
|
|
gfunc_return(&func_vt);
|
|
|
|
} else {
|
|
|
|
tcc_warning("function might return no value: '%s'", funcname);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* ------------------------------------------------------------------------- */
|
|
|
|
/* switch/case */
|
|
|
|
|
2016-10-03 10:40:37 +03:00
|
|
|
static int case_cmp(const void *pa, const void *pb)
|
|
|
|
{
|
2016-11-06 07:02:11 +03:00
|
|
|
int64_t a = (*(struct case_t**) pa)->v1;
|
|
|
|
int64_t b = (*(struct case_t**) pb)->v1;
|
2016-10-03 10:40:37 +03:00
|
|
|
return a < b ? -1 : a > b;
|
|
|
|
}
|
2016-09-21 18:35:29 +03:00
|
|
|
|
jump optimizations
This unifies VT_CMP with VT_JMP(i) by using mostly VT_CMP
with both a positive and a negative jump target list.
Such we can delay putting the non-inverted or inverted jump
until we can see which one is nore suitable (in most cases).
example:
if (a && b || c && d)
e = 0;
before this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 11 00 00 00 je 27 <main+0x27>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 84 05 00 00 00 je 27 <main+0x27>
22: e9 22 00 00 00 jmp 49 <main+0x49>
27: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
2a: 83 f8 00 cmp $0x0,%eax
2d: 0f 84 11 00 00 00 je 44 <main+0x44>
33: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
36: 83 f8 00 cmp $0x0,%eax
39: 0f 84 05 00 00 00 je 44 <main+0x44>
3f: e9 05 00 00 00 jmp 49 <main+0x49>
44: e9 08 00 00 00 jmp 51 <main+0x51>
49: b8 00 00 00 00 mov $0x0,%eax
4e: 89 45 ec mov %eax,0xffffffec(%ebp)
51: ...
with this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 0c 00 00 00 je 22 <main+0x22>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 85 18 00 00 00 jne 3a <main+0x3a>
22: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
25: 83 f8 00 cmp $0x0,%eax
28: 0f 84 14 00 00 00 je 42 <main+0x42>
2e: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
31: 83 f8 00 cmp $0x0,%eax
34: 0f 84 08 00 00 00 je 42 <main+0x42>
3a: b8 00 00 00 00 mov $0x0,%eax
3f: 89 45 ec mov %eax,0xffffffec(%ebp)
42: ...
2019-06-22 12:45:35 +03:00
|
|
|
static void gtst_addr(int t, int a)
|
|
|
|
{
|
|
|
|
gsym_addr(gvtst(0, t), a);
|
|
|
|
}
|
|
|
|
|
2016-11-06 07:02:11 +03:00
|
|
|
static void gcase(struct case_t **base, int len, int *bsym)
|
2016-10-03 13:14:34 +03:00
|
|
|
{
|
|
|
|
struct case_t *p;
|
|
|
|
int e;
|
2016-11-06 07:02:11 +03:00
|
|
|
int ll = (vtop->type.t & VT_BTYPE) == VT_LLONG;
|
2018-06-08 16:31:40 +03:00
|
|
|
while (len > 8) {
|
2016-10-11 11:29:56 +03:00
|
|
|
/* binary search */
|
2016-10-03 13:14:34 +03:00
|
|
|
p = base[len/2];
|
2016-10-10 22:15:20 +03:00
|
|
|
vdup();
|
2016-11-06 07:02:11 +03:00
|
|
|
if (ll)
|
|
|
|
vpushll(p->v2);
|
|
|
|
else
|
|
|
|
vpushi(p->v2);
|
2016-10-03 13:14:34 +03:00
|
|
|
gen_op(TOK_LE);
|
jump optimizations
This unifies VT_CMP with VT_JMP(i) by using mostly VT_CMP
with both a positive and a negative jump target list.
Such we can delay putting the non-inverted or inverted jump
until we can see which one is nore suitable (in most cases).
example:
if (a && b || c && d)
e = 0;
before this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 11 00 00 00 je 27 <main+0x27>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 84 05 00 00 00 je 27 <main+0x27>
22: e9 22 00 00 00 jmp 49 <main+0x49>
27: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
2a: 83 f8 00 cmp $0x0,%eax
2d: 0f 84 11 00 00 00 je 44 <main+0x44>
33: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
36: 83 f8 00 cmp $0x0,%eax
39: 0f 84 05 00 00 00 je 44 <main+0x44>
3f: e9 05 00 00 00 jmp 49 <main+0x49>
44: e9 08 00 00 00 jmp 51 <main+0x51>
49: b8 00 00 00 00 mov $0x0,%eax
4e: 89 45 ec mov %eax,0xffffffec(%ebp)
51: ...
with this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 0c 00 00 00 je 22 <main+0x22>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 85 18 00 00 00 jne 3a <main+0x3a>
22: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
25: 83 f8 00 cmp $0x0,%eax
28: 0f 84 14 00 00 00 je 42 <main+0x42>
2e: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
31: 83 f8 00 cmp $0x0,%eax
34: 0f 84 08 00 00 00 je 42 <main+0x42>
3a: b8 00 00 00 00 mov $0x0,%eax
3f: 89 45 ec mov %eax,0xffffffec(%ebp)
42: ...
2019-06-22 12:45:35 +03:00
|
|
|
e = gvtst(1, 0);
|
2016-10-10 22:15:20 +03:00
|
|
|
vdup();
|
2016-11-06 07:02:11 +03:00
|
|
|
if (ll)
|
|
|
|
vpushll(p->v1);
|
|
|
|
else
|
|
|
|
vpushi(p->v1);
|
2016-10-03 13:14:34 +03:00
|
|
|
gen_op(TOK_GE);
|
2016-10-11 11:29:56 +03:00
|
|
|
gtst_addr(0, p->sym); /* v1 <= x <= v2 */
|
|
|
|
/* x < v1 */
|
2016-11-06 07:02:11 +03:00
|
|
|
gcase(base, len/2, bsym);
|
2016-10-11 11:29:56 +03:00
|
|
|
/* x > v2 */
|
2016-10-03 13:14:34 +03:00
|
|
|
gsym(e);
|
|
|
|
e = len/2 + 1;
|
2016-10-11 11:29:56 +03:00
|
|
|
base += e; len -= e;
|
|
|
|
}
|
|
|
|
/* linear scan */
|
|
|
|
while (len--) {
|
|
|
|
p = *base++;
|
|
|
|
vdup();
|
2016-11-06 07:02:11 +03:00
|
|
|
if (ll)
|
|
|
|
vpushll(p->v2);
|
|
|
|
else
|
|
|
|
vpushi(p->v2);
|
2016-10-11 11:29:56 +03:00
|
|
|
if (p->v1 == p->v2) {
|
|
|
|
gen_op(TOK_EQ);
|
|
|
|
gtst_addr(0, p->sym);
|
|
|
|
} else {
|
|
|
|
gen_op(TOK_LE);
|
jump optimizations
This unifies VT_CMP with VT_JMP(i) by using mostly VT_CMP
with both a positive and a negative jump target list.
Such we can delay putting the non-inverted or inverted jump
until we can see which one is nore suitable (in most cases).
example:
if (a && b || c && d)
e = 0;
before this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 11 00 00 00 je 27 <main+0x27>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 84 05 00 00 00 je 27 <main+0x27>
22: e9 22 00 00 00 jmp 49 <main+0x49>
27: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
2a: 83 f8 00 cmp $0x0,%eax
2d: 0f 84 11 00 00 00 je 44 <main+0x44>
33: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
36: 83 f8 00 cmp $0x0,%eax
39: 0f 84 05 00 00 00 je 44 <main+0x44>
3f: e9 05 00 00 00 jmp 49 <main+0x49>
44: e9 08 00 00 00 jmp 51 <main+0x51>
49: b8 00 00 00 00 mov $0x0,%eax
4e: 89 45 ec mov %eax,0xffffffec(%ebp)
51: ...
with this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 0c 00 00 00 je 22 <main+0x22>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 85 18 00 00 00 jne 3a <main+0x3a>
22: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
25: 83 f8 00 cmp $0x0,%eax
28: 0f 84 14 00 00 00 je 42 <main+0x42>
2e: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
31: 83 f8 00 cmp $0x0,%eax
34: 0f 84 08 00 00 00 je 42 <main+0x42>
3a: b8 00 00 00 00 mov $0x0,%eax
3f: 89 45 ec mov %eax,0xffffffec(%ebp)
42: ...
2019-06-22 12:45:35 +03:00
|
|
|
e = gvtst(1, 0);
|
2016-10-11 11:29:56 +03:00
|
|
|
vdup();
|
2016-11-06 07:02:11 +03:00
|
|
|
if (ll)
|
|
|
|
vpushll(p->v1);
|
|
|
|
else
|
|
|
|
vpushi(p->v1);
|
2016-10-11 11:29:56 +03:00
|
|
|
gen_op(TOK_GE);
|
|
|
|
gtst_addr(0, p->sym);
|
|
|
|
gsym(e);
|
|
|
|
}
|
2016-10-03 13:14:34 +03:00
|
|
|
}
|
jump optimizations
This unifies VT_CMP with VT_JMP(i) by using mostly VT_CMP
with both a positive and a negative jump target list.
Such we can delay putting the non-inverted or inverted jump
until we can see which one is nore suitable (in most cases).
example:
if (a && b || c && d)
e = 0;
before this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 11 00 00 00 je 27 <main+0x27>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 84 05 00 00 00 je 27 <main+0x27>
22: e9 22 00 00 00 jmp 49 <main+0x49>
27: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
2a: 83 f8 00 cmp $0x0,%eax
2d: 0f 84 11 00 00 00 je 44 <main+0x44>
33: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
36: 83 f8 00 cmp $0x0,%eax
39: 0f 84 05 00 00 00 je 44 <main+0x44>
3f: e9 05 00 00 00 jmp 49 <main+0x49>
44: e9 08 00 00 00 jmp 51 <main+0x51>
49: b8 00 00 00 00 mov $0x0,%eax
4e: 89 45 ec mov %eax,0xffffffec(%ebp)
51: ...
with this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 0c 00 00 00 je 22 <main+0x22>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 85 18 00 00 00 jne 3a <main+0x3a>
22: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
25: 83 f8 00 cmp $0x0,%eax
28: 0f 84 14 00 00 00 je 42 <main+0x42>
2e: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
31: 83 f8 00 cmp $0x0,%eax
34: 0f 84 08 00 00 00 je 42 <main+0x42>
3a: b8 00 00 00 00 mov $0x0,%eax
3f: 89 45 ec mov %eax,0xffffffec(%ebp)
42: ...
2019-06-22 12:45:35 +03:00
|
|
|
*bsym = gjmp(*bsym);
|
2016-10-03 13:14:34 +03:00
|
|
|
}
|
|
|
|
|
2019-06-22 14:18:54 +03:00
|
|
|
/* ------------------------------------------------------------------------- */
|
|
|
|
/* __attribute__((cleanup(fn))) */
|
|
|
|
|
|
|
|
static void try_call_scope_cleanup(Sym *stop)
|
|
|
|
{
|
|
|
|
Sym *cls = cur_scope->cl.s;
|
|
|
|
|
|
|
|
for (; cls != stop; cls = cls->ncl) {
|
|
|
|
Sym *fs = cls->next;
|
|
|
|
Sym *vs = cls->prev_tok;
|
|
|
|
|
|
|
|
vpushsym(&fs->type, fs);
|
|
|
|
vset(&vs->type, vs->r, vs->c);
|
|
|
|
vtop->sym = vs;
|
|
|
|
mk_pointer(&vtop->type);
|
|
|
|
gaddrof();
|
|
|
|
gfunc_call(1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void try_call_cleanup_goto(Sym *cleanupstate)
|
|
|
|
{
|
|
|
|
Sym *oc, *cc;
|
|
|
|
int ocd, ccd;
|
|
|
|
|
|
|
|
if (!cur_scope->cl.s)
|
|
|
|
return;
|
|
|
|
|
|
|
|
/* search NCA of both cleanup chains given parents and initial depth */
|
|
|
|
ocd = cleanupstate ? cleanupstate->v & ~SYM_FIELD : 0;
|
|
|
|
for (ccd = cur_scope->cl.n, oc = cleanupstate; ocd > ccd; --ocd, oc = oc->ncl)
|
|
|
|
;
|
|
|
|
for (cc = cur_scope->cl.s; ccd > ocd; --ccd, cc = cc->ncl)
|
|
|
|
;
|
|
|
|
for (; cc != oc; cc = cc->ncl, oc = oc->ncl, --ccd)
|
|
|
|
;
|
|
|
|
|
|
|
|
try_call_scope_cleanup(cc);
|
|
|
|
}
|
|
|
|
|
2019-04-29 14:53:07 +03:00
|
|
|
/* call 'func' for each __attribute__((cleanup(func))) */
|
2019-06-22 14:18:54 +03:00
|
|
|
static void block_cleanup(struct scope *o)
|
2019-04-29 14:53:07 +03:00
|
|
|
{
|
|
|
|
int jmp = 0;
|
|
|
|
Sym *g, **pg;
|
2019-06-22 14:18:54 +03:00
|
|
|
for (pg = &pending_gotos; (g = *pg) && g->c > o->cl.n;) {
|
2019-04-29 14:53:07 +03:00
|
|
|
if (g->prev_tok->r & LABEL_FORWARD) {
|
|
|
|
Sym *pcl = g->next;
|
|
|
|
if (!jmp)
|
|
|
|
jmp = gjmp(0);
|
|
|
|
gsym(pcl->jnext);
|
2019-06-22 14:18:54 +03:00
|
|
|
try_call_scope_cleanup(o->cl.s);
|
2019-04-29 14:53:07 +03:00
|
|
|
pcl->jnext = gjmp(0);
|
2019-06-22 14:18:54 +03:00
|
|
|
if (!o->cl.n)
|
2019-04-29 14:53:07 +03:00
|
|
|
goto remove_pending;
|
2019-06-22 14:18:54 +03:00
|
|
|
g->c = o->cl.n;
|
2019-04-29 14:53:07 +03:00
|
|
|
pg = &g->prev;
|
|
|
|
} else {
|
|
|
|
remove_pending:
|
|
|
|
*pg = g->prev;
|
|
|
|
sym_free(g);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
gsym(jmp);
|
2019-06-22 14:18:54 +03:00
|
|
|
try_call_scope_cleanup(o->cl.s);
|
2019-04-29 14:53:07 +03:00
|
|
|
}
|
|
|
|
|
2019-06-22 14:18:54 +03:00
|
|
|
/* ------------------------------------------------------------------------- */
|
|
|
|
/* VLA */
|
|
|
|
|
|
|
|
static void vla_restore(int loc)
|
2019-04-29 14:53:07 +03:00
|
|
|
{
|
2019-06-22 14:18:54 +03:00
|
|
|
if (loc)
|
|
|
|
gen_vla_sp_restore(loc);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void vla_leave(struct scope *o)
|
|
|
|
{
|
|
|
|
if (o->vla.num < cur_scope->vla.num)
|
|
|
|
vla_restore(o->vla.loc);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* ------------------------------------------------------------------------- */
|
|
|
|
/* local scopes */
|
|
|
|
|
|
|
|
void new_scope(struct scope *o)
|
|
|
|
{
|
|
|
|
/* copy and link previous scope */
|
|
|
|
*o = *cur_scope;
|
|
|
|
o->prev = cur_scope;
|
|
|
|
cur_scope = o;
|
|
|
|
|
|
|
|
/* record local declaration stack position */
|
|
|
|
o->lstk = local_stack;
|
|
|
|
o->llstk = local_label_stack;
|
|
|
|
|
|
|
|
++local_scope;
|
2020-05-05 15:47:00 +03:00
|
|
|
|
|
|
|
if (tcc_state->do_debug)
|
|
|
|
tcc_debug_stabn(N_LBRAC, ind - func_ind);
|
2019-06-22 14:18:54 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
void prev_scope(struct scope *o, int is_expr)
|
|
|
|
{
|
|
|
|
vla_leave(o->prev);
|
|
|
|
|
|
|
|
if (o->cl.s != o->prev->cl.s)
|
|
|
|
block_cleanup(o->prev);
|
|
|
|
|
|
|
|
/* pop locally defined labels */
|
|
|
|
label_pop(&local_label_stack, o->llstk, is_expr);
|
|
|
|
|
|
|
|
/* In the is_expr case (a statement expression is finished here),
|
|
|
|
vtop might refer to symbols on the local_stack. Either via the
|
|
|
|
type or via vtop->sym. We can't pop those nor any that in turn
|
|
|
|
might be referred to. To make it easier we don't roll back
|
|
|
|
any symbols in that case; some upper level call to block() will
|
|
|
|
do that. We do have to remove such symbols from the lookup
|
|
|
|
tables, though. sym_pop will do that. */
|
|
|
|
|
|
|
|
/* pop locally defined symbols */
|
2020-05-05 15:47:00 +03:00
|
|
|
pop_local_syms(&local_stack, o->lstk, is_expr, 0);
|
2019-06-22 14:18:54 +03:00
|
|
|
cur_scope = o->prev;
|
|
|
|
--local_scope;
|
2020-05-05 15:47:00 +03:00
|
|
|
|
|
|
|
if (tcc_state->do_debug)
|
|
|
|
tcc_debug_stabn(N_RBRAC, ind - func_ind);
|
2019-06-22 14:18:54 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/* leave a scope via break/continue(/goto) */
|
|
|
|
void leave_scope(struct scope *o)
|
|
|
|
{
|
|
|
|
if (!o)
|
2019-04-29 14:53:07 +03:00
|
|
|
return;
|
2019-06-22 14:18:54 +03:00
|
|
|
try_call_scope_cleanup(o->cl.s);
|
|
|
|
vla_leave(o);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* ------------------------------------------------------------------------- */
|
|
|
|
/* call block from 'for do while' loops */
|
|
|
|
|
|
|
|
static void lblock(int *bsym, int *csym)
|
|
|
|
{
|
|
|
|
struct scope *lo = loop_scope, *co = cur_scope;
|
|
|
|
int *b = co->bsym, *c = co->csym;
|
|
|
|
if (csym) {
|
|
|
|
co->csym = csym;
|
|
|
|
loop_scope = co;
|
|
|
|
}
|
|
|
|
co->bsym = bsym;
|
|
|
|
block(0);
|
|
|
|
co->bsym = b;
|
|
|
|
if (csym) {
|
|
|
|
co->csym = c;
|
|
|
|
loop_scope = lo;
|
2019-04-29 14:53:07 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-06-22 14:18:54 +03:00
|
|
|
static void block(int is_expr)
|
2009-05-05 22:18:10 +04:00
|
|
|
{
|
2019-04-29 14:53:07 +03:00
|
|
|
int a, b, c, d, e, t;
|
2020-01-19 13:15:12 +03:00
|
|
|
struct scope o;
|
2016-05-05 11:39:09 +03:00
|
|
|
Sym *s;
|
2009-05-05 22:18:10 +04:00
|
|
|
|
|
|
|
if (is_expr) {
|
|
|
|
/* default return value is (void) */
|
|
|
|
vpushi(0);
|
|
|
|
vtop->type.t = VT_VOID;
|
|
|
|
}
|
|
|
|
|
2019-06-22 14:18:54 +03:00
|
|
|
again:
|
2019-04-29 14:53:07 +03:00
|
|
|
t = tok, next();
|
|
|
|
|
|
|
|
if (t == TOK_IF) {
|
2009-05-05 22:18:10 +04:00
|
|
|
skip('(');
|
|
|
|
gexpr();
|
|
|
|
skip(')');
|
2019-04-29 14:53:07 +03:00
|
|
|
a = gvtst(1, 0);
|
2019-06-22 14:18:54 +03:00
|
|
|
block(0);
|
2019-01-31 03:04:55 +03:00
|
|
|
if (tok == TOK_ELSE) {
|
2009-05-05 22:18:10 +04:00
|
|
|
d = gjmp(0);
|
|
|
|
gsym(a);
|
2019-04-29 14:53:07 +03:00
|
|
|
next();
|
2019-06-22 14:18:54 +03:00
|
|
|
block(0);
|
2009-05-05 22:18:10 +04:00
|
|
|
gsym(d); /* patch else jmp */
|
2019-04-29 14:53:07 +03:00
|
|
|
} else {
|
2009-05-05 22:18:10 +04:00
|
|
|
gsym(a);
|
2019-04-29 14:53:07 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
} else if (t == TOK_WHILE) {
|
|
|
|
d = gind();
|
2009-05-05 22:18:10 +04:00
|
|
|
skip('(');
|
|
|
|
gexpr();
|
|
|
|
skip(')');
|
2013-12-31 19:51:20 +04:00
|
|
|
a = gvtst(1, 0);
|
2009-05-05 22:18:10 +04:00
|
|
|
b = 0;
|
2019-06-22 14:18:54 +03:00
|
|
|
lblock(&a, &b);
|
2016-12-18 19:23:33 +03:00
|
|
|
gjmp_addr(d);
|
2009-05-05 22:18:10 +04:00
|
|
|
gsym_addr(b, d);
|
2019-04-29 14:53:07 +03:00
|
|
|
gsym(a);
|
|
|
|
|
|
|
|
} else if (t == '{') {
|
2019-06-22 14:18:54 +03:00
|
|
|
new_scope(&o);
|
2019-01-29 23:32:38 +03:00
|
|
|
|
2009-05-05 22:18:10 +04:00
|
|
|
/* handle local labels declarations */
|
2019-01-09 20:20:15 +03:00
|
|
|
while (tok == TOK_LABEL) {
|
2019-04-29 14:53:07 +03:00
|
|
|
do {
|
|
|
|
next();
|
2009-05-05 22:18:10 +04:00
|
|
|
if (tok < TOK_UIDENT)
|
|
|
|
expect("label identifier");
|
|
|
|
label_push(&local_label_stack, tok, LABEL_DECLARED);
|
|
|
|
next();
|
2019-04-29 14:53:07 +03:00
|
|
|
} while (tok == ',');
|
|
|
|
skip(';');
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
2019-04-29 14:53:07 +03:00
|
|
|
|
2009-05-05 22:18:10 +04:00
|
|
|
while (tok != '}') {
|
2019-04-29 14:53:07 +03:00
|
|
|
decl(VT_LOCAL);
|
2009-05-05 22:18:10 +04:00
|
|
|
if (tok != '}') {
|
|
|
|
if (is_expr)
|
|
|
|
vpop();
|
2019-06-22 14:18:54 +03:00
|
|
|
block(is_expr);
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
}
|
2018-12-20 12:55:22 +03:00
|
|
|
|
2019-06-22 14:18:54 +03:00
|
|
|
prev_scope(&o, is_expr);
|
2020-01-18 00:58:39 +03:00
|
|
|
if (local_scope)
|
|
|
|
next();
|
|
|
|
else if (!nocode_wanted)
|
2019-04-29 14:53:07 +03:00
|
|
|
check_func_return();
|
|
|
|
|
|
|
|
} else if (t == TOK_RETURN) {
|
|
|
|
b = (func_vt.t & VT_BTYPE) != VT_VOID;
|
2019-12-16 20:51:28 +03:00
|
|
|
if (tok != ';') {
|
|
|
|
gexpr();
|
|
|
|
if (b) {
|
|
|
|
gen_assign_cast(&func_vt);
|
|
|
|
} else {
|
|
|
|
if (vtop->type.t != VT_VOID)
|
|
|
|
tcc_warning("void function returns a value");
|
|
|
|
vtop--;
|
|
|
|
}
|
|
|
|
} else if (b) {
|
|
|
|
tcc_warning("'return' with no value");
|
|
|
|
b = 0;
|
|
|
|
}
|
2019-06-22 14:18:54 +03:00
|
|
|
leave_scope(root_scope);
|
2019-12-16 20:51:28 +03:00
|
|
|
if (b)
|
2019-04-29 14:53:07 +03:00
|
|
|
gfunc_return(&func_vt);
|
2009-05-05 22:18:10 +04:00
|
|
|
skip(';');
|
2016-08-11 14:59:08 +03:00
|
|
|
/* jump unless last stmt in top-level block */
|
|
|
|
if (tok != '}' || local_scope != 1)
|
|
|
|
rsym = gjmp(rsym);
|
2019-04-29 14:53:07 +03:00
|
|
|
CODE_OFF();
|
|
|
|
|
|
|
|
} else if (t == TOK_BREAK) {
|
2009-05-05 22:18:10 +04:00
|
|
|
/* compute jump */
|
2019-06-22 14:18:54 +03:00
|
|
|
if (!cur_scope->bsym)
|
2011-08-11 19:07:56 +04:00
|
|
|
tcc_error("cannot break");
|
2020-01-19 13:15:12 +03:00
|
|
|
if (cur_switch && cur_scope->bsym == cur_switch->bsym)
|
2019-06-22 14:18:54 +03:00
|
|
|
leave_scope(cur_switch->scope);
|
2020-01-19 13:15:12 +03:00
|
|
|
else
|
|
|
|
leave_scope(loop_scope);
|
2019-06-22 14:18:54 +03:00
|
|
|
*cur_scope->bsym = gjmp(*cur_scope->bsym);
|
2009-05-05 22:18:10 +04:00
|
|
|
skip(';');
|
2019-04-29 14:53:07 +03:00
|
|
|
|
|
|
|
} else if (t == TOK_CONTINUE) {
|
2009-05-05 22:18:10 +04:00
|
|
|
/* compute jump */
|
2019-06-22 14:18:54 +03:00
|
|
|
if (!cur_scope->csym)
|
2011-08-11 19:07:56 +04:00
|
|
|
tcc_error("cannot continue");
|
2019-06-22 14:18:54 +03:00
|
|
|
leave_scope(loop_scope);
|
|
|
|
*cur_scope->csym = gjmp(*cur_scope->csym);
|
2009-05-05 22:18:10 +04:00
|
|
|
skip(';');
|
2019-04-29 14:53:07 +03:00
|
|
|
|
|
|
|
} else if (t == TOK_FOR) {
|
2019-06-22 14:18:54 +03:00
|
|
|
new_scope(&o);
|
2019-04-30 06:44:15 +03:00
|
|
|
|
2009-05-05 22:18:10 +04:00
|
|
|
skip('(');
|
|
|
|
if (tok != ';') {
|
2011-03-09 00:36:04 +03:00
|
|
|
/* c99 for-loop init decl? */
|
2017-03-11 04:13:59 +03:00
|
|
|
if (!decl0(VT_LOCAL, 1, NULL)) {
|
2011-03-09 00:36:04 +03:00
|
|
|
/* no, regular for-loop init expr */
|
|
|
|
gexpr();
|
|
|
|
vpop();
|
|
|
|
}
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
2010-08-21 15:39:12 +04:00
|
|
|
skip(';');
|
2019-04-29 14:53:07 +03:00
|
|
|
a = b = 0;
|
|
|
|
c = d = gind();
|
2009-05-05 22:18:10 +04:00
|
|
|
if (tok != ';') {
|
|
|
|
gexpr();
|
2013-12-31 19:51:20 +04:00
|
|
|
a = gvtst(1, 0);
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
skip(';');
|
|
|
|
if (tok != ')') {
|
|
|
|
e = gjmp(0);
|
2019-04-29 14:53:07 +03:00
|
|
|
d = gind();
|
2009-05-05 22:18:10 +04:00
|
|
|
gexpr();
|
|
|
|
vpop();
|
2019-04-29 14:53:07 +03:00
|
|
|
gjmp_addr(c);
|
2009-05-05 22:18:10 +04:00
|
|
|
gsym(e);
|
|
|
|
}
|
|
|
|
skip(')');
|
2019-06-22 14:18:54 +03:00
|
|
|
lblock(&a, &b);
|
2019-04-29 14:53:07 +03:00
|
|
|
gjmp_addr(d);
|
|
|
|
gsym_addr(b, d);
|
2009-05-05 22:18:10 +04:00
|
|
|
gsym(a);
|
2019-06-22 14:18:54 +03:00
|
|
|
prev_scope(&o, 0);
|
2016-05-05 11:39:09 +03:00
|
|
|
|
2019-04-29 14:53:07 +03:00
|
|
|
} else if (t == TOK_DO) {
|
|
|
|
a = b = 0;
|
|
|
|
d = gind();
|
2019-06-22 14:18:54 +03:00
|
|
|
lblock(&a, &b);
|
2019-04-29 14:53:07 +03:00
|
|
|
gsym(b);
|
2009-05-05 22:18:10 +04:00
|
|
|
skip(TOK_WHILE);
|
|
|
|
skip('(');
|
2016-12-13 19:23:02 +03:00
|
|
|
gexpr();
|
2019-04-29 14:53:07 +03:00
|
|
|
skip(')');
|
|
|
|
skip(';');
|
2016-12-18 19:23:33 +03:00
|
|
|
c = gvtst(0, 0);
|
|
|
|
gsym_addr(c, d);
|
2009-05-05 22:18:10 +04:00
|
|
|
gsym(a);
|
2019-04-29 14:53:07 +03:00
|
|
|
|
|
|
|
} else if (t == TOK_SWITCH) {
|
2020-01-19 13:15:12 +03:00
|
|
|
struct switch_t *sw;
|
2019-06-22 14:18:54 +03:00
|
|
|
|
2020-01-19 13:15:12 +03:00
|
|
|
sw = tcc_mallocz(sizeof *sw);
|
|
|
|
sw->bsym = &a;
|
|
|
|
sw->scope = cur_scope;
|
|
|
|
sw->prev = cur_switch;
|
|
|
|
cur_switch = sw;
|
2019-06-22 14:18:54 +03:00
|
|
|
|
2009-05-05 22:18:10 +04:00
|
|
|
skip('(');
|
|
|
|
gexpr();
|
|
|
|
skip(')');
|
2020-01-19 13:15:12 +03:00
|
|
|
sw->sv = *vtop--; /* save switch value */
|
jump optimizations
This unifies VT_CMP with VT_JMP(i) by using mostly VT_CMP
with both a positive and a negative jump target list.
Such we can delay putting the non-inverted or inverted jump
until we can see which one is nore suitable (in most cases).
example:
if (a && b || c && d)
e = 0;
before this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 11 00 00 00 je 27 <main+0x27>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 84 05 00 00 00 je 27 <main+0x27>
22: e9 22 00 00 00 jmp 49 <main+0x49>
27: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
2a: 83 f8 00 cmp $0x0,%eax
2d: 0f 84 11 00 00 00 je 44 <main+0x44>
33: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
36: 83 f8 00 cmp $0x0,%eax
39: 0f 84 05 00 00 00 je 44 <main+0x44>
3f: e9 05 00 00 00 jmp 49 <main+0x49>
44: e9 08 00 00 00 jmp 51 <main+0x51>
49: b8 00 00 00 00 mov $0x0,%eax
4e: 89 45 ec mov %eax,0xffffffec(%ebp)
51: ...
with this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 0c 00 00 00 je 22 <main+0x22>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 85 18 00 00 00 jne 3a <main+0x3a>
22: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
25: 83 f8 00 cmp $0x0,%eax
28: 0f 84 14 00 00 00 je 42 <main+0x42>
2e: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
31: 83 f8 00 cmp $0x0,%eax
34: 0f 84 08 00 00 00 je 42 <main+0x42>
3a: b8 00 00 00 00 mov $0x0,%eax
3f: 89 45 ec mov %eax,0xffffffec(%ebp)
42: ...
2019-06-22 12:45:35 +03:00
|
|
|
|
|
|
|
a = 0;
|
|
|
|
b = gjmp(0); /* jump to first case */
|
2019-06-22 14:18:54 +03:00
|
|
|
lblock(&a, NULL);
|
2016-09-21 18:35:29 +03:00
|
|
|
a = gjmp(a); /* add implicit break */
|
2016-10-03 13:14:34 +03:00
|
|
|
/* case lookup */
|
2016-09-21 18:35:29 +03:00
|
|
|
gsym(b);
|
jump optimizations
This unifies VT_CMP with VT_JMP(i) by using mostly VT_CMP
with both a positive and a negative jump target list.
Such we can delay putting the non-inverted or inverted jump
until we can see which one is nore suitable (in most cases).
example:
if (a && b || c && d)
e = 0;
before this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 11 00 00 00 je 27 <main+0x27>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 84 05 00 00 00 je 27 <main+0x27>
22: e9 22 00 00 00 jmp 49 <main+0x49>
27: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
2a: 83 f8 00 cmp $0x0,%eax
2d: 0f 84 11 00 00 00 je 44 <main+0x44>
33: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
36: 83 f8 00 cmp $0x0,%eax
39: 0f 84 05 00 00 00 je 44 <main+0x44>
3f: e9 05 00 00 00 jmp 49 <main+0x49>
44: e9 08 00 00 00 jmp 51 <main+0x51>
49: b8 00 00 00 00 mov $0x0,%eax
4e: 89 45 ec mov %eax,0xffffffec(%ebp)
51: ...
with this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 0c 00 00 00 je 22 <main+0x22>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 85 18 00 00 00 jne 3a <main+0x3a>
22: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
25: 83 f8 00 cmp $0x0,%eax
28: 0f 84 14 00 00 00 je 42 <main+0x42>
2e: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
31: 83 f8 00 cmp $0x0,%eax
34: 0f 84 08 00 00 00 je 42 <main+0x42>
3a: b8 00 00 00 00 mov $0x0,%eax
3f: 89 45 ec mov %eax,0xffffffec(%ebp)
42: ...
2019-06-22 12:45:35 +03:00
|
|
|
|
2020-01-19 13:15:12 +03:00
|
|
|
qsort(sw->p, sw->n, sizeof(void*), case_cmp);
|
|
|
|
for (b = 1; b < sw->n; b++)
|
|
|
|
if (sw->p[b - 1]->v2 >= sw->p[b]->v1)
|
2016-12-18 19:23:33 +03:00
|
|
|
tcc_error("duplicate case value");
|
2019-06-22 14:18:54 +03:00
|
|
|
|
2016-12-18 19:23:33 +03:00
|
|
|
/* Our switch table sorting is signed, so the compared
|
|
|
|
value needs to be as well when it's 64bit. */
|
2020-01-19 13:15:12 +03:00
|
|
|
vpushv(&sw->sv);
|
|
|
|
if ((vtop->type.t & VT_BTYPE) == VT_LLONG)
|
|
|
|
vtop->type.t &= ~VT_UNSIGNED;
|
jump optimizations
This unifies VT_CMP with VT_JMP(i) by using mostly VT_CMP
with both a positive and a negative jump target list.
Such we can delay putting the non-inverted or inverted jump
until we can see which one is nore suitable (in most cases).
example:
if (a && b || c && d)
e = 0;
before this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 11 00 00 00 je 27 <main+0x27>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 84 05 00 00 00 je 27 <main+0x27>
22: e9 22 00 00 00 jmp 49 <main+0x49>
27: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
2a: 83 f8 00 cmp $0x0,%eax
2d: 0f 84 11 00 00 00 je 44 <main+0x44>
33: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
36: 83 f8 00 cmp $0x0,%eax
39: 0f 84 05 00 00 00 je 44 <main+0x44>
3f: e9 05 00 00 00 jmp 49 <main+0x49>
44: e9 08 00 00 00 jmp 51 <main+0x51>
49: b8 00 00 00 00 mov $0x0,%eax
4e: 89 45 ec mov %eax,0xffffffec(%ebp)
51: ...
with this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 0c 00 00 00 je 22 <main+0x22>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 85 18 00 00 00 jne 3a <main+0x3a>
22: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
25: 83 f8 00 cmp $0x0,%eax
28: 0f 84 14 00 00 00 je 42 <main+0x42>
2e: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
31: 83 f8 00 cmp $0x0,%eax
34: 0f 84 08 00 00 00 je 42 <main+0x42>
3a: b8 00 00 00 00 mov $0x0,%eax
3f: 89 45 ec mov %eax,0xffffffec(%ebp)
42: ...
2019-06-22 12:45:35 +03:00
|
|
|
gv(RC_INT);
|
2020-01-19 13:15:12 +03:00
|
|
|
d = 0, gcase(sw->p, sw->n, &d);
|
2016-12-18 19:23:33 +03:00
|
|
|
vpop();
|
2020-01-19 13:15:12 +03:00
|
|
|
if (sw->def_sym)
|
|
|
|
gsym_addr(d, sw->def_sym);
|
jump optimizations
This unifies VT_CMP with VT_JMP(i) by using mostly VT_CMP
with both a positive and a negative jump target list.
Such we can delay putting the non-inverted or inverted jump
until we can see which one is nore suitable (in most cases).
example:
if (a && b || c && d)
e = 0;
before this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 11 00 00 00 je 27 <main+0x27>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 84 05 00 00 00 je 27 <main+0x27>
22: e9 22 00 00 00 jmp 49 <main+0x49>
27: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
2a: 83 f8 00 cmp $0x0,%eax
2d: 0f 84 11 00 00 00 je 44 <main+0x44>
33: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
36: 83 f8 00 cmp $0x0,%eax
39: 0f 84 05 00 00 00 je 44 <main+0x44>
3f: e9 05 00 00 00 jmp 49 <main+0x49>
44: e9 08 00 00 00 jmp 51 <main+0x51>
49: b8 00 00 00 00 mov $0x0,%eax
4e: 89 45 ec mov %eax,0xffffffec(%ebp)
51: ...
with this patch:
a: 8b 45 fc mov 0xfffffffc(%ebp),%eax
d: 83 f8 00 cmp $0x0,%eax
10: 0f 84 0c 00 00 00 je 22 <main+0x22>
16: 8b 45 f8 mov 0xfffffff8(%ebp),%eax
19: 83 f8 00 cmp $0x0,%eax
1c: 0f 85 18 00 00 00 jne 3a <main+0x3a>
22: 8b 45 f4 mov 0xfffffff4(%ebp),%eax
25: 83 f8 00 cmp $0x0,%eax
28: 0f 84 14 00 00 00 je 42 <main+0x42>
2e: 8b 45 f0 mov 0xfffffff0(%ebp),%eax
31: 83 f8 00 cmp $0x0,%eax
34: 0f 84 08 00 00 00 je 42 <main+0x42>
3a: b8 00 00 00 00 mov $0x0,%eax
3f: 89 45 ec mov %eax,0xffffffec(%ebp)
42: ...
2019-06-22 12:45:35 +03:00
|
|
|
else
|
|
|
|
gsym(d);
|
2009-05-05 22:18:10 +04:00
|
|
|
/* break label */
|
|
|
|
gsym(a);
|
2019-06-22 14:18:54 +03:00
|
|
|
|
2020-01-19 13:15:12 +03:00
|
|
|
dynarray_reset(&sw->p, &sw->n);
|
|
|
|
cur_switch = sw->prev;
|
|
|
|
tcc_free(sw);
|
2019-04-29 14:53:07 +03:00
|
|
|
|
|
|
|
} else if (t == TOK_CASE) {
|
2016-09-21 18:35:29 +03:00
|
|
|
struct case_t *cr = tcc_malloc(sizeof(struct case_t));
|
|
|
|
if (!cur_switch)
|
2009-05-05 22:18:10 +04:00
|
|
|
expect("switch");
|
2016-11-06 07:02:11 +03:00
|
|
|
cr->v1 = cr->v2 = expr_const64();
|
2009-05-05 22:18:10 +04:00
|
|
|
if (gnu_ext && tok == TOK_DOTS) {
|
|
|
|
next();
|
2016-11-06 07:02:11 +03:00
|
|
|
cr->v2 = expr_const64();
|
2016-09-21 18:35:29 +03:00
|
|
|
if (cr->v2 < cr->v1)
|
2011-08-11 19:07:56 +04:00
|
|
|
tcc_warning("empty case range");
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
2019-04-29 14:53:07 +03:00
|
|
|
cr->sym = gind();
|
2017-02-13 20:23:43 +03:00
|
|
|
dynarray_add(&cur_switch->p, &cur_switch->n, cr);
|
2009-05-05 22:18:10 +04:00
|
|
|
skip(':');
|
|
|
|
is_expr = 0;
|
|
|
|
goto block_after_label;
|
2019-04-29 14:53:07 +03:00
|
|
|
|
|
|
|
} else if (t == TOK_DEFAULT) {
|
2016-09-21 18:35:29 +03:00
|
|
|
if (!cur_switch)
|
2009-05-05 22:18:10 +04:00
|
|
|
expect("switch");
|
2016-09-21 18:35:29 +03:00
|
|
|
if (cur_switch->def_sym)
|
2011-08-11 19:07:56 +04:00
|
|
|
tcc_error("too many 'default'");
|
2019-04-29 14:53:07 +03:00
|
|
|
cur_switch->def_sym = gind();
|
|
|
|
skip(':');
|
2009-05-05 22:18:10 +04:00
|
|
|
is_expr = 0;
|
|
|
|
goto block_after_label;
|
2019-04-29 14:53:07 +03:00
|
|
|
|
|
|
|
} else if (t == TOK_GOTO) {
|
2019-06-22 14:18:54 +03:00
|
|
|
vla_restore(root_scope->vla.loc);
|
2009-05-05 22:18:10 +04:00
|
|
|
if (tok == '*' && gnu_ext) {
|
|
|
|
/* computed goto */
|
|
|
|
next();
|
|
|
|
gexpr();
|
|
|
|
if ((vtop->type.t & VT_BTYPE) != VT_PTR)
|
|
|
|
expect("pointer");
|
2016-12-18 19:23:33 +03:00
|
|
|
ggoto();
|
2019-06-22 14:18:54 +03:00
|
|
|
|
2009-05-05 22:18:10 +04:00
|
|
|
} else if (tok >= TOK_UIDENT) {
|
2018-12-20 12:55:22 +03:00
|
|
|
s = label_find(tok);
|
2019-01-28 03:21:38 +03:00
|
|
|
/* put forward definition if needed */
|
|
|
|
if (!s)
|
|
|
|
s = label_push(&global_label_stack, tok, LABEL_FORWARD);
|
|
|
|
else if (s->r == LABEL_DECLARED)
|
|
|
|
s->r = LABEL_FORWARD;
|
2018-12-20 12:55:22 +03:00
|
|
|
|
2019-01-28 03:21:38 +03:00
|
|
|
if (s->r & LABEL_FORWARD) {
|
|
|
|
/* start new goto chain for cleanups, linked via label->next */
|
2019-06-22 14:18:54 +03:00
|
|
|
if (cur_scope->cl.s && !nocode_wanted) {
|
|
|
|
sym_push2(&pending_gotos, SYM_FIELD, 0, cur_scope->cl.n);
|
2019-01-28 03:21:38 +03:00
|
|
|
pending_gotos->prev_tok = s;
|
|
|
|
s = sym_push2(&s->next, SYM_FIELD, 0, 0);
|
|
|
|
pending_gotos->next = s;
|
|
|
|
}
|
2018-12-20 12:55:22 +03:00
|
|
|
s->jnext = gjmp(s->jnext);
|
2019-01-28 03:21:38 +03:00
|
|
|
} else {
|
|
|
|
try_call_cleanup_goto(s->cleanupstate);
|
2018-12-20 12:55:22 +03:00
|
|
|
gjmp_addr(s->jnext);
|
2019-01-28 03:21:38 +03:00
|
|
|
}
|
2018-12-20 12:55:22 +03:00
|
|
|
next();
|
2019-04-29 14:53:07 +03:00
|
|
|
|
|
|
|
} else {
|
2009-05-05 22:18:10 +04:00
|
|
|
expect("label identifier");
|
|
|
|
}
|
|
|
|
skip(';');
|
2019-04-29 14:53:07 +03:00
|
|
|
|
|
|
|
} else if (t == TOK_ASM1 || t == TOK_ASM2 || t == TOK_ASM3) {
|
2009-05-05 22:18:10 +04:00
|
|
|
asm_instr();
|
2019-04-29 14:53:07 +03:00
|
|
|
|
2009-05-05 22:18:10 +04:00
|
|
|
} else {
|
2019-04-29 14:53:07 +03:00
|
|
|
if (tok == ':' && t >= TOK_UIDENT) {
|
2009-05-05 22:18:10 +04:00
|
|
|
/* label case */
|
2017-04-15 21:05:39 +03:00
|
|
|
next();
|
2019-04-29 14:53:07 +03:00
|
|
|
s = label_find(t);
|
2009-05-05 22:18:10 +04:00
|
|
|
if (s) {
|
|
|
|
if (s->r == LABEL_DEFINED)
|
2011-08-11 19:07:56 +04:00
|
|
|
tcc_error("duplicate label '%s'", get_tok_str(s->v, NULL));
|
2009-05-05 22:18:10 +04:00
|
|
|
s->r = LABEL_DEFINED;
|
2019-01-28 03:21:38 +03:00
|
|
|
if (s->next) {
|
|
|
|
Sym *pcl; /* pending cleanup goto */
|
|
|
|
for (pcl = s->next; pcl; pcl = pcl->prev)
|
|
|
|
gsym(pcl->jnext);
|
|
|
|
sym_pop(&s->next, NULL, 0);
|
|
|
|
} else
|
|
|
|
gsym(s->jnext);
|
2009-05-05 22:18:10 +04:00
|
|
|
} else {
|
2019-04-29 14:53:07 +03:00
|
|
|
s = label_push(&global_label_stack, t, LABEL_DEFINED);
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
2019-04-29 14:53:07 +03:00
|
|
|
s->jnext = gind();
|
2019-06-22 14:18:54 +03:00
|
|
|
s->cleanupstate = cur_scope->cl.s;
|
2019-04-29 14:53:07 +03:00
|
|
|
|
|
|
|
block_after_label:
|
2019-06-22 14:18:54 +03:00
|
|
|
vla_restore(cur_scope->vla.loc);
|
2009-05-05 22:18:10 +04:00
|
|
|
/* we accept this, but it is a mistake */
|
|
|
|
if (tok == '}') {
|
2011-08-11 19:07:56 +04:00
|
|
|
tcc_warning("deprecated use of label at end of compound statement");
|
2009-05-05 22:18:10 +04:00
|
|
|
} else {
|
2019-06-22 14:18:54 +03:00
|
|
|
goto again;
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
2019-04-29 14:53:07 +03:00
|
|
|
|
2009-05-05 22:18:10 +04:00
|
|
|
} else {
|
|
|
|
/* expression case */
|
2019-04-29 14:53:07 +03:00
|
|
|
if (t != ';') {
|
|
|
|
unget_tok(t);
|
2009-05-05 22:18:10 +04:00
|
|
|
if (is_expr) {
|
|
|
|
vpop();
|
|
|
|
gexpr();
|
|
|
|
} else {
|
|
|
|
gexpr();
|
|
|
|
vpop();
|
|
|
|
}
|
2019-04-29 14:53:07 +03:00
|
|
|
skip(';');
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-03-06 23:43:48 +03:00
|
|
|
/* This skips over a stream of tokens containing balanced {} and ()
|
2017-07-03 19:13:15 +03:00
|
|
|
pairs, stopping at outer ',' ';' and '}' (or matching '}' if we started
|
|
|
|
with a '{'). If STR then allocates and stores the skipped tokens
|
|
|
|
in *STR. This doesn't check if () and {} are nested correctly,
|
|
|
|
i.e. "({)}" is accepted. */
|
2017-03-06 23:43:48 +03:00
|
|
|
static void skip_or_save_block(TokenString **str)
|
|
|
|
{
|
2017-07-03 19:13:15 +03:00
|
|
|
int braces = tok == '{';
|
2017-03-06 23:43:48 +03:00
|
|
|
int level = 0;
|
|
|
|
if (str)
|
|
|
|
*str = tok_str_alloc();
|
|
|
|
|
2017-07-03 20:15:16 +03:00
|
|
|
while ((level > 0 || (tok != '}' && tok != ',' && tok != ';' && tok != ')'))) {
|
2017-03-06 23:43:48 +03:00
|
|
|
int t;
|
|
|
|
if (tok == TOK_EOF) {
|
|
|
|
if (str || level > 0)
|
|
|
|
tcc_error("unexpected end of file");
|
|
|
|
else
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (str)
|
|
|
|
tok_str_add_tok(*str);
|
|
|
|
t = tok;
|
|
|
|
next();
|
|
|
|
if (t == '{' || t == '(') {
|
|
|
|
level++;
|
|
|
|
} else if (t == '}' || t == ')') {
|
|
|
|
level--;
|
2017-07-03 19:13:15 +03:00
|
|
|
if (level == 0 && braces && t == '}')
|
2017-03-06 23:43:48 +03:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (str) {
|
|
|
|
tok_str_add(*str, -1);
|
|
|
|
tok_str_add(*str, 0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-07-31 06:43:17 +03:00
|
|
|
#define EXPR_CONST 1
|
|
|
|
#define EXPR_ANY 2
|
|
|
|
|
|
|
|
static void parse_init_elem(int expr_type)
|
|
|
|
{
|
|
|
|
int saved_global_expr;
|
|
|
|
switch(expr_type) {
|
|
|
|
case EXPR_CONST:
|
|
|
|
/* compound literals must be allocated globally in this case */
|
|
|
|
saved_global_expr = global_expr;
|
|
|
|
global_expr = 1;
|
|
|
|
expr_const1();
|
|
|
|
global_expr = saved_global_expr;
|
2017-02-19 06:25:46 +03:00
|
|
|
/* NOTE: symbols are accepted, as well as lvalue for anon symbols
|
|
|
|
(compound literals). */
|
|
|
|
if (((vtop->r & (VT_VALMASK | VT_LVAL)) != VT_CONST
|
|
|
|
&& ((vtop->r & (VT_SYM|VT_LVAL)) != (VT_SYM|VT_LVAL)
|
|
|
|
|| vtop->sym->v < SYM_FIRST_ANOM))
|
2017-04-04 09:34:52 +03:00
|
|
|
#ifdef TCC_TARGET_PE
|
2017-07-09 13:34:11 +03:00
|
|
|
|| ((vtop->r & VT_SYM) && vtop->sym->a.dllimport)
|
2017-04-04 09:34:52 +03:00
|
|
|
#endif
|
2017-07-09 13:34:11 +03:00
|
|
|
)
|
2016-07-31 06:43:17 +03:00
|
|
|
tcc_error("initializer element is not constant");
|
|
|
|
break;
|
|
|
|
case EXPR_ANY:
|
|
|
|
expr_eq();
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-05-06 06:28:13 +03:00
|
|
|
/* put zeros for variable based init */
|
|
|
|
static void init_putz(Section *sec, unsigned long c, int size)
|
|
|
|
{
|
|
|
|
if (sec) {
|
|
|
|
/* nothing to do because globals are already set to zero */
|
|
|
|
} else {
|
|
|
|
vpush_global_sym(&func_old_type, TOK_memset);
|
|
|
|
vseti(VT_LOCAL, c);
|
|
|
|
#ifdef TCC_TARGET_ARM
|
|
|
|
vpushs(size);
|
|
|
|
vpushi(0);
|
|
|
|
#else
|
|
|
|
vpushi(0);
|
|
|
|
vpushs(size);
|
|
|
|
#endif
|
|
|
|
gfunc_call(3);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-03-18 05:26:19 +03:00
|
|
|
#define DIF_FIRST 1
|
|
|
|
#define DIF_SIZE_ONLY 2
|
|
|
|
#define DIF_HAVE_ELEM 4
|
|
|
|
|
2009-05-05 22:18:10 +04:00
|
|
|
/* t is the array or struct type. c is the array or struct
|
2016-08-01 06:30:55 +03:00
|
|
|
address. cur_field is the pointer to the current
|
2017-05-06 06:28:13 +03:00
|
|
|
field, for arrays the 'c' member contains the current start
|
2019-03-18 05:26:19 +03:00
|
|
|
index. 'flags' is as in decl_initializer.
|
|
|
|
'al' contains the already initialized length of the
|
2017-05-06 06:28:13 +03:00
|
|
|
current container (starting at c). This returns the new length of that. */
|
|
|
|
static int decl_designator(CType *type, Section *sec, unsigned long c,
|
2019-03-18 05:26:19 +03:00
|
|
|
Sym **cur_field, int flags, int al)
|
2009-05-05 22:18:10 +04:00
|
|
|
{
|
|
|
|
Sym *s, *f;
|
2017-04-15 21:07:26 +03:00
|
|
|
int index, index_last, align, l, nb_elems, elem_size;
|
2017-05-06 06:28:13 +03:00
|
|
|
unsigned long corig = c;
|
2009-05-05 22:18:10 +04:00
|
|
|
|
|
|
|
elem_size = 0;
|
|
|
|
nb_elems = 1;
|
2019-04-29 14:53:07 +03:00
|
|
|
|
2019-03-18 05:26:19 +03:00
|
|
|
if (flags & DIF_HAVE_ELEM)
|
|
|
|
goto no_designator;
|
2019-04-29 14:53:07 +03:00
|
|
|
|
|
|
|
if (gnu_ext && tok >= TOK_UIDENT) {
|
|
|
|
l = tok, next();
|
|
|
|
if (tok == ':')
|
|
|
|
goto struct_field;
|
|
|
|
unget_tok(l);
|
|
|
|
}
|
|
|
|
|
2017-04-15 21:07:26 +03:00
|
|
|
/* NOTE: we only support ranges for last designator */
|
|
|
|
while (nb_elems == 1 && (tok == '[' || tok == '.')) {
|
2009-05-05 22:18:10 +04:00
|
|
|
if (tok == '[') {
|
|
|
|
if (!(type->t & VT_ARRAY))
|
|
|
|
expect("array type");
|
|
|
|
next();
|
2017-04-15 21:07:26 +03:00
|
|
|
index = index_last = expr_const();
|
2009-05-05 22:18:10 +04:00
|
|
|
if (tok == TOK_DOTS && gnu_ext) {
|
|
|
|
next();
|
|
|
|
index_last = expr_const();
|
|
|
|
}
|
|
|
|
skip(']');
|
2017-04-15 21:07:26 +03:00
|
|
|
s = type->ref;
|
|
|
|
if (index < 0 || (s->c >= 0 && index_last >= s->c) ||
|
|
|
|
index_last < index)
|
|
|
|
tcc_error("invalid index");
|
2017-05-06 06:28:13 +03:00
|
|
|
if (cur_field)
|
|
|
|
(*cur_field)->c = index_last;
|
2009-05-05 22:18:10 +04:00
|
|
|
type = pointed_type(type);
|
|
|
|
elem_size = type_size(type, &align);
|
|
|
|
c += index * elem_size;
|
|
|
|
nb_elems = index_last - index + 1;
|
|
|
|
} else {
|
2019-07-21 22:14:58 +03:00
|
|
|
int cumofs;
|
2009-05-05 22:18:10 +04:00
|
|
|
next();
|
|
|
|
l = tok;
|
|
|
|
struct_field:
|
2017-04-15 21:07:26 +03:00
|
|
|
next();
|
2009-05-05 22:18:10 +04:00
|
|
|
if ((type->t & VT_BTYPE) != VT_STRUCT)
|
|
|
|
expect("struct/union type");
|
2019-07-21 22:14:58 +03:00
|
|
|
cumofs = 0;
|
2019-04-11 01:30:41 +03:00
|
|
|
f = find_field(type, l, &cumofs);
|
2009-05-05 22:18:10 +04:00
|
|
|
if (!f)
|
|
|
|
expect("field");
|
2017-04-15 21:07:26 +03:00
|
|
|
if (cur_field)
|
2009-05-05 22:18:10 +04:00
|
|
|
*cur_field = f;
|
2017-03-07 00:38:45 +03:00
|
|
|
type = &f->type;
|
2019-04-11 01:30:41 +03:00
|
|
|
c += cumofs + f->c;
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
2017-04-15 21:07:26 +03:00
|
|
|
cur_field = NULL;
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
2017-04-15 21:07:26 +03:00
|
|
|
if (!cur_field) {
|
2009-05-05 22:18:10 +04:00
|
|
|
if (tok == '=') {
|
|
|
|
next();
|
2017-04-15 21:07:26 +03:00
|
|
|
} else if (!gnu_ext) {
|
|
|
|
expect("=");
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
} else {
|
2019-03-18 05:26:19 +03:00
|
|
|
no_designator:
|
2009-05-05 22:18:10 +04:00
|
|
|
if (type->t & VT_ARRAY) {
|
2016-08-01 06:30:55 +03:00
|
|
|
index = (*cur_field)->c;
|
|
|
|
if (type->ref->c >= 0 && index >= type->ref->c)
|
|
|
|
tcc_error("index too large");
|
2009-05-05 22:18:10 +04:00
|
|
|
type = pointed_type(type);
|
|
|
|
c += index * type_size(type, &align);
|
|
|
|
} else {
|
|
|
|
f = *cur_field;
|
2017-05-01 07:04:19 +03:00
|
|
|
while (f && (f->v & SYM_FIRST_ANOM) && (f->type.t & VT_BITFIELD))
|
2017-04-29 23:09:10 +03:00
|
|
|
*cur_field = f = f->next;
|
2009-05-05 22:18:10 +04:00
|
|
|
if (!f)
|
2011-08-11 19:07:56 +04:00
|
|
|
tcc_error("too many field init");
|
2017-03-07 00:38:45 +03:00
|
|
|
type = &f->type;
|
2009-05-05 22:18:10 +04:00
|
|
|
c += f->c;
|
|
|
|
}
|
|
|
|
}
|
2017-05-06 06:28:13 +03:00
|
|
|
/* must put zero in holes (note that doing it that way
|
|
|
|
ensures that it even works with designators) */
|
2019-03-18 05:26:19 +03:00
|
|
|
if (!(flags & DIF_SIZE_ONLY) && c - corig > al)
|
2017-05-06 06:28:13 +03:00
|
|
|
init_putz(sec, corig + al, c - corig - al);
|
2019-03-18 05:26:19 +03:00
|
|
|
decl_initializer(type, sec, c, flags & ~DIF_FIRST);
|
2009-05-05 22:18:10 +04:00
|
|
|
|
|
|
|
/* XXX: make it more general */
|
2019-03-18 05:26:19 +03:00
|
|
|
if (!(flags & DIF_SIZE_ONLY) && nb_elems > 1) {
|
2009-05-05 22:18:10 +04:00
|
|
|
unsigned long c_end;
|
|
|
|
uint8_t *src, *dst;
|
|
|
|
int i;
|
|
|
|
|
2016-08-06 23:38:26 +03:00
|
|
|
if (!sec) {
|
|
|
|
vset(type, VT_LOCAL|VT_LVAL, c);
|
|
|
|
for (i = 1; i < nb_elems; i++) {
|
|
|
|
vset(type, VT_LOCAL|VT_LVAL, c + elem_size * i);
|
|
|
|
vswap();
|
|
|
|
vstore();
|
|
|
|
}
|
|
|
|
vpop();
|
2017-07-16 13:10:00 +03:00
|
|
|
} else if (!NODATA_WANTED) {
|
2016-08-06 23:38:26 +03:00
|
|
|
c_end = c + nb_elems * elem_size;
|
|
|
|
if (c_end > sec->data_allocated)
|
|
|
|
section_realloc(sec, c_end);
|
|
|
|
src = sec->data + c;
|
|
|
|
dst = src;
|
|
|
|
for(i = 1; i < nb_elems; i++) {
|
|
|
|
dst += elem_size;
|
|
|
|
memcpy(dst, src, elem_size);
|
|
|
|
}
|
|
|
|
}
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
2017-05-06 06:28:13 +03:00
|
|
|
c += nb_elems * type_size(type, &align);
|
|
|
|
if (c - corig > al)
|
|
|
|
al = c - corig;
|
|
|
|
return al;
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
|
2016-07-24 01:43:49 +03:00
|
|
|
/* store a value or an expression directly in global data or in local array */
|
2016-07-31 07:18:45 +03:00
|
|
|
static void init_putv(CType *type, Section *sec, unsigned long c)
|
2016-07-24 01:43:49 +03:00
|
|
|
{
|
2017-07-09 13:38:59 +03:00
|
|
|
int bt;
|
2016-07-24 01:43:49 +03:00
|
|
|
void *ptr;
|
|
|
|
CType dtype;
|
|
|
|
|
2009-05-05 22:18:10 +04:00
|
|
|
dtype = *type;
|
|
|
|
dtype.t &= ~VT_CONSTANT; /* need to do that to avoid false warning */
|
|
|
|
|
|
|
|
if (sec) {
|
2016-07-24 01:43:49 +03:00
|
|
|
int size, align;
|
2009-05-05 22:18:10 +04:00
|
|
|
/* XXX: not portable */
|
|
|
|
/* XXX: generate error if incorrect relocation */
|
|
|
|
gen_assign_cast(&dtype);
|
|
|
|
bt = type->t & VT_BTYPE;
|
2017-07-16 13:10:00 +03:00
|
|
|
|
|
|
|
if ((vtop->r & VT_SYM)
|
|
|
|
&& bt != VT_PTR
|
|
|
|
&& bt != VT_FUNC
|
|
|
|
&& (bt != (PTR_SIZE == 8 ? VT_LLONG : VT_INT)
|
|
|
|
|| (type->t & VT_BITFIELD))
|
|
|
|
&& !((vtop->r & VT_CONST) && vtop->sym->v >= SYM_FIRST_ANOM)
|
|
|
|
)
|
|
|
|
tcc_error("initializer element is not computable at load time");
|
|
|
|
|
|
|
|
if (NODATA_WANTED) {
|
|
|
|
vtop--;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2016-07-24 01:43:49 +03:00
|
|
|
size = type_size(type, &align);
|
2017-03-12 07:25:09 +03:00
|
|
|
section_reserve(sec, c + size);
|
2009-05-05 22:18:10 +04:00
|
|
|
ptr = sec->data + c;
|
2017-07-16 13:10:00 +03:00
|
|
|
|
2009-05-05 22:18:10 +04:00
|
|
|
/* XXX: make code faster ? */
|
2016-07-24 01:43:49 +03:00
|
|
|
if ((vtop->r & (VT_SYM|VT_CONST)) == (VT_SYM|VT_CONST) &&
|
|
|
|
vtop->sym->v >= SYM_FIRST_ANOM &&
|
2017-05-08 07:38:09 +03:00
|
|
|
/* XXX This rejects compound literals like
|
2016-07-24 01:43:49 +03:00
|
|
|
'(void *){ptr}'. The problem is that '&sym' is
|
|
|
|
represented the same way, which would be ruled out
|
|
|
|
by the SYM_FIRST_ANOM check above, but also '"string"'
|
|
|
|
in 'char *p = "string"' is represented the same
|
|
|
|
with the type being VT_PTR and the symbol being an
|
|
|
|
anonymous one. That is, there's no difference in vtop
|
|
|
|
between '(void *){x}' and '&(void *){x}'. Ignore
|
|
|
|
pointer typed entities here. Hopefully no real code
|
|
|
|
will every use compound literals with scalar type. */
|
|
|
|
(vtop->type.t & VT_BTYPE) != VT_PTR) {
|
|
|
|
/* These come from compound literals, memcpy stuff over. */
|
|
|
|
Section *ssec;
|
2017-11-27 06:03:03 +03:00
|
|
|
ElfSym *esym;
|
2016-10-03 20:21:10 +03:00
|
|
|
ElfW_Rel *rel;
|
2017-11-27 06:03:03 +03:00
|
|
|
esym = elfsym(vtop->sym);
|
2016-07-24 01:43:49 +03:00
|
|
|
ssec = tcc_state->sections[esym->st_shndx];
|
|
|
|
memmove (ptr, ssec->data + esym->st_value, size);
|
2016-10-03 20:21:10 +03:00
|
|
|
if (ssec->reloc) {
|
|
|
|
/* We need to copy over all memory contents, and that
|
|
|
|
includes relocations. Use the fact that relocs are
|
|
|
|
created it order, so look from the end of relocs
|
|
|
|
until we hit one before the copied region. */
|
|
|
|
int num_relocs = ssec->reloc->data_offset / sizeof(*rel);
|
|
|
|
rel = (ElfW_Rel*)(ssec->reloc->data + ssec->reloc->data_offset);
|
|
|
|
while (num_relocs--) {
|
|
|
|
rel--;
|
|
|
|
if (rel->r_offset >= esym->st_value + size)
|
|
|
|
continue;
|
|
|
|
if (rel->r_offset < esym->st_value)
|
|
|
|
break;
|
2016-10-08 03:44:17 +03:00
|
|
|
/* Note: if the same fields are initialized multiple
|
|
|
|
times (possible with designators) then we possibly
|
|
|
|
add multiple relocations for the same offset here.
|
|
|
|
That would lead to wrong code, the last reloc needs
|
|
|
|
to win. We clean this up later after the whole
|
|
|
|
initializer is parsed. */
|
2016-10-03 20:21:10 +03:00
|
|
|
put_elf_reloca(symtab_section, sec,
|
|
|
|
c + rel->r_offset - esym->st_value,
|
|
|
|
ELFW(R_TYPE)(rel->r_info),
|
|
|
|
ELFW(R_SYM)(rel->r_info),
|
2017-05-13 09:59:06 +03:00
|
|
|
#if PTR_SIZE == 8
|
2016-10-03 20:21:10 +03:00
|
|
|
rel->r_addend
|
|
|
|
#else
|
|
|
|
0
|
|
|
|
#endif
|
|
|
|
);
|
|
|
|
}
|
|
|
|
}
|
2016-07-24 01:43:49 +03:00
|
|
|
} else {
|
2017-07-09 13:38:59 +03:00
|
|
|
if (type->t & VT_BITFIELD) {
|
|
|
|
int bit_pos, bit_size, bits, n;
|
|
|
|
unsigned char *p, v, m;
|
|
|
|
bit_pos = BIT_POS(vtop->type.t);
|
|
|
|
bit_size = BIT_SIZE(vtop->type.t);
|
|
|
|
p = (unsigned char*)ptr + (bit_pos >> 3);
|
|
|
|
bit_pos &= 7, bits = 0;
|
|
|
|
while (bit_size) {
|
|
|
|
n = 8 - bit_pos;
|
|
|
|
if (n > bit_size)
|
|
|
|
n = bit_size;
|
|
|
|
v = vtop->c.i >> bits << bit_pos;
|
|
|
|
m = ((1 << n) - 1) << bit_pos;
|
|
|
|
*p = (*p & ~m) | (v & m);
|
|
|
|
bits += n, bit_size -= n, bit_pos = 0, ++p;
|
|
|
|
}
|
|
|
|
} else
|
|
|
|
switch(bt) {
|
2016-07-24 01:43:49 +03:00
|
|
|
/* XXX: when cross-compiling we assume that each type has the
|
|
|
|
same representation on host and target, which is likely to
|
|
|
|
be wrong in the case of long double */
|
|
|
|
case VT_BOOL:
|
2017-07-09 13:38:59 +03:00
|
|
|
vtop->c.i = vtop->c.i != 0;
|
2016-07-24 01:43:49 +03:00
|
|
|
case VT_BYTE:
|
2017-07-09 13:38:59 +03:00
|
|
|
*(char *)ptr |= vtop->c.i;
|
2016-07-24 01:43:49 +03:00
|
|
|
break;
|
|
|
|
case VT_SHORT:
|
2017-07-09 13:38:59 +03:00
|
|
|
*(short *)ptr |= vtop->c.i;
|
2016-07-24 01:43:49 +03:00
|
|
|
break;
|
2017-03-12 07:25:09 +03:00
|
|
|
case VT_FLOAT:
|
|
|
|
*(float*)ptr = vtop->c.f;
|
|
|
|
break;
|
2016-07-24 01:43:49 +03:00
|
|
|
case VT_DOUBLE:
|
|
|
|
*(double *)ptr = vtop->c.d;
|
|
|
|
break;
|
|
|
|
case VT_LDOUBLE:
|
various stuff
win32/Makefile ("for cygwin") removed
- On cygwin, the normal ./configure && make can be used with either
cygwin's "GCC for Win32 Toolchain"
./configure --cross-prefix=i686-w64-mingw32-
or with an existing tcc:
./configure --cc=<old-tccdir>/tcc.exe
tcctest.c:
- exclude test_high_clobbers() on _WIN64 (does not work)
tests2/95_bitfield.c:
- use 'signed char' for ARM (where default 'char' is unsigned)
tests:
- remove -I "expr" diff option to allow tests with
busybox-diff.
libtcc.c, tcc.c:
- removed -iwithprefix option. It is supposed to be
combined with -iprefix which we don't have either.
tccgen.c:
- fix assignments and return of 'void', as in
void f() {
void *p, *q;
*p = *q:
return *p;
}
This appears to be allowed but should do nothing.
tcc.h, libtcc.c, tccpp.c:
- Revert "Introduce VIP sysinclude paths which are always searched first"
This reverts commit 1d5e386b0a78393ac6b670c209a185849ec798a1.
The patch was giving tcc's system includes priority over -I which
is not how it should be.
tccelf.c:
- add DT_TEXTREL tag only if text relocations are actually
used (which is likely not the case on x86_64)
- prepare_dynamic_rel(): avoid relocation of unresolved
(weak) symbols
tccrun.c:
- for HAVE_SELINUX, use two mappings to the same (real) file.
(it was so once except the RX mapping wasn't used at all).
tccpe.c:
- fix relocation constant used for x86_64 (by Andrei E. Warentin)
- #ifndef _WIN32 do "chmod 755 ..." to get runnable exes on cygwin.
tccasm.c:
- keep forward asm labels static, otherwise they will endup
in dynsym eventually.
configure, Makefile:
- mingw32: respect ./configure options --bindir --docdir --libdir
- allow overriding tcc when building libtcc1.a and libtcc.def with
make XTCC=<tcc program to use>
- use $(wildcard ...) for install to allow installing just
a cross compiler for example
make cross-arm
make install
- use name <target>-libtcc1.a
build-tcc.bat:
- add options: -clean, -b bindir
2017-10-11 19:13:43 +03:00
|
|
|
#if defined TCC_IS_NATIVE_387
|
2017-09-24 19:57:48 +03:00
|
|
|
if (sizeof (long double) >= 10) /* zero pad ten-byte LD */
|
|
|
|
memcpy(ptr, &vtop->c.ld, 10);
|
2017-05-13 09:59:06 +03:00
|
|
|
#ifdef __TINYC__
|
|
|
|
else if (sizeof (long double) == sizeof (double))
|
2017-12-12 19:57:20 +03:00
|
|
|
__asm__("fldl %1\nfstpt %0\n" : "=m" (*ptr) : "m" (vtop->c.ld));
|
2017-05-13 09:59:06 +03:00
|
|
|
#endif
|
2017-12-12 19:57:20 +03:00
|
|
|
else if (vtop->c.ld == 0.0)
|
|
|
|
;
|
2017-09-24 19:57:48 +03:00
|
|
|
else
|
2017-05-07 13:41:29 +03:00
|
|
|
#endif
|
2017-09-24 19:57:48 +03:00
|
|
|
if (sizeof(long double) == LDOUBLE_SIZE)
|
|
|
|
*(long double*)ptr = vtop->c.ld;
|
|
|
|
else if (sizeof(double) == LDOUBLE_SIZE)
|
|
|
|
*(double *)ptr = (double)vtop->c.ld;
|
|
|
|
else
|
2016-07-24 01:43:49 +03:00
|
|
|
tcc_error("can't cross compile long double constants");
|
|
|
|
break;
|
2016-07-11 17:26:36 +03:00
|
|
|
#if PTR_SIZE != 8
|
2016-07-24 01:43:49 +03:00
|
|
|
case VT_LLONG:
|
2017-07-09 13:38:59 +03:00
|
|
|
*(long long *)ptr |= vtop->c.i;
|
2016-07-24 01:43:49 +03:00
|
|
|
break;
|
2016-07-11 17:26:36 +03:00
|
|
|
#else
|
2016-07-24 01:43:49 +03:00
|
|
|
case VT_LLONG:
|
2016-07-11 17:26:36 +03:00
|
|
|
#endif
|
2016-07-24 01:43:49 +03:00
|
|
|
case VT_PTR:
|
|
|
|
{
|
2017-07-09 13:38:59 +03:00
|
|
|
addr_t val = vtop->c.i;
|
2017-05-13 09:59:06 +03:00
|
|
|
#if PTR_SIZE == 8
|
2016-07-24 01:43:49 +03:00
|
|
|
if (vtop->r & VT_SYM)
|
|
|
|
greloca(sec, vtop->sym, c, R_DATA_PTR, val);
|
|
|
|
else
|
|
|
|
*(addr_t *)ptr |= val;
|
2015-02-22 00:29:03 +03:00
|
|
|
#else
|
2016-07-24 01:43:49 +03:00
|
|
|
if (vtop->r & VT_SYM)
|
|
|
|
greloc(sec, vtop->sym, c, R_DATA_PTR);
|
|
|
|
*(addr_t *)ptr |= val;
|
2015-02-22 00:29:03 +03:00
|
|
|
#endif
|
2016-07-24 01:43:49 +03:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
default:
|
|
|
|
{
|
2017-07-09 13:38:59 +03:00
|
|
|
int val = vtop->c.i;
|
2017-05-13 09:59:06 +03:00
|
|
|
#if PTR_SIZE == 8
|
2016-07-24 01:43:49 +03:00
|
|
|
if (vtop->r & VT_SYM)
|
|
|
|
greloca(sec, vtop->sym, c, R_DATA_PTR, val);
|
|
|
|
else
|
|
|
|
*(int *)ptr |= val;
|
2015-02-22 00:29:03 +03:00
|
|
|
#else
|
2016-07-24 01:43:49 +03:00
|
|
|
if (vtop->r & VT_SYM)
|
|
|
|
greloc(sec, vtop->sym, c, R_DATA_PTR);
|
|
|
|
*(int *)ptr |= val;
|
2015-02-22 00:29:03 +03:00
|
|
|
#endif
|
2016-07-24 01:43:49 +03:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2009-05-05 22:18:10 +04:00
|
|
|
vtop--;
|
|
|
|
} else {
|
|
|
|
vset(&dtype, VT_LOCAL|VT_LVAL, c);
|
|
|
|
vswap();
|
|
|
|
vstore();
|
|
|
|
vpop();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* 't' contains the type and storage info. 'c' is the offset of the
|
|
|
|
object in section 'sec'. If 'sec' is NULL, it means stack based
|
2019-03-18 05:26:19 +03:00
|
|
|
allocation. 'flags & DIF_FIRST' is true if array '{' must be read (multi
|
|
|
|
dimension implicit array init handling). 'flags & DIF_SIZE_ONLY' is true if
|
2009-05-05 22:18:10 +04:00
|
|
|
size only evaluation is wanted (only for arrays). */
|
2015-07-29 23:53:57 +03:00
|
|
|
static void decl_initializer(CType *type, Section *sec, unsigned long c,
|
2019-03-18 05:26:19 +03:00
|
|
|
int flags)
|
2009-05-05 22:18:10 +04:00
|
|
|
{
|
2017-05-06 06:28:13 +03:00
|
|
|
int len, n, no_oblock, nb, i;
|
2016-08-01 06:30:55 +03:00
|
|
|
int size1, align1;
|
2009-05-05 22:18:10 +04:00
|
|
|
Sym *s, *f;
|
2016-08-01 06:30:55 +03:00
|
|
|
Sym indexsym;
|
2009-05-05 22:18:10 +04:00
|
|
|
CType *t1;
|
|
|
|
|
2019-03-18 05:26:19 +03:00
|
|
|
if (!(flags & DIF_HAVE_ELEM) && tok != '{' &&
|
2016-08-01 06:30:55 +03:00
|
|
|
/* In case of strings we have special handling for arrays, so
|
|
|
|
don't consume them as initializer value (which would commit them
|
|
|
|
to some anonymous symbol). */
|
|
|
|
tok != TOK_LSTR && tok != TOK_STR &&
|
2019-03-18 05:26:19 +03:00
|
|
|
!(flags & DIF_SIZE_ONLY)) {
|
2016-07-31 06:43:17 +03:00
|
|
|
parse_init_elem(!sec ? EXPR_ANY : EXPR_CONST);
|
2019-03-18 05:26:19 +03:00
|
|
|
flags |= DIF_HAVE_ELEM;
|
2016-07-31 06:43:17 +03:00
|
|
|
}
|
|
|
|
|
2019-03-18 05:26:19 +03:00
|
|
|
if ((flags & DIF_HAVE_ELEM) &&
|
2016-08-01 06:30:55 +03:00
|
|
|
!(type->t & VT_ARRAY) &&
|
2016-08-01 23:55:07 +03:00
|
|
|
/* Use i_c_parameter_t, to strip toplevel qualifiers.
|
|
|
|
The source type might have VT_CONSTANT set, which is
|
2016-08-06 23:38:26 +03:00
|
|
|
of course assignable to non-const elements. */
|
2017-07-09 13:38:25 +03:00
|
|
|
is_compatible_unqualified_types(type, &vtop->type)) {
|
2016-08-01 06:30:55 +03:00
|
|
|
init_putv(type, sec, c);
|
2011-04-06 20:17:03 +04:00
|
|
|
} else if (type->t & VT_ARRAY) {
|
2009-05-05 22:18:10 +04:00
|
|
|
s = type->ref;
|
|
|
|
n = s->c;
|
|
|
|
t1 = pointed_type(type);
|
|
|
|
size1 = type_size(t1, &align1);
|
|
|
|
|
|
|
|
no_oblock = 1;
|
2019-03-18 05:26:19 +03:00
|
|
|
if (((flags & DIF_FIRST) && tok != TOK_LSTR && tok != TOK_STR) ||
|
2009-05-05 22:18:10 +04:00
|
|
|
tok == '{') {
|
2010-03-13 20:07:57 +03:00
|
|
|
if (tok != '{')
|
2011-08-11 19:07:56 +04:00
|
|
|
tcc_error("character array initializer must be a literal,"
|
2010-03-13 20:07:57 +03:00
|
|
|
" optionally enclosed in braces");
|
2009-05-05 22:18:10 +04:00
|
|
|
skip('{');
|
|
|
|
no_oblock = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* only parse strings here if correct type (otherwise: handle
|
|
|
|
them as ((w)char *) expressions */
|
2015-07-29 23:53:57 +03:00
|
|
|
if ((tok == TOK_LSTR &&
|
2009-05-05 22:18:10 +04:00
|
|
|
#ifdef TCC_TARGET_PE
|
|
|
|
(t1->t & VT_BTYPE) == VT_SHORT && (t1->t & VT_UNSIGNED)
|
|
|
|
#else
|
|
|
|
(t1->t & VT_BTYPE) == VT_INT
|
|
|
|
#endif
|
|
|
|
) || (tok == TOK_STR && (t1->t & VT_BTYPE) == VT_BYTE)) {
|
2017-05-06 06:28:13 +03:00
|
|
|
len = 0;
|
2009-05-05 22:18:10 +04:00
|
|
|
while (tok == TOK_STR || tok == TOK_LSTR) {
|
|
|
|
int cstr_len, ch;
|
|
|
|
|
|
|
|
/* compute maximum number of chars wanted */
|
|
|
|
if (tok == TOK_STR)
|
2015-11-21 14:23:53 +03:00
|
|
|
cstr_len = tokc.str.size;
|
2009-05-05 22:18:10 +04:00
|
|
|
else
|
2015-11-21 14:23:53 +03:00
|
|
|
cstr_len = tokc.str.size / sizeof(nwchar_t);
|
2009-05-05 22:18:10 +04:00
|
|
|
cstr_len--;
|
|
|
|
nb = cstr_len;
|
2017-05-06 06:28:13 +03:00
|
|
|
if (n >= 0 && nb > (n - len))
|
|
|
|
nb = n - len;
|
2019-03-18 05:26:19 +03:00
|
|
|
if (!(flags & DIF_SIZE_ONLY)) {
|
2009-05-05 22:18:10 +04:00
|
|
|
if (cstr_len > nb)
|
2011-08-11 19:07:56 +04:00
|
|
|
tcc_warning("initializer-string for array is too long");
|
2009-05-05 22:18:10 +04:00
|
|
|
/* in order to go faster for common case (char
|
|
|
|
string in global variable, we handle it
|
|
|
|
specifically */
|
|
|
|
if (sec && tok == TOK_STR && size1 == 1) {
|
2017-07-16 13:10:00 +03:00
|
|
|
if (!NODATA_WANTED)
|
|
|
|
memcpy(sec->data + c + len, tokc.str.data, nb);
|
2009-05-05 22:18:10 +04:00
|
|
|
} else {
|
|
|
|
for(i=0;i<nb;i++) {
|
|
|
|
if (tok == TOK_STR)
|
2015-11-21 14:23:53 +03:00
|
|
|
ch = ((unsigned char *)tokc.str.data)[i];
|
2009-05-05 22:18:10 +04:00
|
|
|
else
|
2015-11-21 14:23:53 +03:00
|
|
|
ch = ((nwchar_t *)tokc.str.data)[i];
|
2016-07-24 01:43:49 +03:00
|
|
|
vpushi(ch);
|
2017-05-06 06:28:13 +03:00
|
|
|
init_putv(t1, sec, c + (len + i) * size1);
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2017-05-06 06:28:13 +03:00
|
|
|
len += nb;
|
2009-05-05 22:18:10 +04:00
|
|
|
next();
|
|
|
|
}
|
|
|
|
/* only add trailing zero if enough storage (no
|
|
|
|
warning in this case since it is standard) */
|
2017-05-06 06:28:13 +03:00
|
|
|
if (n < 0 || len < n) {
|
2019-03-18 05:26:19 +03:00
|
|
|
if (!(flags & DIF_SIZE_ONLY)) {
|
2016-07-24 01:43:49 +03:00
|
|
|
vpushi(0);
|
2017-05-06 06:28:13 +03:00
|
|
|
init_putv(t1, sec, c + (len * size1));
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
2017-05-06 06:28:13 +03:00
|
|
|
len++;
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
2017-05-06 06:28:13 +03:00
|
|
|
len *= size1;
|
2009-05-05 22:18:10 +04:00
|
|
|
} else {
|
2016-08-01 06:30:55 +03:00
|
|
|
indexsym.c = 0;
|
|
|
|
f = &indexsym;
|
|
|
|
|
|
|
|
do_init_list:
|
2017-05-06 06:28:13 +03:00
|
|
|
len = 0;
|
2019-03-18 05:26:19 +03:00
|
|
|
while (tok != '}' || (flags & DIF_HAVE_ELEM)) {
|
|
|
|
len = decl_designator(type, sec, c, &f, flags, len);
|
|
|
|
flags &= ~DIF_HAVE_ELEM;
|
2016-08-01 06:30:55 +03:00
|
|
|
if (type->t & VT_ARRAY) {
|
2017-05-06 06:28:13 +03:00
|
|
|
++indexsym.c;
|
2016-08-01 06:30:55 +03:00
|
|
|
/* special test for multi dimensional arrays (may not
|
|
|
|
be strictly correct if designators are used at the
|
|
|
|
same time) */
|
2017-05-06 06:28:13 +03:00
|
|
|
if (no_oblock && len >= n*size1)
|
2016-08-01 06:30:55 +03:00
|
|
|
break;
|
|
|
|
} else {
|
2017-07-09 13:34:11 +03:00
|
|
|
if (s->type.t == VT_UNION)
|
2017-05-06 06:28:13 +03:00
|
|
|
f = NULL;
|
|
|
|
else
|
|
|
|
f = f->next;
|
2016-08-01 06:30:55 +03:00
|
|
|
if (no_oblock && f == NULL)
|
|
|
|
break;
|
|
|
|
}
|
2017-05-06 06:28:13 +03:00
|
|
|
|
2016-08-01 06:30:55 +03:00
|
|
|
if (tok == '}')
|
|
|
|
break;
|
|
|
|
skip(',');
|
|
|
|
}
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
/* put zeros at the end */
|
2019-03-18 05:26:19 +03:00
|
|
|
if (!(flags & DIF_SIZE_ONLY) && len < n*size1)
|
2017-05-06 06:28:13 +03:00
|
|
|
init_putz(sec, c + len, n*size1 - len);
|
2016-08-01 06:30:55 +03:00
|
|
|
if (!no_oblock)
|
|
|
|
skip('}');
|
|
|
|
/* patch type size if needed, which happens only for array types */
|
2009-05-05 22:18:10 +04:00
|
|
|
if (n < 0)
|
2017-05-06 06:28:13 +03:00
|
|
|
s->c = size1 == 1 ? len : ((len + size1 - 1)/size1);
|
2016-07-31 07:18:45 +03:00
|
|
|
} else if ((type->t & VT_BTYPE) == VT_STRUCT) {
|
2016-08-01 06:30:55 +03:00
|
|
|
size1 = 1;
|
2009-05-05 22:18:10 +04:00
|
|
|
no_oblock = 1;
|
2019-03-18 05:26:19 +03:00
|
|
|
if ((flags & DIF_FIRST) || tok == '{') {
|
2009-05-05 22:18:10 +04:00
|
|
|
skip('{');
|
|
|
|
no_oblock = 0;
|
|
|
|
}
|
|
|
|
s = type->ref;
|
2010-06-15 19:02:09 +04:00
|
|
|
f = s->next;
|
2009-05-05 22:18:10 +04:00
|
|
|
n = s->c;
|
2016-08-01 06:30:55 +03:00
|
|
|
goto do_init_list;
|
2009-05-05 22:18:10 +04:00
|
|
|
} else if (tok == '{') {
|
2019-03-18 05:26:19 +03:00
|
|
|
if (flags & DIF_HAVE_ELEM)
|
|
|
|
skip(';');
|
2009-05-05 22:18:10 +04:00
|
|
|
next();
|
2019-03-18 05:26:19 +03:00
|
|
|
decl_initializer(type, sec, c, flags & ~DIF_HAVE_ELEM);
|
2009-05-05 22:18:10 +04:00
|
|
|
skip('}');
|
2019-03-18 05:26:19 +03:00
|
|
|
} else if ((flags & DIF_SIZE_ONLY)) {
|
2016-08-01 06:30:55 +03:00
|
|
|
/* If we supported only ISO C we wouldn't have to accept calling
|
2019-03-18 05:26:19 +03:00
|
|
|
this on anything than an array if DIF_SIZE_ONLY (and even then
|
2016-08-01 06:30:55 +03:00
|
|
|
only on the outermost level, so no recursion would be needed),
|
|
|
|
because initializing a flex array member isn't supported.
|
|
|
|
But GNU C supports it, so we need to recurse even into
|
2019-03-18 05:26:19 +03:00
|
|
|
subfields of structs and arrays when DIF_SIZE_ONLY is set. */
|
2009-05-05 22:18:10 +04:00
|
|
|
/* just skip expression */
|
2017-07-03 19:13:15 +03:00
|
|
|
skip_or_save_block(NULL);
|
2009-05-05 22:18:10 +04:00
|
|
|
} else {
|
2019-03-18 05:26:19 +03:00
|
|
|
if (!(flags & DIF_HAVE_ELEM)) {
|
2016-07-31 06:43:17 +03:00
|
|
|
/* This should happen only when we haven't parsed
|
|
|
|
the init element above for fear of committing a
|
|
|
|
string constant to memory too early. */
|
|
|
|
if (tok != TOK_STR && tok != TOK_LSTR)
|
|
|
|
expect("string constant");
|
|
|
|
parse_init_elem(!sec ? EXPR_ANY : EXPR_CONST);
|
|
|
|
}
|
2016-07-31 07:18:45 +03:00
|
|
|
init_putv(type, sec, c);
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* parse an initializer for type 't' if 'has_init' is non zero, and
|
|
|
|
allocate space in local or global data space ('r' is either
|
|
|
|
VT_LOCAL or VT_CONST). If 'v' is non zero, then an associated
|
2015-11-20 13:22:56 +03:00
|
|
|
variable 'v' of scope 'scope' is declared before initializers
|
|
|
|
are parsed. If 'v' is zero, then a reference to the new object
|
|
|
|
is put in the value stack. If 'has_init' is 2, a special parsing
|
|
|
|
is done to handle string constants. */
|
2015-07-29 23:53:57 +03:00
|
|
|
static void decl_initializer_alloc(CType *type, AttributeDef *ad, int r,
|
2015-11-20 13:22:56 +03:00
|
|
|
int has_init, int v, int scope)
|
2009-05-05 22:18:10 +04:00
|
|
|
{
|
2017-03-12 07:25:09 +03:00
|
|
|
int size, align, addr;
|
2016-10-01 21:26:50 +03:00
|
|
|
TokenString *init_str = NULL;
|
2017-07-20 23:21:27 +03:00
|
|
|
|
2009-05-05 22:18:10 +04:00
|
|
|
Section *sec;
|
2011-03-19 03:50:42 +03:00
|
|
|
Sym *flexible_array;
|
2017-07-09 13:34:11 +03:00
|
|
|
Sym *sym = NULL;
|
2017-07-16 13:10:00 +03:00
|
|
|
int saved_nocode_wanted = nocode_wanted;
|
|
|
|
#ifdef CONFIG_TCC_BCHECK
|
2020-01-16 03:19:59 +03:00
|
|
|
int bcheck = tcc_state->do_bounds_check && !NODATA_WANTED;
|
2017-07-16 13:10:00 +03:00
|
|
|
#endif
|
|
|
|
|
2018-06-01 00:51:51 +03:00
|
|
|
/* Always allocate static or global variables */
|
|
|
|
if (v && (r & VT_VALMASK) == VT_CONST)
|
|
|
|
nocode_wanted |= 0x80000000;
|
|
|
|
|
2011-03-19 03:50:42 +03:00
|
|
|
flexible_array = NULL;
|
|
|
|
if ((type->t & VT_BTYPE) == VT_STRUCT) {
|
2013-07-24 19:06:13 +04:00
|
|
|
Sym *field = type->ref->next;
|
|
|
|
if (field) {
|
|
|
|
while (field->next)
|
|
|
|
field = field->next;
|
|
|
|
if (field->type.t & VT_ARRAY && field->type.ref->c < 0)
|
|
|
|
flexible_array = field;
|
|
|
|
}
|
2011-03-19 03:50:42 +03:00
|
|
|
}
|
2009-05-05 22:18:10 +04:00
|
|
|
|
|
|
|
size = type_size(type, &align);
|
|
|
|
/* If unknown size, we must evaluate it before
|
|
|
|
evaluating initializers because
|
|
|
|
initializers can generate global data too
|
|
|
|
(e.g. string pointers or ISOC99 compound
|
|
|
|
literals). It also simplifies local
|
|
|
|
initializers handling */
|
2015-03-03 15:44:29 +03:00
|
|
|
if (size < 0 || (flexible_array && has_init)) {
|
2015-07-29 23:53:57 +03:00
|
|
|
if (!has_init)
|
2015-03-03 15:44:29 +03:00
|
|
|
tcc_error("unknown type size");
|
2009-05-05 22:18:10 +04:00
|
|
|
/* get all init string */
|
|
|
|
if (has_init == 2) {
|
2017-03-06 23:43:48 +03:00
|
|
|
init_str = tok_str_alloc();
|
2009-05-05 22:18:10 +04:00
|
|
|
/* only get strings */
|
|
|
|
while (tok == TOK_STR || tok == TOK_LSTR) {
|
2016-10-01 21:26:50 +03:00
|
|
|
tok_str_add_tok(init_str);
|
2009-05-05 22:18:10 +04:00
|
|
|
next();
|
|
|
|
}
|
2017-03-06 23:43:48 +03:00
|
|
|
tok_str_add(init_str, -1);
|
|
|
|
tok_str_add(init_str, 0);
|
2009-05-05 22:18:10 +04:00
|
|
|
} else {
|
2017-03-06 23:43:48 +03:00
|
|
|
skip_or_save_block(&init_str);
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
2017-07-20 23:21:27 +03:00
|
|
|
unget_tok(0);
|
2009-05-05 22:18:10 +04:00
|
|
|
|
2017-07-20 23:21:27 +03:00
|
|
|
/* compute size */
|
2016-10-01 21:26:50 +03:00
|
|
|
begin_macro(init_str, 1);
|
2009-05-05 22:18:10 +04:00
|
|
|
next();
|
2019-03-18 05:26:19 +03:00
|
|
|
decl_initializer(type, NULL, 0, DIF_FIRST | DIF_SIZE_ONLY);
|
2009-05-05 22:18:10 +04:00
|
|
|
/* prepare second initializer parsing */
|
2016-10-01 21:26:50 +03:00
|
|
|
macro_ptr = init_str->str;
|
2009-05-05 22:18:10 +04:00
|
|
|
next();
|
2015-07-29 23:53:57 +03:00
|
|
|
|
2015-03-03 15:44:29 +03:00
|
|
|
/* if still unknown size, error */
|
2009-05-05 22:18:10 +04:00
|
|
|
size = type_size(type, &align);
|
2015-07-29 23:53:57 +03:00
|
|
|
if (size < 0)
|
2015-03-03 15:44:29 +03:00
|
|
|
tcc_error("unknown type size");
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
2016-03-12 00:35:44 +03:00
|
|
|
/* If there's a flex member and it was used in the initializer
|
|
|
|
adjust size. */
|
|
|
|
if (flexible_array &&
|
|
|
|
flexible_array->type.ref->c > 0)
|
|
|
|
size += flexible_array->type.ref->c
|
|
|
|
* pointed_size(&flexible_array->type);
|
2009-05-05 22:18:10 +04:00
|
|
|
/* take into account specified alignment if bigger */
|
2014-01-07 17:57:07 +04:00
|
|
|
if (ad->a.aligned) {
|
2016-10-09 03:41:34 +03:00
|
|
|
int speca = 1 << (ad->a.aligned - 1);
|
|
|
|
if (speca > align)
|
|
|
|
align = speca;
|
2014-01-07 17:57:07 +04:00
|
|
|
} else if (ad->a.packed) {
|
2009-05-05 22:18:10 +04:00
|
|
|
align = 1;
|
|
|
|
}
|
2017-07-16 13:10:00 +03:00
|
|
|
|
2018-06-01 00:51:51 +03:00
|
|
|
if (!v && NODATA_WANTED)
|
2017-07-16 13:10:00 +03:00
|
|
|
size = 0, align = 1;
|
|
|
|
|
2009-05-05 22:18:10 +04:00
|
|
|
if ((r & VT_VALMASK) == VT_LOCAL) {
|
|
|
|
sec = NULL;
|
2009-12-20 00:22:43 +03:00
|
|
|
#ifdef CONFIG_TCC_BCHECK
|
2020-01-15 10:53:19 +03:00
|
|
|
if (bcheck && v) {
|
2020-01-16 03:19:59 +03:00
|
|
|
/* add padding between stack variables for bound checking */
|
2011-04-08 12:09:39 +04:00
|
|
|
loc--;
|
2011-04-06 20:17:03 +04:00
|
|
|
}
|
2009-12-20 00:22:43 +03:00
|
|
|
#endif
|
2009-05-05 22:18:10 +04:00
|
|
|
loc = (loc - size) & -align;
|
|
|
|
addr = loc;
|
2009-12-20 00:22:43 +03:00
|
|
|
#ifdef CONFIG_TCC_BCHECK
|
2020-01-15 10:53:19 +03:00
|
|
|
if (bcheck && v) {
|
2020-01-16 03:19:59 +03:00
|
|
|
/* add padding between stack variables for bound checking */
|
2009-05-05 22:18:10 +04:00
|
|
|
loc--;
|
|
|
|
}
|
2009-12-20 00:22:43 +03:00
|
|
|
#endif
|
2009-05-05 22:18:10 +04:00
|
|
|
if (v) {
|
|
|
|
/* local variable */
|
2016-10-06 05:05:30 +03:00
|
|
|
#ifdef CONFIG_TCC_ASM
|
|
|
|
if (ad->asm_label) {
|
|
|
|
int reg = asm_parse_regvar(ad->asm_label);
|
|
|
|
if (reg >= 0)
|
|
|
|
r = (r & ~VT_VALMASK) | reg;
|
|
|
|
}
|
|
|
|
#endif
|
2017-07-09 13:34:11 +03:00
|
|
|
sym = sym_push(v, type, r, addr);
|
2018-12-20 12:55:22 +03:00
|
|
|
if (ad->cleanup_func) {
|
2019-06-22 14:18:54 +03:00
|
|
|
Sym *cls = sym_push2(&all_cleanups,
|
|
|
|
SYM_FIELD | ++cur_scope->cl.n, 0, 0);
|
2019-01-28 03:21:38 +03:00
|
|
|
cls->prev_tok = sym;
|
|
|
|
cls->next = ad->cleanup_func;
|
2019-06-22 14:18:54 +03:00
|
|
|
cls->ncl = cur_scope->cl.s;
|
|
|
|
cur_scope->cl.s = cls;
|
2018-12-20 12:55:22 +03:00
|
|
|
}
|
|
|
|
|
2017-07-09 13:34:11 +03:00
|
|
|
sym->a = ad->a;
|
2009-05-05 22:18:10 +04:00
|
|
|
} else {
|
|
|
|
/* push local reference */
|
|
|
|
vset(type, r, addr);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
if (v && scope == VT_CONST) {
|
|
|
|
/* see if the symbol was already defined */
|
|
|
|
sym = sym_find(v);
|
|
|
|
if (sym) {
|
2017-07-09 13:34:11 +03:00
|
|
|
patch_storage(sym, ad, type);
|
2017-12-03 22:43:48 +03:00
|
|
|
/* we accept several definitions of the same global variable. */
|
|
|
|
if (!has_init && sym->c && elfsym(sym)->st_shndx != SHN_UNDEF)
|
2017-04-04 09:34:52 +03:00
|
|
|
goto no_alloc;
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* allocate symbol in corresponding section */
|
|
|
|
sec = ad->section;
|
|
|
|
if (!sec) {
|
2013-11-03 14:55:54 +04:00
|
|
|
if (has_init)
|
|
|
|
sec = data_section;
|
|
|
|
else if (tcc_state->nocommon)
|
|
|
|
sec = bss_section;
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
2017-04-04 09:34:52 +03:00
|
|
|
|
2009-05-05 22:18:10 +04:00
|
|
|
if (sec) {
|
2017-03-12 07:25:09 +03:00
|
|
|
addr = section_add(sec, size, align);
|
2009-12-20 00:22:43 +03:00
|
|
|
#ifdef CONFIG_TCC_BCHECK
|
2009-05-05 22:18:10 +04:00
|
|
|
/* add padding if bound check */
|
2017-07-16 13:10:00 +03:00
|
|
|
if (bcheck)
|
2017-03-12 07:25:09 +03:00
|
|
|
section_add(sec, 1, 1);
|
2009-12-20 00:22:43 +03:00
|
|
|
#endif
|
2009-05-05 22:18:10 +04:00
|
|
|
} else {
|
2017-03-12 07:25:09 +03:00
|
|
|
addr = align; /* SHN_COMMON is special, symbol value is align */
|
|
|
|
sec = common_section;
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
if (v) {
|
2017-03-12 07:25:09 +03:00
|
|
|
if (!sym) {
|
2009-05-05 22:18:10 +04:00
|
|
|
sym = sym_push(v, type, r | VT_SYM, 0);
|
2017-07-09 13:34:11 +03:00
|
|
|
patch_storage(sym, ad, NULL);
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
/* update symbol definition */
|
2017-03-12 07:25:09 +03:00
|
|
|
put_extern_sym(sym, sec, addr, size);
|
2009-05-05 22:18:10 +04:00
|
|
|
} else {
|
|
|
|
/* push global reference */
|
2019-04-18 04:36:39 +03:00
|
|
|
vpush_ref(type, sec, addr, size);
|
|
|
|
sym = vtop->sym;
|
2017-02-19 06:25:46 +03:00
|
|
|
vtop->r |= r;
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
2017-04-04 09:34:52 +03:00
|
|
|
|
2009-12-20 00:22:43 +03:00
|
|
|
#ifdef CONFIG_TCC_BCHECK
|
2009-05-05 22:18:10 +04:00
|
|
|
/* handles bounds now because the symbol must be defined
|
|
|
|
before for the relocation */
|
2017-07-16 13:10:00 +03:00
|
|
|
if (bcheck) {
|
2015-03-26 07:47:45 +03:00
|
|
|
addr_t *bounds_ptr;
|
2009-05-05 22:18:10 +04:00
|
|
|
|
2017-05-13 09:59:06 +03:00
|
|
|
greloca(bounds_section, sym, bounds_section->data_offset, R_DATA_PTR, 0);
|
2009-05-05 22:18:10 +04:00
|
|
|
/* then add global bound info */
|
2015-03-26 07:47:45 +03:00
|
|
|
bounds_ptr = section_ptr_add(bounds_section, 2 * sizeof(addr_t));
|
2009-05-05 22:18:10 +04:00
|
|
|
bounds_ptr[0] = 0; /* relocated */
|
|
|
|
bounds_ptr[1] = size;
|
|
|
|
}
|
2009-12-20 00:22:43 +03:00
|
|
|
#endif
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
2017-04-04 09:34:52 +03:00
|
|
|
|
2016-08-01 06:30:55 +03:00
|
|
|
if (type->t & VT_VLA) {
|
|
|
|
int a;
|
|
|
|
|
2017-07-16 13:10:00 +03:00
|
|
|
if (NODATA_WANTED)
|
|
|
|
goto no_alloc;
|
|
|
|
|
2016-08-01 06:30:55 +03:00
|
|
|
/* save current stack pointer */
|
2019-06-22 14:18:54 +03:00
|
|
|
if (root_scope->vla.loc == 0) {
|
|
|
|
struct scope *v = cur_scope;
|
|
|
|
gen_vla_sp_save(loc -= PTR_SIZE);
|
|
|
|
do v->vla.loc = loc; while ((v = v->prev));
|
2016-08-01 06:30:55 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
vla_runtime_type_size(type, &a);
|
|
|
|
gen_vla_alloc(type, a);
|
2017-12-12 19:57:20 +03:00
|
|
|
#if defined TCC_TARGET_PE && defined TCC_TARGET_X86_64
|
|
|
|
/* on _WIN64, because of the function args scratch area, the
|
|
|
|
result of alloca differs from RSP and is returned in RAX. */
|
|
|
|
gen_vla_result(addr), addr = (loc -= PTR_SIZE);
|
|
|
|
#endif
|
2016-08-01 06:30:55 +03:00
|
|
|
gen_vla_sp_save(addr);
|
2019-06-22 14:18:54 +03:00
|
|
|
cur_scope->vla.loc = addr;
|
|
|
|
cur_scope->vla.num++;
|
2016-08-01 06:30:55 +03:00
|
|
|
} else if (has_init) {
|
2016-10-08 03:44:17 +03:00
|
|
|
size_t oldreloc_offset = 0;
|
|
|
|
if (sec && sec->reloc)
|
|
|
|
oldreloc_offset = sec->reloc->data_offset;
|
2019-03-18 05:26:19 +03:00
|
|
|
decl_initializer(type, sec, addr, DIF_FIRST);
|
2016-10-08 03:44:17 +03:00
|
|
|
if (sec && sec->reloc)
|
|
|
|
squeeze_multi_relocs(sec, oldreloc_offset);
|
2011-03-19 03:50:42 +03:00
|
|
|
/* patch flexible array member size back to -1, */
|
|
|
|
/* for possible subsequent similar declarations */
|
|
|
|
if (flexible_array)
|
|
|
|
flexible_array->type.ref->c = -1;
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
2017-04-04 09:34:52 +03:00
|
|
|
|
|
|
|
no_alloc:
|
2016-10-01 21:26:50 +03:00
|
|
|
/* restore parse state if needed */
|
|
|
|
if (init_str) {
|
|
|
|
end_macro();
|
2017-07-20 23:21:27 +03:00
|
|
|
next();
|
2016-10-01 21:26:50 +03:00
|
|
|
}
|
2017-07-16 13:10:00 +03:00
|
|
|
|
|
|
|
nocode_wanted = saved_nocode_wanted;
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/* parse a function defined by symbol 'sym' and generate its code in
|
|
|
|
'cur_text_section' */
|
2020-01-18 00:58:39 +03:00
|
|
|
static void gen_function(Sym *sym)
|
2009-05-05 22:18:10 +04:00
|
|
|
{
|
2019-06-22 14:18:54 +03:00
|
|
|
/* Initialize VLA state */
|
|
|
|
struct scope f = { 0 };
|
|
|
|
cur_scope = root_scope = &f;
|
|
|
|
|
2015-03-03 15:44:29 +03:00
|
|
|
nocode_wanted = 0;
|
2009-05-05 22:18:10 +04:00
|
|
|
ind = cur_text_section->data_offset;
|
2018-04-07 00:01:45 +03:00
|
|
|
if (sym->a.aligned) {
|
|
|
|
size_t newoff = section_add(cur_text_section, 0,
|
|
|
|
1 << (sym->a.aligned - 1));
|
2018-06-01 00:51:51 +03:00
|
|
|
gen_fill_nops(newoff - ind);
|
2018-04-07 00:01:45 +03:00
|
|
|
}
|
2009-05-05 22:18:10 +04:00
|
|
|
/* NOTE: we patch the symbol size later */
|
|
|
|
put_extern_sym(sym, cur_text_section, ind, 0);
|
2020-01-18 00:58:39 +03:00
|
|
|
if (sym->type.ref->f.func_ctor)
|
|
|
|
add_array (tcc_state, ".init_array", sym->c);
|
|
|
|
if (sym->type.ref->f.func_dtor)
|
|
|
|
add_array (tcc_state, ".fini_array", sym->c);
|
2020-05-05 15:47:00 +03:00
|
|
|
|
2011-02-08 00:42:38 +03:00
|
|
|
funcname = get_tok_str(sym->v, NULL);
|
2009-05-05 22:18:10 +04:00
|
|
|
func_ind = ind;
|
2020-05-05 15:47:00 +03:00
|
|
|
func_vt = sym->type.ref->type;
|
|
|
|
func_var = sym->type.ref->f.func_type == FUNC_ELLIPSIS;
|
|
|
|
|
2009-05-05 22:18:10 +04:00
|
|
|
/* put debug symbol */
|
2017-02-20 20:58:08 +03:00
|
|
|
tcc_debug_funcstart(tcc_state, sym);
|
2009-05-05 22:18:10 +04:00
|
|
|
/* push a dummy symbol to enable local sym storage */
|
|
|
|
sym_push2(&local_stack, SYM_FIELD, 0, 0);
|
2016-05-05 11:39:09 +03:00
|
|
|
local_scope = 1; /* for function parameters */
|
2019-12-10 10:07:25 +03:00
|
|
|
gfunc_prolog(sym);
|
2019-06-22 14:18:54 +03:00
|
|
|
local_scope = 0;
|
2009-05-05 22:18:10 +04:00
|
|
|
rsym = 0;
|
2019-04-29 14:53:07 +03:00
|
|
|
clear_temp_local_var_list();
|
2019-06-22 14:18:54 +03:00
|
|
|
block(0);
|
2009-05-05 22:18:10 +04:00
|
|
|
gsym(rsym);
|
2019-04-29 14:53:07 +03:00
|
|
|
nocode_wanted = 0;
|
2012-10-25 21:40:04 +04:00
|
|
|
/* reset local stack */
|
2020-05-05 15:47:00 +03:00
|
|
|
pop_local_syms(&local_stack, NULL, 0, func_var);
|
2020-01-16 10:24:17 +03:00
|
|
|
gfunc_epilog();
|
|
|
|
cur_text_section->data_offset = ind;
|
2019-06-22 14:18:54 +03:00
|
|
|
local_scope = 0;
|
|
|
|
label_pop(&global_label_stack, NULL, 0);
|
|
|
|
sym_pop(&all_cleanups, NULL, 0);
|
2009-05-05 22:18:10 +04:00
|
|
|
/* patch symbol size */
|
2017-11-27 06:03:03 +03:00
|
|
|
elfsym(sym)->st_size = ind - func_ind;
|
2019-06-22 14:18:54 +03:00
|
|
|
/* end of function */
|
2017-02-20 20:58:08 +03:00
|
|
|
tcc_debug_funcend(tcc_state, ind - func_ind);
|
2009-05-05 22:18:10 +04:00
|
|
|
/* It's better to crash than to generate wrong code */
|
|
|
|
cur_text_section = NULL;
|
|
|
|
funcname = ""; /* for safety */
|
|
|
|
func_vt.t = VT_VOID; /* for safety */
|
2014-01-06 18:27:39 +04:00
|
|
|
func_var = 0; /* for safety */
|
2009-05-05 22:18:10 +04:00
|
|
|
ind = 0; /* for safety */
|
2017-07-16 13:10:00 +03:00
|
|
|
nocode_wanted = 0x80000000;
|
tccpp: fix issues, add tests
* fix some macro expansion issues
* add some pp tests in tests/pp
* improved tcc -E output for better diff'ability
* remove -dD feature (quirky code, exotic feature,
didn't work well)
Based partially on ideas / researches from PipCet
Some issues remain with VA_ARGS macros (if used in a
rather tricky way).
Also, to keep it simple, the pp doesn't automtically
add any extra spaces to separate tokens which otherwise
would form wrong tokens if re-read from tcc -E output
(such as '+' '=') GCC does that, other compilers don't.
* cleanups
- #line 01 "file" / # 01 "file" processing
- #pragma comment(lib,"foo")
- tcc -E: forward some pragmas to output (pack, comment(lib))
- fix macro parameter list parsing mess from
a3fc54345949535524d01319e1ca6378b7c2c201
a715d7143d9d17da17e67fec6af1c01409a71a31
(some coffee might help, next time ;)
- introduce TOK_PPSTR - to have character constants as
written in the file (similar to TOK_PPNUM)
- allow '\' appear in macros
- new functions begin/end_macro to:
- fix switching macro levels during expansion
- allow unget_tok to unget more than one tok
- slight speedup by using bitflags in isidnum_table
Also:
- x86_64.c : fix decl after statements
- i386-gen,c : fix a vstack leak with VLA on windows
- configure/Makefile : build on windows (MSYS) was broken
- tcc_warning: fflush stderr to keep output order (win32)
2015-05-09 15:29:39 +03:00
|
|
|
check_vstack();
|
2020-01-18 00:58:39 +03:00
|
|
|
/* do this after funcend debug info */
|
|
|
|
next();
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
|
2016-10-18 00:24:01 +03:00
|
|
|
static void gen_inline_functions(TCCState *s)
|
2009-05-05 22:18:10 +04:00
|
|
|
{
|
|
|
|
Sym *sym;
|
2018-06-08 16:31:40 +03:00
|
|
|
int inline_generated, i;
|
2009-06-29 23:14:53 +04:00
|
|
|
struct InlineFunc *fn;
|
2009-05-05 22:18:10 +04:00
|
|
|
|
2018-06-08 16:31:40 +03:00
|
|
|
tcc_open_bf(s, ":inline:", 0);
|
2009-05-05 22:18:10 +04:00
|
|
|
/* iterate while inline function are referenced */
|
2017-07-14 18:42:48 +03:00
|
|
|
do {
|
2009-05-05 22:18:10 +04:00
|
|
|
inline_generated = 0;
|
2016-10-18 00:24:01 +03:00
|
|
|
for (i = 0; i < s->nb_inline_fns; ++i) {
|
|
|
|
fn = s->inline_fns[i];
|
2009-06-29 23:14:53 +04:00
|
|
|
sym = fn->sym;
|
2019-06-22 05:00:52 +03:00
|
|
|
if (sym && (sym->c || !(sym->type.t & VT_INLINE))) {
|
2019-06-17 20:28:51 +03:00
|
|
|
/* the function was used or forced (and then not internal):
|
|
|
|
generate its code and convert it to a normal function */
|
2009-06-29 23:14:53 +04:00
|
|
|
fn->sym = NULL;
|
2019-12-14 14:36:12 +03:00
|
|
|
tcc_debug_putfile(s, fn->filename);
|
2016-11-11 20:29:45 +03:00
|
|
|
begin_macro(fn->func_str, 1);
|
2009-05-05 22:18:10 +04:00
|
|
|
next();
|
|
|
|
cur_text_section = text_section;
|
2020-01-18 00:58:39 +03:00
|
|
|
gen_function(sym);
|
tccpp: fix issues, add tests
* fix some macro expansion issues
* add some pp tests in tests/pp
* improved tcc -E output for better diff'ability
* remove -dD feature (quirky code, exotic feature,
didn't work well)
Based partially on ideas / researches from PipCet
Some issues remain with VA_ARGS macros (if used in a
rather tricky way).
Also, to keep it simple, the pp doesn't automtically
add any extra spaces to separate tokens which otherwise
would form wrong tokens if re-read from tcc -E output
(such as '+' '=') GCC does that, other compilers don't.
* cleanups
- #line 01 "file" / # 01 "file" processing
- #pragma comment(lib,"foo")
- tcc -E: forward some pragmas to output (pack, comment(lib))
- fix macro parameter list parsing mess from
a3fc54345949535524d01319e1ca6378b7c2c201
a715d7143d9d17da17e67fec6af1c01409a71a31
(some coffee might help, next time ;)
- introduce TOK_PPSTR - to have character constants as
written in the file (similar to TOK_PPNUM)
- allow '\' appear in macros
- new functions begin/end_macro to:
- fix switching macro levels during expansion
- allow unget_tok to unget more than one tok
- slight speedup by using bitflags in isidnum_table
Also:
- x86_64.c : fix decl after statements
- i386-gen,c : fix a vstack leak with VLA on windows
- configure/Makefile : build on windows (MSYS) was broken
- tcc_warning: fflush stderr to keep output order (win32)
2015-05-09 15:29:39 +03:00
|
|
|
end_macro();
|
2009-05-05 22:18:10 +04:00
|
|
|
|
|
|
|
inline_generated = 1;
|
|
|
|
}
|
|
|
|
}
|
2017-07-14 18:42:48 +03:00
|
|
|
} while (inline_generated);
|
2018-06-08 16:31:40 +03:00
|
|
|
tcc_close();
|
2016-10-18 00:24:01 +03:00
|
|
|
}
|
|
|
|
|
2019-12-11 02:37:18 +03:00
|
|
|
static void free_inline_functions(TCCState *s)
|
2016-10-18 00:24:01 +03:00
|
|
|
{
|
|
|
|
int i;
|
tccpp: fix issues, add tests
* fix some macro expansion issues
* add some pp tests in tests/pp
* improved tcc -E output for better diff'ability
* remove -dD feature (quirky code, exotic feature,
didn't work well)
Based partially on ideas / researches from PipCet
Some issues remain with VA_ARGS macros (if used in a
rather tricky way).
Also, to keep it simple, the pp doesn't automtically
add any extra spaces to separate tokens which otherwise
would form wrong tokens if re-read from tcc -E output
(such as '+' '=') GCC does that, other compilers don't.
* cleanups
- #line 01 "file" / # 01 "file" processing
- #pragma comment(lib,"foo")
- tcc -E: forward some pragmas to output (pack, comment(lib))
- fix macro parameter list parsing mess from
a3fc54345949535524d01319e1ca6378b7c2c201
a715d7143d9d17da17e67fec6af1c01409a71a31
(some coffee might help, next time ;)
- introduce TOK_PPSTR - to have character constants as
written in the file (similar to TOK_PPNUM)
- allow '\' appear in macros
- new functions begin/end_macro to:
- fix switching macro levels during expansion
- allow unget_tok to unget more than one tok
- slight speedup by using bitflags in isidnum_table
Also:
- x86_64.c : fix decl after statements
- i386-gen,c : fix a vstack leak with VLA on windows
- configure/Makefile : build on windows (MSYS) was broken
- tcc_warning: fflush stderr to keep output order (win32)
2015-05-09 15:29:39 +03:00
|
|
|
/* free tokens of unused inline functions */
|
2016-10-18 00:24:01 +03:00
|
|
|
for (i = 0; i < s->nb_inline_fns; ++i) {
|
|
|
|
struct InlineFunc *fn = s->inline_fns[i];
|
2016-11-11 22:25:13 +03:00
|
|
|
if (fn->sym)
|
|
|
|
tok_str_free(fn->func_str);
|
2009-07-14 06:46:35 +04:00
|
|
|
}
|
2016-10-18 00:24:01 +03:00
|
|
|
dynarray_reset(&s->inline_fns, &s->nb_inline_fns);
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
|
2017-03-11 04:13:59 +03:00
|
|
|
/* 'l' is VT_LOCAL or VT_CONST to define default storage type, or VT_CMP
|
|
|
|
if parsing old style parameter decl list (and FUNC_SYM is set then) */
|
|
|
|
static int decl0(int l, int is_for_loop_init, Sym *func_sym)
|
2009-05-05 22:18:10 +04:00
|
|
|
{
|
|
|
|
int v, has_init, r;
|
|
|
|
CType type, btype;
|
|
|
|
Sym *sym;
|
2019-01-28 03:21:38 +03:00
|
|
|
AttributeDef ad, adbase;
|
2012-10-25 21:40:04 +04:00
|
|
|
|
2009-05-05 22:18:10 +04:00
|
|
|
while (1) {
|
2019-04-28 02:07:01 +03:00
|
|
|
if (tok == TOK_STATIC_ASSERT) {
|
2020-02-29 03:24:35 +03:00
|
|
|
CString error_str;
|
2019-04-28 02:07:01 +03:00
|
|
|
int c;
|
|
|
|
|
|
|
|
next();
|
|
|
|
skip('(');
|
|
|
|
c = expr_const();
|
2020-02-29 03:55:11 +03:00
|
|
|
|
|
|
|
if (tok == ')') {
|
|
|
|
if (!c)
|
|
|
|
tcc_error("_Static_assert fail");
|
|
|
|
next();
|
|
|
|
goto static_assert_out;
|
|
|
|
}
|
|
|
|
|
2019-04-28 02:07:01 +03:00
|
|
|
skip(',');
|
2020-02-29 03:24:35 +03:00
|
|
|
parse_mult_str(&error_str, "string constant");
|
2019-04-28 02:07:01 +03:00
|
|
|
if (c == 0)
|
2020-05-05 10:00:24 +03:00
|
|
|
tcc_error("%s", (char *)error_str.data);
|
2020-02-29 03:24:35 +03:00
|
|
|
cstr_free(&error_str);
|
2019-04-28 02:07:01 +03:00
|
|
|
skip(')');
|
2020-02-29 03:55:11 +03:00
|
|
|
static_assert_out:
|
2019-05-03 01:22:35 +03:00
|
|
|
skip(';');
|
2019-04-28 02:07:01 +03:00
|
|
|
continue;
|
|
|
|
}
|
2019-01-28 03:21:38 +03:00
|
|
|
if (!parse_btype(&btype, &adbase)) {
|
2011-03-09 00:36:04 +03:00
|
|
|
if (is_for_loop_init)
|
|
|
|
return 0;
|
2017-03-11 04:13:59 +03:00
|
|
|
/* skip redundant ';' if not in old parameter decl scope */
|
|
|
|
if (tok == ';' && l != VT_CMP) {
|
2009-05-05 22:18:10 +04:00
|
|
|
next();
|
|
|
|
continue;
|
|
|
|
}
|
various stuff
win32/Makefile ("for cygwin") removed
- On cygwin, the normal ./configure && make can be used with either
cygwin's "GCC for Win32 Toolchain"
./configure --cross-prefix=i686-w64-mingw32-
or with an existing tcc:
./configure --cc=<old-tccdir>/tcc.exe
tcctest.c:
- exclude test_high_clobbers() on _WIN64 (does not work)
tests2/95_bitfield.c:
- use 'signed char' for ARM (where default 'char' is unsigned)
tests:
- remove -I "expr" diff option to allow tests with
busybox-diff.
libtcc.c, tcc.c:
- removed -iwithprefix option. It is supposed to be
combined with -iprefix which we don't have either.
tccgen.c:
- fix assignments and return of 'void', as in
void f() {
void *p, *q;
*p = *q:
return *p;
}
This appears to be allowed but should do nothing.
tcc.h, libtcc.c, tccpp.c:
- Revert "Introduce VIP sysinclude paths which are always searched first"
This reverts commit 1d5e386b0a78393ac6b670c209a185849ec798a1.
The patch was giving tcc's system includes priority over -I which
is not how it should be.
tccelf.c:
- add DT_TEXTREL tag only if text relocations are actually
used (which is likely not the case on x86_64)
- prepare_dynamic_rel(): avoid relocation of unresolved
(weak) symbols
tccrun.c:
- for HAVE_SELINUX, use two mappings to the same (real) file.
(it was so once except the RX mapping wasn't used at all).
tccpe.c:
- fix relocation constant used for x86_64 (by Andrei E. Warentin)
- #ifndef _WIN32 do "chmod 755 ..." to get runnable exes on cygwin.
tccasm.c:
- keep forward asm labels static, otherwise they will endup
in dynsym eventually.
configure, Makefile:
- mingw32: respect ./configure options --bindir --docdir --libdir
- allow overriding tcc when building libtcc1.a and libtcc.def with
make XTCC=<tcc program to use>
- use $(wildcard ...) for install to allow installing just
a cross compiler for example
make cross-arm
make install
- use name <target>-libtcc1.a
build-tcc.bat:
- add options: -clean, -b bindir
2017-10-11 19:13:43 +03:00
|
|
|
if (l != VT_CONST)
|
|
|
|
break;
|
|
|
|
if (tok == TOK_ASM1 || tok == TOK_ASM2 || tok == TOK_ASM3) {
|
2009-05-05 22:18:10 +04:00
|
|
|
/* global asm block */
|
|
|
|
asm_global_instr();
|
|
|
|
continue;
|
|
|
|
}
|
various stuff
win32/Makefile ("for cygwin") removed
- On cygwin, the normal ./configure && make can be used with either
cygwin's "GCC for Win32 Toolchain"
./configure --cross-prefix=i686-w64-mingw32-
or with an existing tcc:
./configure --cc=<old-tccdir>/tcc.exe
tcctest.c:
- exclude test_high_clobbers() on _WIN64 (does not work)
tests2/95_bitfield.c:
- use 'signed char' for ARM (where default 'char' is unsigned)
tests:
- remove -I "expr" diff option to allow tests with
busybox-diff.
libtcc.c, tcc.c:
- removed -iwithprefix option. It is supposed to be
combined with -iprefix which we don't have either.
tccgen.c:
- fix assignments and return of 'void', as in
void f() {
void *p, *q;
*p = *q:
return *p;
}
This appears to be allowed but should do nothing.
tcc.h, libtcc.c, tccpp.c:
- Revert "Introduce VIP sysinclude paths which are always searched first"
This reverts commit 1d5e386b0a78393ac6b670c209a185849ec798a1.
The patch was giving tcc's system includes priority over -I which
is not how it should be.
tccelf.c:
- add DT_TEXTREL tag only if text relocations are actually
used (which is likely not the case on x86_64)
- prepare_dynamic_rel(): avoid relocation of unresolved
(weak) symbols
tccrun.c:
- for HAVE_SELINUX, use two mappings to the same (real) file.
(it was so once except the RX mapping wasn't used at all).
tccpe.c:
- fix relocation constant used for x86_64 (by Andrei E. Warentin)
- #ifndef _WIN32 do "chmod 755 ..." to get runnable exes on cygwin.
tccasm.c:
- keep forward asm labels static, otherwise they will endup
in dynsym eventually.
configure, Makefile:
- mingw32: respect ./configure options --bindir --docdir --libdir
- allow overriding tcc when building libtcc1.a and libtcc.def with
make XTCC=<tcc program to use>
- use $(wildcard ...) for install to allow installing just
a cross compiler for example
make cross-arm
make install
- use name <target>-libtcc1.a
build-tcc.bat:
- add options: -clean, -b bindir
2017-10-11 19:13:43 +03:00
|
|
|
if (tok >= TOK_UIDENT) {
|
|
|
|
/* special test for old K&R protos without explicit int
|
|
|
|
type. Only accepted when defining global data */
|
|
|
|
btype.t = VT_INT;
|
|
|
|
} else {
|
|
|
|
if (tok != TOK_EOF)
|
|
|
|
expect("declaration");
|
2009-05-05 22:18:10 +04:00
|
|
|
break;
|
various stuff
win32/Makefile ("for cygwin") removed
- On cygwin, the normal ./configure && make can be used with either
cygwin's "GCC for Win32 Toolchain"
./configure --cross-prefix=i686-w64-mingw32-
or with an existing tcc:
./configure --cc=<old-tccdir>/tcc.exe
tcctest.c:
- exclude test_high_clobbers() on _WIN64 (does not work)
tests2/95_bitfield.c:
- use 'signed char' for ARM (where default 'char' is unsigned)
tests:
- remove -I "expr" diff option to allow tests with
busybox-diff.
libtcc.c, tcc.c:
- removed -iwithprefix option. It is supposed to be
combined with -iprefix which we don't have either.
tccgen.c:
- fix assignments and return of 'void', as in
void f() {
void *p, *q;
*p = *q:
return *p;
}
This appears to be allowed but should do nothing.
tcc.h, libtcc.c, tccpp.c:
- Revert "Introduce VIP sysinclude paths which are always searched first"
This reverts commit 1d5e386b0a78393ac6b670c209a185849ec798a1.
The patch was giving tcc's system includes priority over -I which
is not how it should be.
tccelf.c:
- add DT_TEXTREL tag only if text relocations are actually
used (which is likely not the case on x86_64)
- prepare_dynamic_rel(): avoid relocation of unresolved
(weak) symbols
tccrun.c:
- for HAVE_SELINUX, use two mappings to the same (real) file.
(it was so once except the RX mapping wasn't used at all).
tccpe.c:
- fix relocation constant used for x86_64 (by Andrei E. Warentin)
- #ifndef _WIN32 do "chmod 755 ..." to get runnable exes on cygwin.
tccasm.c:
- keep forward asm labels static, otherwise they will endup
in dynsym eventually.
configure, Makefile:
- mingw32: respect ./configure options --bindir --docdir --libdir
- allow overriding tcc when building libtcc1.a and libtcc.def with
make XTCC=<tcc program to use>
- use $(wildcard ...) for install to allow installing just
a cross compiler for example
make cross-arm
make install
- use name <target>-libtcc1.a
build-tcc.bat:
- add options: -clean, -b bindir
2017-10-11 19:13:43 +03:00
|
|
|
}
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
2017-07-09 13:38:25 +03:00
|
|
|
if (tok == ';') {
|
2015-07-29 23:53:57 +03:00
|
|
|
if ((btype.t & VT_BTYPE) == VT_STRUCT) {
|
|
|
|
int v = btype.ref->v;
|
|
|
|
if (!(v & SYM_FIELD) && (v & ~SYM_STRUCT) >= SYM_FIRST_ANOM)
|
|
|
|
tcc_warning("unnamed struct/union that defines no instances");
|
2017-07-09 13:38:25 +03:00
|
|
|
next();
|
|
|
|
continue;
|
2015-07-29 23:53:57 +03:00
|
|
|
}
|
2017-07-09 13:38:25 +03:00
|
|
|
if (IS_ENUM(btype.t)) {
|
|
|
|
next();
|
|
|
|
continue;
|
|
|
|
}
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
while (1) { /* iterate thru each declaration */
|
|
|
|
type = btype;
|
2016-07-13 18:39:15 +03:00
|
|
|
/* If the base type itself was an array type of unspecified
|
|
|
|
size (like in 'typedef int arr[]; arr x = {1};') then
|
|
|
|
we will overwrite the unknown size by the real one for
|
|
|
|
this decl. We need to unshare the ref symbol holding
|
|
|
|
that size. */
|
|
|
|
if ((type.t & VT_ARRAY) && type.ref->c < 0) {
|
|
|
|
type.ref = sym_push(SYM_FIELD, &type.ref->type, 0, type.ref->c);
|
|
|
|
}
|
2019-01-28 03:21:38 +03:00
|
|
|
ad = adbase;
|
2009-05-05 22:18:10 +04:00
|
|
|
type_decl(&type, &ad, &v, TYPE_DIRECT);
|
|
|
|
#if 0
|
|
|
|
{
|
|
|
|
char buf[500];
|
2017-03-06 05:25:33 +03:00
|
|
|
type_to_str(buf, sizeof(buf), &type, get_tok_str(v, NULL));
|
2009-05-05 22:18:10 +04:00
|
|
|
printf("type = '%s'\n", buf);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
if ((type.t & VT_BTYPE) == VT_FUNC) {
|
2019-12-16 08:54:18 +03:00
|
|
|
if ((type.t & VT_STATIC) && (l == VT_LOCAL))
|
|
|
|
tcc_error("function without file scope cannot be static");
|
2009-05-05 22:18:10 +04:00
|
|
|
/* if old style function prototype, we accept a
|
|
|
|
declaration list */
|
|
|
|
sym = type.ref;
|
2017-07-09 13:34:11 +03:00
|
|
|
if (sym->f.func_type == FUNC_OLD && l == VT_CONST)
|
2017-03-11 04:13:59 +03:00
|
|
|
decl0(VT_CMP, 0, sym);
|
2019-06-22 05:00:52 +03:00
|
|
|
/* always compile 'extern inline' */
|
|
|
|
if (type.t & VT_EXTERN)
|
|
|
|
type.t &= ~VT_INLINE;
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
|
2011-03-03 11:55:02 +03:00
|
|
|
if (gnu_ext && (tok == TOK_ASM1 || tok == TOK_ASM2 || tok == TOK_ASM3)) {
|
2015-11-20 13:22:56 +03:00
|
|
|
ad.asm_label = asm_label_instr();
|
2011-03-03 11:55:02 +03:00
|
|
|
/* parse one last attribute list, after asm label */
|
|
|
|
parse_attribute(&ad);
|
2019-06-22 05:00:52 +03:00
|
|
|
#if 0
|
|
|
|
/* gcc does not allow __asm__("label") with function definition,
|
|
|
|
but why not ... */
|
2015-11-20 13:22:56 +03:00
|
|
|
if (tok == '{')
|
|
|
|
expect(";");
|
2019-06-22 05:00:52 +03:00
|
|
|
#endif
|
2011-03-03 11:55:02 +03:00
|
|
|
}
|
|
|
|
|
2010-01-14 22:55:51 +03:00
|
|
|
#ifdef TCC_TARGET_PE
|
2017-07-09 13:34:11 +03:00
|
|
|
if (ad.a.dllimport || ad.a.dllexport) {
|
2019-06-29 04:42:25 +03:00
|
|
|
if (type.t & VT_STATIC)
|
|
|
|
tcc_error("cannot have dll linkage with static");
|
|
|
|
if (type.t & VT_TYPEDEF) {
|
|
|
|
tcc_warning("'%s' attribute ignored for typedef",
|
|
|
|
ad.a.dllimport ? (ad.a.dllimport = 0, "dllimport") :
|
|
|
|
(ad.a.dllexport = 0, "dllexport"));
|
|
|
|
} else if (ad.a.dllimport) {
|
2017-07-09 13:34:11 +03:00
|
|
|
if ((type.t & VT_BTYPE) == VT_FUNC)
|
|
|
|
ad.a.dllimport = 0;
|
|
|
|
else
|
|
|
|
type.t |= VT_EXTERN;
|
|
|
|
}
|
2017-04-04 09:34:52 +03:00
|
|
|
}
|
2010-01-14 22:55:51 +03:00
|
|
|
#endif
|
2009-05-05 22:18:10 +04:00
|
|
|
if (tok == '{') {
|
2017-03-11 04:13:59 +03:00
|
|
|
if (l != VT_CONST)
|
2011-08-11 19:07:56 +04:00
|
|
|
tcc_error("cannot use local functions");
|
2009-05-05 22:18:10 +04:00
|
|
|
if ((type.t & VT_BTYPE) != VT_FUNC)
|
|
|
|
expect("function definition");
|
|
|
|
|
2017-03-11 04:13:59 +03:00
|
|
|
/* reject abstract declarators in function definition
|
2019-06-11 16:28:42 +03:00
|
|
|
make old style params without decl have int type */
|
2009-05-05 22:18:10 +04:00
|
|
|
sym = type.ref;
|
2017-03-11 04:13:59 +03:00
|
|
|
while ((sym = sym->next) != NULL) {
|
2009-05-05 22:18:10 +04:00
|
|
|
if (!(sym->v & ~SYM_FIELD))
|
2017-03-11 04:13:59 +03:00
|
|
|
expect("identifier");
|
2019-06-11 16:28:42 +03:00
|
|
|
if (sym->type.t == VT_VOID)
|
|
|
|
sym->type = int_type;
|
|
|
|
}
|
2017-02-13 20:23:43 +03:00
|
|
|
|
2020-05-13 12:14:53 +03:00
|
|
|
/* apply post-declaraton attributes */
|
|
|
|
merge_funcattr(&type.ref->f, &ad.f);
|
|
|
|
|
2017-12-03 22:43:48 +03:00
|
|
|
/* put function symbol */
|
2019-06-22 05:00:52 +03:00
|
|
|
type.t &= ~VT_EXTERN;
|
2019-04-18 04:36:39 +03:00
|
|
|
sym = external_sym(v, &type, 0, &ad);
|
2020-05-13 12:14:53 +03:00
|
|
|
|
2009-05-05 22:18:10 +04:00
|
|
|
/* static inline functions are just recorded as a kind
|
|
|
|
of macro. Their code will be emitted at the end of
|
|
|
|
the compilation unit only if they are used */
|
2019-06-22 05:00:52 +03:00
|
|
|
if (sym->type.t & VT_INLINE) {
|
2009-06-29 23:14:53 +04:00
|
|
|
struct InlineFunc *fn;
|
2020-01-18 00:58:39 +03:00
|
|
|
fn = tcc_malloc(sizeof *fn + strlen(file->filename));
|
|
|
|
strcpy(fn->filename, file->filename);
|
tccpp: fix issues, add tests
* fix some macro expansion issues
* add some pp tests in tests/pp
* improved tcc -E output for better diff'ability
* remove -dD feature (quirky code, exotic feature,
didn't work well)
Based partially on ideas / researches from PipCet
Some issues remain with VA_ARGS macros (if used in a
rather tricky way).
Also, to keep it simple, the pp doesn't automtically
add any extra spaces to separate tokens which otherwise
would form wrong tokens if re-read from tcc -E output
(such as '+' '=') GCC does that, other compilers don't.
* cleanups
- #line 01 "file" / # 01 "file" processing
- #pragma comment(lib,"foo")
- tcc -E: forward some pragmas to output (pack, comment(lib))
- fix macro parameter list parsing mess from
a3fc54345949535524d01319e1ca6378b7c2c201
a715d7143d9d17da17e67fec6af1c01409a71a31
(some coffee might help, next time ;)
- introduce TOK_PPSTR - to have character constants as
written in the file (similar to TOK_PPNUM)
- allow '\' appear in macros
- new functions begin/end_macro to:
- fix switching macro levels during expansion
- allow unget_tok to unget more than one tok
- slight speedup by using bitflags in isidnum_table
Also:
- x86_64.c : fix decl after statements
- i386-gen,c : fix a vstack leak with VLA on windows
- configure/Makefile : build on windows (MSYS) was broken
- tcc_warning: fflush stderr to keep output order (win32)
2015-05-09 15:29:39 +03:00
|
|
|
fn->sym = sym;
|
2017-03-06 23:43:48 +03:00
|
|
|
skip_or_save_block(&fn->func_str);
|
|
|
|
dynarray_add(&tcc_state->inline_fns,
|
|
|
|
&tcc_state->nb_inline_fns, fn);
|
2009-05-05 22:18:10 +04:00
|
|
|
} else {
|
|
|
|
/* compute text section */
|
|
|
|
cur_text_section = ad.section;
|
|
|
|
if (!cur_text_section)
|
|
|
|
cur_text_section = text_section;
|
2020-01-18 00:58:39 +03:00
|
|
|
gen_function(sym);
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
} else {
|
2017-03-11 04:13:59 +03:00
|
|
|
if (l == VT_CMP) {
|
|
|
|
/* find parameter in function parameter list */
|
|
|
|
for (sym = func_sym->next; sym; sym = sym->next)
|
|
|
|
if ((sym->v & ~SYM_FIELD) == v)
|
|
|
|
goto found;
|
|
|
|
tcc_error("declaration for parameter '%s' but no such parameter",
|
|
|
|
get_tok_str(v, NULL));
|
|
|
|
found:
|
|
|
|
if (type.t & VT_STORAGE) /* 'register' is okay */
|
|
|
|
tcc_error("storage class specified for '%s'",
|
|
|
|
get_tok_str(v, NULL));
|
|
|
|
if (sym->type.t != VT_VOID)
|
|
|
|
tcc_error("redefinition of parameter '%s'",
|
|
|
|
get_tok_str(v, NULL));
|
|
|
|
convert_parameter_type(&type);
|
|
|
|
sym->type = type;
|
|
|
|
} else if (type.t & VT_TYPEDEF) {
|
2009-05-05 22:18:10 +04:00
|
|
|
/* save typedefed type */
|
|
|
|
/* XXX: test storage specifiers ? */
|
2016-05-06 09:32:54 +03:00
|
|
|
sym = sym_find(v);
|
2017-07-09 13:34:11 +03:00
|
|
|
if (sym && sym->sym_scope == local_scope) {
|
2016-05-06 09:32:54 +03:00
|
|
|
if (!is_compatible_types(&sym->type, &type)
|
|
|
|
|| !(sym->type.t & VT_TYPEDEF))
|
|
|
|
tcc_error("incompatible redefinition of '%s'",
|
|
|
|
get_tok_str(v, NULL));
|
|
|
|
sym->type = type;
|
|
|
|
} else {
|
|
|
|
sym = sym_push(v, &type, 0, 0);
|
|
|
|
}
|
2014-01-07 17:57:07 +04:00
|
|
|
sym->a = ad.a;
|
2017-07-14 18:42:48 +03:00
|
|
|
sym->f = ad.f;
|
2018-08-03 23:39:00 +03:00
|
|
|
} else if ((type.t & VT_BTYPE) == VT_VOID
|
|
|
|
&& !(type.t & VT_EXTERN)) {
|
|
|
|
tcc_error("declaration of void object");
|
2009-05-05 22:18:10 +04:00
|
|
|
} else {
|
|
|
|
r = 0;
|
2011-03-03 12:07:36 +03:00
|
|
|
if ((type.t & VT_BTYPE) == VT_FUNC) {
|
|
|
|
/* external function definition */
|
|
|
|
/* specific case for func_call attribute */
|
2017-07-14 18:42:48 +03:00
|
|
|
type.ref->f = ad.f;
|
2011-03-03 12:07:36 +03:00
|
|
|
} else if (!(type.t & VT_ARRAY)) {
|
|
|
|
/* not lvalue if array */
|
2019-12-16 20:48:31 +03:00
|
|
|
r |= VT_LVAL;
|
2011-03-03 12:07:36 +03:00
|
|
|
}
|
2009-05-05 22:18:10 +04:00
|
|
|
has_init = (tok == '=');
|
2011-04-06 20:17:03 +04:00
|
|
|
if (has_init && (type.t & VT_VLA))
|
2016-08-01 06:30:55 +03:00
|
|
|
tcc_error("variable length array cannot be initialized");
|
2019-06-22 05:00:52 +03:00
|
|
|
if (((type.t & VT_EXTERN) && (!has_init || l != VT_CONST))
|
|
|
|
|| (type.t & VT_BTYPE) == VT_FUNC
|
|
|
|
/* as with GCC, uninitialized global arrays with no size
|
|
|
|
are considered extern: */
|
|
|
|
|| ((type.t & VT_ARRAY) && !has_init
|
|
|
|
&& l == VT_CONST && type.ref->c < 0)
|
|
|
|
) {
|
2011-03-03 12:07:36 +03:00
|
|
|
/* external variable or function */
|
2019-06-22 05:00:52 +03:00
|
|
|
type.t |= VT_EXTERN;
|
2017-07-09 13:34:11 +03:00
|
|
|
sym = external_sym(v, &type, r, &ad);
|
2011-03-03 12:58:45 +03:00
|
|
|
if (ad.alias_target) {
|
2017-11-27 06:03:03 +03:00
|
|
|
ElfSym *esym;
|
2011-03-03 12:58:45 +03:00
|
|
|
Sym *alias_target;
|
|
|
|
alias_target = sym_find(ad.alias_target);
|
2017-11-27 06:03:03 +03:00
|
|
|
esym = elfsym(alias_target);
|
|
|
|
if (!esym)
|
2011-08-11 19:07:56 +04:00
|
|
|
tcc_error("unsupported forward __alias__ attribute");
|
2017-12-12 19:57:20 +03:00
|
|
|
put_extern_sym2(sym, esym->st_shndx, esym->st_value, esym->st_size, 0);
|
2011-03-03 12:58:45 +03:00
|
|
|
}
|
2009-05-05 22:18:10 +04:00
|
|
|
} else {
|
|
|
|
if (type.t & VT_STATIC)
|
|
|
|
r |= VT_CONST;
|
|
|
|
else
|
|
|
|
r |= l;
|
|
|
|
if (has_init)
|
|
|
|
next();
|
2019-06-22 05:00:52 +03:00
|
|
|
else if (l == VT_CONST)
|
2017-12-03 22:43:48 +03:00
|
|
|
/* uninitialized global variables may be overridden */
|
|
|
|
type.t |= VT_EXTERN;
|
2015-11-20 13:22:56 +03:00
|
|
|
decl_initializer_alloc(&type, &ad, r, has_init, v, l);
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
if (tok != ',') {
|
2015-11-20 13:22:56 +03:00
|
|
|
if (is_for_loop_init)
|
2011-03-09 00:36:04 +03:00
|
|
|
return 1;
|
2009-05-05 22:18:10 +04:00
|
|
|
skip(';');
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
next();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2011-03-09 00:36:04 +03:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-07-20 23:21:27 +03:00
|
|
|
static void decl(int l)
|
2011-03-09 00:36:04 +03:00
|
|
|
{
|
2017-03-11 04:13:59 +03:00
|
|
|
decl0(l, 0, NULL);
|
2009-05-05 22:18:10 +04:00
|
|
|
}
|
2016-10-15 16:55:31 +03:00
|
|
|
|
|
|
|
/* ------------------------------------------------------------------------- */
|
2019-04-29 14:53:07 +03:00
|
|
|
#undef gjmp_addr
|
|
|
|
#undef gjmp
|
|
|
|
/* ------------------------------------------------------------------------- */
|