X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=mangle.c;h=eac5d04b89c0aee8acc56743e73708e73db4b9ec;hb=75655e2cb65edb7a4d8e6b112f6182db9d1c1483;hp=a845a6a5d865392f4a56a9e4748265aa0e53a290;hpb=59c4fe3ce552b61c7a1480585b8fb07003586ad6;p=cparser

diff --git a/mangle.c b/mangle.c
index a845a6a..eac5d04 100644
--- a/mangle.c
+++ b/mangle.c
@@ -31,11 +31,7 @@
 #include "lang_features.h"
 #include "adt/error.h"
 
-static ident          *id_underscore;
-static ident          *id_imp;
-static symbol_t       *sym_C;
-static symbol_t       *sym_stdcall;
-static struct obstack  obst;
+static struct obstack obst;
 
 static void mangle_type(type_t *type);
 
@@ -77,18 +73,22 @@ static void mangle_pointer_type(const pointer_type_t *type)
 static void mangle_function_type(const function_type_t *type)
 {
 	obstack_1grow(&obst, 'F');
-	if (type->linkage == sym_C) {
+	if (type->linkage == LINKAGE_C) {
 		obstack_1grow(&obst, 'Y');
 	}
 
 	mangle_type(type->return_type);
 
 	function_parameter_t *parameter = type->parameters;
-	for ( ; parameter != NULL; parameter = parameter->next) {
-		mangle_type(parameter->type);
-	}
-	if (type->variadic) {
-		obstack_1grow(&obst, 'z');
+	if (parameter != NULL) {
+		for ( ; parameter != NULL; parameter = parameter->next) {
+			mangle_type(parameter->type);
+		}
+		if (type->variadic) {
+			obstack_1grow(&obst, 'z');
+		}
+	} else {
+		obstack_1grow(&obst, 'v');
 	}
 	if (type->unspecified_parameters)
 		panic("can't mangle unspecified parameter types");
@@ -100,12 +100,12 @@ static void mangle_function_type(const function_type_t *type)
 
 static void mangle_qualifiers(type_qualifiers_t qualifiers)
 {
-	if (qualifiers & TYPE_QUALIFIER_CONST)
-		obstack_1grow(&obst, 'K');
-	if (qualifiers & TYPE_QUALIFIER_VOLATILE)
-		obstack_1grow(&obst, 'V');
 	if (qualifiers & TYPE_QUALIFIER_RESTRICT)
 		obstack_1grow(&obst, 'r');
+	if (qualifiers & TYPE_QUALIFIER_VOLATILE)
+		obstack_1grow(&obst, 'V');
+	if (qualifiers & TYPE_QUALIFIER_CONST)
+		obstack_1grow(&obst, 'K');
 
 	/* handle MS extended qualifiers? */
 }
@@ -148,6 +148,29 @@ static void mangle_type(type_t *orig_type)
 	panic("invalid type encountered while mangling");
 }
 
+static void mangle_entity(entity_t *entity)
+{
+	obstack_1grow(&obst, '_');
+	obstack_1grow(&obst, 'Z');
+
+	/* TODO: mangle scope */
+
+	symbol_t *symbol = entity->base.symbol;
+	obstack_printf(&obst, "%u%s", strlen(symbol->string), symbol->string);
+
+	if (entity->kind == ENTITY_FUNCTION) {
+		mangle_type(entity->declaration.type);
+	}
+}
+
+static ident *make_id_from_obst(void)
+{
+	size_t  size = obstack_object_size(&obst);
+	char   *str  = obstack_finish(&obst);
+	ident  *id   = new_id_from_chars(str, size);
+	obstack_free(&obst, str);
+	return id;
+}
 
 /**
  * Mangles an entity linker (ld) name for win32 usage.
@@ -157,48 +180,65 @@ static void mangle_type(type_t *orig_type)
  */
 ident *create_name_win32(entity_t *entity)
 {
-	ident *id = new_id_from_str(entity->base.symbol->string);
-
-	if (entity->kind == ENTITY_FUNCTION) {
-		if (entity->declaration.type->function.linkage == sym_stdcall) {
-			char     buf[16];
-			ir_type *irtype = get_ir_type(entity->declaration.type);
-			size_t   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));
-			}
-
-			snprintf(buf, sizeof(buf), "@%d", size);
-			return id_mangle3("_", id, buf);
-		}
-	} else {
-		/* always add an underscore in win32 */
-		id = id_mangle(id_underscore, id);
-	}
+	struct obstack *o = &obst;
 
 	assert(is_declaration(entity));
