X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=entity_t.h;h=19db103747ed16c1f276615d3594c6d81096d87d;hb=188cd4cc8ba69ffabfbf3b78db6a36697cff79f6;hp=b40ab1eb0a8c0618387beaf0c2f9a05982ba6c2b;hpb=53e98a6143f812bc2426879116e9868a05666285;p=cparser

diff --git a/entity_t.h b/entity_t.h
index b40ab1e..19db103 100644
--- a/entity_t.h
+++ b/entity_t.h
@@ -28,8 +28,7 @@
 #include "builtins.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.
  */
@@ -157,7 +164,7 @@ struct enum_value_t {
 	type_t        *enum_type;
 
 	/* ast2firm info */
-	tarval        *tv;
+	ir_tarval     *tv;
 };
 
 struct label_t {
@@ -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,40 +240,32 @@ 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;
 	statement_t   *statement;
+	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;
@@ -272,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;
@@ -295,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