X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbestabs.c;h=cc68b6741cced10aa1d8194c17e5e8ce915d2861;hb=2176caea24ef5a9786dc4ada2bd2eaf74ad88b4d;hp=f08586a350556d397f802daaf41eef1cbd20105b;hpb=b485ffb7624e476b0dc33124b9af6986510a5c8e;p=libfirm

diff --git a/ir/be/bestabs.c b/ir/be/bestabs.c
index f08586a35..cc68b6741 100644
--- a/ir/be/bestabs.c
+++ b/ir/be/bestabs.c
@@ -120,7 +120,7 @@ typedef struct stabs_handle {
 	unsigned                next_type_nr; /**< next type number */
 	pmap                    *type_map;    /**< a map from type to type number */
 	const char              *main_file;   /**< name of the main source file */
-	const char              *curr_file;   /**< name of teh current source file */
+	const char              *curr_file;   /**< name of the current source file */
 } stabs_handle;
 
 /**
@@ -144,6 +144,13 @@ static unsigned get_type_number(stabs_handle *h, ir_type *tp) {
 	return num;
 }  /* get_type_number */
 
+/**
+ * Map a given Type to void by assigned the type number 0.
+ */
+static void map_to_void(stabs_handle *h, ir_type *tp) {
+	pmap_insert(h->type_map, tp, INT_TO_PTR(0));
+}
+
 /**
  * generate the void type.
  */
@@ -181,15 +188,15 @@ typedef struct walker_env {
  * @param h    the stabs handle
  * @param tp   the type
  */
-static void gen_primitive_type(stabs_handle *h, ir_type *tp)
-{
+static void gen_primitive_type(stabs_handle *h, ir_type *tp) {
 	ir_mode *mode = get_type_mode(tp);
 	unsigned type_num;
 
 	SET_TYPE_READY(tp);
 	if (mode == mode_T) {
-    /* jack and FirmJC compiler use mode_T for the void type.
+		/* firmcc, jack and the FirmJC compiler use mode_T for the void type.
 		Ignore it here as it's name is remapped to "void". */
+		map_to_void(h, tp);
 		return;
 	}  /* if */
 
@@ -235,6 +242,17 @@ static void gen_enum_type(stabs_handle *h, ir_type *tp) {
 	fprintf(h->f, ";\",%d,0,0,0\n", N_LSYM);
 }  /* gen_enum_type */
 
+/**
+ * print a pointer type
+ */
+void print_pointer_type(stabs_handle *h, ir_type *tp, int local) {
+	unsigned     type_num = local ? h->next_type_nr++ : get_type_number(h, tp);
+	ir_type      *el_tp   = get_pointer_points_to_type(tp);
+	unsigned     el_num   = get_type_number(h, el_tp);
+
+	fprintf(h->f, "%u=*%u", type_num, el_num);
+}
+
 /**
  * Generates a pointer type
  *
@@ -243,17 +261,69 @@ static void gen_enum_type(stabs_handle *h, ir_type *tp) {
  */
 static void gen_pointer_type(wenv_t *env, ir_type *tp) {
 	stabs_handle *h       = env->h;
-	unsigned     type_num = get_type_number(h, tp);
 	ir_type      *el_tp   = get_pointer_points_to_type(tp);
-	unsigned     el_num   = get_type_number(h, el_tp);
 
 	SET_TYPE_READY(tp);
 	if (! IS_TYPE_READY(el_tp))
 		waitq_put(env->wq, el_tp);
-	fprintf(h->f, "\t.stabs\t\"%s:t%u=*%u\",%d,0,0,0\n",
-		get_type_name(tp), type_num, el_num, N_LSYM);
+
+	fprintf(h->f, "\t.stabs\t\"%s:t", get_type_name(tp));
+	print_pointer_type(h, tp, 0);
+	fprintf(h->f, "\",%d,0,0,0\n", N_LSYM);
 }  /* gen_pointer_type */
 
+/**
+ * print an array type
+ */
+static void print_array_type(stabs_handle *h, ir_type *tp, int local) {
+	ir_type      *etp     = get_array_element_type(tp);
+	int          i, n     = get_array_n_dimensions(tp);
+	unsigned     type_num = local ? h->next_type_nr++ : get_type_number(h, tp);
+	int          *perm;
+
+	fprintf(h->f, "%u=a", type_num);
+	NEW_ARR_A(int, perm, n);
+	for (i = 0; i < n; ++i) {
+		perm[i] = get_array_order(tp, i);
+	}
+
+	for (i = 0; i < n; ++i) {
+		int dim = perm[i];
+
+		if (is_Const(get_array_lower_bound(tp, dim)) && is_Const(get_array_upper_bound(tp, dim))) {
+			long min = get_array_lower_bound_int(tp, dim);
+			long max = get_array_upper_bound_int(tp, dim);
+
+			/* FIXME r1 must be integer type, but seems to work for now */
+			fprintf(h->f, "r1;%ld;%ld;", min, max-1);
+		}
+	}
+
+	type_num = get_type_number(h, etp);
+	fprintf(h->f, "%d", type_num);
+}
+
+/**
+ * Generates an array type
+ *
+ * @param env  the walker environment
+ * @param tp   the type
+ */
+static void gen_array_type(wenv_t *env, ir_type *tp) {
+	stabs_handle *h   = env->h;
+	ir_type      *etp = get_array_element_type(tp);
+
+	SET_TYPE_READY(tp);
+	if (! IS_TYPE_READY(etp))
+		waitq_put(env->wq, etp);
+
+	fprintf(h->f, "\t.stabs\t\"%s:t", get_type_name(tp));
+
+	print_array_type(h, tp, 0);
+
+	fprintf(h->f, "\",%d,0,0,0\n", N_LSYM);
+}  /* gen_array_type */
+
 /**
  * Generates a struct/union type
  *
@@ -306,55 +376,27 @@ static void gen_struct_union_type(wenv_t *env, ir_type *tp) {
 			}
 		} else {
 			/* no bitfield */
-			type_num = get_type_number(h, mtp);
-			size = get_type_size_bits(mtp);
+			fprintf(h->f, "%s:", get_entity_name(ent));
 
-			/* name:type, bit offset from the start of the struct', number of bits in the element. */
-			fprintf(h->f, "%s:%u,%d,%d;", get_entity_name(ent), type_num, ofs, size);
+			if (is_Array_type(mtp)) {
+				/* use a local array definition */
+				print_array_type(h, mtp, 1);
+			} else if (is_Pointer_type(mtp)) {
+				/* use local pointer definition */
+				print_pointer_type(h, mtp, 1);
+			} else {
+				type_num = get_type_number(h, mtp);
+
+				/* name:type, bit offset from the start of the struct', number of bits in the element. */
+				fprintf(h->f, "%u", type_num);
+			}
+			size = get_type_size_bits(mtp);
+			fprintf(h->f, ",%d,%d;", ofs * 8, size);
 		}
 	}
 	fprintf(h->f, ";\",%d,0,0,0\n", N_LSYM);
 }  /* gen_struct_type */
 