-	decl_modifiers_t decl_modifiers = entity->declaration.modifiers;
-	if (decl_modifiers & DM_DLLIMPORT) {
+
+	if (entity->declaration.modifiers & DM_DLLIMPORT) {
 		/* add prefix for imported symbols */
-		id = id_mangle(id_imp, id);
+		obstack_printf(o, "__imp_");
 	}
-	return id;
-}
 
-static void mangle_entity(entity_t *entity)
-{
-	assert(obstack_object_size(&obst) == 0);
-	obstack_1grow(&obst, '_');
-	obstack_1grow(&obst, 'Z');
+	if (entity->kind == ENTITY_FUNCTION) {
+		cc_kind_t cc = entity->declaration.type->function.calling_convention;
+
+		/* calling convention prefix */
+		switch (cc) {
+			case CC_DEFAULT:
+			case CC_CDECL:
+			case CC_STDCALL:  obstack_1grow(o, '_'); break;
+			case CC_FASTCALL: obstack_1grow(o, '@'); break;
+			default:          panic("unhandled calling convention");
+		}
 
-	/* TODO: mangle scope */
+		switch (entity->declaration.type->function.linkage) {
+			case LINKAGE_INVALID:
+				break;
 
-	symbol_t *symbol = entity->base.symbol;
-	obstack_printf(&obst, "%u%s", strlen(symbol->string), symbol->string);
+			case LINKAGE_C:
+				obstack_printf(o, "%s", entity->base.symbol->string);
+				break;
 
-	if (entity->kind == ENTITY_FUNCTION) {
-		mangle_type(entity->declaration.type);
+			case LINKAGE_CXX:
+				mangle_entity(entity);
+				break;
+		}
+
+		/* calling convention suffix */
+		switch (cc) {
+			case CC_DEFAULT:
+			case CC_CDECL:
+				break;
+
+			case CC_STDCALL:
+			case CC_FASTCALL: {
+				ir_type *irtype = get_ir_type(entity->declaration.type);
+				size_t   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));
+				}
+				obstack_printf(o, "@%zu\n", size);
+				break;
+			}
+
+			default:
+				panic("unhandled calling convention");
+		}
+	} else {
+		obstack_printf(o, "_%s", entity->base.symbol->string);
 	}
+
+	return make_id_from_obst();
 }
 
 /**
@@ -211,26 +251,17 @@ ident *create_name_linux_elf(entity_t *entity)
 {
 	bool needs_mangling = false;
 
-	if (entity->kind == ENTITY_FUNCTION && (c_mode & _CXX)) {
-		symbol_t *linkage = entity->declaration.type->function.linkage;
-
-		if (linkage == NULL) {
-			needs_mangling = true;
-		} else if (linkage != sym_C) {
-			errorf(&entity->base.source_position,
-			       "Unknown linkage type \"%Y\" found\n", linkage);
+	if (entity->kind == ENTITY_FUNCTION) {
+		switch (entity->declaration.type->function.linkage) {
+			case LINKAGE_INVALID: break;
+			case LINKAGE_C:       break;
+			case LINKAGE_CXX:     needs_mangling = true; break;
 		}
 	}
 
 	if (needs_mangling) {
 		mangle_entity(entity);
-		obstack_1grow(&obst, '\0');
-		char *str = obstack_finish(&obst);
-
-		ident *id = new_id_from_str(str);
-		obstack_free(&obst, str);
-
-		return id;
+		return make_id_from_obst();
 	}
 
 	return new_id_from_str(entity->base.symbol->string);
@@ -244,17 +275,12 @@ ident *create_name_linux_elf(entity_t *entity)
  */
 ident *create_name_macho(entity_t *entity)
 {
-	ident *id = new_id_from_str(entity->base.symbol->string);
-	return id_mangle(id_underscore, id);
+	obstack_printf(&obst, "_%s", entity->base.symbol->string);
+	return make_id_from_obst();
 }
 
 void init_mangle(void)
 {
-	id_underscore = new_id_from_chars("_", 1);
-	id_imp        = new_id_from_chars("__imp_", 6);
-	sym_C         = symbol_table_insert("C");
-	sym_stdcall   = symbol_table_insert("stdcall");
-
 	obstack_init(&obst);
 }