X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firprog_t.h;h=be5b539c8a6bc2fd3123e351f4d3973e021a7626;hb=0f234e2d94155d13c0e4727871125beda0eaa66d;hp=76143480483b78f65ce809df404610683c105f29;hpb=162b3cdaabf621e5a68431521abfa203a5e351ff;p=libfirm

diff --git a/ir/ir/irprog_t.h b/ir/ir/irprog_t.h
index 761434804..be5b539c8 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,12 +27,10 @@
 #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,97 +41,105 @@
 #include "array.h"
 
 /** Adds mode to the list of modes in irp. */
-void  add_irp_mode(ir_mode *mode);
-
-/* INLINE functions */
+void add_irp_mode(ir_mode *mode);
+
+/* 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 *
+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);
+	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);
+	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);
+	assert(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
+static inline int
 _get_irp_n_modes(void) {
-	assert (irp && irp->modes);
+	assert(irp->modes);
 	return ARR_LEN(irp->modes);
 }
 
-static INLINE ir_mode *
+static inline ir_mode *
 _get_irp_mode(int pos) {
-	assert (irp && irp->modes);
+	assert(irp && irp->modes);
 	return irp->modes[pos];
 }
 
-static INLINE int
+static inline int
 _get_irp_n_opcodes(void) {
-	assert (irp && irp->opcodes);
+	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);
+	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
+static inline ir_label_t
 _get_irp_next_label_nr(void) {
 	assert(irp);
 	return ++irp->last_label_nr;
@@ -158,6 +164,7 @@ 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()