X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firgraph_t.h;h=e0ebfa76366d26d0edf9928575743b06442c00db;hb=8f355cb9b3d20c10f71d1b1e17cbf59a51ced83b;hp=454ed8b109bedb943b6e5b492442749ac4dfbafa;hpb=15e673e2491d9d155656629dd5873750ca80591e;p=libfirm

diff --git a/ir/ir/irgraph_t.h b/ir/ir/irgraph_t.h
index 454ed8b10..e0ebfa763 100644
--- a/ir/ir/irgraph_t.h
+++ b/ir/ir/irgraph_t.h
@@ -1,165 +1,58 @@
 /*
- * Project:     libFIRM
- * File name:   ir/ir/irgraph.c
- * Purpose:     Entry point to the representation of procedure code -- internal header.
- * Author:      Martin Trapp, Christian Schaefer
- * Modified by: Goetz Lindenmaier, Michael Beck
- * Created:
- * CVS-ID:      $Id$
- * Copyright:   (c) 1998-2003 Universität Karlsruhe
- * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
+ *
+ * This file is part of libFirm.
+ *
+ * This file may be distributed and/or modified under the terms of the
+ * GNU General Public License version 2 as published by the Free Software
+ * Foundation and appearing in the file LICENSE.GPL included in the
+ * packaging of this file.
+ *
+ * Licensees holding valid libFirm Professional Edition licenses may use
+ * this file in accordance with the libFirm Commercial License.
+ * Agreement provided with the Software.
+ *
+ * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+ * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE.
  */
 
 /**
- * @file irgraph_t.h
- *
- * IR graph construction.
+ * @file
+ * @brief    Entry point to the representation of procedure code -- internal header.
+ * @author   Martin Trapp, Christian Schaefer, Goetz Lindenmaier, Michael Beck
+ * @version  $Id$
  */
-#ifndef _IRGRAPH_T_H_
-#define _IRGRAPH_T_H_
+#ifndef FIRM_IR_IRGRAPH_T_H
+#define FIRM_IR_IRGRAPH_T_H
 
 #include "firm_types.h"
 #include "irgraph.h"
 
 #include "firm_common_t.h"
-#include "irtypeinfo.h"
+#include "irtypes.h"
 #include "irprog.h"
 #include "pseudo_irg.h"
 #include "type_t.h"
 #include "entity_t.h"
-#include "typegmod.h"
-#include "tr_inheritance.h"
+#include "iredgekinds.h"
 
 #include "irloop.h"
-#include "execution_frequency.h"
 
 #include "obst.h"
 #include "pset.h"
 #include "set.h"
 
-/** Prefix that is added to every frame type. */
+/** Suffix that is added to every frame type. */
 #define FRAME_TP_SUFFIX "frame_tp"
 
