X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fdebug%2Fdbginfo.c;h=9ed9658d9a1919b570da4e02afa92467c6d1fb91;hb=75921a0e9db46ba1c32889bd830900aac298691d;hp=20ff762d0cb791ca984844c227a31fad771f8701;hpb=aa8b5906d8cb57701b73ac37f932cc1c44dde4c7;p=libfirm

diff --git a/ir/debug/dbginfo.c b/ir/debug/dbginfo.c
index 20ff762d0..9ed9658d9 100644
--- a/ir/debug/dbginfo.c
+++ b/ir/debug/dbginfo.c
@@ -1,15 +1,29 @@
 /*
- * Project:     libFIRM
- * File name:   ir/debug/dbginfo.c
- * Purpose:     Implements the Firm interface to debug information.
- * Author:      Goetz Lindenmaier
- * Modified by:
- * Created:     2001
- * CVS-ID:      $Id$
- * Copyright:   (c) 2001-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
+ * @brief    Implements the Firm interface to debug information.
+ * @author   Goetz Lindenmaier, Michael Beck
+ * @date     2001
+ * @version  $Id$
+ */
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
@@ -19,17 +33,6 @@
 #include "type_t.h"
 #include "entity_t.h"
 
-void
-default_dbg_info_merge_pair(ir_node *nw, ir_node *old, dbg_action info) {
-  set_irn_dbg_info(nw, get_irn_dbg_info(old));
-}
-
-void
-default_dbg_info_merge_sets(ir_node **new_nodes, int n_new_nodes,
-            ir_node **old_nodes, int n_old_nodes,
-            dbg_action info) {
-}
-
 merge_pair_func *__dbg_info_merge_pair = default_dbg_info_merge_pair;
 
 merge_sets_func *__dbg_info_merge_sets = default_dbg_info_merge_sets;
@@ -38,42 +41,10 @@ snprint_dbg_func *__dbg_info_snprint   = (snprint_dbg_func *)0;
 
 void dbg_init( merge_pair_func *mpf, merge_sets_func *msf, snprint_dbg_func *snprint_dbg )
 {
-  __dbg_info_merge_pair = mpf ? mpf : default_dbg_info_merge_pair;
-  __dbg_info_merge_sets = msf ? msf : default_dbg_info_merge_sets;
-  __dbg_info_snprint    = snprint_dbg;
-}
-
-
-void
-set_irn_dbg_info(ir_node *n, struct dbg_info* db) {
-  n->dbi = db;
-}
-
-struct dbg_info *
-get_irn_dbg_info(const ir_node *n) {
-  return n->dbi;
-}
-
-
-/* Routines to access the field of an entity containing the
-   debugging information. */
-void set_entity_dbg_info(entity *ent, dbg_info* db) {
-  ent->dbi = db;
-}
-
-dbg_info *get_entity_dbg_info(entity *ent) {
-  return ent->dbi;
-}
-
-/* Routines to access the field of a type containing the
-   debugging information. */
-void set_type_dbg_info(ir_type *tp, dbg_info* db) {
-  tp->dbi = db;
-}
-
-dbg_info *get_type_dbg_info(ir_type *tp) {
-  return tp->dbi;
-}
+	__dbg_info_merge_pair = mpf ? mpf : default_dbg_info_merge_pair;
+	__dbg_info_merge_sets = msf ? msf : default_dbg_info_merge_sets;
+	__dbg_info_snprint    = snprint_dbg;
+}  /* dbg_init */
 
 /*
  * Converts a debug_action into a string.
@@ -81,30 +52,52 @@ dbg_info *get_type_dbg_info(ir_type *tp) {
 const char *dbg_action_2_str(dbg_action a) {
 #define CASE(a) case a: return #a
 
-  switch (a) {
-  CASE(dbg_error);
-  CASE(dbg_opt_ssa);
-  CASE(dbg_opt_auxnode);
-  CASE(dbg_const_eval);
-  CASE(dbg_opt_cse);
-  CASE(dbg_straightening);
-  CASE(dbg_if_simplification);
-  CASE(dbg_algebraic_simplification);
-  CASE(dbg_write_after_write);
-  CASE(dbg_write_after_read);
-  CASE(dbg_read_after_write);
-  CASE(dbg_read_after_read);
-  CASE(dbg_read_a_const);
-  CASE(dbg_rem_poly_call);
-  CASE(dbg_dead_code);
-  CASE(dbg_opt_confirm);
-  CASE(dbg_backend);
-  default:
-    if (a <= dbg_max)
-      return "string conversion not implemented";
-    else
-      assert(0);
-    return NULL;
-  }
+	switch (a) {
+	CASE(dbg_error);
+	CASE(dbg_opt_ssa);
+	CASE(dbg_opt_auxnode);
+	CASE(dbg_const_eval);
+	CASE(dbg_opt_cse);
+	CASE(dbg_straightening);
+	CASE(dbg_if_simplification);
+	CASE(dbg_algebraic_simplification);
+	CASE(dbg_write_after_write);
+	CASE(dbg_write_after_read);
+	CASE(dbg_read_after_write);
+	CASE(dbg_read_after_read);
+	CASE(dbg_read_a_const);
+	CASE(dbg_rem_poly_call);
+	CASE(dbg_dead_code);
+	CASE(dbg_opt_confirm);
+	CASE(dbg_backend);
+	default:
+		if (a <= dbg_max)
+			return "string conversion not implemented";
+		else
+			assert(!"Missing debug action in dbg_action_2_str()");
+		return NULL;
+	}
 #undef CASE
-}
+}  /* dbg_action_2_str */
+
+
+void default_dbg_info_merge_pair(ir_node *nw, ir_node *old, dbg_action info) {
+	dbg_info *new_db = get_irn_dbg_info(nw);
+	(void) info;
+	if (new_db == NULL)
+		set_irn_dbg_info(nw, get_irn_dbg_info(old));
+}  /* default_dbg_info_merge_pair */
+
+void default_dbg_info_merge_sets(ir_node **new_nodes, int n_new_nodes,
+                                 ir_node **old_nodes, int n_old_nodes,
+                                 dbg_action info) {
+	(void) info;
+	if (n_old_nodes == 1) {
+		dbg_info *old_db = get_irn_dbg_info(old_nodes[0]);
+		int i;
+
+		for (i = 0; i < n_new_nodes; ++i)
+			if (get_irn_dbg_info(new_nodes[i]) == NULL)
+				set_irn_dbg_info(new_nodes[i], old_db);
+	}
+}  /* default_dbg_info_merge_sets */