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

diff --git a/ir/ir/irprog_t.h b/ir/ir/irprog_t.h
index d6fb5e1b8..c17a5bad0 100644
--- a/ir/ir/irprog_t.h
+++ b/ir/ir/irprog_t.h
@@ -22,136 +22,89 @@
  * @brief    Entry point to the representation of a whole program 0-- private header.
  * @author   Goetz Lindenmaier
  * @date     2000
- * @version  $Id$
  */
 #ifndef FIRM_IR_IRPROG_T_H
 #define FIRM_IR_IRPROG_T_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"
 
 #include "callgraph.h"
-#include "field_temperature.h"
-#include "execution_frequency.h"
 
 #include "array.h"
 
-/** Adds mode to the list of modes in irp. */
-void  add_irp_mode(ir_mode *mode);
-
 /* inline functions */
-static inline ir_type *
-_get_segment_type(ir_segment_t segment)
+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 *
-_get_glob_type(void) {
-	return _get_segment_type(IR_SEGMENT_GLOBAL);
+static inline ir_type *get_glob_type_(void)
+{
+	return get_segment_type_(IR_SEGMENT_GLOBAL);
 }
 
-static inline ir_type *
-_get_tls_type(void) {
-	return _get_segment_type(IR_SEGMENT_THREAD_LOCAL);
+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 <= ARR_LEN(irp->graphs));
+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]);
-}
-
-static inline int
-_get_irp_n_modes(void) {
-	assert (irp && irp->modes);
-	return ARR_LEN(irp->modes);
-}
-
-static inline ir_mode *
-_get_irp_mode(int pos) {
-	assert (irp && irp->modes);
-	return irp->modes[pos];
-}
-
-static inline int
-_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);
-	return irp->opcodes[pos];
+	return irp->types[pos];
 }
 
 /** 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++;
 }
 
-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) {
-	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;
 }
 
-void           set_irp_ip_outedges(ir_node ** ip_outedges);
-ir_node**      get_irp_ip_outedges(void);
+void      set_irp_ip_outedges(ir_node ** ip_outedges);
+ir_node** get_irp_ip_outedges(void);
 
 /** initializes ir_prog. Constructs only the basic lists */
 void init_irprog_1(void);
@@ -159,20 +112,22 @@ void init_irprog_1(void);
 /** Completes ir_prog. */
 void init_irprog_2(void);
 
+/** Adds type to the list of types in irp. */
+void add_irp_type(ir_type *typ);
+
+/** Removes type from the list of types, deallocates it and
+    shrinks the list by one. */
+void remove_irp_type(ir_type *typ);
+
 /* Inline functions. */
-#define get_irp_n_irgs()          _get_irp_n_irgs()
-#define get_irp_irg(pos)          _get_irp_irg(pos)
-#define get_irp_n_types()         _get_irp_n_types()
-#define get_irp_type(pos)         _get_irp_type(pos)
-#define get_irp_n_modes()         _get_irp_n_modes()
-#define get_irp_mode(pos)         _get_irp_mode(pos)
-#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()
+#define get_irp_n_irgs()                 get_irp_n_irgs_()
+#define get_irp_irg(pos)                 get_irp_irg_(pos)
+#define get_irp_n_types()                get_irp_n_types_()
+#define get_irp_type(pos)                get_irp_type_(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_label_nr()          get_irp_next_label_nr_()
 
 #endif