X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firprog_t.h;h=7eb4436cafc9f60af6f128918ec37720d84f6c42;hb=7d070c58e7bef1ed875fac066b57f29de449724b;hp=e23b2133efbc12793858b0f4a7fd99204968e9a6;hpb=bd84c0c27fb6a39f8d2fe340c50dab076bacbb63;p=libfirm

diff --git a/ir/ir/irprog_t.h b/ir/ir/irprog_t.h
index e23b2133e..7eb4436ca 100644
--- a/ir/ir/irprog_t.h
+++ b/ir/ir/irprog_t.h
@@ -27,12 +27,8 @@
 #ifndef FIRM_IR_IRPROG_T_H
 #define FIRM_IR_IRPROG_T_H
 
-#include "firm_config.h"
 #include "irprog.h"
 #include "irtypes.h"
-#include "pseudo_irg.h"
-#include "ircgcons.h"
-#include "firm_common_t.h"
 #include "irtypeinfo.h"
 #include "irmemory.h"
 
@@ -43,110 +39,103 @@
 #include "array.h"
 
 /** Adds mode to the list of modes in irp. */
-void  add_irp_mode(ir_mode *mode);
+void add_irp_mode(ir_mode *mode);
 
-/* INLINE functions */
-
-static INLINE ir_type *
-_get_glob_type(void) {
-	assert(irp);
-	return irp->glob_type = skip_tid(irp->glob_type);
+/* inline functions */
+static inline ir_type *_get_segment_type(ir_segment_t segment)
+{
+	assert(segment <= IR_SEGMENT_LAST);
+	return irp->segment_types[segment];
 }
 
-static INLINE ir_type *
-_get_tls_type(void) {
-	assert(irp);
-	return irp->tls_type = skip_tid(irp->tls_type);
+static inline ir_type *_get_glob_type(void)
+{
+	return _get_segment_type(IR_SEGMENT_GLOBAL);
 }
 
-static INLINE ir_type *
-_get_constructors_type(void) {
-	assert(irp);
-	return irp->constructors_type = skip_tid(irp->constructors_type);
+static inline ir_type *_get_tls_type(void)
+{
+	return _get_segment_type(IR_SEGMENT_THREAD_LOCAL);
 }
 
-static INLINE int
-_get_irp_n_irgs(void) {
-	assert (irp && irp->graphs);
-	if (get_visit_pseudo_irgs()) return get_irp_n_allirgs();
+static inline size_t _get_irp_n_irgs(void)
+{
+	assert(irp && irp->graphs);
 	return ARR_LEN(irp->graphs);
 }
 
-static INLINE ir_graph *
-_get_irp_irg(int pos){
-	if (get_visit_pseudo_irgs()) return get_irp_allirg(pos);
-	assert(0 <= pos && pos <= _get_irp_n_irgs());
+static inline ir_graph *_get_irp_irg(size_t pos)
+{
+	assert(pos < ARR_LEN(irp->graphs));
 	return irp->graphs[pos];
 }
 
-
-static INLINE int
-_get_irp_n_types(void) {
-	assert (irp && irp->types);
+static inline size_t _get_irp_n_types(void)
+{
+	assert(irp && irp->types);
 	return ARR_LEN(irp->types);
 }
 
-static INLINE ir_type *
-_get_irp_type(int pos) {
-	assert (irp && irp->types);
+static inline ir_type *_get_irp_type(size_t pos)
+{
+	assert(irp->types);
+	assert(pos < ARR_LEN(irp->types));
 	/* Don't set the skip_tid result so that no double entries are generated. */
-	return skip_tid(irp->types[pos]);
+	return irp->types[pos];
 }
 
-static INLINE int
-_get_irp_n_modes(void) {
-	assert (irp && irp->modes);
+static inline size_t _get_irp_n_modes(void)
+{
+	assert(irp->modes);
 	return ARR_LEN(irp->modes);
 }
 
-static INLINE ir_mode *
-_get_irp_mode(int pos) {
-	assert (irp && irp->modes);
+static inline ir_mode *_get_irp_mode(size_t pos)
+{
+	assert(irp && irp->modes);
 	return irp->modes[pos];
 }
 
-static INLINE int
-_get_irp_n_opcodes(void) {
-	assert (irp && irp->opcodes);
+static inline size_t _get_irp_n_opcodes(void)
+{
+	assert(irp && irp->opcodes);
 	return ARR_LEN(irp->opcodes);
 }
 
-static INLINE ir_op *
-_get_irp_opcode(int pos) {
-	assert (irp && irp->opcodes);
+static inline ir_op *_get_irp_opcode(size_t pos)
+{
+	assert(irp && irp->opcodes);
 	return irp->opcodes[pos];
 }
 
-#ifdef DEBUG_libfirm
 /** Returns a new, unique number to number nodes or the like. */
-static INLINE long
-get_irp_new_node_nr(void) {
+static inline long get_irp_new_node_nr(void)
+{
 	assert(irp);
 	return irp->max_node_nr++;
 }
-#endif /* DEBUG_libfirm */
 
-static INLINE int
-get_irp_new_irg_idx(void) {
+static inline size_t get_irp_new_irg_idx(void)
+{
 	assert(irp);
 	return irp->max_irg_idx++;
 }
 
-static INLINE ir_graph *
-_get_const_code_irg(void) {
+static inline ir_graph *_get_const_code_irg(void)
+{
 	return irp->const_code_irg;
 }
 
 /** Returns a new, unique exception region number. */
-static INLINE ir_exc_region_t
-_get_irp_next_region_nr(void) {
+static inline ir_exc_region_t _get_irp_next_region_nr(void)
+{
 	assert(irp);
 	return ++irp->last_region_nr;
 }
 
 /** Returns a new, unique label number. */
-static INLINE ir_label_t
-_get_irp_next_label_nr(void) {
+static inline ir_label_t _get_irp_next_label_nr(void)
+{
 	assert(irp);
 	return ++irp->last_label_nr;
 }
@@ -170,9 +159,9 @@ void init_irprog_2(void);
 #define get_irp_n_opcodes()       _get_irp_n_opcodes()
 #define get_irp_opcode(pos)       _get_irp_opcode(pos)
 #define get_const_code_irg()      _get_const_code_irg()
+#define get_segment_type(s)       _get_segment_type(s)
 #define get_glob_type()           _get_glob_type()
 #define get_tls_type()            _get_tls_type()
-#define get_constructors_type()   _get_constructors_type()
 #define get_irp_next_region_nr()  _get_irp_next_region_nr()
 #define get_irp_next_label_nr()   _get_irp_next_label_nr()