* dw2gencfi.c, dw2gencfi.h: Rewrite from scratch.

        * as.c (main): Always call cfi_finish.
        * config/tc-i386.c (x86_dwarf2_return_column): New.
        (x86_cie_data_alignment): New.
        (md_begin): Set them.
        (tc_x86_cfi_init): Remove.
        (tc_x86_regname_to_dw2regnum): Fix 32-bit register numbers;
        return int, not unsigned long; don't as_bad here.
        (tc_x86_frame_initial_instructions): Streamline; use
        updated api.
        * config/tc-i386.h (tc_cfi_init): Remove.
        (DWARF2_DEFAULT_RETURN_COLUMN): New.
        (DWARF2_CIE_DATA_ALIGNMENT): New.

        * gas/cfi/cfi-i386.d: Update for dw2gencfi rewrite.
        * gas/cfi/cfi-x86_64.d: Likewise.
        * gas/cfi/cfi-i386-2.d: New.
        * gas/cfi/cfi-i386-2.s: New.

11 files changed, 748 insertions, 800 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 8383b73..16a1618 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,21 @@
 2003-05-27  Richard Henderson  <rth@redhat.com>
 
+	* dw2gencfi.c, dw2gencfi.h: Rewrite from scratch.
+	* as.c (main): Always call cfi_finish.
+	* config/tc-i386.c (x86_dwarf2_return_column): New.
+	(x86_cie_data_alignment): New.
+	(md_begin): Set them.
+	(tc_x86_cfi_init): Remove.
+	(tc_x86_regname_to_dw2regnum): Fix 32-bit register numbers;
+	return int, not unsigned long; don't as_bad here.
+	(tc_x86_frame_initial_instructions): Streamline; use
+	updated api.
+	* config/tc-i386.h (tc_cfi_init): Remove.
+	(DWARF2_DEFAULT_RETURN_COLUMN): New.
+	(DWARF2_CIE_DATA_ALIGNMENT): New.
+
+2003-05-27  Richard Henderson  <rth@redhat.com>
+
 	* symbols.c (temp_label_name): New.
 	(symbol_temp_new, symbol_temp_new_now, symbol_temp_make): New.
 	(symbol_set_value_now): New.
diff --git a/gas/as.c b/gas/as.c
index ff3c983..27a0089 100644
--- a/gas/as.c
+++ b/gas/as.c
@@ -911,9 +911,9 @@ main (argc, argv)
      assembly debugging or on behalf of the compiler, emit it now.  */
   dwarf2_finish ();
 
-#ifdef TARGET_USE_CFIPOP
+  /* If we constructed dwarf2 .eh_frame info, either via .cfi 
+     directives from the user or by the backend, emit it now.  */
   cfi_finish ();
-#endif
 
   if (seen_at_least_1_file ()
       && (flag_always_generate_output || had_errors () == 0))
diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index 9a3bbbb..4823ee7 100644
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -319,6 +319,12 @@ static unsigned int no_cond_jump_promotion = 0;
 /* Pre-defined "_GLOBAL_OFFSET_TABLE_".  */
 symbolS *GOT_symbol;
 
+/* The dwarf2 return column, adjusted for 32 or 64 bit.  */
+unsigned int x86_dwarf2_return_column;
+
+/* The dwarf2 data alignment, adjusted for 32 or 64 bit.  */
+int x86_cie_data_alignment;
+
 /* Interface to relax_segment.
    There are 3 major relax states for 386 jump insns because the
    different types of jumps add different sizes to frags when we're
@@ -987,6 +993,17 @@ md_begin ()
       record_alignment (bss_section, 2);
     }
 #endif
+
+  if (flag_code == CODE_64BIT)
+    {
+      x86_dwarf2_return_column = 16;
+      x86_cie_data_alignment = -8;
+    }
+  else
+    {
+      x86_dwarf2_return_column = 8;
+      x86_cie_data_alignment = -4;
+    }
 }
 
 void
@@ -6301,42 +6318,15 @@ intel_putback_token ()
   prev_token.str = NULL;
 }
 
-void
-tc_x86_cfi_init (void)
-{
-  struct cfi_config cfi_config;
-
-  if (flag_code == CODE_64BIT)
-    {
-      cfi_config.addr_length = 8;
-      cfi_config.eh_align = 8;
-      cfi_config.code_align = 1;
-      cfi_config.data_align = -8;
-      cfi_config.ra_column = 0x10;
-      cfi_config.reloc_type = BFD_RELOC_64;
-    }
-  else
-    {
-      cfi_config.addr_length = 4;
-      cfi_config.eh_align = 4;
-      cfi_config.code_align = 1;
-      cfi_config.data_align = -4;
-      cfi_config.ra_column = 0x08;
-      cfi_config.reloc_type = BFD_RELOC_32;
-    }
-
-  cfi_set_config (&cfi_config);
-}
-
-unsigned long
+int
 tc_x86_regname_to_dw2regnum (const char *regname)
 {
   unsigned int regnum;
   unsigned int regnames_count;
   char *regnames_32[] =
     {
-      "eax", "ebx", "ecx", "edx",
-      "edi", "esi", "ebp", "esp",
+      "eax", "ecx", "edx", "ebx",
+      "esp", "ebp", "esi", "edi",
       "eip"
     };
   char *regnames_64[] =
@@ -6364,21 +6354,18 @@ tc_x86_regname_to_dw2regnum (const char *regname)
     if (strcmp (regname, regnames[regnum]) == 0)
       return regnum;
 
-  as_bad (_("unknown register name '%s'"), regname);
   return -1;
 }
 
 void
 tc_x86_frame_initial_instructions (void)
 {
-  if (flag_code == CODE_64BIT)
-    {
-      cfi_add_insn (CFA_def_cfa, tc_x86_regname_to_dw2regnum ("rsp"), 8);
-      cfi_add_insn (CFA_offset, tc_x86_regname_to_dw2regnum ("rip"), -8);
-    }
-  else
-    {
-      cfi_add_insn (CFA_def_cfa, tc_x86_regname_to_dw2regnum ("esp"), 4);
-      cfi_add_insn (CFA_offset, tc_x86_regname_to_dw2regnum ("eip"), -4);
-    }
+  static unsigned int sp_regno;
+
+  if (!sp_regno)
+    sp_regno = tc_x86_regname_to_dw2regnum (flag_code == CODE_64BIT
+					    ? "rsp" : "esp");
+
+  cfi_add_CFA_def_cfa (sp_regno, -x86_cie_data_alignment);
+  cfi_add_CFA_offset (x86_dwarf2_return_column, x86_cie_data_alignment);
 }
diff --git a/gas/config/tc-i386.h b/gas/config/tc-i386.h
index aa131ba..f45d713 100644
--- a/gas/config/tc-i386.h
+++ b/gas/config/tc-i386.h
@@ -546,18 +546,18 @@ extern void sco_id PARAMS ((void));
 #endif
 
 /* We want .cfi_* pseudo-ops for generating unwind info.  */
-#define TARGET_USE_CFIPOP
-#ifdef TARGET_USE_CFIPOP
+#define TARGET_USE_CFIPOP 1
 
-#define tc_cfi_init() tc_x86_cfi_init ()
-extern void tc_x86_cfi_init PARAMS ((void));
+extern unsigned int x86_dwarf2_return_column;
+#define DWARF2_DEFAULT_RETURN_COLUMN x86_dwarf2_return_column
+
+extern int x86_cie_data_alignment;
+#define DWARF2_CIE_DATA_ALIGNMENT x86_cie_data_alignment
 
 #define tc_regname_to_dw2regnum tc_x86_regname_to_dw2regnum
-extern unsigned long tc_x86_regname_to_dw2regnum PARAMS ((const char *regname));
+extern int tc_x86_regname_to_dw2regnum PARAMS ((const char *regname));
 
 #define tc_cfi_frame_initial_instructions tc_x86_frame_initial_instructions
 extern void tc_x86_frame_initial_instructions PARAMS ((void));
 
-#endif /* TARGET_USE_CFIPOP */
-
 #endif /* TC_I386 */
diff --git a/gas/dw2gencfi.c b/gas/dw2gencfi.c
index 0b50592..2239578 100644
--- a/gas/dw2gencfi.c
+++ b/gas/dw2gencfi.c
@@ -19,812 +19,782 @@
    Software Foundation, 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.  */
 
-#include <errno.h>
 #include "as.h"
 #include "dw2gencfi.h"
 
