BugFix: Keep-alives had a wrong position in ir_edge objects

[libfirm] / ir / ir / irprog_t.h

diff --git a/ir/ir/irprog_t.h b/ir/ir/irprog_t.h
index 6174d2b..51781d0 100644 (file)
--- 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,13 @@ struct ir_prog {
                                        to allocate nodes the represent values
                                        of constant entities. It is not meant as
                                        a procedure.  */
-  ir_type   *glob_type;           /**< global type.  Must be a class as it can
+  ir_type   *glob_type;           /**< The global type.  Must be a class as it can
                                        have fields and procedures.  */
+  ir_type   *tls_type;            /**< The thread local storage type.  Must be a struct as it can
+                                       only have fields.  */
   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. */
@@ -95,6 +98,12 @@ _get_glob_type(void) {
   return irp->glob_type = skip_tid(irp->glob_type);
 }
 
+static INLINE ir_type *
+_get_tls_type(void) {
+  assert(irp);
+  return irp->tls_type = skip_tid(irp->tls_type);
+}
+
 static INLINE int
 _get_irp_n_irgs(void) {
   assert (irp && irp->graphs);
@@ -135,6 +144,18 @@ _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. */
 static INLINE long
@@ -164,7 +185,10 @@ 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()
+#define get_tls_type()         _get_tls_type()
 
-#endif /* ifndef _IRPROG_T_H_ */
+#endif /* ifndef _FIRM_IR_IRPROG_T_H_ */