X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Ftr%2Ftype_t.h;h=a0c6b09084a929c9a236137fa95d244cb34452de;hb=dd4cd761ab637d4488c7e29f49843b1b02366acf;hp=be7efed0371712a4afc1ec02680d59380c35619b;hpb=1ec30d95387eb392ba5a1adc7958ebd91383d59c;p=libfirm diff --git a/ir/tr/type_t.h b/ir/tr/type_t.h index be7efed03..a0c6b0908 100644 --- a/ir/tr/type_t.h +++ b/ir/tr/type_t.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1995-2007 University of Karlsruhe. All right reserved. + * Copyright (C) 1995-2008 University of Karlsruhe. All right reserved. * * This file is part of libFirm. * @@ -115,9 +115,10 @@ typedef struct { ir_type *points_to; /**< The type of the ir_entity the pointer points to. */ } ptr_attr; -/* -typedef struct { * No private attr yet! * -} pri_attr; */ +/** Primitive type attributes. */ +typedef struct { + ir_type *base_type; /**< For bitfield types: The base primitive type, NULL else. */ +} pri_attr; /* @@ -134,6 +135,7 @@ typedef union { arr_attr aa; /**< Attributes of an array type */ enm_attr ea; /**< Attributes of an enumeration type */ ptr_attr pa; /**< Attributes of a pointer type */ + pri_attr ba; /**< Attributes of a primitive bitfield type */ } tp_attr; /** Additional type flags. */ @@ -215,15 +217,15 @@ struct ir_type { ident *name; /**< The name of the type */ ir_visibility visibility;/**< Visibility of entities of this type. */ unsigned flags; /**< Type flags, a bitmask of enum type_flags. */ - int size; /**< Size of an ir_entity of this type. This is determined + unsigned size; /**< Size of an ir_entity of this type. This is determined when fixing the layout of this class. Size must be - given in bits. */ - int align; /**< Alignment of an ir_entity of this type. This should be + given in bytes. */ + unsigned align; /**< Alignment of an ir_entity of this type. This should be set according to the source language needs. If not set it's calculated automatically by get_type_alignment(). - Alignment must be given in bits. */ + Alignment must be given in bytes. */ ir_mode *mode; /**< The mode for atomic types */ - unsigned long visit; /**< visited counter for walks of the type information */ + ir_visited_t visit; /**< visited counter for walks of the type information */ void *link; /**< holds temporary data - like in irnode_t.h */ struct dbg_info *dbi; /**< A pointer to information for debug support. */ ir_type *assoc_type; /**< The associated lowered/unlowered type */ @@ -277,11 +279,11 @@ void set_pointer_mode(ir_type *tp, ir_mode *mode); void set_primitive_mode(ir_type *tp, ir_mode *mode); void set_enumeration_mode(ir_type *tp, ir_mode *mode); -void set_class_size_bits(ir_type *tp, int bits); -void set_struct_size_bits(ir_type *tp, int bits); -void set_union_size_bits(ir_type *tp, int bits); -void set_array_size_bits(ir_type *tp, int size); -void set_default_size_bits(ir_type *tp, int size); +void set_class_size(ir_type *tp, unsigned bytes); +void set_struct_size(ir_type *tp, unsigned bytes); +void set_union_size(ir_type *tp, unsigned bytes); +void set_array_size(ir_type *tp, unsigned bytes); +void set_default_size(ir_type *tp, unsigned bytes); /** * Initialize the type module. @@ -296,11 +298,11 @@ void firm_init_type(dbg_info *builtin_db, unsigned default_cc_mask); * inline functions * * ------------------- */ -extern unsigned long firm_type_visited; +extern ir_visited_t firm_type_visited; -static INLINE void _set_master_type_visited(unsigned long val) { firm_type_visited = val; } -static INLINE unsigned long _get_master_type_visited(void) { return firm_type_visited; } -static INLINE void _inc_master_type_visited(void) { ++firm_type_visited; } +static INLINE void _set_master_type_visited(ir_visited_t val) { firm_type_visited = val; } +static INLINE ir_visited_t _get_master_type_visited(void) { return firm_type_visited; } +static INLINE void _inc_master_type_visited(void) { ++firm_type_visited; } static INLINE void * _get_type_link(const ir_type *tp) { @@ -350,38 +352,26 @@ _set_type_ident(ir_type *tp, ident* id) { tp->name = id; } -static INLINE int -_get_type_size_bits(const ir_type *tp) { +static INLINE unsigned +_get_type_size_bytes(const ir_type *tp) { assert(tp && tp->kind == k_type); return tp->size; } -static INLINE int -_get_type_size_bytes(const ir_type *tp) { - int size = _get_type_size_bits(tp); - if (size < 0) - return -1; - if ((size & 7) != 0) { - assert(0 && "cannot take byte size of this type"); - return -1; - } - return size >> 3; -} - -static INLINE type_state +static INLINE ir_type_state _get_type_state(const ir_type *tp) { assert(tp && tp->kind == k_type); return tp->flags & tf_layout_fixed ? layout_fixed : layout_undefined; } -static INLINE unsigned long +static INLINE ir_visited_t _get_type_visited(const ir_type *tp) { assert(tp && tp->kind == k_type); return tp->visit; } static INLINE void -_set_type_visited(ir_type *tp, unsigned long num) { +_set_type_visited(ir_type *tp, ir_visited_t num) { assert(tp && tp->kind == k_type); tp->visit = num; } @@ -405,6 +395,16 @@ _type_not_visited(const ir_type *tp) { return tp->visit < firm_type_visited; } +static INLINE dbg_info * +_get_type_dbg_info(const ir_type *tp) { + return tp->dbi; +} + +static INLINE void +_set_type_dbg_info(ir_type *tp, dbg_info *db) { + tp->dbi = db; +} + static INLINE int _is_type(const void *thing) { return (get_kind(thing) == k_type); @@ -584,6 +584,7 @@ _set_method_calling_convention(ir_type *method, unsigned cc_mask) { method->attr.ma.irg_calling_conv = cc_mask; } + #define set_master_type_visited(val) _set_master_type_visited(val) #define get_master_type_visited() _get_master_type_visited() #define inc_master_type_visited() _inc_master_type_visited() @@ -595,7 +596,6 @@ _set_method_calling_convention(ir_type *method, unsigned cc_mask) { #define get_type_mode(tp) _get_type_mode(tp) #define get_type_ident(tp) _get_type_ident(tp) #define set_type_ident(tp, id) _set_type_ident(tp, id) -#define get_type_size_bits(tp) _get_type_size_bits(tp) #define get_type_size_bytes(tp) _get_type_size_bytes(tp) #define get_type_state(tp) _get_type_state(tp) #define get_type_visited(tp) _get_type_visited(tp) @@ -603,6 +603,8 @@ _set_method_calling_convention(ir_type *method, unsigned cc_mask) { #define mark_type_visited(tp) _mark_type_visited(tp) #define type_visited(tp) _type_visited(tp) #define type_not_visited(tp) _type_not_visited(tp) +#define get_type_dbg_info(tp) _get_type_dbg_info(tp) +#define set_type_dbg_info(tp, db) _set_type_dbg_info(tp, db) #define is_type(thing) _is_type(thing) #define is_Class_type(clss) _is_class_type(clss) #define get_class_n_members(clss) _get_class_n_members(clss)