X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=mangle.c;h=f9ebe76d0217b78eb7996c92e813220187e3cbbd;hb=79c6f528c76905104d20dd5e41d1117d713492e1;hp=c09c7737d6ec39e64103b36d4f5f9a0b62fd7fe4;hpb=2b7bb0748f889bb6fe28f046fd69518be36679ab;p=cparser

diff --git a/mangle.c b/mangle.c
index c09c773..f9ebe76 100644
--- a/mangle.c
+++ b/mangle.c
@@ -70,6 +70,12 @@ static void mangle_pointer_type(const pointer_type_t *type)
 	mangle_type(type->points_to);
 }
 
+static void mangle_reference_type(const reference_type_t *type)
+{
+	obstack_1grow(&obst, 'R');
+	mangle_type(type->refers_to);
+}
+
 static void mangle_parameters(const function_type_t *type)
 {
 	if (type->unspecified_parameters)
@@ -103,22 +109,64 @@ static void mangle_function_type(const function_type_t *type)
 	obstack_1grow(&obst, 'E');
 }
 
-static void mangle_class_enum_type(const entity_base_t *ent)
+static void print_name(const char* name)
+{
+	obstack_printf(&obst, "%u%s", (unsigned)strlen(name), name);
+}
+
+static void mangle_class_type(const compound_type_t *type)
+{
+	const symbol_t *sym = type->compound->base.symbol;
+	if (sym == NULL) {
+		if (type->compound->alias == NULL)
+			panic("mangling anonymous type");
+		sym = type->compound->alias->base.symbol;
+	}
+	print_name(sym->string);
+}
+
+static void mangle_enum_type(const enum_type_t *type)
+{
+	const symbol_t *sym = type->enume->base.symbol;
+	if (sym == NULL) {
+		if (type->enume->alias == NULL)
+			panic("mangling anonymous type");
+		sym = type->enume->alias->base.symbol;
+	}
+	print_name(sym->string);
+}
+
+static void mangle_array_type(const array_type_t *type)
 {
-	const symbol_t *sym = ent->symbol;
-	if (sym != NULL) {
-		const char *name = sym->string;
-		obstack_printf(&obst, "%zu%s", strlen(name), name);
+	if (type->is_vla) {
+		obstack_1grow(&obst, 'A');
+		obstack_1grow(&obst, '_');
+	} else if (type->size_constant) {
+		obstack_printf(&obst, "A%u_", (unsigned) type->size);
 	} else {
-		/* TODO need the first typedef name here */
-		panic("mangling of unnamed compound types not implemented yet");
+		panic("mangling of non-constant sized array types not implemented yet");
 	}
+	mangle_type(type->element_type);
+}
+
+static void mangle_complex_type(const complex_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)
+{
+	obstack_1grow(&obst, 'G');
+	obstack_1grow(&obst, get_atomic_type_mangle(type->akind));
 }
 
 static void mangle_qualifiers(type_qualifiers_t qualifiers)
 {
+#if 0 /* Do not mangle restrict qualifiers.  GCC doesn't either */
 	if (qualifiers & TYPE_QUALIFIER_RESTRICT)
 		obstack_1grow(&obst, 'r');
+#endif
 	if (qualifiers & TYPE_QUALIFIER_VOLATILE)
 		obstack_1grow(&obst, 'V');
 	if (qualifiers & TYPE_QUALIFIER_CONST)
@@ -140,15 +188,27 @@ static void mangle_type(type_t *orig_type)
 	case TYPE_POINTER:
 		mangle_pointer_type(&type->pointer);
 		return;
+	case TYPE_REFERENCE:
+		mangle_reference_type(&type->reference);
+		return;
 	case TYPE_FUNCTION:
 		mangle_function_type(&type->function);
 		return;
 	case TYPE_COMPOUND_STRUCT:
 	case TYPE_COMPOUND_UNION:
-		mangle_class_enum_type(&type->compound.compound->base);
+		mangle_class_type(&type->compound);
 		return;
 	case TYPE_ENUM:
-		mangle_class_enum_type(&type->enumt.enume->base);
+		mangle_enum_type(&type->enumt);
+		return;
+	case TYPE_ARRAY:
+		mangle_array_type(&type->array);
+		return;
+	case TYPE_COMPLEX:
+		mangle_complex_type(&type->complex);
+		return;
+	case TYPE_IMAGINARY:
+		mangle_imaginary_type(&type->imaginary);
 		return;
 	case TYPE_INVALID:
 		panic("invalid type encountered while mangling");
@@ -160,9 +220,6 @@ static void mangle_type(type_t *orig_type)
 		panic("typeref not resolved while manging?!?");
 
 	case TYPE_BITFIELD:
-	case TYPE_COMPLEX:
-	case TYPE_IMAGINARY:
-	case TYPE_ARRAY:
 		panic("no mangling for this type implemented yet");
 		break;
 	}
@@ -176,8 +233,7 @@ static void mangle_entity(entity_t *entity)
 
 	/* TODO: mangle scope */
 
-	const char *name = entity->base.symbol->string;
-	obstack_printf(&obst, "%zu%s", strlen(name), name);
+	print_name(entity->base.symbol->string);
 
 	if (entity->kind == ENTITY_FUNCTION) {
 		mangle_parameters(&entity->declaration.type->function);
@@ -243,12 +299,12 @@ ident *create_name_win32(entity_t *entity)
 
 			case CC_STDCALL:
 			case CC_FASTCALL: {
-				ir_type *irtype = get_ir_type(entity->declaration.type);
-				size_t   size   = 0;
+				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));
 				}
-				obstack_printf(o, "@%zu", size);
+				obstack_printf(o, "@%u", size);
 				break;
 			}