X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=entity_t.h;h=b836d0bd1ecdb808b25202ac9774522b5e6adca8;hb=441f7b19fce3fb2baf035f62630c3aeea0e1b09c;hp=d6d37020d74bc5f44baec659d6955e8b3e5c60fb;hpb=03d3b8c10e86bd5604ac13f2cb020c11261977f8;p=cparser

diff --git a/entity_t.h b/entity_t.h
index d6d3702..b836d0b 100644
--- a/entity_t.h
+++ b/entity_t.h
@@ -20,16 +20,15 @@
 #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 "token_t.h"
 
 typedef enum {
-	ENTITY_INVALID,
-	ENTITY_VARIABLE,
+	ENTITY_VARIABLE = 1,
 	ENTITY_COMPOUND_MEMBER,
 	ENTITY_PARAMETER,
 	ENTITY_FUNCTION,
@@ -46,8 +45,7 @@ typedef enum {
 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;
@@ -93,8 +91,17 @@ 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 {
+	ELF_VISIBILITY_DEFAULT,
+	ELF_VISIBILITY_HIDDEN,
+	ELF_VISIBILITY_INTERNAL,
+	ELF_VISIBILITY_PROTECTED,
+	ELF_VISIBILITY_ERROR
+} elf_visibility_tag_t;
+
 /**
  * A scope containing entities.
  */
@@ -202,6 +209,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 */
+	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. */
@@ -212,13 +221,14 @@ 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;  /**< GCC __thread */
+	bool              restricta      : 1;
+	bool              deprecated     : 1;
+	bool              noalias        : 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;
 
@@ -230,24 +240,13 @@ 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;
+	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;
@@ -255,16 +254,18 @@ struct function_t {
 	symbol_t      *actual_name;        /**< gnu extension __REDIRECT */
 
 	/* 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;
-	compound_t         structe;
-	compound_t         unione;
 	compound_t         compound;
 	enum_t             enume;
 	enum_value_t       enum_value;
@@ -273,21 +274,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
+	case DECLARATION_KIND_CASES:
 		return true;
 	default:
 		return false;
@@ -296,6 +296,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 kind);
+entity_t *allocate_entity_zero(entity_kind_t, entity_namespace_t, symbol_t*, source_position_t const*);
+
+elf_visibility_tag_t get_elf_visibility_from_string(const char *string);
+
+entity_t *skip_unnamed_bitfields(entity_t*);
 
 #endif