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

diff --git a/ir/ir/irprog_t.h b/ir/ir/irprog_t.h
index d6fb5e1b8..be5b539c8 100644
--- a/ir/ir/irprog_t.h
+++ b/ir/ir/irprog_t.h
@@ -31,7 +31,6 @@
 #include "irtypes.h"
 #include "pseudo_irg.h"
 #include "ircgcons.h"
-#include "firm_common_t.h"
 #include "irtypeinfo.h"
 #include "irmemory.h"
 
@@ -42,18 +41,14 @@
 #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_segment_type(ir_segment_t segment)
 {
-	ir_type *type;
-
-	assert(segment < IR_SEGMENT_COUNT);
-	type                        = skip_tid(irp->segment_types[segment]);
-	irp->segment_types[segment] = type;
-	return type;
+	assert(segment <= IR_SEGMENT_LAST);
+	return irp->segment_types[segment];
 }
 
 static inline ir_type *
@@ -68,7 +63,7 @@ _get_tls_type(void) {
 
 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);
 }
@@ -83,38 +78,38 @@ _get_irp_irg(int pos){
 
 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 *
 _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
 _get_irp_n_modes(void) {
-	assert (irp && irp->modes);
+	assert(irp->modes);
 	return ARR_LEN(irp->modes);
 }
 
 static inline ir_mode *
 _get_irp_mode(int pos) {
-	assert (irp && irp->modes);
+	assert(irp && irp->modes);
 	return irp->modes[pos];
 }
 
 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 *
 _get_irp_opcode(int pos) {
-	assert (irp && irp->opcodes);
+	assert(irp && irp->opcodes);
 	return irp->opcodes[pos];
 }