WebSVN – Kolibri OS – Diff – /contrib/toolchain/binutils/gas/dwarf2dbg.c

 /* dwarf2dbg.c - DWARF2 debug support
-   Copyright 1999-2013 Free Software Foundation, Inc.
+   Copyright (C) 1999-2015 Free Software Foundation, Inc.
    Contributed by David Mosberger-Tang
    This file is part of GAS, the GNU Assembler.
 #define SPECIAL_ADDR(op) (((op) - DWARF2_LINE_OPCODE_BASE)/DWARF2_LINE_RANGE)
 /* The maximum address skip amount that can be encoded with a special op.  */
+#define MAX_SPECIAL_ADDR_DELTA		SPECIAL_ADDR(255)
+#ifndef TC_PARSE_CONS_RETURN_NONE
+#define TC_PARSE_CONS_RETURN_NONE BFD_RELOC_NONE
-#define MAX_SPECIAL_ADDR_DELTA		SPECIAL_ADDR(255)
+#endif
 struct line_entry {
   struct line_entry *next;
   symbolS *label;
   symbolS *text_end;
 };
 /* Collects data for all line table entries during assembly.  */
-static struct line_seg *all_segs;
-/* Hash used to quickly lookup a segment by name, avoiding the need to search
-   through the all_segs list.  */
-static struct hash_control *all_segs_hash;
+static struct line_seg *all_segs;
 static struct line_seg **last_seg_ptr;
 struct file_entry {
 /* Find or create (if CREATE_P) an entry for SEG+SUBSEG in ALL_SEGS.  */
 static struct line_subseg *
 get_line_subseg (segT seg, subsegT subseg, bfd_boolean create_p)
-{
-  static segT last_seg;
-  static subsegT last_subseg;
+{
-  static struct line_subseg *last_line_subseg;
-  struct line_seg *s;
+  struct line_seg *s = seg_info (seg)->dwarf2_line_seg;
-  struct line_subseg **pss, *lss;
-  if (seg == last_seg && subseg == last_subseg)
-    return last_line_subseg;
   struct line_subseg **pss, *lss;
   s = (struct line_seg *) hash_find (all_segs_hash, seg->name);
   if (s == NULL)
+    {
       s->next = NULL;
       s->seg = seg;
       s->head = NULL;
       *last_seg_ptr = s;
       last_seg_ptr = &s->next;
-      hash_insert (all_segs_hash, seg->name, s);
+      seg_info (seg)->dwarf2_line_seg = s;
+    }
   gas_assert (seg == s->seg);
   for (pss = &s->head; (lss = *pss) != NULL ; pss = &lss->next)
   lss->ptail = &lss->head;
   lss->pmove_tail = &lss->head;
   *pss = lss;
- found_subseg:
-  last_seg = seg;
-  last_subseg = subseg;
-  last_line_subseg = lss;
  found_subseg:
   return lss;
+}
   while (ISALPHA (*input_line_pointer))
+    {
       char *p, c;
       offsetT value;
-      p = input_line_pointer;
-      c = get_symbol_end ();
+      c = get_symbol_name (& p);
       if (strcmp (p, "basic_block") == 0)
+	{
 	  current.flags |= DWARF2_FLAG_EPILOGUE_BEGIN;
 	  *input_line_pointer = c;
+	}
       else if (strcmp (p, "is_stmt") == 0)
+	{
-	  *input_line_pointer = c;
+	  (void) restore_line_pointer (c);
 	  value = get_absolute_expression ();
 	  if (value == 0)
 	    current.flags &= ~DWARF2_FLAG_IS_STMT;
 	  else if (value == 1)
 	    current.flags |= DWARF2_FLAG_IS_STMT;
 	      return;
+	    }
+	}
       else if (strcmp (p, "isa") == 0)
+	{
-	  *input_line_pointer = c;
+	  (void) restore_line_pointer (c);
 	  value = get_absolute_expression ();
 	  if (value >= 0)
 	    current.isa = value;
 	  else
+	    {
 	      return;
+	    }
+	}
       else if (strcmp (p, "discriminator") == 0)
+	{
-	  *input_line_pointer = c;
+	  (void) restore_line_pointer (c);
 	  value = get_absolute_expression ();
 	  if (value >= 0)
 	    current.discriminator = value;
 	  else
+	    {
+	    }
+	}
       else
+	{
 	  as_bad (_("unknown .loc sub-directive `%s'"), p);
-	  *input_line_pointer = c;
+	  (void) restore_line_pointer (c);
 	  return;
+	}
-      SKIP_WHITESPACE ();
+      SKIP_WHITESPACE_AFTER_NAME ();
+    }
   demand_empty_rest_of_line ();
       p += output_leb128 (p, sizeof_address + 1, 0);
       *p++ = DW_LNE_set_address;
       exp.X_op = O_symbol;
       exp.X_add_symbol = to_sym;
       exp.X_add_number = 0;
-      emit_expr_fix (&exp, sizeof_address, frag, p);
+      emit_expr_fix (&exp, sizeof_address, frag, p, TC_PARSE_CONS_RETURN_NONE);
       p += sizeof_address;
+    }
   else
