X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Ftr%2Ftype_identify.c;h=70b899806dba2101ae0ef597e7a63517de01d4cd;hb=d2dc2564b47d9c113d7e6e598574e9733627fcca;hp=1780362d9f5063fb30d56e47115d0b7d61142f2d;hpb=649db362d8fe7e54a1589cf0abce5662b445572b;p=libfirm

diff --git a/ir/tr/type_identify.c b/ir/tr/type_identify.c
index 1780362d9..70b899806 100644
--- a/ir/tr/type_identify.c
+++ b/ir/tr/type_identify.c
@@ -1,6 +1,6 @@
 /*
  * Project:     libFIRM
- * File name:   ir/tr/type.c
+ * File name:   ir/tr/type_identify.c
  * Purpose:     Representation of types.
  * Author:      Goetz Lindenmaier
  * Modified by:
@@ -11,69 +11,66 @@
  */
 
 /**
+ *  @file type_identify.c
  *
- *   file type.c - implementation of the datastructure to hold
- *   type information.
  *  (C) 2004 by Universitaet Karlsruhe
  *  Goetz Lindenmaier
  *
  */
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+# include "config.h"
 #endif
 
-#include "type_identify.h"
-
-# include <stdlib.h>
-# include <stddef.h>
-# include <string.h>
-# include "type_t.h"
-# include "tpop_t.h"
-# include "irprog_t.h"
-# include "typegmod.h"
-# include "array.h"
-# include "irprog.h"
-# include "mangle.h"
+#include "type_identify_t.h"
+
+#include <stdlib.h>
+#include <stddef.h>
+#include <string.h>
+
+#include "type_t.h"
+#include "tpop_t.h"
+#include "irprog_t.h"
+#include "typegmod.h"
+#include "array.h"
+#include "irprog_t.h"
+#include "mangle.h"
 #include "pset.h"
+#include "irtools.h"
 
 /* The hash set for types. */
 static pset *type_table = NULL;
 
+/* hash and compare types */
+static hash_types_func_t    *hash_types_func;
+static compare_types_func_t *compare_types_func;
 
 int compare_names (const void *tp1, const void *tp2) {
-  type *t1 = (type *) tp1;
-  type *t2 = (type *) tp2;
+  ir_type *t1 = (ir_type *) tp1;
+  ir_type *t2 = (ir_type *) tp2;
 
   return (t1 != t2 &&
 	  (t1->type_op !=  t2->type_op ||
 	   t1->name    !=  t2->name      )  );
 }
 
-
 /* stuff for comparing two types. */
-//int compare_strict (type *tp1, type *tp2) {
 int compare_strict (const void *tp1, const void *tp2) {
-  type *t1 = (type *) tp1;
-  type *t2 = (type *) tp2;
+  ir_type *t1 = (ir_type *) tp1;
+  ir_type *t2 = (ir_type *) tp2;
   return t1 != t2;
 }
 
-compare_types_func_tp compare_types_func = compare_strict;
-
 /* stuff to compute a hash value for a type. */
-int hash_name (type *tp) {
-  unsigned h = (unsigned)tp->type_op;
-  h = 9*h + (unsigned)tp->name;
+int firm_hash_name (ir_type *tp) {
+  unsigned h = (unsigned)PTR_TO_INT(tp->type_op);
+  h = 9*h + (unsigned)PTR_TO_INT(tp->name);
   return h;
 }
 
-hash_types_func_tp hash_types_func = hash_name;
-
-
 /* The function that hashes a type. */
-type *mature_type(type *tp) {
-  type *o;
+ir_type *mature_type(ir_type *tp) {
+  ir_type *o;
 
   assert(type_table);
 
@@ -88,8 +85,8 @@ type *mature_type(type *tp) {
 
 
 /* The function that hashes a type. */
-type *mature_type_free(type *tp) {
-  type *o;
+ir_type *mature_type_free(ir_type *tp) {
+  ir_type *o;
 
   assert(type_table);
 
@@ -104,8 +101,8 @@ type *mature_type_free(type *tp) {
 }
 
 /* The function that hashes a type. */
-type *mature_type_free_entities(type *tp) {
-  type *o;
+ir_type *mature_type_free_entities(ir_type *tp) {
+  ir_type *o;
 
   assert(type_table);
 
@@ -119,9 +116,10 @@ type *mature_type_free_entities(type *tp) {
   return o;
 }
 
-void init_type_identify(void) {
-  //type_table = new_pset ((int (const void *, const void *))compare_types_func, 8);
+/* initialize this module */
+void init_type_identify(type_identify_if_t *ti_if) {
+  compare_types_func = ti_if && ti_if->cmp  ? ti_if->cmp  : compare_strict;
+  hash_types_func    = ti_if && ti_if->hash ? ti_if->hash : firm_hash_name;
 
   type_table = new_pset (compare_types_func, 8);
-  //type_table = new_pset (compare_names, 8);
 }