X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=mangle.c;h=2ac228714e1aa624352f23c2bec98c9254eed4fc;hb=a012c52db2829f908f0f03e85be1a2dfb62149fb;hp=636159fc93ea16d4d45771263eddcea18e5cdccb;hpb=fa077741f6264f062b87f6dbe4d0627e0a969a56;p=cparser

diff --git a/mangle.c b/mangle.c
index 636159f..2ac2287 100644
--- a/mangle.c
+++ b/mangle.c
@@ -38,7 +38,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';
@@ -150,13 +149,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,22 +205,16 @@ 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_INVALID:
-		panic("invalid type encountered while mangling");
 	case TYPE_ERROR:
 		panic("error type encountered while mangling");
-	case TYPE_BUILTIN:
 	case TYPE_TYPEDEF:
 	case TYPE_TYPEOF:
 		panic("typeref not resolved while manging?!?");
-
-	case TYPE_BITFIELD:
-		panic("no mangling for this type implemented yet");
 	}
 	panic("invalid type encountered while mangling");
 }
@@ -297,9 +290,6 @@ ident *create_name_win32(entity_t *entity)
 		}
 
 		switch (type->function.linkage) {
-		case LINKAGE_INVALID:
-			panic("linkage type of function is invalid");
-
 		case LINKAGE_C:
 			obstack_printf(o, "%s", entity->base.symbol->string);
 			break;
@@ -344,26 +334,24 @@ ident *create_name_win32(entity_t *entity)
  */
 ident *create_name_linux_elf(entity_t *entity)
 {
-	bool needs_mangling = false;
+	const char *name = entity->base.symbol->string;
 
 	if (entity->kind == ENTITY_FUNCTION) {
 		type_t *type = skip_typeref(entity->declaration.type);
 		assert(is_type_function(type));
 		switch (type->function.linkage) {
-			case LINKAGE_INVALID:
-				panic("linkage type of function is invalid");
-
-			case LINKAGE_C:   break;
-			case LINKAGE_CXX: needs_mangling = true; break;
+			case LINKAGE_C:
+				if (entity->function.actual_name != NULL)
+					name = entity->function.actual_name->string;
+				break;
+			case LINKAGE_CXX:
+				// TODO What about __REDIRECT/actual_name with mangling?
+				mangle_entity(entity);
+				return make_id_from_obst();
 		}
 	}
 
-	if (needs_mangling) {
-		mangle_entity(entity);
-		return make_id_from_obst();
-	}
-
-	return new_id_from_str(entity->base.symbol->string);
+	return new_id_from_str(name);
 }
 
 /**
@@ -377,8 +365,13 @@ ident *create_name_macho(entity_t *entity)
 	if (entity->kind == ENTITY_FUNCTION) {
 		type_t *type = skip_typeref(entity->declaration.type);
 		assert(is_type_function(type));
-		if (type->function.linkage == LINKAGE_INVALID)
-			panic("linkage type of function is invalid");
+
+		switch (type->function.linkage) {
+			default:
+				if (entity->function.actual_name != NULL)
+					return new_id_from_str(entity->function.actual_name->string);
+				break;
+		}
 	}
 
 	obstack_printf(&obst, "_%s", entity->base.symbol->string);