-/**
- * Edge info to put into an irg.
- */
-typedef struct _irg_edge_info_t {
-  set      *edges;         /**< a set containing all edges of a graph. */
-  unsigned activated : 1;  /**< set if edges are activated for the graph. */
-} irg_edge_info_t;
-
-/**
- * Index constants for nodes that can be accessed through the graph itself.
- */
-enum irg_anchors {
-  anchor_start_block = 0,  /**< block the start node will belong to */
-  anchor_start,            /**< start node of this ir_graph */
-  anchor_end_block,        /**< block the end node will belong to */
-  anchor_end,              /**< end node of this ir_graph */
-  anchor_end_reg,          /**< end node of this ir_graph */
-  anchor_end_except,       /**< end node of this ir_graph */
-  anchor_frame,            /**< method's frame */
-  anchor_globals,          /**< pointer to the data segment containing all
-                                globals as well as global procedures. */
-  anchor_tls,              /**< pointer to the thread local storage containing all
-                                thread local data. */
-  anchor_initial_mem,      /**< initial memory of this graph */
-  anchor_args,             /**< methods arguments */
-  anchor_value_param_base, /**< method value param base */
-  anchor_bad,              /**< bad node of this ir_graph, the one and
-                                only in this graph */
-  anchor_no_mem,           /**< NoMem node of this ir_graph, the one and only in this graph */
-  anchor_max
-};
-
-/** ir_graph holds all information for a procedure */
-struct ir_graph {
-  firm_kind         kind;            /**<  always set to k_ir_graph*/
-  /* --  Basics of the representation -- */
-  entity  *ent;           /**< The entity of this procedure, i.e.,
-                    the type of the procedure and the
-                    class it belongs to. */
-  ir_type *frame_type;           /**< A class type representing the stack frame.
-                                      Can include "inner" methods. */
-  ir_node *anchors[anchor_max];  /**< anchor nodes */
-  ir_node **proj_args;           /**< projs of the methods arguments */
-  struct obstack *obst;          /**< obstack where all of the ir_nodes live */
-  ir_node *current_block;        /**< block for newly gen_*()-erated ir_nodes */
-  struct obstack *extbb_obst;    /**< obstack for extended basic block info */
-
-  unsigned last_node_idx;        /**< last IR node index for this graph */
-
-  /* -- Fields for graph properties -- */
-  irg_inline_property inline_property;     /**< How to handle inlineing. */
-  unsigned additional_properties;          /**< additional graph properties. */
-
-  /* -- Fields indicating different states of irgraph -- */
-  irg_phase_state phase_state;       /**< Compiler phase. */
-  op_pin_state irg_pinned_state;     /**< Flag for status of nodes. */
-  irg_outs_state outs_state;         /**< Out edges. */
-  irg_dom_state dom_state;           /**< Dominator state information. */
-  irg_dom_state pdom_state;          /**< Post Dominator state information. */
-  ir_typeinfo_state typeinfo_state;        /**< Validity of type information. */
-  irg_callee_info_state callee_info_state; /**< Validity of callee information. */
-  irg_loopinfo_state loopinfo_state;       /**< State of loop information. */
-  ir_class_cast_state class_cast_state;    /**< Kind of cast operations in code. */
-  irg_extblk_info_state extblk_state;      /**< State of extended basic block info. */
-  exec_freq_state execfreq_state;          /**< Execution frequency state. */
-  unsigned fp_model;                       /**< floating point model of the graph. */
-
-  /* -- Fields for construction -- */
-#if USE_EXPLICIT_PHI_IN_STACK
-  struct Phi_in_stack *Phi_in_stack; /**< needed for automatic Phi construction */
-#endif
-  int n_loc;                         /**< number of local variable in this
-                                          procedure including procedure parameters. */
-  void **loc_descriptions;           /**< storage for local variable descriptions */
-
-  /* -- Fields for optimizations / analysis information -- */
-  pset *value_table;                 /**< hash table for global value numbering (cse)
-                    for optimizing use in iropt.c */
-  ir_node **outs;                    /**< Space for the out arrays. */
-
-  ir_loop *loop;                     /**< The outermost loop */
-  void *link;                        /**< A void* field to link any information to
-                    the node. */
-
-  ir_graph **callers;                /**< For callgraph analysis. */
-  unsigned char *caller_isbe;        /**< For callgraph analysis: set if backedge. */
-  ir_graph **callees;                /**< For callgraph analysis. */
-  unsigned char *callee_isbe;        /**< For callgraph analysis: set if backedge. */
-  int        callgraph_loop_depth;         /**< For callgraph analysis */
-  int        callgraph_recursion_depth;    /**< For callgraph analysis */
-  double     method_execution_frequency;   /**< For callgraph analysis */
-
-  ir_loop   *l;
-
-  /* -- Fields for Walking the graph -- */
-  unsigned long visited;             /**< this flag is an identifier for
-                    ir walk. it will be incremented
-                    every time someone walks through
-                    the graph */
-  unsigned long block_visited;       /**< same as visited, for a complete block */
-  unsigned estimated_node_count;     /**< estimated number of nodes in this graph,
-                                          updated after every walk */
-  irg_edge_info_t edge_info;         /**< edge info for automatic outs */
-  ir_node **idx_irn_map;             /**< Array mapping node indexes to nodes. */
-
-#ifdef DEBUG_libfirm
-  int             n_outs;            /**< Size wasted for outs */
-  long graph_nr;              /**< a unique graph number for each graph to make output
-                   readable. */
-#endif
-
-};
-
 /**
  * Initializes the graph construction module
  */
 void firm_init_irgraph(void);
 
 /* Internal constructor that does not add to irp_irgs or the like. */
