used ir_type instead of type

[libfirm] / ir / tr / mangle.c

diff --git a/ir/tr/mangle.c b/ir/tr/mangle.c
index 9cd6ad7..8873c79 100644 (file)
--- a/ir/tr/mangle.c
+++ b/ir/tr/mangle.c
@@ -13,20 +13,24 @@
 # include "config.h"
 #endif
 
-# include "mangle.h"
-# include "obst.h"
+#ifdef HAVE_STDIO_H
+# include <stdio.h>
+#endif
+
+#include "mangle.h"
+#include "obst.h"
 
 /* Make types visible to allow most efficient access */
-# include "entity_t.h"
-# include "type_t.h"
-# include "tpop_t.h"
+#include "entity_t.h"
+#include "type_t.h"
+#include "tpop_t.h"
 
 /** a obstack used for temporary space */
 static struct obstack mangle_obst;
 
 /** returned a mangled type name, currently no mangling */
 static INLINE ident *
-mangle_type (type *tp)
+mangle_type (ir_type *tp)
 {
   assert (tp->kind == k_type);
   return tp->name;
@@ -67,7 +71,7 @@ ident *mangle (ident *first, ident *scnd) {
   return res;
 }
 
-/* Returns a new ident that represents 'prefixscndsuffix'. */
+/** Returns a new ident that represents 'prefixscndsuffix'. */
 static ident *mangle3(const char *prefix, ident *scnd, const char *suffix) {
   char *cp;
   int len;
@@ -83,14 +87,14 @@ static ident *mangle3(const char *prefix, ident *scnd, const char *suffix) {
   return res;
 }
 
-/* Returns a new ident that represents first_scnd. */
-ident *mangle_u (ident *first, ident* scnd) {
+/** Returns a new ident that represents first<c>scnd. */
+static ident *mangle_3(ident *first, char c, ident* scnd) {
   char *cp;
   int len;
   ident *res;
 
   obstack_grow(&mangle_obst, get_id_str(first), get_id_strlen(first));
-  obstack_1grow(&mangle_obst,'_');
+  obstack_1grow(&mangle_obst, c);
   obstack_grow(&mangle_obst,get_id_str(scnd),get_id_strlen(scnd));
   len = obstack_object_size (&mangle_obst);
   cp = obstack_finish (&mangle_obst);
@@ -99,10 +103,20 @@ ident *mangle_u (ident *first, ident* scnd) {
   return res;
 }
 
+/* Returns a new ident that represents first_scnd. */
+ident *mangle_u (ident *first, ident* scnd) {
+  return mangle_3(first, '_', scnd);
+}
+
+/* Returns a new ident that represents first.scnd. */
+ident *mangle_dot (ident *first, ident* scnd) {
+  return mangle_3(first, '.', scnd);
+}
+
 /* returns a mangled name for a Win32 function using it's calling convention */
 ident *decorate_win32_c_fkt(entity *ent) {
-  type *tp         = get_entity_type(ent);
-  unsigned cc_mask = get_entity_calling_convention(ent);
+  ir_type *tp      = get_entity_type(ent);
+  unsigned cc_mask = get_method_calling_convention(tp);
   char buf[16];
   int size, i;
 
@@ -117,7 +131,7 @@ ident *decorate_win32_c_fkt(entity *ent) {
 
     snprintf(buf, sizeof(buf), "@%d", size);
 
-    if (cc_mask & irg_cc_reg_param)
+    if (cc_mask & cc_reg_param)
       return mangle3("@", get_entity_ident(ent), buf);
     else
       return mangle3("_", get_entity_ident(ent), buf);