fixed the fix of the fix (that was fix)

[libfirm] / ir / ir / irdump.c

diff --git a/ir/ir/irdump.c b/ir/ir/irdump.c
index 0289e7d..c56bd13 100644 (file)
--- a/ir/ir/irdump.c
+++ b/ir/ir/irdump.c
@@ -17,15 +17,11 @@
  * PURPOSE.
  */
 
-/*
- * Project:     libFIRM
- * File name:   ir/ir/irdump.c
- * Purpose:     Write vcg representation of firm to file.
- * Author:      Martin Trapp, Christian Schaefer
- * Modified by: Goetz Lindenmaier, Hubert Schmidt
- * Created:
- * CVS-ID:      $Id$
- * Copyright:   (c) 1998-2006 Universit�t Karlsruhe
+/**
+ * @file
+ * @brief   Write vcg representation of firm to file.
+ * @author  Martin Trapp, Christian Schaefer, Goetz Lindenmaier, Hubert Schmidt
+ * @version $Id$
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -52,9 +48,7 @@
 #include "irdump_t.h"
 
 #include "irgwalk.h"
-#include "typewalk.h"
 #include "tv_t.h"
-#include "type_or_entity.h"
 #include "irouts.h"
 #include "irdom.h"
 #include "irloop_t.h"
@@ -876,10 +870,11 @@ static const pns_lookup_t cond_lut[] = {
 static const pns_lookup_t call_lut[] = {
 #define X(a)    { pn_Call_##a, #a }
        X(M_regular),
-       X(T_result),
-       X(P_value_res_base),
+       X(X_regular),
        X(X_except),
-       X(M_except)
+       X(T_result),
+       X(M_except),
+       X(P_value_res_base)
 #undef X
 };
 
@@ -887,6 +882,7 @@ static const pns_lookup_t call_lut[] = {
 static const pns_lookup_t quot_lut[] = {
 #define X(a)    { pn_Quot_##a, #a }
        X(M),
+       X(X_regular),
        X(X_except),
        X(res)
 #undef X
@@ -896,6 +892,7 @@ static const pns_lookup_t quot_lut[] = {
 static const pns_lookup_t divmod_lut[] = {
 #define X(a)    { pn_DivMod_##a, #a }
        X(M),
+       X(X_regular),
        X(X_except),
        X(res_div),
        X(res_mod)
@@ -906,6 +903,7 @@ static const pns_lookup_t divmod_lut[] = {
 static const pns_lookup_t div_lut[] = {
 #define X(a)    { pn_Div_##a, #a }
        X(M),
+       X(X_regular),
        X(X_except),
        X(res)
 #undef X
@@ -915,6 +913,7 @@ static const pns_lookup_t div_lut[] = {
 static const pns_lookup_t mod_lut[] = {
 #define X(a)    { pn_Mod_##a, #a }
        X(M),
+       X(X_regular),
        X(X_except),
        X(res)
 #undef X
@@ -924,6 +923,7 @@ static const pns_lookup_t mod_lut[] = {
 static const pns_lookup_t load_lut[] = {
 #define X(a)    { pn_Load_##a, #a }
        X(M),
+       X(X_regular),
        X(X_except),
        X(res)
 #undef X
@@ -933,6 +933,7 @@ static const pns_lookup_t load_lut[] = {
 static const pns_lookup_t store_lut[] = {
 #define X(a)    { pn_Store_##a, #a }
        X(M),
+       X(X_regular),
        X(X_except)
 #undef X
 };
@@ -941,6 +942,7 @@ static const pns_lookup_t store_lut[] = {
 static const pns_lookup_t alloc_lut[] = {
 #define X(a)    { pn_Alloc_##a, #a }
        X(M),
+       X(X_regular),
        X(X_except),
        X(res)
 #undef X
@@ -950,6 +952,7 @@ static const pns_lookup_t alloc_lut[] = {
 static const pns_lookup_t copyb_lut[] = {
 #define X(a)    { pn_CopyB_##a, #a }
        X(M),
+       X(X_regular),
        X(X_except),
        X(M_except)
 #undef X
@@ -959,6 +962,7 @@ static const pns_lookup_t copyb_lut[] = {
 static const pns_lookup_t instof_lut[] = {
 #define X(a)    { pn_InstOf_##a, #a }
        X(M),
+       X(X_regular),
        X(X_except),
        X(res),
        X(M_except),
@@ -977,6 +981,7 @@ static const pns_lookup_t raise_lut[] = {
 static const pns_lookup_t bound_lut[] = {
 #define X(a)    { pn_Bound_##a, #a }
        X(M),
+       X(X_regular),
        X(X_except),
        X(res),
 #undef X
@@ -1175,6 +1180,9 @@ static void dump_node_vcgattr(FILE *F, ir_node *node, ir_node *local, int bad)
        case iro_Tuple:
                print_vcg_color(F, ird_color_yellow);
                break;
+       case iro_ASM:
+               print_vcg_color(F, ird_color_darkyellow);
+               break;
        default:
                PRINT_DEFAULT_NODE_ATTR;
        }
@@ -3021,9 +3029,9 @@ void dump_callgraph_loop_tree(const char *suffix) {
 }
 
 
-/*-----------------------------------------------------------------------------*/
-/* Dumps the firm nodes in the loop tree to a graph along with the loop nodes. */
-/*-----------------------------------------------------------------------------*/
+/*----------------------------------------------------------------------------*/
+/* Dumps the firm nodes in the loop tree to a graph along with the loop nodes.*/
+/*----------------------------------------------------------------------------*/
 
 void collect_nodeloop(FILE *F, ir_loop *loop, eset *loopnodes) {
        int i, son_number = 0, node_number = 0;