-struct cie_entry
+
+/* We re-use DWARF2_LINE_MIN_INSN_LENGTH for the code alignment field
+   of the CIE.  Default to 1 if not otherwise specified.  */
+#ifndef DWARF2_LINE_MIN_INSN_LENGTH
+# define DWARF2_LINE_MIN_INSN_LENGTH 1
+#endif
+
+/* If TARGET_USE_CFIPOP is defined, it is required that the target
+   provide the following definitions.  Otherwise provide them to 
+   allow compilation to continue.  */
+#ifndef TARGET_USE_CFIPOP
+# ifndef DWARF2_DEFAULT_RETURN_COLUMN
+#  define DWARF2_DEFAULT_RETURN_COLUMN 0
+# endif
+# ifndef DWARF2_CIE_DATA_ALIGNMENT
+#  define DWARF2_CIE_DATA_ALIGNMENT 1
+# endif
+#endif
+
+#ifndef tc_cfi_frame_initial_instructions
+# define tc_cfi_frame_initial_instructions() ((void)0)
+#endif
+
+
+struct cfi_insn_data
 {
-  unsigned long offset;
-  size_t size;
-  void *data;
-  struct cie_entry *next;
+  struct cfi_insn_data *next;
+  int insn;
+  union {
+    struct {
+      unsigned reg;
+      offsetT offset;
+    } ri;
+
+    struct {
+      unsigned reg1;
+      unsigned reg2;
+    } rr;
+
+    unsigned r;
+    offsetT i;
+
+    struct {
+      symbolS *lab1;
+      symbolS *lab2;
+    } ll;
+  } u;
 };
 
-struct cfi_data
+struct fde_entry
 {
-  enum cfi_insn insn;
-  long param[2];
-  struct cfi_data *next;
+  struct fde_entry *next;
+  symbolS *start_address;
+  symbolS *end_address;
+  struct cfi_insn_data *data;
+  struct cfi_insn_data **last;
+  unsigned int return_column;
 };
 
-struct cfi_info
+struct cie_entry
 {
-  addressT start_address;
-  addressT end_address;
-  addressT last_address;
-  const char *labelname;
-  struct cfi_data *data;
-  struct cfi_info *next;
+  struct cie_entry *next;
+  symbolS *start_address;
+  unsigned int return_column;
+  struct cfi_insn_data *first, *last;
 };
 
-/* Current open CFI entry.  */
-static struct cfi_info *cfi_info;
+
+/* Current open FDE entry.  */
+static struct fde_entry *cur_fde_data;
+static symbolS *last_address;
+static offsetT cur_cfa_offset;
+
+/* List of FDE entries.  */
+static struct fde_entry *all_fde_data;
+static struct fde_entry **last_fde_data = &all_fde_data;
 
 /* List of CIEs so that they could be reused.  */
 static struct cie_entry *cie_root;
 
-/* Current target config.  */
-static struct cfi_config current_config;
+
+/* Construct a new FDE structure and add it to the end of the fde list.  */
 
-/* This is the main entry point to the CFI machinery.  */
-static void dot_cfi (int arg);
+static struct fde_entry *
+alloc_fde_entry (void)
+{
+  struct fde_entry *fde = xcalloc (1, sizeof (struct fde_entry));
 
-const pseudo_typeS cfi_pseudo_table[] =
-  {
-    { "cfi_verbose", dot_cfi, CFI_verbose },
-    { "cfi_startproc", dot_cfi, CFI_startproc },
-    { "cfi_endproc", dot_cfi, CFI_endproc },
-    { "cfi_def_cfa", dot_cfi, CFA_def_cfa },
-    { "cfi_def_cfa_register", dot_cfi, CFA_def_cfa_register },
-    { "cfi_def_cfa_offset", dot_cfi, CFA_def_cfa_offset },
-    { "cfi_adjust_cfa_offset", dot_cfi, CFI_adjust_cfa_offset },
-    { "cfi_offset", dot_cfi, CFA_offset },
-    { "cfi_register", dot_cfi, CFA_register },
-    { NULL, NULL, 0 }
-  };
+  cur_fde_data = fde;
+  *last_fde_data = fde;
+  last_fde_data = &fde->next;
 
-static const char *
-cfi_insn_str (enum cfi_insn insn)
+  fde->last = &fde->data;
+  fde->return_column = DWARF2_DEFAULT_RETURN_COLUMN;
+
+  return fde;
+}
+
+/* The following functions are available for a backend to construct its
+   own unwind information, usually from legacy unwind directives.  */
+
+/* Construct a new INSN structure and add it to the end of the insn list
+   for the currently active FDE.  */
+
+static struct cfi_insn_data *
+alloc_cfi_insn_data (void)
 {
-  switch (insn)
-    {
-    case CFA_nop:
-      return "CFA_nop";
-    case CFA_set_loc:
-      return "CFA_set_loc";
-    case CFA_advance_loc1:
-      return "CFA_advance_loc1";
-    case CFA_advance_loc2:
-      return "CFA_advance_loc2";
-    case CFA_advance_loc4:
-      return "CFA_advance_loc4";
-    case CFA_offset_extended:
-      return "CFA_offset_extended";
-    case CFA_resotre_extended:
-      return "CFA_resotre_extended";
-    case CFA_undefined:
-      return "CFA_undefined";
-    case CFA_same_value:
-      return "CFA_same_value";
-    case CFA_register:
-      return "CFA_register";
-    case CFA_remember_state:
-      return "CFA_remember_state";
-    case CFA_restore_state:
-      return "CFA_restore_state";
-    case CFA_def_cfa:
-      return "CFA_def_cfa";
-    case CFA_def_cfa_register:
-      return "CFA_def_cfa_register";
-    case CFA_def_cfa_offset:
-      return "CFA_def_cfa_offset";
-    case CFA_advance_loc:
-      return "CFA_advance_loc";
-    case CFA_offset:
-      return "CFA_offset";
-    case CFA_restore:
-      return "CFA_restore";
-    default:
-      break;
-    }
+  struct cfi_insn_data *insn = xcalloc (1, sizeof (struct cfi_insn_data));
+
+  *cur_fde_data->last = insn;
+  cur_fde_data->last = &insn->next;
 
-  return "CFA_unknown";
+  return insn;
 }
 
-static struct cfi_data *
-alloc_cfi_data (void)
+/* Construct a new FDE structure that begins at LABEL.  */
+
+void 
+cfi_new_fde (symbolS *label)
 {
-  return (struct cfi_data *) xcalloc (sizeof (struct cfi_info), 1);
+  struct fde_entry *fde = alloc_fde_entry ();
+  fde->start_address = label;
+  last_address = label;
 }
 
-static struct cfi_info *
-alloc_cfi_info (void)
+/* End the currently open FDE.  */
+
+void 
+cfi_end_fde (symbolS *label)
 {
-  return (struct cfi_info *) xcalloc (sizeof (struct cfi_info), 1);
+  cur_fde_data->end_address = label;
+  cur_fde_data = NULL;
 }
 
-/* Parse arguments.  */
-static int
-cfi_parse_arg (long *param, int resolvereg)
+/* Set the return column for the current FDE.  */
+
+void
+cfi_set_return_column (unsigned regno)
 {
-  long value;
-  int retval = -1;
-  int nchars;
+  cur_fde_data->return_column = regno;
+}
 
-  assert (param != NULL);
-  SKIP_WHITESPACE ();
+/* Add a CFI insn to advance the PC from the last address to LABEL.  */
 
-  if (sscanf (input_line_pointer, "%li%n", &value, &nchars) >= 1)
-    {
-      input_line_pointer += nchars;
-      retval = 1;
-    }
-#ifdef tc_regname_to_dw2regnum
-  else if (resolvereg && ((is_name_beginner (*input_line_pointer))
-			   || (*input_line_pointer == '%'
-			       && is_name_beginner (*(++input_line_pointer)))))
-    {
-      char *name, c, *p;
+void
+cfi_add_advance_loc (symbolS *label)
+{
+  struct cfi_insn_data *insn = alloc_cfi_insn_data ();
 
-      name = input_line_pointer;
-      c = get_symbol_end ();
-      p = input_line_pointer;
+  insn->insn = DW_CFA_advance_loc;
+  insn->u.ll.lab1 = last_address;
+  insn->u.ll.lab2 = label;
 
-      if ((value = tc_regname_to_dw2regnum (name)) >= 0)
-	retval = 1;
+  last_address = label;
+}
 
-      *p = c;
-    }
-#endif
-  else
-    as_bad (resolvereg ?
-	    _("can't convert argument to a register number") :
-	    _("can't convert argument to an integer"));
+/* Add a DW_CFA_offset record to the CFI data.  */
+
+void
+cfi_add_CFA_offset (unsigned regno, offsetT offset)
+{
+  struct cfi_insn_data *insn = alloc_cfi_insn_data ();
+  
+  insn->insn = DW_CFA_offset;
+  insn->u.ri.reg = regno;
+  insn->u.ri.offset = offset;
+}
 
