projects
/
cparser
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
parser: Parse and reject GCC range initializers "[0 ... 9]".
[cparser]
/
entity_t.h
diff --git
a/entity_t.h
b/entity_t.h
index
c9670f0
..
11481fc
100644
(file)
--- a/
entity_t.h
+++ b/
entity_t.h
@@
-20,16
+20,16
@@
#ifndef ENTITY_T_H
#define ENTITY_T_H
#ifndef ENTITY_T_H
#define ENTITY_T_H
-#include "lexer.h"
#include "symbol.h"
#include "entity.h"
#include "attribute.h"
#include <libfirm/firm_types.h>
#include "builtins.h"
#include "symbol.h"
#include "entity.h"
#include "attribute.h"
#include <libfirm/firm_types.h>
#include "builtins.h"
+#include "jump_target.h"
+#include "token_t.h"
typedef enum {
typedef enum {
- ENTITY_INVALID,
- ENTITY_VARIABLE,
+ ENTITY_VARIABLE = 1,
ENTITY_COMPOUND_MEMBER,
ENTITY_PARAMETER,
ENTITY_FUNCTION,
ENTITY_COMPOUND_MEMBER,
ENTITY_PARAMETER,
ENTITY_FUNCTION,
@@
-46,8
+46,7
@@
typedef enum {
typedef unsigned char entity_kind_t;
typedef enum namespace_tag_t {
typedef unsigned char entity_kind_t;
typedef enum namespace_tag_t {
- NAMESPACE_INVALID,
- NAMESPACE_NORMAL,
+ NAMESPACE_NORMAL = 1,
NAMESPACE_TAG,
NAMESPACE_LABEL
} namespace_tag_t;
NAMESPACE_TAG,
NAMESPACE_LABEL
} namespace_tag_t;
@@
-93,8
+92,17
@@
typedef enum decl_modifier_t {
DM_RETURNS_TWICE = 1 << 25,
DM_MALLOC = 1 << 26,
DM_WEAK = 1 << 27,
DM_RETURNS_TWICE = 1 << 25,
DM_MALLOC = 1 << 26,
DM_WEAK = 1 << 27,
+ DM_LEAF = 1 << 28,
} decl_modifier_t;
} decl_modifier_t;
+typedef enum elf_visibility_tag_t {
+ ELF_VISIBILITY_DEFAULT,
+ ELF_VISIBILITY_HIDDEN,
+ ELF_VISIBILITY_INTERNAL,
+ ELF_VISIBILITY_PROTECTED,
+ ELF_VISIBILITY_ERROR
+} elf_visibility_tag_t;
+
/**
* A scope containing entities.
*/
/**
* A scope containing entities.
*/
@@
-113,7
+121,7
@@
struct entity_base_t {
entity_kind_t kind;
entity_namespace_t namespc;
symbol_t *symbol;
entity_kind_t kind;
entity_namespace_t namespc;
symbol_t *symbol;
-
source_position_t source_position
;
+
position_t pos
;
scope_t *parent_scope; /**< The scope where this entity
is contained in */
entity_t *parent_entity;
scope_t *parent_scope; /**< The scope where this entity
is contained in */
entity_t *parent_entity;
@@
-129,6
+137,7
@@
struct compound_t {
entity_t *alias; /* used for name mangling of anonymous types */
scope_t members;
decl_modifiers_t modifiers;
entity_t *alias; /* used for name mangling of anonymous types */
scope_t members;
decl_modifiers_t modifiers;
+ attribute_t *attributes;
bool layouted : 1;
bool complete : 1;
bool transparent_union : 1;
bool layouted : 1;
bool complete : 1;
bool transparent_union : 1;
@@
-164,10
+173,12
@@
struct label_t {
entity_base_t base;
bool used : 1;
bool address_taken : 1;
entity_base_t base;
bool used : 1;
bool address_taken : 1;
+ unsigned n_users; /* Reference counter to mature the label block as early as possible. */
statement_t *statement;
/* ast2firm info */
statement_t *statement;
/* ast2firm info */
- ir_node *block;
+ jump_target target;
+ ir_node *indirect_block;
};
struct namespace_t {
};
struct namespace_t {
@@
-202,9
+213,8
@@
struct compound_member_t {
declaration_t base;
il_size_t offset; /**< the offset of this member in the compound */
unsigned char bit_offset; /**< extra bit offset for bitfield members */
declaration_t base;
il_size_t offset; /**< the offset of this member in the compound */
unsigned char bit_offset; /**< extra bit offset for bitfield members */
- bool read : 1;
- bool address_taken : 1; /**< Set if the address of this
- declaration was taken. */
+ unsigned char bit_size; /**< bitsize for bitfield members */
+ bool bitfield : 1; /**< member is (part of) a bitfield */
/* ast2firm info */
ir_entity *entity;
/* ast2firm info */
ir_entity *entity;
@@
-212,13
+222,11
@@
struct compound_member_t {
struct variable_t {
declaration_t base;
struct variable_t {
declaration_t base;
- bool thread_local : 1; /**< GCC __thread */
- bool restricta : 1;
- bool deprecated : 1;
- bool noalias : 1;
+ bool thread_local : 1;
- bool address_taken : 1; /**< Set if the address of this declaration was taken. */
- bool read : 1;
+ bool address_taken : 1; /**< Set if the address of this declaration was taken. */
+ bool read : 1;
+ unsigned elf_visibility : 2;
initializer_t *initializer;
initializer_t *initializer;
@@
-230,40
+238,32
@@
struct variable_t {
} v;
};
} v;
};
-struct parameter_t {
- declaration_t base;
- bool address_taken : 1;
- bool read : 1;
-
- /* ast2firm info */
- union {
- unsigned int value_number;
- ir_entity *entity;
- } v;
-};
-
struct function_t {
declaration_t base;
struct function_t {
declaration_t base;
- bool is_inline : 1;
+ bool is_inline
: 1;
- bool need_closure : 1; /**< Inner function needs closure. */
- bool goto_to_outer : 1; /**< Inner function has goto to outer function. */
+ bool need_closure : 1; /**< Inner function needs closure. */
+ bool goto_to_outer : 1; /**< Inner function has goto to outer function. */
+ unsigned elf_visibility : 2;
builtin_kind_t btk;
scope_t parameters;
builtin_kind_t btk;
scope_t parameters;
- statement_t *statement;
+ statement_t *body;
+ symbol_t *actual_name; /**< gnu extension __REDIRECT */
/* ast2firm info */
/* ast2firm info */
- ir_entity *irentity;
- ir_node *static_link; /**< if need_closure is set, the node
- representing the static link. */
+ union {
+ ir_builtin_kind firm_builtin_kind;
+ unsigned chk_arg_pos;
+ } b;
+ ir_entity *irentity;
+ ir_node *static_link; /**< if need_closure is set, the node
+ representing the static link. */
};
union entity_t {
entity_kind_t kind;
entity_base_t base;
};
union entity_t {
entity_kind_t kind;
entity_base_t base;
- compound_t structe;
- compound_t unione;
compound_t compound;
enum_t enume;
enum_value_t enum_value;
compound_t compound;
enum_t enume;
enum_value_t enum_value;
@@
-272,21
+272,20
@@
union entity_t {
typedef_t typedefe;
declaration_t declaration;
variable_t variable;
typedef_t typedefe;
declaration_t declaration;
variable_t variable;
- parameter_t parameter;
function_t function;
compound_member_t compound_member;
};
function_t function;
compound_member_t compound_member;
};
-#define DECLARATION_KIND_CASES
\
-
case ENTITY_FUNCTION:
\
- case ENTITY_VARIABLE:
\
- case ENTITY_PARAMETER:
\
- case ENTITY_COMPOUND_MEMBER
:
+#define DECLARATION_KIND_CASES \
+
ENTITY_FUNCTION:
\
+ case ENTITY_VARIABLE: \
+ case ENTITY_PARAMETER: \
+ case ENTITY_COMPOUND_MEMBER
static inline bool is_declaration(const entity_t *entity)
{
static inline bool is_declaration(const entity_t *entity)
{
- switch(entity->kind) {
- DECLARATION_KIND_CASES
+ switch
(entity->kind) {
+ case DECLARATION_KIND_CASES:
return true;
default:
return false;
return true;
default:
return false;
@@
-295,6
+294,10
@@
static inline bool is_declaration(const entity_t *entity)
const char *get_entity_kind_name(entity_kind_t kind);
const char *get_entity_kind_name(entity_kind_t kind);
-entity_t *allocate_entity_zero(entity_kind_t kind);
+entity_t *allocate_entity_zero(entity_kind_t, entity_namespace_t, symbol_t*, position_t const*);
+
+elf_visibility_tag_t get_elf_visibility_from_string(const char *string);
+
+entity_t *skip_unnamed_bitfields(entity_t*);
#endif
#endif