X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=entity_t.h;h=11481fc80c8abaab01f49d09c40b1ac866c64525;hb=3d1fea359377282d17186c6d61d8ca1f20b87c69;hp=2f4e892d253f68ed81a4591f2c75f858ea9784d6;hpb=1a47a352dc074585e56b11a6e1e693e8ece6b5be;p=cparser

diff --git a/entity_t.h b/entity_t.h
index 2f4e892..11481fc 100644
--- a/entity_t.h
+++ b/entity_t.h
@@ -20,12 +20,13 @@
 #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 "jump_target.h"
+#include "token_t.h"
 
 typedef enum {
 	ENTITY_VARIABLE = 1,
@@ -91,6 +92,7 @@ typedef enum decl_modifier_t {
 	DM_RETURNS_TWICE     = 1 << 25,
 	DM_MALLOC            = 1 << 26,
 	DM_WEAK              = 1 << 27,
+	DM_LEAF              = 1 << 28,
 } decl_modifier_t;
 
 typedef enum elf_visibility_tag_t {
@@ -119,7 +121,7 @@ struct entity_base_t {
 	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;
@@ -135,6 +137,7 @@ struct compound_t {
 	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;
@@ -170,10 +173,12 @@ struct label_t {
 	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 */
-	ir_node       *block;
+	jump_target    target;
+	ir_node       *indirect_block;
 };
 
 struct namespace_t {
@@ -210,9 +215,6 @@ struct compound_member_t {
 	unsigned char  bit_offset; /**< extra bit offset for bitfield members */
 	unsigned char  bit_size;   /**< bitsize for bitfield members */
 	bool           bitfield      : 1;  /**< member is (part of) a bitfield */
-	bool           read          : 1;
-	bool           address_taken : 1;  /**< Set if the address of this
-	                                        declaration was taken. */
 
 	/* ast2firm info */
 	ir_entity *entity;
@@ -220,10 +222,7 @@ struct compound_member_t {
 
 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;
@@ -239,18 +238,6 @@ struct variable_t {
 	} 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;
 	bool           is_inline      : 1;
@@ -261,7 +248,7 @@ struct function_t {
 
 	builtin_kind_t btk;
 	scope_t        parameters;
-	statement_t   *statement;
+	statement_t   *body;
 	symbol_t      *actual_name;        /**< gnu extension __REDIRECT */
 
 	/* ast2firm info */
@@ -285,21 +272,20 @@ union entity_t {
 	typedef_t          typedefe;
 	declaration_t      declaration;
 	variable_t         variable;
-	parameter_t        parameter;
 	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)
 {
-	switch(entity->kind) {
-	DECLARATION_KIND_CASES
+	switch (entity->kind) {
+	case DECLARATION_KIND_CASES:
 		return true;
 	default:
 		return false;
@@ -308,8 +294,10 @@ static inline bool is_declaration(const entity_t *entity)
 
 const char *get_entity_kind_name(entity_kind_t kind);
 
-entity_t *allocate_entity_zero(entity_kind_t, entity_namespace_t, symbol_t*);
+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