-  if (retval > 0)
-    *param = value;
+/* Add a DW_CFA_def_cfa record to the CFI data.  */
 
-  SKIP_WHITESPACE ();
-  if (*input_line_pointer == ',')
-    {
-      input_line_pointer++;
-      SKIP_WHITESPACE ();
-    }
+void
+cfi_add_CFA_def_cfa (unsigned regno, offsetT offset)
+{
+  struct cfi_insn_data *insn = alloc_cfi_insn_data ();
+  
+  insn->insn = DW_CFA_def_cfa;
+  insn->u.ri.reg = regno;
+  insn->u.ri.offset = offset;
 
-  return retval;
+  cur_cfa_offset = offset;
 }
 
-static int
-cfi_parse_reg (long *param)
+/* Add a DW_CFA_register record to the CFI data.  */
+
+void
+cfi_add_CFA_register (unsigned reg1, unsigned reg2)
 {
-  return cfi_parse_arg (param, 1);
+  struct cfi_insn_data *insn = alloc_cfi_insn_data ();
+  
+  insn->insn = DW_CFA_register;
+  insn->u.rr.reg1 = reg1;
+  insn->u.rr.reg2 = reg2;
 }
 
-static int
-cfi_parse_const (long *param)
+/* Add a DW_CFA_def_cfa_register record to the CFI data.  */
+
+void
+cfi_add_CFA_def_cfa_register (unsigned regno)
 {
-  return cfi_parse_arg (param, 0);
+  struct cfi_insn_data *insn = alloc_cfi_insn_data ();
+  
+  insn->insn = DW_CFA_def_cfa_register;
+  insn->u.r = regno;
 }
 
+/* Add a DW_CFA_def_cfa_offset record to the CFI data.  */
+
 void
-cfi_add_insn (enum cfi_insn insn, long param0, long param1)
+cfi_add_CFA_def_cfa_offset (offsetT offset)
 {
-  struct cfi_data *data_ptr;
+  struct cfi_insn_data *insn = alloc_cfi_insn_data ();
+  
+  insn->insn = DW_CFA_def_cfa_offset;
+  insn->u.i = offset;
 
-  if (!cfi_info->data)
-    {
-      cfi_info->data = alloc_cfi_data ();
-      data_ptr = cfi_info->data;
-    }
-  else
-    {
-      data_ptr = cfi_info->data;
+  cur_cfa_offset = offset;
+}
 
-      while (data_ptr && data_ptr->next)
-	data_ptr = data_ptr->next;
+
+/* Parse CFI assembler directives.  */
 
-      data_ptr->next = alloc_cfi_data ();
+static void dot_cfi (int);
+static void dot_cfi_startproc (int);
+static void dot_cfi_endproc (int);
 
-      data_ptr = data_ptr->next;
-    }
+/* Fake CFI type; outside the byte range of any real CFI insn.  */
+#define CFI_adjust_cfa_offset 0x100
 
-  data_ptr->insn = insn;
-  data_ptr->param[0] = param0;
-  data_ptr->param[1] = param1;
-}
+const pseudo_typeS cfi_pseudo_table[] =
+  {
+    { "cfi_startproc", dot_cfi_startproc, 0 },
+    { "cfi_endproc", dot_cfi_endproc, 0 },
+    { "cfi_def_cfa", dot_cfi, DW_CFA_def_cfa },
+    { "cfi_def_cfa_register", dot_cfi, DW_CFA_def_cfa_register },
+    { "cfi_def_cfa_offset", dot_cfi, DW_CFA_def_cfa_offset },
+    { "cfi_adjust_cfa_offset", dot_cfi, CFI_adjust_cfa_offset },
+    { "cfi_offset", dot_cfi, DW_CFA_offset },
+    { "cfi_register", dot_cfi, DW_CFA_register },
+    { NULL, NULL, 0 }
+  };
 
 static void
-cfi_advance_loc (void)
+cfi_parse_separator (void)
 {
-  addressT curr_address = frag_now_fix ();
-  if (cfi_info->last_address == curr_address)
-    return;
-  cfi_add_insn (CFA_advance_loc,
-		(long) (curr_address - cfi_info->last_address), 0);
-  cfi_info->last_address = curr_address;
+  SKIP_WHITESPACE ();
+  if (*input_line_pointer == ',')
+    input_line_pointer++;
+  else
+    as_bad (_("missing separator"));
 }
 
-static long
-get_current_offset (struct cfi_info *info)
+static unsigned
+cfi_parse_reg (void)
 {
-  long current_offset = 0;
-  struct cfi_data *data = info->data;
+  int regno;
+  expressionS exp;
+
+#ifdef tc_regname_to_dw2regnum
+  SKIP_WHITESPACE ();
+  if (is_name_beginner (*input_line_pointer)
+      || (*input_line_pointer == '%'
+	  && is_name_beginner (*++input_line_pointer)))
+    {
+      char *name, c;
+
+      name = input_line_pointer;
+      c = get_symbol_end ();
+
+      if ((regno = tc_regname_to_dw2regnum (name)) < 0)
+	{
+	  as_bad (_("bad register expression"));
+	  regno = 0;
+	}
 
-  current_offset = 0;
-  while (data)
+      *input_line_pointer = c;
+      return regno;
+    }
+#endif
+
+  expression (&exp);
+  switch (exp.X_op)
     {
-      if (data->insn == CFA_def_cfa)
-	current_offset = data->param[1];
-      else if (data->insn == CFA_def_cfa_offset)
-	current_offset = data->param[0];
-      data = data->next;
+    case O_register:
+    case O_constant:
+      regno = exp.X_add_number;
+      break;
+
+    default:
+      as_bad (_("bad register expression"));
+      regno = 0;
+      break;
     }
 
-  return current_offset;
+  return regno;
+}
+
+static offsetT
+cfi_parse_const (void)
+{
+  return get_absolute_expression ();
 }
 
 static void
-cfi_make_insn (int arg)
+dot_cfi (int arg)
 {
-  long param[2] = { 0, 0 };
+  offsetT offset;
+  unsigned reg1, reg2;
 
-  if (!cfi_info)
+  if (!cur_fde_data)
     {
       as_bad (_("CFI instruction used without previous .cfi_startproc"));
       return;
     }
 
-  cfi_advance_loc ();
+  /* If the last address was not at the current PC, advance to current.  */
+  if (symbol_get_frag (last_address) != frag_now
+      || S_GET_VALUE (last_address) != frag_now_fix ())
+    cfi_add_advance_loc (symbol_temp_new_now ());
 
   switch (arg)
     {
       /* Instructions that take two arguments (register, integer). */
-    case CFA_offset:
-    case CFA_def_cfa:
-      if (cfi_parse_reg (&param[0]) < 0)
-	{
-	  as_bad (_("first argument to %s is not a register"),
-		  cfi_insn_str (arg));
-	  return;
-	}
-      if (cfi_parse_const (&param[1]) < 0)
-	{
-	  as_bad (_("second argument to %s is not a number"),
-		  cfi_insn_str (arg));
-	  return;
-	}
+    case DW_CFA_offset:
+    case DW_CFA_def_cfa:
+      reg1 = cfi_parse_reg ();
+      cfi_parse_separator ();
+      offset = cfi_parse_const ();
+
+      if (arg == DW_CFA_def_cfa)
+	cfi_add_CFA_def_cfa (reg1, offset);
+      else
+	cfi_add_CFA_offset (reg1, offset);
       break;
 
-    case CFA_register:
-      if (cfi_parse_reg (&param[0]) < 0)
-	{
-	  as_bad (_("first argument to %s is not a register"),
-		  cfi_insn_str (arg));
-	  return;
-	}
-      if (cfi_parse_reg (&param[1]) < 0)
-	{
-	  as_bad (_("second argument to %s is not a register"),
-		  cfi_insn_str (arg));
-	  return;
-	}
+      /* Instructions that take two arguments (register, register). */
+    case DW_CFA_register:
+      reg1 = cfi_parse_reg ();
+      cfi_parse_separator ();
+      reg2 = cfi_parse_reg ();
+
+      cfi_add_CFA_register (reg1, reg2);
       break;
 
       /* Instructions that take one register argument.  */
-    case CFA_def_cfa_register:
-      if (cfi_parse_reg (&param[0]) < 0)
-	{
-	  as_bad (_("argument to %s is not a register"), cfi_insn_str (arg));
-	  return;
-	}
+    case DW_CFA_def_cfa_register:
+      reg1 = cfi_parse_reg ();
+      cfi_add_CFA_def_cfa_register (reg1);
       break;
 
       /* Instructions that take one integer argument.  */
-    case CFA_def_cfa_offset:
-      if (cfi_parse_const (&param[0]) < 0)
-	{
-	  as_bad (_("argument to %s is not a number"), cfi_insn_str (arg));
-	  return;
-	}
+    case DW_CFA_def_cfa_offset:
+      offset = cfi_parse_const ();
+      cfi_add_CFA_def_cfa_offset (offset);
       break;
 
       /* Special handling for pseudo-instruction.  */
     case CFI_adjust_cfa_offset:
-      if (cfi_parse_const (&param[0]) < 0)
-	{
-	  as_bad (_("argument to %s is not a number"),
-		    ".cfi_adjust_cfa_offset");
-	  return;
-	}
-      param[0] += get_current_offset (cfi_info);
-      arg = CFA_def_cfa_offset;
+      offset = cfi_parse_const ();
+      cfi_add_CFA_def_cfa_offset (cur_cfa_offset + offset);
       break;
 
     default:
-      as_bad (_("unknown CFI instruction %d (%s)"), arg, cfi_insn_str (arg));
-      return;
+      abort ();
     }
-  cfi_add_insn (arg, param[0], param[1]);
-}
 