+    {
       *p++ = DW_LNS_fixed_advance_pc;
-      emit_expr_fix (pexp, 2, frag, p);
+      emit_expr_fix (pexp, 2, frag, p, TC_PARSE_CONS_RETURN_NONE);
       p += 2;
+    }
   if (line_delta == INT_MAX)
   out_byte (0);
+}
 /* Switch to SEC and output a header length field.  Return the size of
+   offsets used in SEC.  The caller must set EXPR->X_add_symbol value
-   offsets used in SEC.  The caller must set EXPR->X_add_symbol value
+   to the end of the section.  EXPR->X_add_number will be set to the
-   to the end of the section.  */
+   negative size of the header.  */
 static int
 out_header (asection *sec, expressionS *exp)
+{
   symbolS *start_sym;
+  symbolS *end_sym;
+  subseg_set (sec, 0);
+  if (flag_dwarf_sections)
+    {
+      /* If we are going to put the start and end symbols in different
+	 sections, then we need real symbols, not just fake, local ones.  */
+      frag_now_fix ();
+      start_sym = symbol_make (".Ldebug_line_start");
+      end_sym = symbol_make (".Ldebug_line_end");
+      symbol_set_value_now (start_sym);
   symbolS *end_sym;
   else
+    {
-  subseg_set (sec, 0);
+      start_sym = symbol_temp_new_now ();
-  start_sym = symbol_temp_new_now ();
+      end_sym = symbol_temp_make ();
   end_sym = symbol_temp_make ();
 static void
 out_debug_line (segT line_seg)
+{
   expressionS exp;
-  symbolS *prologue_end;
+  symbolS *prologue_start, *prologue_end;
   symbolS *line_end;
   struct line_seg *s;
   int sizeof_offset;
   /* Version.  */
   out_two (DWARF2_LINE_VERSION);
   /* Length of the prologue following this length.  */
+  prologue_start = symbol_temp_make ();
-  /* Length of the prologue following this length.  */
+  prologue_end = symbol_temp_make ();
+  exp.X_op = O_subtract;
-  prologue_end = symbol_temp_make ();
+  exp.X_add_symbol = prologue_end;
-  exp.X_add_symbol = prologue_end;
+  exp.X_op_symbol = prologue_start;
+  exp.X_add_number = 0;
-  exp.X_add_number = - (4 + 2 + 4);
+  emit_expr (&exp, sizeof_offset);
-  emit_expr (&exp, sizeof_offset);
+  symbol_set_value_now (prologue_start);
   /* Parameters of the state machine.  */
 static void
 out_debug_aranges (segT aranges_seg, segT info_seg)
+{
+  unsigned int addr_size = sizeof_address;
-  unsigned int addr_size = sizeof_address;
+  offsetT size;
   struct line_seg *s;
   expressionS exp;
   symbolS *aranges_end;
   char *p;
   int sizeof_offset;
+  sizeof_offset = out_header (aranges_seg, &exp);
-  sizeof_offset = out_header (aranges_seg, &exp);
+  aranges_end = exp.X_add_symbol;
-  aranges_end = exp.X_add_symbol;
+  size = -exp.X_add_number;
   /* Version.  */
-  /* Version.  */
+  out_two (DWARF2_ARANGES_VERSION);
+  size += 2;
   out_two (DWARF2_ARANGES_VERSION);
   /* Offset to .debug_info.  */
+  TC_DWARF2_EMIT_OFFSET (section_symbol (info_seg), sizeof_offset);
-  /* Offset to .debug_info.  */
+  size += sizeof_offset;
   TC_DWARF2_EMIT_OFFSET (section_symbol (info_seg), sizeof_offset);
+  /* Size of an address (offset portion).  */
   out_byte (addr_size);
-  /* Size of an address (offset portion).  */
+  size++;
-  out_byte (addr_size);
+  /* Size of a segment descriptor.  */
   out_byte (0);
-  /* Size of a segment descriptor.  */
+  size++;
   out_byte (0);
+}
 void
 dwarf2_init (void)
-{
   all_segs_hash = hash_new ();
   last_seg_ptr = &all_segs;
+}

Subversion Repositories Kolibri OS

(root)/contrib/toolchain/binutils/gas/dwarf2dbg.c – Rev 5222 → 6324