X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firprog_t.h;h=b3e3f91af28e754d2e4d34680af6585db99acc56;hb=e1c33a238578342a072e1c95ff12eefe6d0acd37;hp=2c06cd9b4ec4b42df5d9ecbc20b1279e34c165aa;hpb=816a38115fd6359501e155b6fc33a86dc9e3c46c;p=libfirm

diff --git a/ir/ir/irprog_t.h b/ir/ir/irprog_t.h
index 2c06cd9b4..b3e3f91af 100644
--- a/ir/ir/irprog_t.h
+++ b/ir/ir/irprog_t.h
@@ -14,8 +14,8 @@
  * @file irprog_t.h
  */
 
-#ifndef _IRPROG_T_H_
-#define _IRPROG_T_H_
+#ifndef _FIRM_IR_IRPROG_T_H_
+#define _FIRM_IR_IRPROG_T_H_
 
 #ifdef HAVE_CONFIG_H
 #include "firm_config.h"
@@ -48,10 +48,11 @@ struct ir_prog {
                                        to allocate nodes the represent values
                                        of constant entities. It is not meant as
                                        a procedure.  */
-  type      *glob_type;           /**< global type.  Must be a class as it can
+  ir_type   *glob_type;           /**< global type.  Must be a class as it can
                                        have fields and procedures.  */
-  type     **types;               /**< all types in the ir */
+  ir_type  **types;               /**< all types in the ir */
   ir_mode  **modes;               /**< all modes in the ir */
+  ir_op    **opcodes;             /**< all opcodes in the ir */
 
   /* -- states of and access to generated information -- */
   irg_phase_state phase_state;    /**< State of construction. */
@@ -69,7 +70,7 @@ struct ir_prog {
   inh_transitive_closure_state inh_trans_closure_state;  /**< trans closure of inh relations. */
 
   irp_callgraph_state callgraph_state; /**< State of the callgraph. */
-  struct ir_loop *outermost_cg_loop;   /**< For callgraph analysis: entry point
+  ir_loop *outermost_cg_loop;          /**< For callgraph analysis: entry point
 					    to looptree over callgraph. */
   int max_callgraph_loop_depth;        /**< needed in callgraph. */
   int max_callgraph_recursion_depth;   /**< needed in callgraph. */
@@ -80,7 +81,7 @@ struct ir_prog {
   ir_class_cast_state class_cast_state;    /**< kind of cast operations in code. */
 
 #ifdef DEBUG_libfirm
-  long max_node_nr;                /**< to generate unique numbers for nodes. */
+  long max_node_nr;                   /**< to generate unique numbers for nodes. */
 #endif
 };
 
@@ -89,7 +90,7 @@ void  add_irp_mode(ir_mode *mode);
 
 /* INLINE functions */
 
-static INLINE type *
+static INLINE ir_type *
 _get_glob_type(void) {
   assert(irp);
   return irp->glob_type = skip_tid(irp->glob_type);
@@ -105,7 +106,7 @@ _get_irp_n_irgs(void) {
 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 <= _get_irp_n_irgs());
   return irp->graphs[pos];
 }
 
@@ -116,7 +117,7 @@ _get_irp_n_types (void) {
   return ARR_LEN(irp->types);
 }
 
-static INLINE 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. */
@@ -135,10 +136,26 @@ _get_irp_mode(int pos) {
   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];
+}
+
 #ifdef DEBUG_libfirm
 /** Returns a new, unique number to number nodes or the like. */
-int get_irp_new_node_nr(void);
-#endif
+static INLINE long
+get_irp_new_node_nr(void) {
+  assert(irp);
+  return irp->max_node_nr++;
+}
+#endif /* DEBUG_libfirm */
 
 static INLINE ir_graph *
 _get_const_code_irg(void) {
@@ -160,7 +177,9 @@ void init_irprog_2(void);
 #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_glob_type()        _get_glob_type()
 
-#endif /* ifndef _IRPROG_T_H_ */
+#endif /* ifndef _FIRM_IR_IRPROG_T_H_ */