-static symbolS *
-cfi_get_label (void)
-{
-  char symname[40], *symbase=".Llbl_cfi";
-  symbolS *symbolP;
-  unsigned int i = 0;
-
-  snprintf (symname, sizeof (symname), "%s_0x%lx",
-	    symbase, (long) frag_now_fix ());
-  while ((symbolP = symbol_find (symname)))
-    {
-      if ((S_GET_VALUE (symbolP) == frag_now_fix ())
-	  && (S_GET_SEGMENT (symbolP) == now_seg))
-	return symbolP;
-
-      snprintf (symname, sizeof (symname), "%s_0x%lx_%u",
-		symbase, (long) frag_now_fix (), i++);
-    }
-#ifdef BFD_ASSEMBLER
-  symbolP = (symbolS *) local_symbol_make (symname, now_seg,
-					   (valueT) frag_now_fix (),
-					   frag_now);
-#else
-  symbolP = symbol_make (symname);
-#endif
-  return symbolP;
+  demand_empty_rest_of_line ();
 }
 
 static void
-dot_cfi_startproc (void)
+dot_cfi_startproc (int ignored ATTRIBUTE_UNUSED)
 {
-#ifdef tc_cfi_frame_initial_instructions
-  const char *simple = "simple";
-#endif
+  int simple = 0;
 
-  if (cfi_info)
+  if (cur_fde_data)
     {
       as_bad (_("previous CFI entry not closed (missing .cfi_endproc)"));
       return;
     }
 
-#if defined(TARGET_USE_CFIPOP)
-  /* Because this file is linked even for architectures that 
-     don't use CFI, we must wrap this call.  */
-  if (current_config.addr_length == 0)
-    tc_cfi_init ();
-#endif
+  cfi_new_fde (symbol_temp_new_now ());
 
-  cfi_info = alloc_cfi_info ();
+  SKIP_WHITESPACE ();
+  if (is_name_beginner (*input_line_pointer))
+    {
+      char *name, c;
 
-  cfi_info->start_address = frag_now_fix ();
-  cfi_info->last_address = cfi_info->start_address;
-  cfi_info->labelname = S_GET_NAME (cfi_get_label ());
+      name = input_line_pointer;
+      c = get_symbol_end ();
 
-  SKIP_WHITESPACE ();
-#ifdef tc_cfi_frame_initial_instructions
-  if (strncmp (simple, input_line_pointer, strlen (simple)) != 0)
+      if (strcmp (name, "simple") == 0)
+	{
+	  simple = 1;
+	  *input_line_pointer = c;
+	}
+      else
+	input_line_pointer = name;
+    }
+  demand_empty_rest_of_line ();
+
+  if (!simple)
     tc_cfi_frame_initial_instructions ();
-  else
-    input_line_pointer += strlen (simple);
-#endif
 }
 
-#define cfi_is_advance_insn(insn)				\
-  ((insn >= CFA_set_loc && insn <= CFA_advance_loc4)		\
-   || insn == CFA_advance_loc)
+static void
+dot_cfi_endproc (int ignored ATTRIBUTE_UNUSED)
+{
+  if (! cur_fde_data)
+    {
+      as_bad (_(".cfi_endproc without corresponding .cfi_startproc"));
+      return;
+    }
 
-/* Output CFI instructions to the file.  */
+  cfi_end_fde (symbol_temp_new_now ());
+}
 
-enum data_types
-  {
-    t_ascii = 0,
-    t_byte = 1,
-    t_half = 2,
-    t_long = 4,
-    t_quad = 8,
-    t_uleb128 = 0x10,
-    t_sleb128 = 0x11
-  };
+
+/* Emit a single byte into the current segment.  */
 
-static int
-output_data (char **p, unsigned long *size, enum data_types type, long value)
+static inline void
+out_one (int byte)
 {
-  char *ptr = *p;
-  unsigned int ret_size;
+  FRAG_APPEND_1_CHAR (byte);
+}
 
-  switch (type)
-    {
-    case t_byte:
-      ret_size = 1;
-      break;
-    case t_half:
-      ret_size = 2;
-      break;
-    case t_long:
-      ret_size = 4;
-      break;
-    case t_quad:
-    case t_uleb128:
-    case t_sleb128:
-      ret_size = 8;
-      break;
-    default:
-      /* This should never happen - throw an internal error.  */
-      as_fatal (_("unknown type %d"), type);
-      return 0;
-    }
+/* Emit a two-byte word into the current segment.  */
 
-  if (*size < ret_size)
-    {
-      as_bad (_("output_data buffer is too small"));
-      return 0;
-    }
+static inline void
+out_two (int data)
+{
+  md_number_to_chars (frag_more (2), data, 2);
+}
 
-  switch (type)
-    {
-    case t_byte:
-      *ptr = (char) value;
-      if (verbose)
-	printf ("\t.byte\t0x%x\n", (unsigned char) *ptr);
-      break;
-    case t_half:
-      *(short *) ptr = (short) value & 0xFFFF;
-      if (verbose)
-	printf ("\t.half\t0x%x\n", (unsigned short) *ptr);
-      break;
-    case t_long:
-      *(int *) ptr = (int) value & 0xFFFFFFFF;
-      if (verbose)
-	printf ("\t.long\t0x%x\n", (unsigned int) *ptr);
-      break;
-    case t_quad:
-      *(long long *) ptr = (long long) value & 0xFFFFFFFF;
-      if (verbose)
-	printf ("\t.quad\t0x%x\n", (unsigned int) *ptr);
-      break;
-    case t_uleb128:
-    case t_sleb128:
-      ret_size = output_leb128 (ptr, value, type == t_sleb128);
-      if (verbose)
-	printf ("\t.%s\t0x%lx\n",
-		type == t_sleb128 ? "sleb128" : "uleb128",
-		value);
-      break;
-    default:
-      as_fatal (_("unknown type %d"), type);
-      return 0;
-    }
+/* Emit a four byte word into the current segment.  */
 
-  *size -= ret_size;
-  *p += ret_size;
+static inline void
+out_four (int data)
+{
+  md_number_to_chars (frag_more (4), data, 4);
+}
+
+/* Emit an unsigned "little-endian base 128" number.  */
 
-  return ret_size;
+static void
+out_uleb128 (addressT value)
+{
+  output_leb128 (frag_more (sizeof_leb128 (value, 0)), value, 0);
 }
 
-static int
-cfi_output_insn (struct cfi_data *data, char **buf, unsigned long *buf_size)
+/* Emit an unsigned "little-endian base 128" number.  */
+
+static void
+out_sleb128 (offsetT value)
 {
-  char **pbuf = buf, *orig_buf = *buf;
-  unsigned long size;
+  output_leb128 (frag_more (sizeof_leb128 (value, 1)), value, 1);
+}
 
