lower_intrinsics() now has an additional parameter alloweing part_block() to be used
[libfirm] / ir / be / bestabs.c
index 7121a07..cc68b67 100644 (file)
@@ -1,11 +1,29 @@
-/**
- * Stabs support.
+/*
+ * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ *
+ * This file is part of libFirm.
+ *
+ * This file may be distributed and/or modified under the terms of the
+ * GNU General Public License version 2 as published by the Free Software
+ * Foundation and appearing in the file LICENSE.GPL included in the
+ * packaging of this file.
  *
- * @author Michael Beck
- * @date   11.9.2006
- * @cvsid  $Id$
+ * Licensees holding valid libFirm Professional Edition licenses may use
+ * this file in accordance with the libFirm Commercial License.
+ * Agreement provided with the Software.
+ *
+ * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+ * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE.
  */
 
+/**
+ * @file
+ * @brief   Stabs support.
+ * @author  Michael Beck
+ * @date    11.9.2006
+ * @version $Id$
+ */
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 #include <stdlib.h>
 #include <assert.h>
 
+#include "obst.h"
 #include "irprog.h"
-#include "entity.h"
 #include "irgraph.h"
-#include "typewalk.h"
 #include "tv.h"
 #include "xmalloc.h"
 #include "pmap.h"
@@ -98,10 +115,12 @@ enum stabs_types {
 typedef struct stabs_handle {
        dbg_handle              base;         /**< the base class */
        FILE                    *f;           /**< the file write to */
-       entity                  *cur_ent;     /**< current method entity */
+       ir_entity               *cur_ent;     /**< current method entity */
        const be_stack_layout_t *layout;      /**< current stack layout */
        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 the current source file */
 } stabs_handle;
 
 /**
@@ -109,28 +128,28 @@ typedef struct stabs_handle {
  */
 static unsigned get_type_number(stabs_handle *h, ir_type *tp) {
        pmap_entry *entry;
+       unsigned num;
 
        if (tp == NULL) {
                /* map to the void type */
                return 0;
        }
        entry = pmap_find(h->type_map, tp);
-       return entry ? PTR_TO_INT(entry->value) : 0;
+       if (! entry) {
+               num = h->next_type_nr++;
+               pmap_insert(h->type_map, tp, INT_TO_PTR(num));
+       } else {
+               num = PTR_TO_INT(entry->value);
+       }
+       return num;
 }  /* get_type_number */
 
 /**
- * Assign a stabs type number to a Firm type.
+ * Map a given Type to void by assigned the type number 0.
  */
-static unsigned assign_type_number(stabs_handle *h, ir_type *tp) {
-       unsigned num;
-       if (tp == NULL) {
-               /* map to the void type */
-               return 0;
-       }
-       num = h->next_type_nr++;
-       pmap_insert(h->type_map, tp, INT_TO_PTR(num));
-       return num;
-}  /* assign_type_number */
+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.
@@ -169,14 +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 */
 
@@ -185,7 +205,7 @@ static void gen_primitive_type(stabs_handle *h, ir_type *tp)
                return;
        }  /* if */
 
