Add support of asm label for variables.

Add support for asm labels for variables, that is the ability to rename
a variable at assembly level with __asm__ ("newname") appended in
its declaration.
See http://gcc.gnu.org/onlinedocs/gcc-4.4.4/gcc/Asm-Labels.html for more
details.
This commit is contained in:
Thomas Preud'homme 2011-02-07 23:43:18 +01:00
parent 32a682b88f
commit 11b2d33523

View File

@ -75,7 +75,7 @@ static void type_decl(CType *type, AttributeDef *ad, int *v, int td);
static void parse_expr_type(CType *type); static void parse_expr_type(CType *type);
static void decl_initializer(CType *type, Section *sec, unsigned long c, int first, int size_only); static void decl_initializer(CType *type, Section *sec, unsigned long c, int first, int size_only);
static void block(int *bsym, int *csym, int *case_sym, int *def_sym, int case_reg, int is_expr); static void block(int *bsym, int *csym, int *case_sym, int *def_sym, int case_reg, int is_expr);
static void decl_initializer_alloc(CType *type, AttributeDef *ad, int r, int has_init, int v, int scope); static void decl_initializer_alloc(CType *type, AttributeDef *ad, int r, int has_init, int v, char *asm_label, int scope);
static void expr_eq(void); static void expr_eq(void);
static void unary_type(CType *type); static void unary_type(CType *type);
static int is_compatible_parameter_types(CType *type1, CType *type2); static int is_compatible_parameter_types(CType *type1, CType *type2);
@ -3385,7 +3385,7 @@ ST_FUNC void unary(void)
mk_pointer(&type); mk_pointer(&type);
type.t |= VT_ARRAY; type.t |= VT_ARRAY;
memset(&ad, 0, sizeof(AttributeDef)); memset(&ad, 0, sizeof(AttributeDef));
decl_initializer_alloc(&type, &ad, VT_CONST, 2, 0, 0); decl_initializer_alloc(&type, &ad, VT_CONST, 2, 0, NULL, 0);
break; break;
case '(': case '(':
next(); next();
@ -3404,7 +3404,7 @@ ST_FUNC void unary(void)
if (!(type.t & VT_ARRAY)) if (!(type.t & VT_ARRAY))
r |= lvalue_type(type.t); r |= lvalue_type(type.t);
memset(&ad, 0, sizeof(AttributeDef)); memset(&ad, 0, sizeof(AttributeDef));
decl_initializer_alloc(&type, &ad, r, 1, 0, 0); decl_initializer_alloc(&type, &ad, r, 1, 0, NULL, 0);
} else { } else {
if (sizeof_caller) { if (sizeof_caller) {
vpush(&type); vpush(&type);
@ -4992,12 +4992,14 @@ static void decl_initializer(CType *type, Section *sec, unsigned long c,
/* parse an initializer for type 't' if 'has_init' is non zero, and /* parse an initializer for type 't' if 'has_init' is non zero, and
allocate space in local or global data space ('r' is either allocate space in local or global data space ('r' is either
VT_LOCAL or VT_CONST). If 'v' is non zero, then an associated VT_LOCAL or VT_CONST). If 'v' is non zero, then an associated
variable 'v' of scope 'scope' is declared before initializers are variable 'v' with an associated name represented by 'asm_label' of
parsed. If 'v' is zero, then a reference to the new object is put scope 'scope' is declared before initializers are parsed. If 'v' is
in the value stack. If 'has_init' is 2, a special parsing is done zero, then a reference to the new object is put in the value stack.
to handle string constants. */ If 'has_init' is 2, a special parsing is done to handle string
constants. */
static void decl_initializer_alloc(CType *type, AttributeDef *ad, int r, static void decl_initializer_alloc(CType *type, AttributeDef *ad, int r,
int has_init, int v, int scope) int has_init, int v, char *asm_label,
int scope)
{ {
int size, align, addr, data_offset; int size, align, addr, data_offset;
int level; int level;
@ -5164,6 +5166,7 @@ static void decl_initializer_alloc(CType *type, AttributeDef *ad, int r,
if (v) { if (v) {
if (scope != VT_CONST || !sym) { if (scope != VT_CONST || !sym) {
sym = sym_push(v, type, r | VT_SYM, 0); sym = sym_push(v, type, r | VT_SYM, 0);
sym->asm_label = asm_label;
} }
/* update symbol definition */ /* update symbol definition */
if (sec) { if (sec) {
@ -5550,10 +5553,20 @@ ST_FUNC void decl(int l)
if (gnu_ext && (tok == TOK_ATTRIBUTE1 || tok == TOK_ATTRIBUTE2)) if (gnu_ext && (tok == TOK_ATTRIBUTE1 || tok == TOK_ATTRIBUTE2))
parse_attribute((AttributeDef *) &fn->type.ref->r); parse_attribute((AttributeDef *) &fn->type.ref->r);
} else { } else {
char *asm_label; // associated asm label
/* not lvalue if array */ /* not lvalue if array */
r = 0; r = 0;
asm_label = NULL;
if (!(type.t & VT_ARRAY)) if (!(type.t & VT_ARRAY))
r |= lvalue_type(type.t); r |= lvalue_type(type.t);
if (tok == TOK_ASM1 || tok == TOK_ASM2 || tok == TOK_ASM3) {
CString astr;
asm_label_instr(&astr);
asm_label = tcc_strdup(astr.data);
cstr_free(&astr);
}
has_init = (tok == '='); has_init = (tok == '=');
if ((btype.t & VT_EXTERN) || if ((btype.t & VT_EXTERN) ||
((type.t & VT_ARRAY) && (type.t & VT_STATIC) && ((type.t & VT_ARRAY) && (type.t & VT_STATIC) &&
@ -5562,7 +5575,7 @@ ST_FUNC void decl(int l)
/* NOTE: as GCC, uninitialized global static /* NOTE: as GCC, uninitialized global static
arrays of null size are considered as arrays of null size are considered as
extern */ extern */
external_sym(v, &type, r, NULL); external_sym(v, &type, r, asm_label);
} else { } else {
type.t |= (btype.t & VT_STATIC); /* Retain "static". */ type.t |= (btype.t & VT_STATIC); /* Retain "static". */
if (type.t & VT_STATIC) if (type.t & VT_STATIC)
@ -5571,7 +5584,7 @@ ST_FUNC void decl(int l)
r |= l; r |= l;
if (has_init) if (has_init)
next(); next();
decl_initializer_alloc(&type, &ad, r, has_init, v, l); decl_initializer_alloc(&type, &ad, r, has_init, v, asm_label, l);
} }
} }
if (tok != ',') { if (tok != ',') {