-  if (!data || !buf)
-    as_fatal (_("cfi_output_insn called with NULL pointer"));
+static void
+output_cfi_insn (struct cfi_insn_data *insn)
+{
+  offsetT offset;
+  unsigned int regno;
 
-  switch (data->insn)
+  switch (insn->insn)
     {
-    case CFA_advance_loc:
-      if (verbose)
-	printf ("\t# %s(%ld)\n", cfi_insn_str (data->insn),
-		data->param[0]);
-      if (data->param[0] <= 0x3F)
-	{
-	  output_data (pbuf, buf_size, t_byte, CFA_advance_loc +
-		       (data->param[0] / current_config.code_align));
-	}
-      else if (data->param[0] <= 0xFF)
-	{
-	  output_data (pbuf, buf_size, t_byte, CFA_advance_loc1);
-	  output_data (pbuf, buf_size, t_byte,
-		       data->param[0] / current_config.code_align);
-	}
-      else if (data->param[0] <= 0xFFFF)
+    case DW_CFA_advance_loc:
+      {
+	symbolS *from = insn->u.ll.lab1;
+	symbolS *to = insn->u.ll.lab2;
+
+	if (symbol_get_frag (to) == symbol_get_frag (from))
+	  {
+	    addressT delta = S_GET_VALUE (to) - S_GET_VALUE (from);
+	    addressT scaled = delta / DWARF2_LINE_MIN_INSN_LENGTH;
+
+	    if (scaled <= 0x3F)
+	      out_one (DW_CFA_advance_loc + scaled);
+	    else if (delta <= 0xFF)
+	      {
+	        out_one (DW_CFA_advance_loc1);
+	        out_one (delta);
+	      }
+	    else if (delta <= 0xFFFF)
+	      {
+	        out_one (DW_CFA_advance_loc2);
+	        out_two (delta);
+	      }
+	    else
+	      {
+	        out_one (DW_CFA_advance_loc4);
+	        out_four (delta);
+	      }
+	  }
+	else
+	  {
+	    expressionS exp;
+
+	    exp.X_op = O_subtract;
+	    exp.X_add_symbol = to;
+	    exp.X_op_symbol = from;
+	    exp.X_add_number = 0;
+
+	    /* The code in ehopt.c expects that one byte of the encoding
+	       is already allocated to the frag.  This comes from the way
+	       that it scans the .eh_frame section looking first for the
+	       .byte DW_CFA_advance_loc4.  */
+	    frag_more (1);
+
+	    frag_var (rs_cfa, 4, 0, DWARF2_LINE_MIN_INSN_LENGTH << 3,
+		      make_expr_symbol (&exp), frag_now_fix () - 1,
+		      (char *) frag_now);
+	  }
+      }
+      break;
+
+    case DW_CFA_def_cfa:
+      offset = insn->u.ri.offset;
+      if (offset < 0)
 	{
-	  output_data (pbuf, buf_size, t_byte, CFA_advance_loc2);
-	  output_data (pbuf, buf_size, t_half,
-		       data->param[0] / current_config.code_align);
+	  out_one (DW_CFA_def_cfa_sf);
+	  out_uleb128 (insn->u.ri.reg);
+	  out_uleb128 (offset);
 	}
       else
 	{
-	  output_data (pbuf, buf_size, t_byte, CFA_advance_loc4);
-	  output_data (pbuf, buf_size, t_long,
-		       data->param[0] / current_config.code_align);
+	  out_one (DW_CFA_def_cfa);
+	  out_uleb128 (insn->u.ri.reg);
+	  out_uleb128 (offset);
 	}
       break;
 
-    case CFA_def_cfa:
-      if (verbose)
-	printf ("\t# CFA_def_cfa(%ld,%ld)\n",
-		data->param[0], data->param[1]);
-      output_data (pbuf, buf_size, t_byte, CFA_def_cfa);
-      output_data (pbuf, buf_size, t_uleb128, data->param[0]);
-      output_data (pbuf, buf_size, t_uleb128, data->param[1]);
+    case DW_CFA_def_cfa_register:
+      out_one (DW_CFA_def_cfa_register);
+      out_uleb128 (insn->u.i);
       break;
 
-    case CFA_def_cfa_register:
-    case CFA_def_cfa_offset:
-      if (verbose)
-	printf ("\t# %s(%ld)\n", cfi_insn_str (data->insn),
-		data->param[0]);
-      output_data (pbuf, buf_size, t_byte, data->insn);
-      output_data (pbuf, buf_size, t_uleb128, data->param[0]);
+    case DW_CFA_def_cfa_offset:
+      offset = insn->u.i;
+      if (offset < 0)
+	{
+	  out_one (DW_CFA_def_cfa_offset_sf);
+	  out_sleb128 (offset);
+	}
+      else
+	{
+	  out_one (DW_CFA_def_cfa_offset);
+	  out_uleb128 (offset);
+	}
       break;
 
-    case CFA_offset:
-      if (verbose)
-	printf ("\t# %s(%ld,%ld)\n", cfi_insn_str (data->insn),
-		data->param[0], data->param[1]);
-
-      /* Check whether to use CFA_offset or CFA_offset_extended.  */
-      if (data->param[0] <= 0x3F)
-	output_data (pbuf, buf_size, t_byte, CFA_offset + data->param[0]);
+    case DW_CFA_offset:
+      regno = insn->u.ri.reg;
+      offset = insn->u.ri.offset / DWARF2_CIE_DATA_ALIGNMENT;
+      if (offset < 0)
+	{
+	  out_one (DW_CFA_offset_extended);
+	  out_uleb128 (regno);
+	  out_sleb128 (offset);
+	}
+      else if (regno <= 0x3F)
+	{
+	  out_one (DW_CFA_offset + regno);
+	  out_uleb128 (offset);
+	}
       else
 	{
-	  output_data (pbuf, buf_size, t_byte, CFA_offset_extended);
-	  output_data (pbuf, buf_size, t_uleb128, data->param[0]);
+	  out_one (DW_CFA_offset_extended);
+	  out_uleb128 (regno);
+	  out_uleb128 (offset);
 	}
-      output_data (pbuf, buf_size, t_uleb128,
-		   data->param[1] / current_config.data_align);
       break;
 
-    case CFA_register:
-      if (verbose)
-	printf ("\t# %s(%ld,%ld)\n", cfi_insn_str (data->insn),
-		data->param[0], data->param[1]);
-      output_data (pbuf, buf_size, t_byte, CFA_register);
-      output_data (pbuf, buf_size, t_uleb128, data->param[0]);
-      output_data (pbuf, buf_size, t_uleb128, data->param[1]);
+    case DW_CFA_register:
+      out_one (DW_CFA_register);
+      out_uleb128 (insn->u.rr.reg1);
+      out_uleb128 (insn->u.rr.reg2);
       break;
 
-    case CFA_nop:
-      if (verbose)
-	printf ("\t# CFA_nop\n");
-      output_data (pbuf, buf_size, t_byte, CFA_nop);
+    case DW_CFA_nop:
+      out_one (DW_CFA_nop);
       break;
 
     default:
-      as_warn ("CFA_unknown[%d](%ld,%ld)", data->insn,
-	       data->param[0], data->param[1]);
+      abort ();
     }
-  size = *pbuf - orig_buf;
-  *buf = *pbuf;
-  *buf_size -= size;
-  return size;
 }
 
 static void
-dot_cfi_endproc (void)
+output_cie (struct cie_entry *cie)
 {
-  struct cfi_data *data_ptr;
-  struct cie_entry *cie_ptr;
-  char *cie_buf, *fde_buf, *pbuf, *where;
-  unsigned long buf_size, cie_size, fde_size, last_cie_offset;
-  unsigned long fde_initloc_offset, fde_len_offset, fde_offset;
-  segT saved_seg, cfi_seg;
+  symbolS *after_size_address, *end_address;
   expressionS exp;
+  struct cfi_insn_data *i;
+
+  cie->start_address = symbol_temp_new_now ();
+  after_size_address = symbol_temp_make ();
+  end_address = symbol_temp_make ();
+
+  exp.X_op = O_subtract;
+  exp.X_add_symbol = end_address;
+  exp.X_op_symbol = after_size_address;
+  exp.X_add_number = 0;
+
+  emit_expr (&exp, 4);				/* Length */
+  symbol_set_value_now (after_size_address);
+  out_four (0);					/* CIE id */
+  out_one (DW_CIE_VERSION);			/* Version */
+  out_one ('z');				/* Augmentation */
+  out_one ('R');
+  out_one (0);
+  out_uleb128 (DWARF2_LINE_MIN_INSN_LENGTH);	/* Code alignment */
+  out_sleb128 (DWARF2_CIE_DATA_ALIGNMENT);	/* Data alignment */
+  out_one (cie->return_column);			/* Return column */
+  out_uleb128 (1);				/* Augmentation size */
+  out_one (DW_EH_PE_pcrel | DW_EH_PE_sdata4);
+
+  if (cie->first)
+    for (i = cie->first; i != cie->last; i = i->next)
+      output_cfi_insn (i);
+
+  frag_align (2, 0, 0);
+  symbol_set_value_now (end_address);
+}
 
