X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbestabs.c;h=c21394c6b30c4f9cdbf64f35fa8088349f774efe;hb=0b1140d1887f497ef413709e5cda2608f2cd1017;hp=2c3b0291d4407c73eedc1f82baf0622faa810f42;hpb=6d191fd97e62c526424920192a3bc86a77bc385a;p=libfirm

diff --git a/ir/be/bestabs.c b/ir/be/bestabs.c
index 2c3b0291d..c21394c6b 100644
--- a/ir/be/bestabs.c
+++ b/ir/be/bestabs.c
@@ -41,7 +41,7 @@
 #include "pdeq.h"
 #include "irtools.h"
 #include "obst.h"
-#include "array.h"
+#include "array_t.h"
 #include "be_dbgout_t.h"
 #include "beabi.h"
 #include "bemodule.h"
@@ -469,13 +469,13 @@ static void gen_method_type(wenv_t *env, ir_type *tp) {
  * type-walker: generate declaration for simple types,
  * put all other types on a wait queue
  */
-static void walk_type(type_or_ent *tore, void *ctx)
+static void walk_type(type_or_ent tore, void *ctx)
 {
 	wenv_t *env = ctx;
 	ir_type  *tp;
 
-	if (get_kind(tore) == k_type) {
-		tp = (ir_type *)tore;
+	if (is_type(tore.typ)) {
+		tp = tore.typ;
 
 		/* ignore the unknown type */
 		if (tp == firm_unknown_type)
@@ -618,12 +618,6 @@ static void stabs_set_dbg_info(dbg_handle *h, dbg_info *dbgi)
 		return;
 
 	if (handle->curr_file != fname) {
-		/* TODO: escape filename correctly */
-		if (handle->curr_file != handle->main_file) {
-			be_emit_irprintf("\t.stabs\t\"%s\",%d,0,0,0\n", handle->curr_file,
-			                 N_EINCL);
-			be_emit_write_line();
-		}
 		if (fname != handle->main_file) {
 			be_emit_irprintf("\t.stabs\t\"%s\",%d,0,0,0\n", fname, N_SOL);
 			be_emit_write_line();