X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=entity_t.h;h=0e5c0d2dbdda02b484838e659ee8c58befe090da;hb=a81dc4c1999d4853ddff49a749240440024aa6a3;hp=a543a897415d89c7ba316d9a9ec622ddf05b012e;hpb=9634f9c53e95b6bdc7883228c5ec5147f3de4f8e;p=cparser

diff --git a/entity_t.h b/entity_t.h
index a543a89..0e5c0d2 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,6 +91,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 {
@@ -210,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. */
@@ -265,9 +266,13 @@ 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 {
@@ -286,16 +291,16 @@ union entity_t {
 	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;
@@ -304,8 +309,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*, source_position_t const*);
 
 elf_visibility_tag_t get_elf_visibility_from_string(const char *string);
 
+entity_t *skip_unnamed_bitfields(entity_t*);
+
 #endif