-ir_graph *new_r_ir_graph (entity *ent, int n_loc);
+ir_graph *new_r_ir_graph (ir_entity *ent, int n_loc);
 
 /** Make a rudimentary ir graph for the constant code.
    Must look like a correct irg, spare everything else. */
@@ -189,221 +82,216 @@ int node_is_in_irgs_storage(ir_graph *irg, ir_node *n);
 /* inline functions for graphs                                       */
 /*-------------------------------------------------------------------*/
 
-extern int firm_interprocedural_view;
-
-static INLINE int
-_get_interprocedural_view(void) {
-  return firm_interprocedural_view;
-}
-
 static INLINE int
 _is_ir_graph(const void *thing) {
-  return (get_kind(thing) == k_ir_graph);
+	return (get_kind(thing) == k_ir_graph);
 }
 
 /** Returns the start block of a graph. */
 static INLINE ir_node *
 _get_irg_start_block(const ir_graph *irg) {
-  return irg->anchors[anchor_start_block];
+	return get_irn_intra_n(irg->anchor, anchor_start_block);
 }
 
 static INLINE void
 _set_irg_start_block(ir_graph *irg, ir_node *node) {
-  irg->anchors[anchor_start_block] = node;
+	set_irn_n(irg->anchor, anchor_start_block, node);
 }
 
 static INLINE ir_node *
 _get_irg_start(const ir_graph *irg) {
-  return irg->anchors[anchor_start];
+	return get_irn_intra_n(irg->anchor, anchor_start);
 }
 
 static INLINE void
 _set_irg_start(ir_graph *irg, ir_node *node) {
-  irg->anchors[anchor_start] = node;
+	set_irn_n(irg->anchor, anchor_start, node);
 }
 
 static INLINE ir_node *
 _get_irg_end_block(const ir_graph *irg) {
-  return irg->anchors[anchor_end_block];
+	return get_irn_intra_n(irg->anchor, anchor_end_block);
 }
 
 static INLINE void
 _set_irg_end_block(ir_graph *irg, ir_node *node) {
-  irg->anchors[anchor_end_block] = node;
+	set_irn_n(irg->anchor, -1, node);
+	set_irn_n(irg->anchor, anchor_end_block, node);
 }
 
 static INLINE ir_node *
 _get_irg_end(const ir_graph *irg) {
-  return irg->anchors[anchor_end];
+	return get_irn_intra_n(irg->anchor, anchor_end);
 }
 
 static INLINE void
 _set_irg_end(ir_graph *irg, ir_node *node) {
-  irg->anchors[anchor_end] = node;
+	set_irn_n(irg->anchor, anchor_end, node);
 }
 
 static INLINE ir_node *
 _get_irg_end_reg(const ir_graph *irg) {
-  return irg->anchors[anchor_end_reg];
+	return get_irn_intra_n(irg->anchor, anchor_end_reg);
+}
+
+static INLINE void
+_set_irg_end_reg(ir_graph *irg, ir_node *node) {
+	set_irn_n(irg->anchor, anchor_end_reg, node);
 }
 
 static INLINE ir_node *
