X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=mangle.c;h=fb02128081361579fae097fbed487eb4b5ed21eb;hb=ef3b0164cbb6c9d616c3fdad92fb8da669e4b5d7;hp=780cb90742f02f187b9cecf12e60eaca27c2e0db;hpb=864a15484c0e50d85507b17ee17fc49571fae66a;p=cparser

diff --git a/mangle.c b/mangle.c
index 780cb90..fb02128 100644
--- a/mangle.c
+++ b/mangle.c
@@ -1,33 +1,17 @@
 /*
  * This file is part of cparser.
- * Copyright (C) 2007-2009 Matthias Braun <matze@braunis.de>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Copyright (C) 2012 Matthias Braun <matze@braunis.de>
  */
 #include <config.h>
 
 #include <libfirm/firm.h>
 #include <string.h>
 
+#include "adt/obst.h"
 #include "entity_t.h"
 #include "type_t.h"
 #include "symbol_t.h"
 #include "mangle.h"
-#include "diagnostic.h"
-#include "ast2firm.h"
 #include "lang_features.h"
 #include "adt/error.h"
 
@@ -38,7 +22,6 @@ static void mangle_type(type_t *type);
 static char get_atomic_type_mangle(atomic_type_kind_t kind)
 {
 	switch (kind) {
-	case ATOMIC_TYPE_INVALID:     break;
 	case ATOMIC_TYPE_VOID:        return 'v';
 	case ATOMIC_TYPE_WCHAR_T:     return 'w';
 	case ATOMIC_TYPE_BOOL:        return 'b';
@@ -57,7 +40,7 @@ static char get_atomic_type_mangle(atomic_type_kind_t kind)
 	case ATOMIC_TYPE_FLOAT:       return 'f';
 	case ATOMIC_TYPE_DOUBLE:      return 'd';
 	}
-	panic("invalid atomic type in mangler");
+	panic("invalid atomic type");
 }
 
 static void mangle_atomic_type(const atomic_type_t *type)
@@ -150,13 +133,13 @@ static void mangle_array_type(const array_type_t *type)
 	mangle_type(type->element_type);
 }
 
-static void mangle_complex_type(const complex_type_t *type)
+static void mangle_complex_type(const atomic_type_t *type)
 {
 	obstack_1grow(&obst, 'C');
 	obstack_1grow(&obst, get_atomic_type_mangle(type->akind));
 }
 
-static void mangle_imaginary_type(const imaginary_type_t *type)
+static void mangle_imaginary_type(const atomic_type_t *type)
 {
 	obstack_1grow(&obst, 'G');
 	obstack_1grow(&obst, get_atomic_type_mangle(type->akind));
@@ -206,10 +189,10 @@ static void mangle_type(type_t *orig_type)
 		mangle_array_type(&type->array);
 		return;
 	case TYPE_COMPLEX:
-		mangle_complex_type(&type->complex);
+		mangle_complex_type(&type->atomic);
 		return;
 	case TYPE_IMAGINARY:
-		mangle_imaginary_type(&type->imaginary);
+		mangle_imaginary_type(&type->atomic);
 		return;
 	case TYPE_ERROR:
 		panic("error type encountered while mangling");
@@ -308,10 +291,9 @@ ident *create_name_win32(entity_t *entity)
 
 		case CC_STDCALL:
 		case CC_FASTCALL: {
-			ir_type  *irtype = get_ir_type(entity->declaration.type);
-			unsigned size    = 0;
-			for (int i = get_method_n_params(irtype) - 1; i >= 0; --i) {
-				size += get_type_size_bytes(get_method_param_type(irtype, i));
+			unsigned size = 0;
+			for (function_parameter_t const* i = type->function.parameters; i; i = i->next) {
+				size += get_type_size(i->type);
 			}
 			obstack_printf(o, "@%u", size);
 			break;