-  if (! cfi_info)
-    {
-      as_bad (_(".cfi_endproc without corresponding .cfi_startproc"));
-      return;
-    }
-  cfi_info->end_address = frag_now_fix ();
+static void
+output_fde (struct fde_entry *fde, struct cie_entry *cie,
+	    struct cfi_insn_data *first)
+{
+  symbolS *after_size_address, *end_address;
+  expressionS exp;
 
-  /* Open .eh_frame section.  */
-  saved_seg = now_seg;
-  cfi_seg = subseg_new (".eh_frame", 0);
-#ifdef BFD_ASSEMBLER
-  bfd_set_section_flags (stdoutput, cfi_seg,
-			 SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_DATA);
-#endif
-  subseg_set (cfi_seg, 0);
+  after_size_address = symbol_temp_make ();
+  end_address = symbol_temp_make ();
 
-  /* Build CIE.  */
-  cie_buf = xcalloc (1024, 1);
-  /* Skip space for CIE length.  */
-  pbuf = cie_buf + 4;
-  buf_size = 1020;
-
-  if (verbose)
-    printf ("# CIE *****\n");
-
-  /* CIE id.  */
-  output_data (&pbuf, &buf_size, t_long, 0x0);
-  /* Version.  */
-  output_data (&pbuf, &buf_size, t_byte, 1);
-  /* Augmentation.  */
-  output_data (&pbuf, &buf_size, t_byte, 0);
-  /* Code alignment.  */
-  output_data (&pbuf, &buf_size, t_uleb128, current_config.code_align);
-  /* Data alignment.  */
-  output_data (&pbuf, &buf_size, t_sleb128, current_config.data_align);
-  /* Return address column.  */
-  output_data (&pbuf, &buf_size, t_byte, current_config.ra_column);
-
-  /* Build CFI instructions.  */
-  data_ptr = cfi_info->data;
-  while (data_ptr && !cfi_is_advance_insn (data_ptr->insn))
-    {
-      cfi_output_insn (data_ptr, &pbuf, &buf_size);
-      data_ptr = data_ptr->next;
-    }
+  exp.X_op = O_subtract;
+  exp.X_add_symbol = end_address;
+  exp.X_op_symbol = after_size_address;
+  exp.X_add_number = 0;
+  emit_expr (&exp, 4);				/* Length */
+  symbol_set_value_now (after_size_address);
 
-  /* Align the whole data to current_config.eh_align.  */
-  cie_size = pbuf - cie_buf;
-  cie_size += current_config.eh_align - cie_size % current_config.eh_align;
+  exp.X_add_symbol = after_size_address;
+  exp.X_op_symbol = cie->start_address;
+  emit_expr (&exp, 4);				/* CIE offset */
+  
+  exp.X_add_symbol = fde->start_address;
+  exp.X_op_symbol = symbol_temp_new_now ();
+  emit_expr (&exp, 4);				/* Code offset */
 
-  /* CIE length.  */
-  pbuf = cie_buf;
-  output_data (&pbuf, &buf_size, t_long, cie_size - 4);
+  exp.X_add_symbol = fde->end_address;
+  exp.X_op_symbol = fde->start_address;		/* Code length */
+  emit_expr (&exp, 4);
 
-  /* OK, we built the CIE. Let's write it to the file...  */
-  last_cie_offset = frag_now_fix ();
+  out_uleb128 (0);				/* Augmentation size */
 
-  /* Check if we have already emitted the exactly same CIE. 
-     If yes then use its offset instead and don't put out 
-     the new one.  */
-  cie_ptr = cie_root;
-  while (cie_ptr)
-    {
-      if (cie_ptr->size == cie_size - 4
-	  && memcmp (cie_ptr->data, cie_buf + 4, cie_ptr->size) == 0)
-	break;
-      cie_ptr = cie_ptr->next;
-    }
+  for (; first; first = first->next)
+    output_cfi_insn (first);
 
-  /* If we have found the same CIE, use it...  */
-  if (cie_ptr)
-    {
-      if (verbose)
-	printf ("# Duplicate CIE found. Previous is at offset %lu\n",
-		cie_ptr->offset);
-      last_cie_offset = cie_ptr->offset;
-    }
-  else
+  frag_align (2, 0, 0);
+  symbol_set_value_now (end_address);
+}
+
+static struct cie_entry *
+select_cie_for_fde (struct fde_entry *fde, struct cfi_insn_data **pfirst)
+{
+  struct cfi_insn_data *i, *j;
+  struct cie_entry *cie;
+
+  for (cie = cie_root; cie; cie = cie->next)
     {
-      /* Otherwise join this CIE to the list.  */
-      where = (unsigned char *) frag_more (cie_size);
-      memcpy (where, cie_buf, cie_size);
-      if (cie_root)
+      if (cie->return_column != fde->return_column)
+	continue;
+      for (i = cie->first, j = fde->data;
+	   i != cie->last && j != NULL;
+	   i = i->next, j = j->next)
 	{
-	  cie_ptr = cie_root;
-	  while (cie_ptr->next)
-	    cie_ptr = cie_ptr->next;
-	  cie_ptr->next = calloc (sizeof (struct cie_entry), 1);
-	  cie_ptr = cie_ptr->next;
+	  if (i->insn != j->insn)
+	    goto fail;
+	  switch (i->insn)
+	    {
+	    case DW_CFA_advance_loc:
+	      /* We reached the first advance in the FDE, but did not
+		 reach the end of the CIE list.  */
+	      goto fail;
+
+	    case DW_CFA_offset:
+	    case DW_CFA_def_cfa:
+	      if (i->u.ri.reg != j->u.ri.reg)
+		goto fail;
+	      if (i->u.ri.offset != j->u.ri.offset)
+		goto fail;
+	      break;
+
+	    case DW_CFA_register:
+	      if (i->u.rr.reg1 != j->u.rr.reg1)
+		goto fail;
+	      if (i->u.rr.reg2 != j->u.rr.reg2)
+		goto fail;
+	      break;
+
+	    case DW_CFA_def_cfa_register:
+	      if (i->u.r != j->u.r)
+		goto fail;
+	      break;
+
+	    case DW_CFA_def_cfa_offset:
+	      if (i->u.i != j->u.i)
+		goto fail;
+	      break;
+
+	    default:
+	      abort ();
+	    }
 	}
-      else
+
+      /* Success if we reached the end of the CIE list, and we've either
+	 run out of FDE entries or we've encountered an advance.  */
+      if (i == cie->last && (!j || j->insn == DW_CFA_advance_loc))
 	{
-	  cie_root = calloc (sizeof (struct cie_entry), 1);
-	  cie_ptr = cie_root;
+	  *pfirst = j;
+	  return cie;
 	}
 
-      cie_ptr->size = cie_size - 4;
-      cie_ptr->data = calloc (cie_ptr->size, 1);
-      cie_ptr->offset = last_cie_offset;
-      memcpy (cie_ptr->data, cie_buf + 4, cie_ptr->size);
-    }
-
-  /* Clean up.  */
-  free (cie_buf);
-
-  /* Build the FDE...  */
-  fde_buf = xcalloc (1024, 1);
-  pbuf = fde_buf;
-  buf_size = 1024;
-
-  /* Offset of this FDE in current fragment.  */
-  fde_offset = frag_now_fix ();
-
-  if (verbose)
-    {
-      printf ("# FDE: start=0x%lx, end=0x%lx, delta=%d\n",
-	      (long) cfi_info->start_address,
-	      (long) cfi_info->end_address,
-	      (int) (cfi_info->end_address - cfi_info->start_address));
-    }
-
-  /* FDE length (t_long, 4 bytes) - will be set later.  */
-  fde_len_offset = pbuf - fde_buf;
-  pbuf += 4;
-  buf_size -= 4;
-
-  /* CIE pointer - offset from here.  */
-  output_data (&pbuf, &buf_size, t_long, fde_offset - last_cie_offset + 4);
-
-  /* FDE initial location - this must be set relocatable!  */
-  fde_initloc_offset = pbuf - fde_buf + fde_offset;
-  output_data (&pbuf, &buf_size, current_config.addr_length,
-	       cfi_info->start_address);
-
-  /* FDE address range.  */
-  output_data (&pbuf, &buf_size, current_config.addr_length,
-	       cfi_info->end_address - cfi_info->start_address);
-
-  while (data_ptr)
-    {
-      cfi_output_insn (data_ptr, &pbuf, &buf_size);
-      data_ptr = data_ptr->next;
+    fail:;
     }
 
-  fde_size = pbuf - fde_buf;
-  fde_size += current_config.eh_align - fde_size % current_config.eh_align;
+  cie = xmalloc (sizeof (struct cie_entry));
+  cie->next = cie_root;
+  cie_root = cie;
+  cie->return_column = fde->return_column;
+  cie->first = fde->data;
 
-  /* Now we can set FDE length.  */
-  pbuf = fde_buf + fde_len_offset;
-  buf_size = 4;
-  output_data (&pbuf, &buf_size, t_long, fde_size - 4);
-
-  /* Copy FDE to objfile.  */
-  where = (unsigned char *) frag_more (fde_size);
-  memcpy (where, fde_buf, fde_size);
-
-  /* Set relocation for initial address.  */
-  buf_size = current_config.addr_length;
-  memset (&exp, 0, sizeof (exp));
-  exp.X_op = O_symbol;
-  exp.X_add_symbol = symbol_find (cfi_info->labelname);
-  fix_new_exp (frag_now, fde_initloc_offset,
-	       current_config.addr_length,
-	       &exp, 0, current_config.reloc_type);
-
-  /* Clean up.  */
-  free (fde_buf);
+  for (i = cie->first; i ; i = i->next)
+    if (i->insn == DW_CFA_advance_loc)
+      break;
 
-  free (cfi_info);
-  cfi_info = NULL;
+  cie->last = i;
+  *pfirst = i;
+   
+  output_cie (cie);
 
-  /* Restore previous segment.  */
-  subseg_set (saved_seg, 0);
+  return cie;
 }
 
 void
