2003-05-20 Michal Ludvig <mludvig@suse.cz>

	* as.c (main): Remove tc_cfi_init().
	* dw2gencfi.c (cfi_parse_arg): Allow regnames beginning
	with '%'.
	(cfi_pseudo_table): Add "cfi_register" entry.
	(cfi_make_insn): Handle CFA_register.
	(cfi_output_insn): Ditto.
	(dot_cfi): Ditto.
	(cfi_get_label): Add 'simple' modifier to .cfi_startproc.
	(dot_cfi_endproc): Reuse already emitted CIEs.
	* testsuite/gas/cfi/cfi-i386.d: New pattern.
	* testsuite/gas/cfi/cfi-x86-64.d: Ditto.

2 files changed, 8 insertions, 121 deletions

diff --git a/gas/testsuite/gas/cfi/cfi-i386.d b/gas/testsuite/gas/cfi/cfi-i386.d
index d27a69b..6253066 100644
--- a/gas/testsuite/gas/cfi/cfi-i386.d
+++ b/gas/testsuite/gas/cfi/cfi-i386.d
@@ -1,6 +1,5 @@
 #readelf: -wf
 #name: CFI on i386
-
 The section .eh_frame contains:
 
 00000000 00000010 00000000 CIE
@@ -22,19 +21,7 @@ The section .eh_frame contains:
   DW_CFA_def_cfa_offset: 4
   DW_CFA_nop
 
-0000002c 00000010 00000000 CIE
-  Version:               1
-  Augmentation:          ""
-  Code alignment factor: 1
-  Data alignment factor: -4
-  Return address column: 8
-
-  DW_CFA_def_cfa: r7 ofs 4
-  DW_CFA_offset: r8 at cfa-4
-  DW_CFA_nop
-  DW_CFA_nop
-
-00000040 00000018 00000018 FDE cie=0000002c pc=00000012..0000001f
+0000002c 00000018 00000030 FDE cie=00000000 pc=00000012..0000001f
   DW_CFA_advance_loc: 1 to 00000013
   DW_CFA_def_cfa_offset: 8
   DW_CFA_offset: r6 at cfa-8
@@ -44,56 +31,20 @@ The section .eh_frame contains:
   DW_CFA_def_cfa_reg: r7
   DW_CFA_nop
 
-0000005c 00000010 00000000 CIE
-  Version:               1
-  Augmentation:          ""
-  Code alignment factor: 1
-  Data alignment factor: -4
-  Return address column: 8
-
-  DW_CFA_def_cfa: r7 ofs 4
-  DW_CFA_offset: r8 at cfa-4
-  DW_CFA_nop
-  DW_CFA_nop
-
-00000070 00000014 00000018 FDE cie=0000005c pc=0000001f..0000002f
+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
 
-00000088 00000010 00000000 CIE
-  Version:               1
-  Augmentation:          ""
-  Code alignment factor: 1
-  Data alignment factor: -4
-  Return address column: 8
-
-  DW_CFA_def_cfa: r7 ofs 4
-  DW_CFA_offset: r8 at cfa-4
-  DW_CFA_nop
-  DW_CFA_nop
-
-0000009c 00000010 00000018 FDE cie=00000088 pc=0000002f..00000035
+00000060 00000010 00000064 FDE cie=00000000 pc=0000002f..00000035
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
 
-000000b0 00000010 00000000 CIE
-  Version:               1
-  Augmentation:          ""
-  Code alignment factor: 1
-  Data alignment factor: -4
-  Return address column: 8
-
-  DW_CFA_def_cfa: r7 ofs 4
-  DW_CFA_offset: r8 at cfa-4
-  DW_CFA_nop
-  DW_CFA_nop
-
-000000c4 00000010 00000018 FDE cie=000000b0 pc=00000035..00000044
+00000074 00000010 00000078 FDE cie=00000000 pc=00000035..00000044
   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 b4b99ab..2d47c2d 100644
--- a/gas/testsuite/gas/cfi/cfi-x86_64.d
+++ b/gas/testsuite/gas/cfi/cfi-x86_64.d
@@ -26,23 +26,7 @@ The section .eh_frame contains:
   DW_CFA_def_cfa_offset: 8
   DW_CFA_nop
 
-00000038 00000014 00000000 CIE
-  Version:               1
-  Augmentation:          ""
-  Code alignment factor: 1
-  Data alignment factor: -8
-  Return address column: 16
-
-  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
-
-00000050 00000024 0000001c FDE cie=00000038 pc=00000000..0000000f
+00000038 00000024 0000003c FDE cie=00000000 pc=00000000..0000000f
   DW_CFA_advance_loc: 1 to 00000001
   DW_CFA_def_cfa_offset: 16
   DW_CFA_offset: r6 at cfa-16
@@ -55,23 +39,7 @@ The section .eh_frame contains:
   DW_CFA_nop
   DW_CFA_nop
 
-00000078 00000014 00000000 CIE
-  Version:               1
-  Augmentation:          ""
-  Code alignment factor: 1
-  Data alignment factor: -8
-  Return address column: 16
-
-  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
-
-00000090 0000001c 0000001c FDE cie=00000078 pc=00000000..00000013
+00000060 0000001c 00000064 FDE cie=00000000 pc=00000000..00000013
   DW_CFA_advance_loc: 3 to 00000003
   DW_CFA_def_cfa_reg: r12
   DW_CFA_advance_loc: 15 to 00000012
@@ -79,23 +47,7 @@ The section .eh_frame contains:
   DW_CFA_nop
   DW_CFA_nop
 
-000000b0 00000014 00000000 CIE
-  Version:               1
-  Augmentation:          ""
-  Code alignment factor: 1
-  Data alignment factor: -8
-  Return address column: 16
-
-  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
-
-000000c8 0000001c 0000001c FDE cie=000000b0 pc=00000000..00000006
+00000080 0000001c 00000084 FDE cie=00000000 pc=00000000..00000006
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
@@ -105,23 +57,7 @@ The section .eh_frame contains:
   DW_CFA_nop
   DW_CFA_nop
 
-000000e8 00000014 00000000 CIE
-  Version:               1
-  Augmentation:          ""
-  Code alignment factor: 1
-  Data alignment factor: -8
-  Return address column: 16
-
-  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
-
-00000100 0000001c 0000001c FDE cie=000000e8 pc=00000000..00000012
+000000a0 0000001c 000000a4 FDE cie=00000000 pc=00000000..00000012
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop