Fixed the last fix again:

[libfirm] / ir / common / firm.h

diff --git a/ir/common/firm.h b/ir/common/firm.h
index f3cc21a..09edffc 100644 (file)
--- a/ir/common/firm.h
+++ b/ir/common/firm.h
@@ -1,18 +1,28 @@
 /*
- * Project:     libFIRM
- * File name:   ir/common/firm.h
- * Purpose:     Central firm header.
- * Author:      Martin Trapp, Christian Schaefer
- * Modified by: Goetz Lindenmaier
- * Created:
- * CVS-ID:      $Id$
- * Copyright:   (c) 1998-2003 Universität Karlsruhe
- * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
+ * Copyright (C) 1995-2007 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 firm.h
- *
+ * @file
+ * @brief     Central firm header.
+ * @author    Martin Trapp, Christian Schaefer, Goetz Lindenmaier
+ * @version   $Id$
+ * @summary
  *  Central FIRM header.
  *
  *  FIRM is a full graph based intermediate representation in SSA Form
@@ -46,8 +56,8 @@
  *   generic functionality to support implementations using firm.  (Code generation,
  *   further optimizations).
  */
-#ifndef _FIRM_H_
-#define _FIRM_H_
+#ifndef FIRM_COMMON_FIRM_H
+#define FIRM_COMMON_FIRM_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -92,18 +102,20 @@ extern "C" {
 #include "lower_calls.h"      /* lowering of different calls */
 #include "lower_intrinsics.h" /* lowering of intrinsic calls */
 #include "lower_dw.h"         /* double word types lowering */
+#include "lower_hl.h"         /* lowering of high-level constructs */
 
 /* Analyses */
-#include "irouts.h"         /* Graph reversal / out edges. */
-#include "trouts.h"         /* Graph reversal / out edges for types. */
-#include "irdom.h"          /* Dominator analysis */
-#include "cgana.h"          /* Analysis to construct interprocedural graph */
-                            /* including some optimizations */
-#include "irloop.h"         /* loop and backedge analysis */
-#include "callgraph.h"      /* Callgraph construction */
-#include "irconsconfirm.h"  /* Confirm nodes */
+#include "irouts.h"           /* Graph reversal / out edges. */
+#include "trouts.h"           /* Graph reversal / out edges for types. */
+#include "irdom.h"            /* Dominator analysis */
+#include "cgana.h"            /* Analysis to construct interprocedural graph */
+                              /* including some optimizations */
+#include "irloop.h"           /* loop and backedge analysis */
+#include "callgraph.h"        /* Callgraph construction */
+#include "irconsconfirm.h"    /* Confirm nodes */
 #include "analyze_irg_args.h" /* Simple pointer parameter analysis */
 #include "irtypeinfo.h"       /* type information for nodes */
+#include "irmemory.h"         /* memory disambiguation */
 #include "interval_analysis.h"
 #include "field_temperature.h"
 #include "execution_frequency.h"
@@ -126,6 +138,7 @@ extern "C" {
 #include "irreflect.h"     /* reflection */
 
 #include "seqnumbers.h"    /* debug support */
+#include "firm_ycomp.h"    /* ycomp debugging support */
 
 
 /* @@@ temporarily for jni builder until preprocessor works.
@@ -248,4 +261,4 @@ void firm_init_options(const char *arg_prefix, int argc, const char **argv);
 }
 #endif
 
-#endif /* _FIRM_H_ */
+#endif