-/**
- * Generates an array type
- *
- * @param env  the walker environment
- * @param tp   the type
- */
-static void gen_array_type(wenv_t *env, ir_type *tp) {
-	stabs_handle *h       = env->h;
-	unsigned     type_num = get_type_number(h, tp);
-	int          i, n = get_array_n_dimensions(tp);
-	ir_type      *etp = get_array_element_type(tp);
-	int          *perm;
-
-	SET_TYPE_READY(tp);
-	if (! IS_TYPE_READY(etp))
-		waitq_put(env->wq, etp);
-
-	NEW_ARR_A(int, perm, n);
-	for (i = 0; i < n; ++i) {
-		perm[i] = get_array_order(tp, i);
-	}
-	fprintf(h->f, "\t.stabs\t\"%s:t%u=a", get_type_name(tp), type_num);
-
-	for (i = 0; i < n; ++i) {
-		int dim = perm[i];
-
-		if (is_Const(get_array_lower_bound(tp, dim)) && is_Const(get_array_upper_bound(tp, dim))) {
-			long min = get_array_lower_bound_int(tp, dim);
-			long max = get_array_upper_bound_int(tp, dim);
-
-			/* FIXME r1 must be integer type, but seems to work for now */
-			fprintf(h->f, "r1;%ld;%ld;", min, max-1);
-		}
-	}
-
-	type_num = get_type_number(h, etp);
-	fprintf(h->f, "%d\",%d,0,0,0\n", type_num, N_LSYM);
-}  /* gen_array_type */
-
 /**
  * Generates a method type
  *
@@ -604,7 +646,21 @@ static void stabs_method_begin(dbg_handle *handle, ir_entity *ent, const be_stac
 		if (stack_ent) {
 			ofs = get_entity_offset(stack_ent) + between_size;
 		}
-		fprintf(h->f, "\t.stabs\t\"%s:p%u\",%d,0,0,%d\n", name, type_num, N_PSYM, ofs);
+		fprintf(h->f, "\t.stabs\t\"%s:p", name);
+		if (is_Array_type(ptp)) {
+			/* use a local array definition */
+			print_array_type(h, ptp, 1);
+		} else if (is_Pointer_type(ptp)) {
+			/* use local pointer definition */
+			print_pointer_type(h, ptp, 1);
+		} else {
+			type_num = get_type_number(h, ptp);
+
+			/* name:type, bit offset from the start of the struct', number of bits in the element. */
+			fprintf(h->f, "%u", type_num);
+		}
+
+		fprintf(h->f, "\",%d,0,0,%d\n", N_PSYM, ofs);
 	}
 }  /* stabs_method_begin */