-_get_irg_end_except (const ir_graph *irg) {
-  return irg->anchors[anchor_end_except];
+_get_irg_end_except(const ir_graph *irg) {
+	return get_irn_intra_n(irg->anchor, anchor_end_except);
+}
+
+static INLINE void
+_set_irg_end_except(ir_graph *irg, ir_node *node) {
+	set_irn_n(irg->anchor, anchor_end_except, node);
 }
 
 static INLINE ir_node *
 _get_irg_frame(const ir_graph *irg) {
-  return irg->anchors[anchor_frame];
+	return get_irn_intra_n(irg->anchor, anchor_frame);
 }
 
 static INLINE void
 _set_irg_frame(ir_graph *irg, ir_node *node) {
-  irg->anchors[anchor_frame] = node;
+	set_irn_n(irg->anchor, anchor_frame, node);
 }
 
 static INLINE ir_node *
 _get_irg_globals(const ir_graph *irg) {
-  return irg->anchors[anchor_globals];
+	return get_irn_intra_n(irg->anchor, anchor_globals);
 }
 
 static INLINE void
 _set_irg_globals(ir_graph *irg, ir_node *node) {
-  irg->anchors[anchor_globals] = node;
+	set_irn_n(irg->anchor, anchor_globals, node);
 }
 
 static INLINE ir_node *
 _get_irg_tls(const ir_graph *irg) {
-  return irg->anchors[anchor_tls];
+	return get_irn_intra_n(irg->anchor, anchor_tls);
 }
 
 static INLINE void
 _set_irg_tls(ir_graph *irg, ir_node *node) {
-  irg->anchors[anchor_tls] = node;
+	set_irn_n(irg->anchor, anchor_tls, node);
 }
 
 static INLINE ir_node *
 _get_irg_initial_mem(const ir_graph *irg) {
-  return irg->anchors[anchor_initial_mem];
+	return get_irn_intra_n(irg->anchor, anchor_initial_mem);
 }
 
 static INLINE void
 _set_irg_initial_mem(ir_graph *irg, ir_node *node) {
-  irg->anchors[anchor_initial_mem] = node;
+	set_irn_n(irg->anchor, anchor_initial_mem, node);
 }
 
 static INLINE ir_node *
 _get_irg_args(const ir_graph *irg) {
-  return irg->anchors[anchor_args];
+	return get_irn_intra_n(irg->anchor, anchor_args);
 }
 
 static INLINE void
 _set_irg_args(ir_graph *irg, ir_node *node) {
-  irg->anchors[anchor_args] = node;
+	set_irn_n(irg->anchor, anchor_args, node);
 }
 
 static INLINE ir_node *
 _get_irg_value_param_base(const ir_graph *irg) {
-  return irg->anchors[anchor_value_param_base];
+	return get_irn_intra_n(irg->anchor, anchor_value_param_base);
 }
 
 static INLINE void
 _set_irg_value_param_base(ir_graph *irg, ir_node *node) {
-  irg->anchors[anchor_value_param_base] = node;
-}
-
-static INLINE ir_node **
-_get_irg_proj_args(const ir_graph *irg) {
-  return irg->proj_args;
-}
-
-static INLINE void
-_set_irg_proj_args(ir_graph *irg, ir_node **nodes) {
-  irg->proj_args = nodes;
+	set_irn_n(irg->anchor, anchor_value_param_base, node);
 }
 
 static INLINE ir_node *
 _get_irg_bad(const ir_graph *irg) {
-  return irg->anchors[anchor_bad];
+	return get_irn_intra_n(irg->anchor, anchor_bad);
 }
 
 static INLINE void
 _set_irg_bad(ir_graph *irg, ir_node *node) {
-  irg->anchors[anchor_bad] = node;
+	set_irn_n(irg->anchor, anchor_bad, node);
 }
 
 static INLINE ir_node *
 _get_irg_no_mem(const ir_graph *irg) {
-  return irg->anchors[anchor_no_mem];
+	return get_irn_intra_n(irg->anchor, anchor_no_mem);
 }
 
 static INLINE void
 _set_irg_no_mem(ir_graph *irg, ir_node *node) {
-  irg->anchors[anchor_no_mem] = node;
+	set_irn_n(irg->anchor, anchor_no_mem, node);
 }
+
 static INLINE ir_node *
 _get_irg_current_block(const ir_graph *irg) {
-  return irg->current_block;
+	return irg->current_block;
 }
 
 static INLINE void
 _set_irg_current_block(ir_graph *irg, ir_node *node) {
-  irg->current_block = node;
+	irg->current_block = node;
 }
 
-static INLINE entity *
+static INLINE ir_entity *
 _get_irg_entity(const ir_graph *irg) {
-  assert(irg && irg->ent);
-  return irg->ent;
+	assert(irg && irg->ent);
+	return irg->ent;
 }
 
 static INLINE void
-_set_irg_entity(ir_graph *irg, entity *ent) {
-  irg->ent = ent;
+_set_irg_entity(ir_graph *irg, ir_entity *ent) {
+	irg->ent = ent;
 }
 
 static INLINE ir_type *
 _get_irg_frame_type(ir_graph *irg) {
-  assert(irg && irg->frame_type);
-  return irg->frame_type = skip_tid(irg->frame_type);
+	assert(irg && irg->frame_type);
+	return irg->frame_type = skip_tid(irg->frame_type);
 }
 
 static INLINE void
 _set_irg_frame_type(ir_graph *irg, ir_type *ftp) {
-  assert(is_frame_type(ftp));
-  irg->frame_type = ftp;
+	assert(is_frame_type(ftp));
+	irg->frame_type = ftp;
 }
 
 static INLINE struct obstack *
 _get_irg_obstack(const ir_graph *irg) {
-  return irg->obst;
+	return irg->obst;
 }
 
 
 static INLINE irg_phase_state
 _get_irg_phase_state(const ir_graph *irg) {
-  return irg->phase_state;
+	return irg->phase_state;
 }
 
 static INLINE void
 _set_irg_phase_state(ir_graph *irg, irg_phase_state state) {
-  irg->phase_state = state;
+	irg->phase_state = state;
 }
 
 static INLINE op_pin_state
 _get_irg_pinned(const ir_graph *irg) {
-  return irg->irg_pinned_state;
+	return irg->irg_pinned_state;
 }
 
 static INLINE irg_outs_state
 _get_irg_outs_state(const ir_graph *irg) {
-  return irg->outs_state;
+	return irg->outs_state;
 }
 
 static INLINE void
 _set_irg_outs_inconsistent(ir_graph *irg) {
-  if (irg->outs_state == outs_consistent)
-    irg->outs_state = outs_inconsistent;
+	if (irg->outs_state == outs_consistent)
+		irg->outs_state = outs_inconsistent;
 }
 
 static INLINE irg_extblk_state
@@ -413,31 +301,31 @@ _get_irg_extblk_state(const ir_graph *irg) {
 
 static INLINE void
 _set_irg_extblk_inconsistent(ir_graph *irg) {
-  if (irg->extblk_state == extblk_valid)
-    irg->extblk_state = extblk_invalid;
+	if (irg->extblk_state == extblk_valid)
+		irg->extblk_state = extblk_invalid;
 }
 
 static INLINE irg_dom_state
 _get_irg_dom_state(const ir_graph *irg) {
-  return irg->dom_state;
+	return irg->dom_state;
 }
 
 static INLINE irg_dom_state
 _get_irg_postdom_state(const ir_graph *irg) {
-  return irg->pdom_state;
+	return irg->pdom_state;
 }
 
 static INLINE void
 _set_irg_doms_inconsistent(ir_graph *irg) {
-  if (irg->dom_state != dom_none)
-    irg->dom_state = dom_inconsistent;
-  if (irg->pdom_state != dom_none)
-    irg->pdom_state = dom_inconsistent;
+	if (irg->dom_state != dom_none)
+		irg->dom_state = dom_inconsistent;
+	if (irg->pdom_state != dom_none)
+		irg->pdom_state = dom_inconsistent;
 }
 
 static INLINE irg_loopinfo_state
 _get_irg_loopinfo_state(const ir_graph *irg) {
-  return irg->loopinfo_state;
+	return irg->loopinfo_state;
 }
 
 static INLINE void
@@ -447,102 +335,100 @@ _set_irg_loopinfo_state(ir_graph *irg, irg_loopinfo_state s) {
 
 static INLINE void
 _set_irg_loopinfo_inconsistent(ir_graph *irg) {
-  irg->loopinfo_state &= ~loopinfo_valid;
+	irg->loopinfo_state &= ~loopinfo_valid;
 }
 
 static INLINE void
 _set_irg_pinned(ir_graph *irg, op_pin_state p) {
-  irg->irg_pinned_state = p;
+	irg->irg_pinned_state = p;
 }
 
 static INLINE irg_callee_info_state
 _get_irg_callee_info_state(const ir_graph *irg) {
-  return irg->callee_info_state;
+	return irg->callee_info_state;
 }
 
 static INLINE void
 _set_irg_callee_info_state(ir_graph *irg, irg_callee_info_state s) {
-  irg_callee_info_state irp_state = get_irp_callee_info_state();
+	irg_callee_info_state irp_state = get_irp_callee_info_state();
 
-  irg->callee_info_state = s;
+	irg->callee_info_state = s;
 
-  /* I could compare ... but who knows? */
-  if ((irp_state == irg_callee_info_consistent)  ||
-      ((irp_state == irg_callee_info_inconsistent) && (s == irg_callee_info_none)))
-      set_irp_callee_info_state(s);
+	/* I could compare ... but who knows? */
+	if ((irp_state == irg_callee_info_consistent)  ||
+	    ((irp_state == irg_callee_info_inconsistent) && (s == irg_callee_info_none)))
+		set_irp_callee_info_state(s);
 }
 
 static INLINE irg_inline_property
 _get_irg_inline_property(const ir_graph *irg) {
-  return irg->inline_property;
+	return irg->inline_property;
 }
 
 static INLINE void
 _set_irg_inline_property(ir_graph *irg, irg_inline_property s) {
-  irg->inline_property = s;
+	irg->inline_property = s;
 }
 
 static INLINE unsigned
 _get_irg_additional_properties(const ir_graph *irg) {
-  if (irg->additional_properties & mtp_property_inherited)
-    return get_method_additional_properties(get_entity_type(irg->ent));
-  return irg->additional_properties;
+	if (irg->additional_properties & mtp_property_inherited)
+		return get_method_additional_properties(get_entity_type(irg->ent));
+	return irg->additional_properties;
 }
 
 static INLINE void
 _set_irg_additional_properties(ir_graph *irg, unsigned mask) {
-  /* do not allow to set the mtp_property_inherited flag or
-   * the automatic inheritance of flags will not work */
-  irg->additional_properties = mask & ~mtp_property_inherited;
+	irg->additional_properties = mask & ~mtp_property_inherited;
 }
 
 static INLINE void
 _set_irg_additional_property(ir_graph *irg, mtp_additional_property flag) {
-  unsigned prop = irg->additional_properties;
+	unsigned prop = irg->additional_properties;
 
-  if (prop & mtp_property_inherited)
-    prop = get_method_additional_properties(get_entity_type(irg->ent));
-  irg->additional_properties = prop | flag;
+	if (prop & mtp_property_inherited)
+		prop = get_method_additional_properties(get_entity_type(irg->ent));
+	irg->additional_properties = prop | flag;
 }
 
 static INLINE void
 _set_irg_link(ir_graph *irg, void *thing) {
-  irg->link = thing;
+	irg->link = thing;
 }
 
 static INLINE void *
 _get_irg_link(const ir_graph *irg) {
-  return irg->link;
+	return irg->link;
 }
 
 static INLINE unsigned long
 _get_irg_visited(const ir_graph *irg) {
-  return irg->visited;
+	return irg->visited;
 }
 
 static INLINE unsigned long
 _get_irg_block_visited(const ir_graph *irg) {
-  return irg->block_visited;
+	return irg->block_visited;
 }
 
 static INLINE void
 _set_irg_block_visited(ir_graph *irg, unsigned long visited) {
-  irg->block_visited = visited;
+	irg->block_visited = visited;
 }
 
 static INLINE void
 _inc_irg_block_visited(ir_graph *irg) {
-  ++irg->block_visited;
+	++irg->block_visited;
 }
 
 static INLINE void
 _dec_irg_block_visited(ir_graph *irg) {
-  --irg->block_visited;
+	--irg->block_visited;
 }
 
 static INLINE unsigned
 _get_irg_estimated_node_cnt(const ir_graph *irg) {
-  return irg->estimated_node_count;
+	return irg->estimated_node_count;
 }
 
 /* Return the floating point model of this graph. */
@@ -557,11 +443,9 @@ _get_irg_fp_model(const ir_graph *irg) {
  * @param irn The node.
  * @return    The index allocated for the node.
  */
-static INLINE unsigned
-irg_register_node_idx(ir_graph *irg, ir_node *irn)
-{
+static INLINE unsigned irg_register_node_idx(ir_graph *irg, ir_node *irn) {
 	unsigned idx = irg->last_node_idx++;
-	if(idx >= (unsigned) ARR_LEN(irg->idx_irn_map))
+	if (idx >= (unsigned)ARR_LEN(irg->idx_irn_map))
 		ARR_RESIZE(ir_node *, irg->idx_irn_map, idx + 1);
 
 	irg->idx_irn_map[idx] = irn;
@@ -575,6 +459,8 @@ irg_register_node_idx(ir_graph *irg, ir_node *irn)
 static INLINE void
 irg_kill_node(ir_graph *irg, ir_node *n) {
 	unsigned idx = get_irn_idx(n);
+	assert(idx + 1 == irg->last_node_idx);
+
 	if (idx + 1 == irg->last_node_idx)
 		--irg->last_node_idx;
 	irg->idx_irn_map[idx] = NULL;
@@ -594,7 +480,41 @@ get_idx_irn(ir_graph *irg, unsigned idx) {
 	return irg->idx_irn_map[idx];
 }
 
+/**
+ * Return the number of anchors in this graph.
+ */
+static INLINE int
+get_irg_n_anchors(const ir_graph *irg) {
+	return get_irn_arity(irg->anchor);
+}
+
+/**
+ * Return anchor for given index
+ */
+static INLINE ir_node *
+get_irg_anchor(const ir_graph *irg, int idx) {
+	return get_irn_intra_n(irg->anchor, idx);
+}
+
+/**
+ * Set anchor for given index
+ */
+static INLINE void
+set_irg_anchor(ir_graph *irg, int idx, ir_node *irn) {
+	set_irn_n(irg->anchor, idx, irn);
+}
+
+#ifdef INTERPROCEDURAL_VIEW
+extern int firm_interprocedural_view;
+
+static INLINE int
+_get_interprocedural_view(void) {
+	return firm_interprocedural_view;
+}
+
 #define get_interprocedural_view()            _get_interprocedural_view()
+#endif
+
 #define is_ir_graph(thing)                    _is_ir_graph(thing)
 #define get_irg_start_block(irg)              _get_irg_start_block(irg)
 #define set_irg_start_block(irg, node)        _set_irg_start_block(irg, node)
@@ -605,7 +525,9 @@ get_idx_irn(ir_graph *irg, unsigned idx) {
 #define get_irg_end(irg)                      _get_irg_end(irg)
 #define set_irg_end(irg, node)                _set_irg_end(irg, node)
 #define get_irg_end_reg(irg)                  _get_irg_end_reg(irg)
+#define set_irg_end_reg(irg, node)            _set_irg_end_reg(irg, node)
 #define get_irg_end_except(irg)               _get_irg_end_except(irg)
+#define set_irg_end_except(irg, node)         _set_irg_end_except(irg, node)
 #define get_irg_frame(irg)                    _get_irg_frame(irg)
 #define set_irg_frame(irg, node)              _set_irg_frame(irg, node)
 #define get_irg_globals(irg)                  _get_irg_globals(irg)
@@ -621,7 +543,7 @@ get_idx_irn(ir_graph *irg, unsigned idx) {
 #define get_irg_bad(irg)                      _get_irg_bad(irg)
 #define set_irg_bad(irg, node)                _set_irg_bad(irg, node)
 #define get_irg_no_mem(irg)                   _get_irg_no_mem(irg)
-#define set_irg_no_mem(irg, node)             _set_irg_no_mem(irg, node)
+#define set_irn_no_mem(irg, node)             _set_irn_no_mem(irg, node)
 #define get_irg_current_block(irg)            _get_irg_current_block(irg)
 #define set_irg_current_block(irg, node)      _set_irg_current_block(irg, node)
 #define get_irg_entity(irg)                   _get_irg_entity(irg)
@@ -660,4 +582,4 @@ get_idx_irn(ir_graph *irg, unsigned idx) {
 #define get_irg_estimated_node_cnt(irg)       _get_irg_estimated_node_cnt(irg)
 #define get_irg_fp_model(irg)                 _get_irg_fp_model(irg)
 
-# endif /* _IRGRAPH_T_H_ */
+#endif