diff options
| -rw-r--r-- | gas/ChangeLog | 24 | ||||
| -rw-r--r-- | gas/NEWS | 3 | ||||
| -rw-r--r-- | gas/config/tc-ia64.c | 90 | ||||
| -rw-r--r-- | gas/doc/as.texinfo | 1 | ||||
| -rw-r--r-- | gas/doc/c-ia64.texi | 8 | ||||
| -rw-r--r-- | gas/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gas/testsuite/gas/ia64/ia64.exp | 4 |
7 files changed, 120 insertions, 15 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 3428d6c..67d0d3d 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,27 @@ +2005-02-11 H.J. Lu <hongjiu.lu@intel.com> + + * NEWS: Mention "-munwind-check=[warning|error]". + + * config/tc-ia64.c (md): Add unwind_check. + (unwind_diagnostic): New. + (in_procedure): Call unwind_diagnostic when a directive isn't + in procedure. + (in_prologue): Call unwind_diagnostic when a directive isn't in + prologue. + (in_body): Call unwind_diagnostic when a directive isn't in + body region. + (dot_endp): Set md.unwind_check to error before calling + in_procedure and restore it after. When the name is missing or + couldn't be found, use the one from the last .proc if + md.unwind_check isn't error. Warn if md.unwind_check is + warning. + (md_parse_option): Handle "-munwind-check=[warning|error]". + (md_show_usage): Add "-munwind-check=[warning|error]". + (ia64_init): Set md.unwind_check to warning. + + * doc/as.texinfo: Add "-munwind-check=[none|warning|error]". + * doc/c-ia64.texi: Likewise. + 2005-02-11 Jan Beulich <jbeulich@novell.com> * config/tc-ia64.h (LEX_AT): Include LEX_BEGIN_NAME. @@ -1,5 +1,8 @@ -*- text -*- +* New command line option -munwind-check=[warning|error] for IA64 + targets. + * Port to MAXQ processor contributed by HCL Tech. * Added support for generating unwind tables for ARM ELF targets. diff --git a/gas/config/tc-ia64.c b/gas/config/tc-ia64.c index e06649c..39ed40b 100644 --- a/gas/config/tc-ia64.c +++ b/gas/config/tc-ia64.c @@ -231,6 +231,13 @@ static struct auto_align : 1, keep_pending_output : 1; + /* What to do when something is wrong with unwind directives. */ + enum + { + unwind_check_warning, + unwind_check_error + } unwind_check; + /* Each bundle consists of up to three instructions. We keep track of four most recent instructions so we can correctly set the end_of_insn_group for the last instruction in a bundle. */ @@ -3048,14 +3055,25 @@ dot_special_section (which) set_section ((char *) special_section_name[which]); } +static void +unwind_diagnostic (const char * region, const char *directive) +{ + if (md.unwind_check == unwind_check_warning) + as_warn (".%s outside of %s", directive, region); + else + { + as_bad (".%s outside of %s", directive, region); + ignore_rest_of_line (); + } +} + static int in_procedure (const char *directive) { if (unwind.proc_start && (!unwind.saved_text_seg || strcmp (directive, "endp") == 0)) return 1; - as_bad (".%s outside of procedure", directive); - ignore_rest_of_line (); + unwind_diagnostic ("procedure", directive); return 0; } @@ -3064,10 +3082,10 @@ in_prologue (const char *directive) { if (in_procedure (directive)) { + /* We are in a procedure. Check if we are in a prologue. */ if (unwind.prologue) return 1; - as_bad (".%s outside of prologue", directive); - ignore_rest_of_line (); + unwind_diagnostic ("prologue", directive); } return 0; } @@ -3077,10 +3095,10 @@ in_body (const char *directive) { if (in_procedure (directive)) { + /* We are in a procedure. Check if we are in a body. */ if (unwind.body) return 1; - as_bad (".%s outside of body region", directive); - ignore_rest_of_line (); + unwind_diagnostic ("body region", directive); } return 0; } @@ -4292,11 +4310,14 @@ dot_endp (dummy) long where; segT saved_seg; subsegT saved_subseg; - char *name, *p, c; + char *name, *default_name, *p, c; symbolS *sym; + int unwind_check = md.unwind_check; + md.unwind_check = unwind_check_error; if (!in_procedure ("endp")) return; + md.unwind_check = unwind_check; if (unwind.saved_text_seg) { @@ -4368,6 +4389,11 @@ dot_endp (dummy) subseg_set (saved_seg, saved_subseg); + if (unwind.proc_start) + default_name = (char *) S_GET_NAME (unwind.proc_start); + else + default_name = NULL; + /* Parse names of main and alternate entry points and set symbol sizes. */ while (1) { @@ -4376,10 +4402,35 @@ dot_endp (dummy) c = get_symbol_end (); p = input_line_pointer; if (!*name) - as_bad ("Empty argument of .endp"); - else + { + if (md.unwind_check == unwind_check_warning) + { + if (default_name) + { + as_warn ("Empty argument of .endp. Use the default name `%s'", + default_name); + name = default_name; + } + else + as_warn ("Empty argument of .endp"); + } + else + as_bad ("Empty argument of .endp"); + } + if (*name) { sym = symbol_find (name); + if (!sym + && md.unwind_check == unwind_check_warning + && default_name + && default_name != name) + { + /* We have a bad name. Try the default one if needed. */ + as_warn ("`%s' was not defined within procedure. Use the default name `%s'", + name, default_name); + name = default_name; + sym = symbol_find (name); + } if (!sym || !S_IS_DEFINED (sym)) as_bad ("`%s' was not defined within procedure", name); else if (unwind.proc_start @@ -6689,6 +6740,16 @@ md_parse_option (c, arg) md.flags |= EF_IA_64_BE; default_big_endian = 1; } + else if (strncmp (arg, "unwind-check=", 13) == 0) + { + arg += 13; + if (strcmp (arg, "warning") == 0) + md.unwind_check = unwind_check_warning; + else if (strcmp (arg, "error") == 0) + md.unwind_check = unwind_check_error; + else + return 0; + } else return 0; break; @@ -6792,6 +6853,8 @@ IA-64 options:\n\ EF_IA_64_NOFUNCDESC_CONS_GP)\n\ -milp32|-milp64|-mlp64|-mp64 select data model (default -mlp64)\n\ -mle | -mbe select little- or big-endian byte order (default -mle)\n\ + -munwind-check=[warning|error]\n\ + unwind directive check (default -munwind-check=warning)\n\ -x | -xexplicit turn on dependency violation checking (default)\n\ -xauto automagically remove dependency violations\n\ -xdebug debug dependency violation checker\n"), @@ -7126,10 +7189,9 @@ md_begin () md.entry_labels = NULL; } -/* Set the elf type to 64 bit ABI by default. Cannot do this in md_begin - because that is called after md_parse_option which is where we do the - dynamic changing of md.flags based on -mlp64 or -milp32. Also, set the - default endianness. */ +/* Set the default options in md. Cannot do this in md_begin because + that is called after md_parse_option which is where we set the + options in md based on command line options. */ void ia64_init (argc, argv) @@ -7137,6 +7199,8 @@ ia64_init (argc, argv) char **argv ATTRIBUTE_UNUSED; { md.flags = MD_FLAGS_DEFAULT; + /* FIXME: We should change it to unwind_check_error someday. */ + md.unwind_check = unwind_check_warning; } /* Return a string for the target object file format. */ diff --git a/gas/doc/as.texinfo b/gas/doc/as.texinfo index 529c351..051ab70 100644 --- a/gas/doc/as.texinfo +++ b/gas/doc/as.texinfo @@ -315,6 +315,7 @@ gcc(1), ld(1), and the Info entries for @file{binutils} and @file{ld}. [@b{-mconstant-gp}|@b{-mauto-pic}] [@b{-milp32}|@b{-milp64}|@b{-mlp64}|@b{-mp64}] [@b{-mle}|@b{mbe}] + [@b{-munwind-check=warning}|@b{-munwind-check=error}] [@b{-x}|@b{-xexplicit}] [@b{-xauto}] [@b{-xdebug}] @end ifset @ifset IP2K diff --git a/gas/doc/c-ia64.texi b/gas/doc/c-ia64.texi index 96c9f88..cfe6469 100644 --- a/gas/doc/c-ia64.texi +++ b/gas/doc/c-ia64.texi @@ -65,6 +65,14 @@ These options select the byte order. The @code{-mle} option selects little-endi byte order (default) and @code{-mbe} selects big-endian byte order. Note that IA-64 machine code always uses little-endian byte order. +@item -munwind-check=warning +@item -munwind-check=error +These options control what the assembler will do when performing +consistency checks on unwind directives. @code{-munwind-check=warning} +will make the assembler issue a warning when an unwind directive check +fails. This is the default. @code{-munwind-check=error} will make the +assembler issue an error when an unwind directive check fails. + @item -x @item -xexplicit These options turn on dependency violation checking. This checking is turned on by diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index 9e031b6..33dae55 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2005-02-11 H.J. Lu <hongjiu.lu@intel.com> + + * gas/ia64/ia64.exp: Pass -munwind-check=error for unwind-err + and proc. + 2005-02-09 Jan Beulich <jbeulich@novell.com> * gas/i386/intelok.s: Remove comments disabling alternative forms of diff --git a/gas/testsuite/gas/ia64/ia64.exp b/gas/testsuite/gas/ia64/ia64.exp index d36f92f..84688ae 100644 --- a/gas/testsuite/gas/ia64/ia64.exp +++ b/gas/testsuite/gas/ia64/ia64.exp @@ -67,7 +67,7 @@ if [istarget "ia64-*"] then { run_dump_test "bundling" run_list_test "label" "" run_list_test "last" "" - run_list_test "proc" "" + run_list_test "proc" "-munwind-check=error" run_list_test "slot2" "" - run_list_test "unwind-err" "" + run_list_test "unwind-err" "-munwind-check=error" } |