-       type_num = assign_type_number(h, tp);
+       type_num = get_type_number(h, tp);
 
        if (mode_is_int(mode)) {
                char buf[64];
@@ -207,9 +227,10 @@ static void gen_primitive_type(stabs_handle *h, ir_type *tp)
  * @param tp   the type
  */
 static void gen_enum_type(stabs_handle *h, ir_type *tp) {
-       unsigned type_num = assign_type_number(h, tp);
+       unsigned type_num = get_type_number(h, tp);
        int i, n;
 
+       SET_TYPE_READY(tp);
        fprintf(h->f, "\t.stabs\t\"%s:T%u=e", get_type_name(tp), type_num);
        for (i = 0, n = get_enumeration_n_enums(tp); i < n; ++i) {
                ir_enum_const *ec = get_enumeration_const(tp, i);
@@ -221,31 +242,101 @@ 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
  *
- * @param h    the stabs handle
+ * @param env  the walker environment
  * @param tp   the type
  */
-static void gen_pointer_type(stabs_handle *h, ir_type *tp) {
-       unsigned type_num = assign_type_number(h, tp);
-       unsigned el_num   = get_type_number(h, get_pointer_points_to_type(tp));
+static void gen_pointer_type(wenv_t *env, ir_type *tp) {
+       stabs_handle *h       = env->h;
+       ir_type      *el_tp   = get_pointer_points_to_type(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
  *
- * @param h    the stabs handle
+ * @param env  the walker environment
  * @param tp   the type
  */
-static void gen_struct_union_type(stabs_handle *h, ir_type *tp) {
-       unsigned type_num = assign_type_number(h, tp);
-       int i, n;
-       char desc;
+static void gen_struct_union_type(wenv_t *env, ir_type *tp) {
+       stabs_handle *h       = env->h;
+       unsigned     type_num = get_type_number(h, tp);
+       int          i, n;
+       char         desc = 's';
 
+       SET_TYPE_READY(tp);
        if (is_Struct_type(tp)) {
                desc = 's';
                if (get_type_mode(tp) != NULL) {
@@ -253,92 +344,78 @@ static void gen_struct_union_type(stabs_handle *h, ir_type *tp) {
                        return;
                }
        }
-       else
+       else if (is_Union_type(tp))
                desc = 'u';
 
-       fprintf(h->f, "\t.stabs\t\"%s:T%u=%c%d",
+       fprintf(h->f, "\t.stabs\t\"%s:Tt%u=%c%d",
                get_type_name(tp), type_num, desc, get_type_size_bytes(tp));
 
        for (i = 0, n = get_compound_n_members(tp); i < n; ++i) {
-               entity  *ent = get_compound_member(tp, i);
-               ir_type *mtp = get_entity_type(ent);
+               ir_entity *ent = get_compound_member(tp, i);
+               ir_type   *mtp = get_entity_type(ent);
                int ofs, size;
 
-               ofs  = get_entity_offset_bits(ent);
+               if (! IS_TYPE_READY(mtp))
+                       waitq_put(env->wq, mtp);
+               ofs  = get_entity_offset(ent);
                if (is_Struct_type(mtp) && get_type_mode(mtp) != NULL) {
                        /* this structure is a bitfield, skip */
                        int i, n;
 
                        for (i = 0, n = get_struct_n_members(mtp); i < n; ++i) {
-                               entity *ent = get_struct_member(mtp, i);
+                               ir_entity *ent = get_struct_member(mtp, i);
                                ir_type *tp = get_entity_type(ent);
                                int bofs;
 
                                type_num = get_type_number(h, tp);
                                size = get_type_size_bits(tp);
-                               bofs = ofs + get_entity_offset_bits(ent);
+                               bofs = (ofs + get_entity_offset(ent)) * 8 + get_entity_offset_bits_remainder(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, bofs, size);
                        }
                } 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 h    the stabs handle
- * @param tp   the type
- */
-static void gen_array_type(stabs_handle *h, ir_type *tp) {
-       unsigned type_num = assign_type_number(h, tp);
-       int i, n = get_array_n_dimensions(tp);
-       int *perm;
-       ir_type *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];
-               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);
-       }
-
-       etp = get_array_element_type(tp);
-       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
  *
- * @param h    the stabs handle
+ * @param env  the walker environment
  * @param tp   the type
  */
-static void gen_method_type(stabs_handle *h, ir_type *tp) {
-       unsigned type_num = assign_type_number(h, tp);
+static void gen_method_type(wenv_t *env, ir_type *tp) {
+       stabs_handle *h       = env->h;
+       unsigned     type_num = get_type_number(h, tp);
        ir_type *rtp = NULL;
        unsigned res_type_num;
        int i, n = get_method_n_ress(tp);
 
-       if (n > 0)
+       SET_TYPE_READY(tp);
+       if (n > 0) {
                rtp = get_method_res_type(tp, 0);
+               if (! IS_TYPE_READY(rtp))
+                       waitq_put(env->wq, rtp);
+       }
        res_type_num = get_type_number(h, rtp);
 
        fprintf(h->f, "\t.stabs\t\"%s:t%u=f%u", get_type_name(tp), type_num, res_type_num);
@@ -346,6 +423,8 @@ static void gen_method_type(stabs_handle *h, ir_type *tp) {
        /* handle more than one return type */
        for (i = 1; i < n; ++i) {
                rtp = get_method_res_type(tp, i);
+               if (! IS_TYPE_READY(rtp))
+                       waitq_put(env->wq, rtp);
                res_type_num = get_type_number(h, rtp);
                fprintf(h->f, ",%u", res_type_num);
        }
@@ -380,31 +459,32 @@ static void walk_type(type_or_ent *tore, void *ctx)
                /* fall through */
        case tpo_struct:
        case tpo_union:
-               SET_TYPE_NOT_READY(env->wq, tp);
+               gen_struct_union_type(env, tp);
                break;
 
        case tpo_enumeration:
                gen_enum_type(env->h, tp);
-               SET_TYPE_READY(tp);
                break;
 
        case tpo_primitive:
                gen_primitive_type(env->h, tp);
-               SET_TYPE_READY(tp);
                break;
 
        case tpo_method:
+               gen_method_type(env, tp);
+               break;
+
        case tpo_array:
-               SET_TYPE_NOT_READY(env->wq, tp);
+               gen_array_type(env, tp);
                break;
 
        case tpo_pointer:
-               /* must construct the pointer type */
-               SET_TYPE_NOT_READY(env->wq, tp);
+               gen_pointer_type(env, tp);
                break;
 
        case tpo_unknown:
                /* the unknown type: ignore */
+               SET_TYPE_READY(tp);
                break;
        default:
                assert(! "Unknown tpop code");
@@ -412,94 +492,47 @@ static void walk_type(type_or_ent *tore, void *ctx)
 }  /* walk_type */
 
 /**
- * check, if a method type can be generated
- */
-static int is_method_type_ready(ir_type *tp)
-{
-  int i;
-  ir_type *etp;
-
-  for (i = get_method_n_ress(tp) - 1; i >= 0; --i) {
-    etp = SKIP_PTR(get_method_res_type(tp, i));
-
-    if (! IS_TYPE_READY(etp) && (! is_compound_type(etp) || is_Array_type(etp)))
-      return 0;
-  }  /* for */
-
-  for (i = get_method_n_params(tp) - 1; i >= 0; --i) {
-    etp = SKIP_PTR(get_method_param_type(tp, i));
-
-    if (! IS_TYPE_READY(etp) && (! is_compound_type(etp) || is_Array_type(etp)))
-      return 0;
-  }  /* for */
-  return 1;
-}  /* is_method_type_ready */
-
-/**
- * check, whether a compound type can be generated
+ * generate declaration for all types
  */
-static int is_compound_type_ready(ir_type *tp)
+static void finish_types(wenv_t *env)
 {
-  int i;
-  ir_type *etp;
-
-  for (i = get_compound_n_members(tp) - 1; i >= 0; --i) {
-    etp = SKIP_PTR(get_entity_type(get_compound_member(tp, i)));
+       waitq *wq = env->wq;
+       ir_type *tp;
 
-    if (! IS_TYPE_READY(etp) && (! is_compound_type(etp) || is_Array_type(etp)))
-      return 0;
-  }  /* for */
-  return 1;
-}  /* is_compound_type_ready */
+       while (! waitq_empty(wq)) {
+               tp = waitq_get(wq);
+               if (IS_TYPE_READY(tp))
+                       continue;
 
-/**
- * generate declaration for all types
- */
-static void finish_types(stabs_handle *h, waitq *wq)
-{
-  ir_type *tp;
-
-  while (! waitq_empty(wq)) {
-    tp = waitq_get(wq);
-
-    switch (get_type_tpop_code(tp)) {
-    case tpo_method:
-      if (is_method_type_ready(tp)) {
-        gen_method_type(h, tp);
-        SET_TYPE_READY(tp);
-        continue;
-      }  /* if */
-      break;
-    case tpo_class:
-    case tpo_union:
-    case tpo_struct:
-      if (is_compound_type_ready(tp)) {
-        gen_struct_union_type(h, tp);
-        SET_TYPE_READY(tp);
-        continue;
-      }  /* if */
-      break;
-    case tpo_array:
-      if (IS_TYPE_READY(get_array_element_type(tp))) {
-        gen_array_type(h, tp);
-        SET_TYPE_READY(tp);
-        continue;
-      }  /* if */
-      break;
-    case tpo_pointer:
-      if (IS_TYPE_READY(get_pointer_points_to_type(tp))) {
-        gen_pointer_type(h, tp);
-        SET_TYPE_READY(tp);
-        continue;
-      }  /* if */
-      break;
-    default:
-      assert(! "Unknown tpop code");
-    }  /* switch */
-
-    /* still not ready, defer type output */
-    pdeq_putr(wq, tp);
-  }  /* while */
+               switch (get_type_tpop_code(tp)) {
+               case tpo_method:
+                       gen_method_type(env, tp);
+                       break;
+               case tpo_class:
+               case tpo_union:
+               case tpo_struct:
+                       gen_struct_union_type(env, tp);
+                       break;
+               case tpo_enumeration:
+                       gen_enum_type(env->h, tp);
+                       break;
+               case tpo_primitive:
+                       gen_primitive_type(env->h, tp);
+                       break;
+               case tpo_array:
+                       gen_array_type(env, tp);
+                       break;
+               case tpo_pointer:
+                       gen_pointer_type(env, tp);
+                       break;
+               case tpo_unknown:
+                       /* the unknown type: ignore */
+                       SET_TYPE_READY(tp);
+                       break;
+               default:
+                       assert(! "Unknown tpop code");
+               }  /* switch */
+       }  /* while */
 }  /* finish_types */
 
 /**
@@ -511,7 +544,7 @@ static void gen_types(stabs_handle *h) {
        env.h  = h;
        env.wq = new_waitq();
        type_walk(NULL, walk_type, &env);
-       finish_types(h, env.wq);
+       finish_types(&env);
        del_waitq(env.wq);
 }  /* gen_types */
 
@@ -523,9 +556,29 @@ static void gen_types(stabs_handle *h) {
  */
 static void stabs_so(dbg_handle *handle, const char *filename) {
        stabs_handle *h = (stabs_handle *)handle;
+       h->main_file = h->curr_file = filename;
        fprintf(h->f, "\t.stabs\t\"%s\",%d,0,0,.Ltext0\n", filename, N_SO);
 }  /* stabs_so */
 
+/**
+ * end an include file
+ */
+static void stabs_include_end(dbg_handle *handle) {
+       stabs_handle *h = (stabs_handle *)handle;
+       h->curr_file = h->main_file;
+}  /* stabs_include_end */
+
+/**
+ * start an include file
+ */
+static void stabs_include_begin(dbg_handle *handle, const char *filename) {
+       stabs_handle *h = (stabs_handle *)handle;
+       if (h->main_file != h->curr_file)
+               stabs_include_end(handle);
+       h->curr_file = filename;
+       fprintf(h->f, "\t.stabs\t\"%s\",%d,0,0,0\n", filename, N_SOL);
+}  /* stabs_include_begin */
+
 /**
  * Main Program
  */
@@ -548,7 +601,7 @@ static void stabs_line(dbg_handle *handle, unsigned lineno, const char *address)
 /**
  * dump the stabs for a method begin
  */
-static void stabs_method_begin(dbg_handle *handle, entity *ent, const be_stack_layout_t *layout) {
+static void stabs_method_begin(dbg_handle *handle, ir_entity *ent, const be_stack_layout_t *layout) {
        stabs_handle *h = (stabs_handle *)handle;
        ir_type      *mtp, *rtp;
        unsigned     type_num;
@@ -581,7 +634,7 @@ static void stabs_method_begin(dbg_handle *handle, entity *ent, const be_stack_l
                unsigned type_num = get_type_number(h, ptp);
         char buf[16];
         int ofs = 0;
-               entity *stack_ent;
+               ir_entity *stack_ent;
 
         if (! name) {
           snprintf(buf, sizeof(buf), "arg%d", i);
@@ -591,9 +644,23 @@ static void stabs_method_begin(dbg_handle *handle, entity *ent, const be_stack_l
                   it transmitted on the stack, else in a register */
                stack_ent = layout->param_map[i];
                if (stack_ent) {
-                       ofs = get_entity_offset_bytes(stack_ent) + between_size;
+                       ofs = get_entity_offset(stack_ent) + between_size;
+               }
+               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, "\t.stabs\t\"%s:p%u\",%d,0,0,%d\n", name, type_num, N_PSYM, ofs);
+
+               fprintf(h->f, "\",%d,0,0,%d\n", N_PSYM, ofs);
        }
 }  /* stabs_method_begin */
 
@@ -602,7 +669,7 @@ static void stabs_method_begin(dbg_handle *handle, entity *ent, const be_stack_l
  */
 static void stabs_method_end(dbg_handle *handle) {
        stabs_handle            *h = (stabs_handle *)handle;
-       entity                  *ent = h->cur_ent;
+       ir_entity               *ent = h->cur_ent;
        const be_stack_layout_t *layout = h->layout;
        const char              *ld_name = get_entity_ld_name(ent);
        int                     i, n, frame_size;
@@ -611,7 +678,7 @@ static void stabs_method_end(dbg_handle *handle) {
        /* create entries for automatic variables on the stack */
        frame_size = get_type_size_bytes(layout->frame_type);
        for (i = 0, n = get_compound_n_members(layout->frame_type); i < n; ++i) {
-               entity *ent = get_compound_member(layout->frame_type, i);
+               ir_entity *ent = get_compound_member(layout->frame_type, i);
                ir_type *tp;
                int ofs;
                unsigned type_num;
@@ -625,7 +692,7 @@ static void stabs_method_end(dbg_handle *handle) {
                if (is_Method_type(tp))
                        continue;
                type_num = get_type_number(h, tp);
-               ofs      = -frame_size + get_entity_offset_bytes(ent);
+               ofs      = -frame_size + get_entity_offset(ent);
 
                fprintf(h->f, "\t.stabs\t\"%s:%u\",%d,0,0,%d\n",
                        get_entity_name(ent), type_num, N_LSYM, ofs);
@@ -655,7 +722,7 @@ static void stabs_types(dbg_handle *handle) {
 /**
  * dump a variable in the global type
  */
-static void stabs_variable(dbg_handle *handle, struct obstack *obst, entity *ent) {
+static void stabs_variable(dbg_handle *handle, struct obstack *obst, ir_entity *ent) {
        stabs_handle *h = (stabs_handle *)handle;
        unsigned tp_num = get_type_number(h, get_entity_type(ent));
        char buf[1024];
@@ -696,6 +763,8 @@ static void stabs_close(dbg_handle *handle) {
 static const debug_ops stabs_ops = {
        stabs_close,
        stabs_so,
+    stabs_include_begin,
+    stabs_include_end,
        stabs_main_program,
        stabs_method_begin,
        stabs_method_end,
@@ -719,6 +788,9 @@ dbg_handle *be_stabs_open(FILE *out) {
        h->layout       = NULL;
        h->next_type_nr = 0;
        h->type_map     = pmap_create_ex(64);
+       h->main_file    = NULL;
+       h->curr_file    = NULL;
+
        return &h->base;
 }  /* stabs_open */
 
@@ -736,6 +808,22 @@ void be_dbg_so(dbg_handle *h, const char *filename) {
                h->ops->so(h, filename);
 }  /* be_dbg_begin */
 
+/**
+ * start an include file
+ */
+void be_dbg_include_begin(dbg_handle *h, const char *filename) {
+       if (h && h->ops->include_begin)
+               h->ops->include_begin(h, filename);
+}  /* stabs_include_begin */
+
+/**
+ * end an include file
+ */
+void be_dbg_include_end(dbg_handle *h) {
+       if (h && h->ops->include_end)
+               h->ops->include_end(h);
+}  /* stabs_include_end */
+
 /**
  * Main program
  */
@@ -745,7 +833,7 @@ void be_dbg_main_program(dbg_handle *h) {
 }  /* be_dbg_main_program */
 
 /** debug for a method begin */
-void be_dbg_method_begin(dbg_handle *h, entity *ent, const be_stack_layout_t *layout) {
+void be_dbg_method_begin(dbg_handle *h, ir_entity *ent, const be_stack_layout_t *layout) {
        if (h && h->ops->method_begin)
                h->ops->method_begin(h, ent, layout);
 }  /* be_dbg_method_begin */
@@ -769,7 +857,7 @@ void be_dbg_types(dbg_handle *h) {
 }  /* be_dbg_types */
 
 /** dump a global */
-void be_dbg_variable(dbg_handle *h, struct obstack *obst, entity *ent) {
+void be_dbg_variable(dbg_handle *h, struct obstack *obst, ir_entity *ent) {
        if (h && h->ops->variable)
                h->ops->variable(h, obst, ent);
 }  /* be_dbg_variable */