-dot_cfi (int arg)
+cfi_finish (void)
 {
-  long param;
+  segT cfi_seg;
+  struct fde_entry *fde;
 
-  switch (arg)
+  if (cur_fde_data)
     {
-    case CFI_startproc:
-      dot_cfi_startproc ();
-      break;
-    case CFI_endproc:
-      dot_cfi_endproc ();
-      break;
-    case CFA_def_cfa:
-    case CFA_def_cfa_register:
-    case CFA_def_cfa_offset:
-    case CFA_offset:
-    case CFA_register:
-    case CFI_adjust_cfa_offset:
-      cfi_make_insn (arg);
-      break;
-    case CFI_verbose:
-      if (cfi_parse_const (&param) >= 0)
-	verbose = (int) param;
-      else
-	verbose = 1;
-      break;
-    default:
-      as_bad (_("unknown CFI code 0x%x (%s)"), arg, cfi_insn_str (arg));
-      break;
+      as_bad (_("open CFI at the end of file; missing .cfi_endproc directive"));
+      cur_fde_data->end_address = cur_fde_data->start_address;
     }
-  ignore_rest_of_line ();
-}
 
-void
-cfi_set_config (struct cfi_config *cfg)
-{
-  assert (cfg != NULL);
-  assert (cfg->addr_length > 0);
+  if (all_fde_data == 0)
+    return;
 
-  current_config = *cfg;
-}
+  /* Open .eh_frame section.  */
+  cfi_seg = subseg_new (".eh_frame", 0);
+#ifdef BFD_ASSEMBLER
+  bfd_set_section_flags (stdoutput, cfi_seg,
+			 SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_DATA);
+#endif
+  subseg_set (cfi_seg, 0);
+  record_alignment (cfi_seg, 2);
 
-void
-cfi_finish (void)
-{
-  if (cfi_info)
-    as_bad (_("open CFI at the end of file; missing .cfi_endproc directive"));
+  for (fde = all_fde_data; fde ; fde = fde->next)
+    {
+      struct cfi_insn_data *first;
+      struct cie_entry *cie;
+
+      cie = select_cie_for_fde (fde, &first);
+      output_fde (fde, cie, first);
+    }
 }
diff --git a/gas/dw2gencfi.h b/gas/dw2gencfi.h
index 1c72454..792225d 100644
--- a/gas/dw2gencfi.h
+++ b/gas/dw2gencfi.h
@@ -24,77 +24,23 @@
 
 #include "elf/dwarf2.h"
 
-struct cfi_config {
-  /* Target address length in bytes. (usually 4 or 8).
-     Round it up for archs like S/390 with 31b addresses.  */
-  unsigned int addr_length;
-
-  /* Alignment of .eh_frame blocks in bytes (usually 1, 4 or 8).  */
-  unsigned int eh_align;
-
-  /* Code alignment (1 for x86/amd64 machines, 4 or 8 for
-     RISC machines). Consult Dwarf2 standard for details.  */
-  int code_align;
-
-  /* Data (stack) alignment (-4 on x86, -8 on amd64, something
-     positive on archs where stack grows up).  Consult Dwarf2
-     standard for details.  */
-  int data_align;
-
-  /* Return address column (0x8 on x86, 0x10 on amd64).  Consult
-     Dwarf2 standard for details.  */
-  int ra_column;
-
-  /* Relocation type for init_addr FDE record. (BFD_RELOC_64
-     on amd64).  */
-  int reloc_type;
-};
-
-/* Codes of CFI instructions taken from Dwarf2 standard.  */
-enum cfi_insn {
-  CFA_nop = DW_CFA_nop,
-  CFA_set_loc = DW_CFA_set_loc,
-  CFA_advance_loc1 = DW_CFA_advance_loc1,
-  CFA_advance_loc2 = DW_CFA_advance_loc2,
-  CFA_advance_loc4 = DW_CFA_advance_loc4,
-  CFA_offset_extended = DW_CFA_offset_extended,
-  CFA_resotre_extended = DW_CFA_restore_extended,
-  CFA_undefined = DW_CFA_undefined,
-  CFA_same_value = DW_CFA_same_value,
-  CFA_register = DW_CFA_register,
-  CFA_remember_state = DW_CFA_remember_state,
-  CFA_restore_state = DW_CFA_restore_state,
-  CFA_def_cfa = DW_CFA_def_cfa,
-  CFA_def_cfa_register = DW_CFA_def_cfa_register,
-  CFA_def_cfa_offset = DW_CFA_def_cfa_offset,
-  CFA_advance_loc = DW_CFA_advance_loc,
-  CFA_offset = DW_CFA_offset,
-  CFA_restore = DW_CFA_restore,
-
-  /* These don't belong to the standard.  */
-  CFI_startproc = 0xff00,
-  CFI_endproc = 0xff01,
-  CFI_adjust_cfa_offset = 0xff10,
-  CFI_verbose = 0xffff
-};
+struct symbol;
 
 extern const pseudo_typeS cfi_pseudo_table[];
 
-/* Insert .cfi_* directives to the list of pseudo-ops.  */
-void cfi_pop_insert PARAMS ((void));
-
-/* Set/change setup of the CFI machinery.  This change won't
-   affect already generated CIEs/FDEs.  */
-void cfi_set_config PARAMS ((struct cfi_config *cfg));
-
 /* cfi_finish() is called at the end of file. It will complain if
    the last CFI wasn't properly closed by .cfi_endproc.  */
-void cfi_finish PARAMS ((void));
-
-/* Add CFI instruction to the list of instructions
-   of the current frame. cfi_add_insn() could be used
-   in tc_cfi_frame_initial_instructions() to add instructions
-   needed for every frame (ie. those that usually go to CIE).  */
-void cfi_add_insn (enum cfi_insn insn, long param0, long param1);
+extern void cfi_finish (void);
+
+/* Entry points for backends to add unwind information.  */
+extern void cfi_new_fde (struct symbol *);
+extern void cfi_end_fde (struct symbol *);
+extern void cfi_set_return_column (unsigned);
+extern void cfi_add_advance_loc (struct symbol *);
+extern void cfi_add_CFA_offset (unsigned, offsetT);
+extern void cfi_add_CFA_def_cfa (unsigned, offsetT);
+extern void cfi_add_CFA_register (unsigned, unsigned);
+extern void cfi_add_CFA_def_cfa_register (unsigned);
+extern void cfi_add_CFA_def_cfa_offset (offsetT);
 
 #endif /* DW2GENCFI_H */
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index ec0e1e8..5a7cbe0 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2003-05-27  Richard Henderson  <rth@redhat.com>
+
+	* gas/cfi/cfi-i386.d: Update for dw2gencfi rewrite.
+	* gas/cfi/cfi-x86_64.d: Likewise.
+	* gas/cfi/cfi-i386-2.d: New.
+	* gas/cfi/cfi-i386-2.s: New.
+
 2003-05-23  Jason Eckhardt  <jle@rice.edu>
 
 	* gas/i860/xp.s: New file.
