From 7c9c8381d9b4fe39531f5b2988ca9da13a974c4e Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Wed, 28 Sep 2005 14:51:02 +0000 Subject: [PATCH] gas/ 2005-09-28 Jan Beulich * dw2gencfi.c (dot_cfi): Call ignore_rest_of_line when not fully parsing the input. (dot_cfi_startproc): Likewise. (dot_cfi_endproc): Likewise. Also check no extra input was given. (dot_cfi_escape): Likewise. --- gas/ChangeLog | 8 ++++++++ gas/dw2gencfi.c | 9 +++++++++ 2 files changed, 17 insertions(+) diff --git a/gas/ChangeLog b/gas/ChangeLog index b513b57892..91d515f100 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,11 @@ +2005-09-28 Jan Beulich + + * dw2gencfi.c (dot_cfi): Call ignore_rest_of_line when not fully + parsing the input. + (dot_cfi_startproc): Likewise. + (dot_cfi_endproc): Likewise. Also check no extra input was given. + (dot_cfi_escape): Likewise. + 2005-09-28 Jan Beulich * config/tc-i386.h (x86_cons_fix_new): Declare unconditionally. diff --git a/gas/dw2gencfi.c b/gas/dw2gencfi.c index d54e23346e..65be298d0f 100644 --- a/gas/dw2gencfi.c +++ b/gas/dw2gencfi.c @@ -447,6 +447,7 @@ dot_cfi (int arg) if (!cur_fde_data) { as_bad (_("CFI instruction used without previous .cfi_startproc")); + ignore_rest_of_line (); return; } @@ -548,6 +549,7 @@ dot_cfi_escape (int ignored ATTRIBUTE_UNUSED) if (!cur_fde_data) { as_bad (_("CFI instruction used without previous .cfi_startproc")); + ignore_rest_of_line (); return; } @@ -570,6 +572,9 @@ dot_cfi_escape (int ignored ATTRIBUTE_UNUSED) insn = alloc_cfi_insn_data (); insn->insn = CFI_escape; insn->u.esc = head; + + --input_line_pointer; + demand_empty_rest_of_line (); } static void @@ -580,6 +585,7 @@ dot_cfi_startproc (int ignored ATTRIBUTE_UNUSED) if (cur_fde_data) { as_bad (_("previous CFI entry not closed (missing .cfi_endproc)")); + ignore_rest_of_line (); return; } @@ -614,10 +620,13 @@ dot_cfi_endproc (int ignored ATTRIBUTE_UNUSED) if (! cur_fde_data) { as_bad (_(".cfi_endproc without corresponding .cfi_startproc")); + ignore_rest_of_line (); return; } cfi_end_fde (symbol_temp_new_now ()); + + demand_empty_rest_of_line (); } -- 2.34.1