X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firprog_t.h;h=d6fb5e1b8249c7afd8606fea6e902453dcf62ec8;hb=79b409329e8b6e9f43ac71df6599372fa0dbe497;hp=4b9de62f9a75595af0ece5fcc587e8b05787ad1d;hpb=e4276a2614fb8c5027549e54b64dee3cc3be4c12;p=libfirm

diff --git a/ir/ir/irprog_t.h b/ir/ir/irprog_t.h
index 4b9de62f9..d6fb5e1b8 100644
--- a/ir/ir/irprog_t.h
+++ b/ir/ir/irprog_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.
  *
@@ -27,7 +27,6 @@
 #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"
@@ -45,93 +44,112 @@
 /** Adds mode to the list of modes in irp. */
 void  add_irp_mode(ir_mode *mode);
 
-/* INLINE functions */
+/* inline functions */
+static inline ir_type *
+_get_segment_type(ir_segment_t segment)
+{
+	ir_type *type;
 
-static INLINE ir_type *
+	assert(segment < IR_SEGMENT_COUNT);
+	type                        = skip_tid(irp->segment_types[segment]);
+	irp->segment_types[segment] = type;
+	return type;
+}
+
+static inline ir_type *
 _get_glob_type(void) {
-	assert(irp);
-	return irp->glob_type = skip_tid(irp->glob_type);
+	return _get_segment_type(IR_SEGMENT_GLOBAL);
 }
 
-static INLINE ir_type *
+static inline ir_type *
 _get_tls_type(void) {
-	assert(irp);
-	return irp->tls_type = skip_tid(irp->tls_type);
+	return _get_segment_type(IR_SEGMENT_THREAD_LOCAL);
 }
 
-static INLINE int
+static inline int
 _get_irp_n_irgs(void) {
 	assert (irp && irp->graphs);
 	if (get_visit_pseudo_irgs()) return get_irp_n_allirgs();
 	return ARR_LEN(irp->graphs);
 }
 
-static INLINE ir_graph *
+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());
+	assert(0 <= pos && pos <= ARR_LEN(irp->graphs));
 	return irp->graphs[pos];
 }
 
 
-static INLINE int
+static inline int
 _get_irp_n_types(void) {
 	assert (irp && irp->types);
 	return ARR_LEN(irp->types);
 }
 
-static INLINE ir_type *
+static inline ir_type *
 _get_irp_type(int pos) {
 	assert (irp && irp->types);
 	/* Don't set the skip_tid result so that no double entries are generated. */
 	return skip_tid(irp->types[pos]);
 }
 
-static INLINE int
+static inline int
 _get_irp_n_modes(void) {
 	assert (irp && irp->modes);
 	return ARR_LEN(irp->modes);
 }
 
-static INLINE ir_mode *
+static inline ir_mode *
 _get_irp_mode(int pos) {
 	assert (irp && irp->modes);
 	return irp->modes[pos];
 }
 
-static INLINE int
+static inline int
 _get_irp_n_opcodes(void) {
 	assert (irp && irp->opcodes);
 	return ARR_LEN(irp->opcodes);
 }
 
-static INLINE ir_op *
+static inline ir_op *
 _get_irp_opcode(int 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
+static inline long
 get_irp_new_node_nr(void) {
 	assert(irp);
 	return irp->max_node_nr++;
 }
-#endif /* DEBUG_libfirm */
 
-static INLINE ir_graph *
+static inline int
+get_irp_new_irg_idx(void) {
+	assert(irp);
+	return irp->max_irg_idx++;
+}
+
+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
+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) {
+	assert(irp);
+	return ++irp->last_label_nr;
+}
+
 void           set_irp_ip_outedges(ir_node ** ip_outedges);
 ir_node**      get_irp_ip_outedges(void);
 
@@ -151,8 +169,10 @@ 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_irp_next_region_nr()  _get_irp_next_region_nr()
+#define get_irp_next_label_nr()   _get_irp_next_label_nr()
 
 #endif