From a8b83ce43a95fa519dacfe7690a3a0098af7909c Mon Sep 17 00:00:00 2001 From: Michael Matz Date: Sun, 19 Feb 2017 23:50:13 +0100 Subject: [PATCH] Remove VT_REF The canonical way to describe a local variable that actually holds the address of an lvalue is VT_LLOCAL. Remove the last user of VT_REF, and handling of it, thereby freeing a flag for SValue.r. --- tcc.h | 1 - tccgen.c | 12 ++---------- x86_64-gen.c | 2 +- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/tcc.h b/tcc.h index ae7bb305..02619ba3 100644 --- a/tcc.h +++ b/tcc.h @@ -825,7 +825,6 @@ struct filespec { #define VT_CMP 0x0033 /* the value is stored in processor flags (in vc) */ #define VT_JMP 0x0034 /* value is the consequence of jmp true (even) */ #define VT_JMPI 0x0035 /* value is the consequence of jmp false (odd) */ -#define VT_REF 0x0040 /* value is pointer to structure rather than address */ #define VT_LVAL 0x0100 /* var is an lvalue */ #define VT_SYM 0x0200 /* a symbol value is added */ #define VT_MUSTCAST 0x0400 /* value must be casted to be correct (used for diff --git a/tccgen.c b/tccgen.c index 8d54ade4..d8aa71e6 100644 --- a/tccgen.c +++ b/tccgen.c @@ -1026,8 +1026,6 @@ static void move_reg(int r, int s, int t) /* get address of vtop (vtop MUST BE an lvalue) */ ST_FUNC void gaddrof(void) { - if (vtop->r & VT_REF) - gv(RC_INT); vtop->r &= ~VT_LVAL; /* tricky: if saved lvalue, then we can go back to lvalue */ if ((vtop->r & VT_VALMASK) == VT_LLOCAL) @@ -1237,13 +1235,7 @@ ST_FUNC int gv(int rc) t = vtop->type.t; t1 = t; /* compute memory access type */ - if (vtop->r & VT_REF) -#if defined(TCC_TARGET_ARM64) || defined(TCC_TARGET_X86_64) - t = VT_PTR; -#else - t = VT_INT; -#endif - else if (vtop->r & VT_LVAL_BYTE) + if (vtop->r & VT_LVAL_BYTE) t = VT_BYTE; else if (vtop->r & VT_LVAL_SHORT) t = VT_SHORT; @@ -4616,7 +4608,7 @@ ST_FUNC void unary(void) skip(')'); if ((vtop->r & VT_VALMASK) != VT_LOCAL) tcc_error("__builtin_va_start expects a local variable"); - vtop->r &= ~(VT_LVAL | VT_REF); + vtop->r &= ~VT_LVAL; vtop->type = char_pointer_type; vtop->c.i += 8; vstore(); diff --git a/x86_64-gen.c b/x86_64-gen.c index 9f19e78a..0c0968c6 100644 --- a/x86_64-gen.c +++ b/x86_64-gen.c @@ -957,7 +957,7 @@ void gfunc_prolog(CType *func_type) if (reg_param_index < REGN) { gen_modrm64(0x89, arg_regs[reg_param_index], VT_LOCAL, NULL, addr); } - sym_push(sym->v & ~SYM_FIELD, type, VT_LOCAL | VT_LVAL | VT_REF, addr); + sym_push(sym->v & ~SYM_FIELD, type, VT_LLOCAL | VT_LVAL, addr); } else { if (reg_param_index < REGN) { /* save arguments passed by register */ -- 2.11.4.GIT