diff --git a/gas/testsuite/gas/cfi/cfi-i386-2.d b/gas/testsuite/gas/cfi/cfi-i386-2.d
new file mode 100644
index 0000000..a42e088
--- /dev/null
+++ b/gas/testsuite/gas/cfi/cfi-i386-2.d
@@ -0,0 +1,26 @@
+#readelf: -wf
+#name: CFI on i386, 2
+The section .eh_frame contains:
+
+00000000 00000014 00000000 CIE
+  Version:               1
+  Augmentation:          "zR"
+  Code alignment factor: 1
+  Data alignment factor: -4
+  Return address column: 8
+  Augmentation data:     1b
+
+  DW_CFA_def_cfa: r4 ofs 4
+  DW_CFA_offset: r8 at cfa-4
+  DW_CFA_nop
+  DW_CFA_nop
+
+00000018 00000018 0000001c FDE cie=00000000 pc=00000020..00000029
+  DW_CFA_advance_loc: 1 to 00000021
+  DW_CFA_def_cfa_offset: 8
+  DW_CFA_offset: r5 at cfa-8
+  DW_CFA_advance_loc: 4 to 00000025
+  DW_CFA_offset: r3 at cfa-12
+  DW_CFA_def_cfa_offset: 12
+  DW_CFA_nop
+
diff --git a/gas/testsuite/gas/cfi/cfi-i386-2.s b/gas/testsuite/gas/cfi/cfi-i386-2.s
new file mode 100644
index 0000000..811220b
--- /dev/null
+++ b/gas/testsuite/gas/cfi/cfi-i386-2.s
@@ -0,0 +1,17 @@
+	.text
+	.globl foo
+	.type foo,@function
+	.cfi_startproc
+foo:
+	push %ebp
+	.cfi_adjust_cfa_offset 4
+	.cfi_offset %ebp, -8
+	.align 4
+	push %ebx
+	.cfi_offset %ebx, -12
+	.cfi_adjust_cfa_offset 4
+	nop
+	pop %ebx
+	pop %ebp
+	ret
+	.cfi_endproc
diff --git a/gas/testsuite/gas/cfi/cfi-i386.d b/gas/testsuite/gas/cfi/cfi-i386.d
index 6253066..471f5e1 100644
--- a/gas/testsuite/gas/cfi/cfi-i386.d
+++ b/gas/testsuite/gas/cfi/cfi-i386.d
@@ -2,50 +2,46 @@
 #name: CFI on i386
 The section .eh_frame contains:
 
-00000000 00000010 00000000 CIE
+00000000 00000014 00000000 CIE
   Version:               1
-  Augmentation:          ""
+  Augmentation:          "zR"
   Code alignment factor: 1
   Data alignment factor: -4
   Return address column: 8
+  Augmentation data:     1b
 
-  DW_CFA_def_cfa: r7 ofs 4
+  DW_CFA_def_cfa: r4 ofs 4
   DW_CFA_offset: r8 at cfa-4
   DW_CFA_nop
   DW_CFA_nop
 
-00000014 00000014 00000018 FDE cie=00000000 pc=00000000..00000012
-  DW_CFA_advance_loc: 6 to 00000006
+00000018 00000014 0000001c FDE cie=00000000 pc=00000020..00000032
+  DW_CFA_advance_loc: 6 to 00000026
   DW_CFA_def_cfa_offset: 4664
-  DW_CFA_advance_loc: 11 to 00000011
+  DW_CFA_advance_loc: 11 to 00000031
   DW_CFA_def_cfa_offset: 4
-  DW_CFA_nop
 
-0000002c 00000018 00000030 FDE cie=00000000 pc=00000012..0000001f
-  DW_CFA_advance_loc: 1 to 00000013
+00000030 00000018 00000034 FDE cie=00000000 pc=0000004a..00000057
+  DW_CFA_advance_loc: 1 to 0000004b
   DW_CFA_def_cfa_offset: 8
-  DW_CFA_offset: r6 at cfa-8
-  DW_CFA_advance_loc: 2 to 00000015
-  DW_CFA_def_cfa_reg: r6
-  DW_CFA_advance_loc: 9 to 0000001e
-  DW_CFA_def_cfa_reg: r7
-  DW_CFA_nop
+  DW_CFA_offset: r5 at cfa-8
+  DW_CFA_advance_loc: 2 to 0000004d
+  DW_CFA_def_cfa_reg: r5
+  DW_CFA_advance_loc: 9 to 00000056
+  DW_CFA_def_cfa_reg: r4
 
-00000048 00000014 0000004c FDE cie=00000000 pc=0000001f..0000002f
-  DW_CFA_advance_loc: 2 to 00000021
-  DW_CFA_def_cfa_reg: r1
-  DW_CFA_advance_loc: 13 to 0000002e
-  DW_CFA_def_cfa: r7 ofs 4
-  DW_CFA_nop
+0000004c 00000014 00000050 FDE cie=00000000 pc=00000073..00000083
+  DW_CFA_advance_loc: 2 to 00000075
+  DW_CFA_def_cfa_reg: r3
+  DW_CFA_advance_loc: 13 to 00000082
+  DW_CFA_def_cfa: r4 ofs 4
 
-00000060 00000010 00000064 FDE cie=00000000 pc=0000002f..00000035
-  DW_CFA_nop
+00000064 00000010 00000068 FDE cie=00000000 pc=0000009b..000000a1
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
 
-00000074 00000010 00000078 FDE cie=00000000 pc=00000035..00000044
-  DW_CFA_nop
+00000078 00000010 0000007c FDE cie=00000000 pc=000000b5..000000c4
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
diff --git a/gas/testsuite/gas/cfi/cfi-x86_64.d b/gas/testsuite/gas/cfi/cfi-x86_64.d
index 2d47c2d..2b19641 100644
--- a/gas/testsuite/gas/cfi/cfi-x86_64.d
+++ b/gas/testsuite/gas/cfi/cfi-x86_64.d
@@ -1,68 +1,51 @@
 #readelf: -wf
 #name: CFI on x86-64
-
 The section .eh_frame contains:
 
 00000000 00000014 00000000 CIE
   Version:               1
-  Augmentation:          ""
+  Augmentation:          "zR"
   Code alignment factor: 1
   Data alignment factor: -8
   Return address column: 16
+  Augmentation data:     1b
 
   DW_CFA_def_cfa: r7 ofs 8
   DW_CFA_offset: r16 at cfa-8
   DW_CFA_nop
   DW_CFA_nop
-  DW_CFA_nop
-  DW_CFA_nop
-  DW_CFA_nop
-  DW_CFA_nop
 
-00000018 0000001c 0000001c FDE cie=00000000 pc=00000000..00000014
-  DW_CFA_advance_loc: 7 to 00000007
+00000018 00000014 0000001c FDE cie=00000000 pc=00000020..00000034
+  DW_CFA_advance_loc: 7 to 00000027
   DW_CFA_def_cfa_offset: 4668
-  DW_CFA_advance_loc: 12 to 00000013
+  DW_CFA_advance_loc: 12 to 00000033
   DW_CFA_def_cfa_offset: 8
-  DW_CFA_nop
 
-00000038 00000024 0000003c FDE cie=00000000 pc=00000000..0000000f
-  DW_CFA_advance_loc: 1 to 00000001
+00000030 0000001c 00000034 FDE cie=00000000 pc=00000038..00000047
+  DW_CFA_advance_loc: 1 to 00000039
   DW_CFA_def_cfa_offset: 16
   DW_CFA_offset: r6 at cfa-16
-  DW_CFA_advance_loc: 3 to 00000004
+  DW_CFA_advance_loc: 3 to 0000003c
   DW_CFA_def_cfa_reg: r6
-  DW_CFA_advance_loc: 10 to 0000000e
+  DW_CFA_advance_loc: 10 to 00000046
   DW_CFA_def_cfa: r7 ofs 8
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
-  DW_CFA_nop
 
-00000060 0000001c 00000064 FDE cie=00000000 pc=00000000..00000013
-  DW_CFA_advance_loc: 3 to 00000003
+00000050 00000014 00000054 FDE cie=00000000 pc=00000058..0000006b
+  DW_CFA_advance_loc: 3 to 0000005b
   DW_CFA_def_cfa_reg: r12
-  DW_CFA_advance_loc: 15 to 00000012
+  DW_CFA_advance_loc: 15 to 0000006a
   DW_CFA_def_cfa_reg: r7
   DW_CFA_nop
-  DW_CFA_nop
 
-00000080 0000001c 00000084 FDE cie=00000000 pc=00000000..00000006
-  DW_CFA_nop
-  DW_CFA_nop
-  DW_CFA_nop
-  DW_CFA_nop
-  DW_CFA_nop
+00000068 00000010 0000006c FDE cie=00000000 pc=00000070..00000076
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
 
-000000a0 0000001c 000000a4 FDE cie=00000000 pc=00000000..00000012
-  DW_CFA_nop
-  DW_CFA_nop
-  DW_CFA_nop
-  DW_CFA_nop
-  DW_CFA_nop
+0000007c 00000010 00000080 FDE cie=00000000 pc=00000084..00000096
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop