decorate_win32_c_fkt() now gets the initial id as a parameter instead reading...

decorate_win32_c_fkt() now gets the initial id as a parameter instead reading it from the entity itself.
This simplifies some Java-frontend code.

[r13444]

ir/tr/mangle.c

@@ -3,10 +3,10 @@
  * File name:   ir/tr/mangle.c
  * Purpose:     Methods to manipulate names.
  * Author:      Martin Trapp, Christian Schaefer
- * Modified by: Goetz Lindenmaier
+ * Modified by: Goetz Lindenmaier, Michael Beck
  * Created:
  * CVS-ID:      $Id$
- * Copyright:   (c) 1998-2003 Universitt Karlsruhe
+ * Copyright:   (c) 1998-2007 Universitt Karlsruhe
  * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
  */
 #ifdef HAVE_CONFIG_H
@@ -25,122 +25,115 @@
 #include "type_t.h"
 #include "tpop_t.h"
 
-/** a obstack used for temporary space */
+/** An obstack used for temporary space */
 static struct obstack mangle_obst;
 
 /** returned a mangled type name, currently no mangling */
-static INLINE ident *
-mangle_type (ir_type *tp)
-{
-  assert (tp->kind == k_type);
-  return tp->name;
+static INLINE ident *mangle_type(ir_type *tp) {
+	assert(tp->kind == k_type);
+	return tp->name;
 }
 
-ident *
-mangle_entity (ir_entity *ent)
-{
-  ident *type_id;
-  char *cp;
-  int len;
-  ident *res;
-
-  type_id = mangle_type(ent->owner);
-  obstack_grow(&mangle_obst, get_id_str(type_id), get_id_strlen(type_id));
-  obstack_1grow(&mangle_obst,'_');
-  obstack_grow(&mangle_obst,get_id_str(ent->name),get_id_strlen(ent->name));
-  len = obstack_object_size (&mangle_obst);
-  cp = obstack_finish (&mangle_obst);
-  res = new_id_from_chars(cp, len);
-  obstack_free (&mangle_obst, cp);
-  return res;
+ident *mangle_entity(ir_entity *ent) {
+	ident *type_id;
+	char *cp;
+	int len;
+	ident *res;
+
+	type_id = mangle_type(ent->owner);
+	obstack_grow(&mangle_obst, get_id_str(type_id), get_id_strlen(type_id));
+	obstack_1grow(&mangle_obst,'_');
+	obstack_grow(&mangle_obst,get_id_str(ent->name),get_id_strlen(ent->name));
+	len = obstack_object_size (&mangle_obst);
+	cp = obstack_finish (&mangle_obst);
+	res = new_id_from_chars(cp, len);
+	obstack_free (&mangle_obst, cp);
+	return res;
 }
 
 
 /* Returns a new ident that represents 'firstscnd'. */
-ident *mangle (ident *first, ident *scnd) {
-  char *cp;
-  int len;
-  ident *res;
-
-  obstack_grow(&mangle_obst, get_id_str(first), get_id_strlen(first));
-  obstack_grow(&mangle_obst, get_id_str(scnd), get_id_strlen(scnd));
-  len = obstack_object_size (&mangle_obst);
-  cp = obstack_finish (&mangle_obst);
-  res = new_id_from_chars (cp, len);
-  obstack_free (&mangle_obst, cp);
-  return res;
+ident *mangle(ident *first, ident *scnd) {
+	char *cp;
+	int len;
+	ident *res;
+
+	obstack_grow(&mangle_obst, get_id_str(first), get_id_strlen(first));
+	obstack_grow(&mangle_obst, get_id_str(scnd), get_id_strlen(scnd));
+	len = obstack_object_size (&mangle_obst);
+	cp = obstack_finish (&mangle_obst);
+	res = new_id_from_chars (cp, len);
+	obstack_free (&mangle_obst, cp);
+	return res;
 }
 
 /** Returns a new ident that represents 'prefixscndsuffix'. */
 static ident *mangle3(const char *prefix, ident *scnd, const char *suffix) {
-  char *cp;
-  int len;
-  ident *res;
-
-  obstack_grow(&mangle_obst, prefix, strlen(prefix));
-  obstack_grow(&mangle_obst, get_id_str(scnd), get_id_strlen(scnd));
-  obstack_grow(&mangle_obst, suffix, strlen(suffix));
-  len = obstack_object_size (&mangle_obst);
-  cp  = obstack_finish (&mangle_obst);
-  res = new_id_from_chars (cp, len);
-  obstack_free (&mangle_obst, cp);
-  return res;
+	char *cp;
+	int len;
+	ident *res;
+
+	obstack_grow(&mangle_obst, prefix, strlen(prefix));
+	obstack_grow(&mangle_obst, get_id_str(scnd), get_id_strlen(scnd));
+	obstack_grow(&mangle_obst, suffix, strlen(suffix));
+	len = obstack_object_size (&mangle_obst);
+	cp  = obstack_finish (&mangle_obst);
+	res = new_id_from_chars (cp, len);
+	obstack_free (&mangle_obst, cp);
+	return res;
 }
 
 /** 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, c);
-  obstack_grow(&mangle_obst,get_id_str(scnd),get_id_strlen(scnd));
-  len = obstack_object_size (&mangle_obst);
-  cp = obstack_finish (&mangle_obst);
-  res = new_id_from_chars (cp, len);
-  obstack_free (&mangle_obst, cp);
-  return res;
+	char *cp;
+	int len;
+	ident *res;
+
+	obstack_grow(&mangle_obst, get_id_str(first), get_id_strlen(first));
+	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);
+	res = new_id_from_chars (cp, len);
+	obstack_free (&mangle_obst, cp);
+	return res;
 }
 
 /* Returns a new ident that represents first_scnd. */
-ident *mangle_u (ident *first, ident* scnd) {
-  return mangle_3(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);
+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(ir_entity *ent) {
-  ir_type *tp      = get_entity_type(ent);
-  unsigned cc_mask = get_method_calling_convention(tp);
-  char buf[16];
-  int size, i;
-
-  if (IS_CDECL(cc_mask))
-    return mangle3("_", get_entity_ident(ent), "");
-  else if (IS_STDCALL(cc_mask)) {
-
-    size = 0;
-    for (i = get_method_n_params(tp) - 1; i >= 0; --i) {
-      size += get_type_size_bytes(get_method_param_type(tp, i));
-    }
-
-    snprintf(buf, sizeof(buf), "@%d", size);
-
-    if (cc_mask & cc_reg_param)
-      return mangle3("@", get_entity_ident(ent), buf);
-    else
-      return mangle3("_", get_entity_ident(ent), buf);
-  }
-  return get_entity_ident(ent);
+ident *decorate_win32_c_fkt(ir_entity *ent, ident *id) {
+	ir_type *tp      = get_entity_type(ent);
+	unsigned cc_mask = get_method_calling_convention(tp);
+	char buf[16];
+	int size, i;
+
+	if (IS_CDECL(cc_mask))
+		return mangle3("_", id, "");
+	else if (IS_STDCALL(cc_mask)) {
+		size = 0;
+		for (i = get_method_n_params(tp) - 1; i >= 0; --i) {
+			size += get_type_size_bytes(get_method_param_type(tp, i));
+		}
+
+		snprintf(buf, sizeof(buf), "@%d", size);
+
+		if (cc_mask & cc_reg_param)
+			return mangle3("@", id, buf);
+		else
+			return mangle3("_", id, buf);
+	}
+	return id;
 }
 
-void
-firm_init_mangle (void)
-{
-  obstack_init(&mangle_obst);
+void firm_init_mangle(void) {
+	obstack_init(&mangle_obst);
 }

ir/tr/mangle.h

@@ -42,6 +42,6 @@ ident *mangle_dot (ident *first, ident* scnd);
 ident *mangle   (ident *first, ident* scnd);
 
 /** returns a mangled name for a Win32 function using it's calling convention */
-ident *decorate_win32_c_fkt(ir_entity *ent);
+ident *decorate_win32_c_fkt(ir_entity *ent, ident *id);
 
 #endif /* _MANGLE_H_ */