diff options
Diffstat (limited to 'gas')
27 files changed, 310 insertions, 11 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 821955e..1bce7a4 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,19 @@ +2010-06-15 Joseph Myers <joseph@codesourcery.com> + + * config/tc-tic6x.c: Include elf/tic6x.h. + (tic6x_arch_attribute, tic6x_seen_insns): New. + (tic6x_arch_table, tic6x_arches): Add attribute values. + (tic6x_use_arch): Handle attribute settings. + (tic6x_attributes_set_explicitly, s_tic6x_c6xabi_attribute, + tic6x_attribute_table, tic6x_attributes, + tic6x_convert_symbolic_attribute): New. + (md_pseudo_table): Add c6xabi_attribute. + (md_assemble): Set tic6x_seen_insns and tic6x_arch_attribute. + (tic6x_set_attribute_int, tic6x_set_attributes): New. + (tic6x_end): Call tic6x_set_attributes. + * config/tc-tic6x.h (CONVERT_SYMBOLIC_ATTRIBUTE): Define. + (tic6x_convert_symbolic_attribute): Declare. + 2010-06-14 Alan Modra <amodra@gmail.com> * config/tc-ppc.c (md_assemble): Emit APUinfo section for diff --git a/gas/config/tc-tic6x.c b/gas/config/tc-tic6x.c index 5e63c8b..9c40c15 100644 --- a/gas/config/tc-tic6x.c +++ b/gas/config/tc-tic6x.c @@ -24,6 +24,7 @@ #include "safe-ctype.h" #include "subsegs.h" #include "opcode/tic6x.h" +#include "elf/tic6x.h" #include "elf32-tic6x.h" /* Truncate and sign-extend at 32 bits, so that building on a 64-bit @@ -81,6 +82,15 @@ static unsigned short tic6x_arch_enable = (TIC6X_INSN_C62X (architecture, as modified by other options). */ static unsigned short tic6x_features; +/* The architecture attribute value, or C6XABI_Tag_CPU_arch_none if + not yet set. */ +static int tic6x_arch_attribute = C6XABI_Tag_CPU_arch_none; + +/* Whether any instructions at all have been seen. Once any + instructions have been seen, architecture attributes merge into the + previous attribute value rather than replacing it. */ +static bfd_boolean tic6x_seen_insns = FALSE; + /* The number of registers in each register file supported by the current architecture. */ static unsigned int tic6x_num_registers; @@ -105,21 +115,26 @@ static bfd_boolean tic6x_generate_rela = TRUE; typedef struct { const char *arch; + int attr; unsigned short features; } tic6x_arch_table; static const tic6x_arch_table tic6x_arches[] = { - { "c62x", TIC6X_INSN_C62X }, - { "c64x", TIC6X_INSN_C62X | TIC6X_INSN_C64X }, - { "c64x+", TIC6X_INSN_C62X | TIC6X_INSN_C64X | TIC6X_INSN_C64XP }, - { "c67x", TIC6X_INSN_C62X | TIC6X_INSN_C67X }, - { "c67x+", TIC6X_INSN_C62X | TIC6X_INSN_C67X | TIC6X_INSN_C67XP }, - { "c674x", (TIC6X_INSN_C62X - | TIC6X_INSN_C64X - | TIC6X_INSN_C64XP - | TIC6X_INSN_C67X - | TIC6X_INSN_C67XP - | TIC6X_INSN_C674X) } + { "c62x", C6XABI_Tag_CPU_arch_C62X, TIC6X_INSN_C62X }, + { "c64x", C6XABI_Tag_CPU_arch_C64X, TIC6X_INSN_C62X | TIC6X_INSN_C64X }, + { "c64x+", C6XABI_Tag_CPU_arch_C64XP, (TIC6X_INSN_C62X + | TIC6X_INSN_C64X + | TIC6X_INSN_C64XP) }, + { "c67x", C6XABI_Tag_CPU_arch_C67X, TIC6X_INSN_C62X | TIC6X_INSN_C67X }, + { "c67x+", C6XABI_Tag_CPU_arch_C67XP, (TIC6X_INSN_C62X + | TIC6X_INSN_C67X + | TIC6X_INSN_C67XP) }, + { "c674x", C6XABI_Tag_CPU_arch_C674X, (TIC6X_INSN_C62X + | TIC6X_INSN_C64X + | TIC6X_INSN_C64XP + | TIC6X_INSN_C67X + | TIC6X_INSN_C67XP + | TIC6X_INSN_C674X) } }; /* Update the selected architecture based on ARCH, giving an error if @@ -135,6 +150,12 @@ tic6x_use_arch (const char *arch) if (strcmp (arch, tic6x_arches[i].arch) == 0) { tic6x_arch_enable = tic6x_arches[i].features; + if (tic6x_seen_insns) + tic6x_arch_attribute + = elf32_tic6x_merge_arch_attributes (tic6x_arch_attribute, + tic6x_arches[i].attr); + else + tic6x_arch_attribute = tic6x_arches[i].attr; return; } @@ -295,10 +316,53 @@ s_tic6x_nocmp (int ignored ATTRIBUTE_UNUSED) demand_empty_rest_of_line (); } +/* Track for each attribute whether it has been set explicitly (and so + should not have a default value set by the assembler). */ +static bfd_boolean tic6x_attributes_set_explicitly[NUM_KNOWN_OBJ_ATTRIBUTES]; + +/* Parse a .c6xabi_attribute directive. */ + +static void +s_tic6x_c6xabi_attribute (int ignored ATTRIBUTE_UNUSED) +{ + int tag = s_vendor_attribute (OBJ_ATTR_PROC); + + if (tag < NUM_KNOWN_OBJ_ATTRIBUTES) + tic6x_attributes_set_explicitly[tag] = TRUE; +} + +typedef struct +{ + const char *name; + int tag; +} tic6x_attribute_table; + +static const tic6x_attribute_table tic6x_attributes[] = + { +#define TAG(tag, value) { #tag, tag } +#include "elf/tic6x-attrs.h" +#undef TAG + }; + +/* Convert an attribute name to a number. */ + +int +tic6x_convert_symbolic_attribute (const char *name) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE (tic6x_attributes); i++) + if (strcmp (name, tic6x_attributes[i].name) == 0) + return tic6x_attributes[i].tag; + + return -1; +} + const pseudo_typeS md_pseudo_table[] = { { "arch", s_tic6x_arch, 0 }, { "atomic", s_tic6x_atomic, 0 }, + { "c6xabi_attribute", s_tic6x_c6xabi_attribute, 0 }, { "noatomic", s_tic6x_noatomic, 0 }, { "nocmp", s_tic6x_nocmp, 0 }, { "word", cons, 4 }, @@ -2587,6 +2651,16 @@ md_assemble (char *str) if (p == str) abort (); + /* Now an instruction has been seen, architecture attributes from + .arch directives merge with rather than overriding the previous + value. */ + tic6x_seen_insns = TRUE; + /* If no .arch directives or -march options have been seen, we are + assessing instruction validity based on the C674X default, so set + the attribute accordingly. */ + if (tic6x_arch_attribute == C6XABI_Tag_CPU_arch_none) + tic6x_arch_attribute = C6XABI_Tag_CPU_arch_C674X; + /* Reset global settings for parallel bars and predicates now to avoid extra errors if there are problems with this opcode. */ this_line_parallel = tic6x_line_parallel; @@ -3760,6 +3834,29 @@ tic6x_frag_init (fragS *fragp) fragp->tc_frag_data.can_cross_fp_boundary = FALSE; } +/* Set an attribute if it has not already been set by the user. */ + +static void +tic6x_set_attribute_int (int tag, int value) +{ + if (tag < 1 + || tag >= NUM_KNOWN_OBJ_ATTRIBUTES) + abort (); + if (!tic6x_attributes_set_explicitly[tag]) + bfd_elf_add_proc_attr_int (stdoutput, tag, value); +} + +/* Set object attributes deduced from the input file and command line + rather than given explicitly. */ +static void +tic6x_set_attributes (void) +{ + if (tic6x_arch_attribute == C6XABI_Tag_CPU_arch_none) + tic6x_arch_attribute = C6XABI_Tag_CPU_arch_C674X; + + tic6x_set_attribute_int (Tag_C6XABI_Tag_CPU_arch, tic6x_arch_attribute); +} + /* Do machine-dependent manipulations of the frag chains after all input has been read and before the machine-independent sizing and relaxing. */ @@ -3767,6 +3864,9 @@ tic6x_frag_init (fragS *fragp) void tic6x_end (void) { + /* Set object attributes at this point if not explicitly set. */ + tic6x_set_attributes (); + /* Meeting alignment requirements may require inserting NOPs in parallel in execute packets earlier in the segment. Future 16-bit instruction generation involves whole-segment optimization diff --git a/gas/config/tc-tic6x.h b/gas/config/tc-tic6x.h index 0285db4..c9df520 100644 --- a/gas/config/tc-tic6x.h +++ b/gas/config/tc-tic6x.h @@ -119,6 +119,10 @@ extern void tic6x_cons_align (int n); } while (0) extern bfd_boolean tic6x_do_align (int n, char *fill, int len, int max); +#define CONVERT_SYMBOLIC_ATTRIBUTE(name) \ + tic6x_convert_symbolic_attribute (name) +extern int tic6x_convert_symbolic_attribute (const char *); + #define md_end() tic6x_end (); extern void tic6x_end (void); diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index b4583a1..1a5b9f2 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,3 +1,24 @@ +2010-06-15 Joseph Myers <joseph@codesourcery.com> + + * gas/elf/elf.exp: Set target_machine for tic6x-*-*. + * gas/elf/section2.e-tic6x, gas/tic6x/attr-arch-directive-1.d, + gas/tic6x/attr-arch-directive-1.s, + gas/tic6x/attr-arch-directive-2.d, + gas/tic6x/attr-arch-directive-2.s, + gas/tic6x/attr-arch-directive-3.d, + gas/tic6x/attr-arch-directive-3.s, + gas/tic6x/attr-arch-directive-4.d, + gas/tic6x/attr-arch-directive-4.s, + gas/tic6x/attr-arch-directive-5.d, + gas/tic6x/attr-arch-directive-5.s, + gas/tic6x/attr-arch-opts-c62x.d, gas/tic6x/attr-arch-opts-c64x+.d, + gas/tic6x/attr-arch-opts-c64x.d, gas/tic6x/attr-arch-opts-c674x.d, + gas/tic6x/attr-arch-opts-c67x+.d, gas/tic6x/attr-arch-opts-c67x.d, + gas/tic6x/attr-arch-opts-none-1.d, + gas/tic6x/attr-arch-opts-none-2.d, + gas/tic6x/attr-arch-opts-override-1.d, + gas/tic6x/attr-arch-opts-override-2.d, gas/tic6x/empty.s: New. + 2010-06-14 Sebastian Andrzej Siewior <bigeasy@linutronix.de> * gas/ppc/e500.s: Add eieio, mbar and lwsync diff --git a/gas/testsuite/gas/elf/elf.exp b/gas/testsuite/gas/elf/elf.exp index 7c191ad..9771a86 100644 --- a/gas/testsuite/gas/elf/elf.exp +++ b/gas/testsuite/gas/elf/elf.exp @@ -59,6 +59,9 @@ if { ([istarget "*-*-*elf*"] if {[istarget "score-*-*"]} then { set target_machine -score } + if {[istarget "tic6x-*-*"]} then { + set target_machine -tic6x + } if {[istarget "xtensa*-*-*"]} then { set target_machine -xtensa } diff --git a/gas/testsuite/gas/elf/section2.e-tic6x b/gas/testsuite/gas/elf/section2.e-tic6x new file mode 100644 index 0000000..84463b1 --- /dev/null +++ b/gas/testsuite/gas/elf/section2.e-tic6x @@ -0,0 +1,9 @@ + +Symbol table '.symtab' contains 6 entries: + Num: Value[ ]* Size Type Bind Vis Ndx Name + 0: 0+0 0 NOTYPE LOCAL DEFAULT UND + 1: 0+0 0 SECTION LOCAL DEFAULT 1 + 2: 0+0 0 SECTION LOCAL DEFAULT 2 + 3: 0+0 0 SECTION LOCAL DEFAULT 3 + 4: 0+0 0 SECTION LOCAL DEFAULT 4 + 5: 0+0 0 SECTION LOCAL DEFAULT 5 diff --git a/gas/testsuite/gas/tic6x/attr-arch-directive-1.d b/gas/testsuite/gas/tic6x/attr-arch-directive-1.d new file mode 100644 index 0000000..e89cb95 --- /dev/null +++ b/gas/testsuite/gas/tic6x/attr-arch-directive-1.d @@ -0,0 +1,8 @@ +#readelf: -A +#name: C6X arch attributes, directives 1 +#as: -march=c64x +#source: attr-arch-directive-1.s + +Attribute Section: c6xabi +File Attributes + Tag_C6XABI_Tag_CPU_arch: C62x diff --git a/gas/testsuite/gas/tic6x/attr-arch-directive-1.s b/gas/testsuite/gas/tic6x/attr-arch-directive-1.s new file mode 100644 index 0000000..5d8c605 --- /dev/null +++ b/gas/testsuite/gas/tic6x/attr-arch-directive-1.s @@ -0,0 +1,3 @@ +# .arch directives override previous attributes before instructions are seen. +.arch c67x +.arch c62x diff --git a/gas/testsuite/gas/tic6x/attr-arch-directive-2.d b/gas/testsuite/gas/tic6x/attr-arch-directive-2.d new file mode 100644 index 0000000..35e3a24 --- /dev/null +++ b/gas/testsuite/gas/tic6x/attr-arch-directive-2.d @@ -0,0 +1,8 @@ +#readelf: -A +#name: C6X arch attributes, directives 2 +#as: -march=c64x +#source: attr-arch-directive-2.s + +Attribute Section: c6xabi +File Attributes + Tag_C6XABI_Tag_CPU_arch: C64x\+ diff --git a/gas/testsuite/gas/tic6x/attr-arch-directive-2.s b/gas/testsuite/gas/tic6x/attr-arch-directive-2.s new file mode 100644 index 0000000..b7a759f --- /dev/null +++ b/gas/testsuite/gas/tic6x/attr-arch-directive-2.s @@ -0,0 +1,9 @@ +# .arch directives override previous attributes before instructions +# are seen, but not after. +.text +.globl f +f: +.arch c67x +.arch c62x + nop +.arch c64x+ diff --git a/gas/testsuite/gas/tic6x/attr-arch-directive-3.d b/gas/testsuite/gas/tic6x/attr-arch-directive-3.d new file mode 100644 index 0000000..d68149e --- /dev/null +++ b/gas/testsuite/gas/tic6x/attr-arch-directive-3.d @@ -0,0 +1,8 @@ +#readelf: -A +#name: C6X arch attributes, directives 3 +#as: -march=c62x +#source: attr-arch-directive-3.s + +Attribute Section: c6xabi +File Attributes + Tag_C6XABI_Tag_CPU_arch: C674x diff --git a/gas/testsuite/gas/tic6x/attr-arch-directive-3.s b/gas/testsuite/gas/tic6x/attr-arch-directive-3.s new file mode 100644 index 0000000..edfca62 --- /dev/null +++ b/gas/testsuite/gas/tic6x/attr-arch-directive-3.s @@ -0,0 +1,7 @@ +# .arch directives merge attributes after instructions are seen. +.text +.globl f +f: + nop +.arch c67x +.arch c64x+ diff --git a/gas/testsuite/gas/tic6x/attr-arch-directive-4.d b/gas/testsuite/gas/tic6x/attr-arch-directive-4.d new file mode 100644 index 0000000..bf7ff28 --- /dev/null +++ b/gas/testsuite/gas/tic6x/attr-arch-directive-4.d @@ -0,0 +1,8 @@ +#readelf: -A +#name: C6X arch attributes, directives 4 +#as: +#source: attr-arch-directive-4.s + +Attribute Section: c6xabi +File Attributes + Tag_C6XABI_Tag_CPU_arch: C62x diff --git a/gas/testsuite/gas/tic6x/attr-arch-directive-4.s b/gas/testsuite/gas/tic6x/attr-arch-directive-4.s new file mode 100644 index 0000000..1c15ae9 --- /dev/null +++ b/gas/testsuite/gas/tic6x/attr-arch-directive-4.s @@ -0,0 +1,3 @@ +# .c6xabi_attribute directives override other architecture information. +.c6xabi_attribute 2, 1 +.arch c674x diff --git a/gas/testsuite/gas/tic6x/attr-arch-directive-5.d b/gas/testsuite/gas/tic6x/attr-arch-directive-5.d new file mode 100644 index 0000000..3edaa63 --- /dev/null +++ b/gas/testsuite/gas/tic6x/attr-arch-directive-5.d @@ -0,0 +1,8 @@ +#readelf: -A +#name: C6X arch attributes, directives 5 +#as: +#source: attr-arch-directive-5.s + +Attribute Section: c6xabi +File Attributes + Tag_C6XABI_Tag_CPU_arch: C62x diff --git a/gas/testsuite/gas/tic6x/attr-arch-directive-5.s b/gas/testsuite/gas/tic6x/attr-arch-directive-5.s new file mode 100644 index 0000000..81d7094 --- /dev/null +++ b/gas/testsuite/gas/tic6x/attr-arch-directive-5.s @@ -0,0 +1,3 @@ +# .c6xabi_attribute directives override other architecture information. +.arch c674x +.c6xabi_attribute Tag_C6XABI_Tag_CPU_arch, 1 diff --git a/gas/testsuite/gas/tic6x/attr-arch-opts-c62x.d b/gas/testsuite/gas/tic6x/attr-arch-opts-c62x.d new file mode 100644 index 0000000..7f3ffd2 --- /dev/null +++ b/gas/testsuite/gas/tic6x/attr-arch-opts-c62x.d @@ -0,0 +1,8 @@ +#readelf: -A +#name: C6X arch attributes, -march=c62x +#as: -march=c62x +#source: dummy.s + +Attribute Section: c6xabi +File Attributes + Tag_C6XABI_Tag_CPU_arch: C62x diff --git a/gas/testsuite/gas/tic6x/attr-arch-opts-c64x+.d b/gas/testsuite/gas/tic6x/attr-arch-opts-c64x+.d new file mode 100644 index 0000000..899b461 --- /dev/null +++ b/gas/testsuite/gas/tic6x/attr-arch-opts-c64x+.d @@ -0,0 +1,8 @@ +#readelf: -A +#name: C6X arch attributes, -march=c64x+ +#as: -march=c64x+ +#source: dummy.s + +Attribute Section: c6xabi +File Attributes + Tag_C6XABI_Tag_CPU_arch: C64x\+ diff --git a/gas/testsuite/gas/tic6x/attr-arch-opts-c64x.d b/gas/testsuite/gas/tic6x/attr-arch-opts-c64x.d new file mode 100644 index 0000000..53d6d3e --- /dev/null +++ b/gas/testsuite/gas/tic6x/attr-arch-opts-c64x.d @@ -0,0 +1,8 @@ +#readelf: -A +#name: C6X arch attributes, -march=c64x +#as: -march=c64x +#source: dummy.s + +Attribute Section: c6xabi +File Attributes + Tag_C6XABI_Tag_CPU_arch: C64x diff --git a/gas/testsuite/gas/tic6x/attr-arch-opts-c674x.d b/gas/testsuite/gas/tic6x/attr-arch-opts-c674x.d new file mode 100644 index 0000000..89678ec --- /dev/null +++ b/gas/testsuite/gas/tic6x/attr-arch-opts-c674x.d @@ -0,0 +1,8 @@ +#readelf: -A +#name: C6X arch attributes, -march=c674x +#as: -march=c674x +#source: dummy.s + +Attribute Section: c6xabi +File Attributes + Tag_C6XABI_Tag_CPU_arch: C674x diff --git a/gas/testsuite/gas/tic6x/attr-arch-opts-c67x+.d b/gas/testsuite/gas/tic6x/attr-arch-opts-c67x+.d new file mode 100644 index 0000000..8c5bfe3 --- /dev/null +++ b/gas/testsuite/gas/tic6x/attr-arch-opts-c67x+.d @@ -0,0 +1,8 @@ +#readelf: -A +#name: C6X arch attributes, -march=c67x+ +#as: -march=c67x+ +#source: dummy.s + +Attribute Section: c6xabi +File Attributes + Tag_C6XABI_Tag_CPU_arch: C67x\+ diff --git a/gas/testsuite/gas/tic6x/attr-arch-opts-c67x.d b/gas/testsuite/gas/tic6x/attr-arch-opts-c67x.d new file mode 100644 index 0000000..04c71b2 --- /dev/null +++ b/gas/testsuite/gas/tic6x/attr-arch-opts-c67x.d @@ -0,0 +1,8 @@ +#readelf: -A +#name: C6X arch attributes, -march=c67x +#as: -march=c67x +#source: dummy.s + +Attribute Section: c6xabi +File Attributes + Tag_C6XABI_Tag_CPU_arch: C67x diff --git a/gas/testsuite/gas/tic6x/attr-arch-opts-none-1.d b/gas/testsuite/gas/tic6x/attr-arch-opts-none-1.d new file mode 100644 index 0000000..7ece957 --- /dev/null +++ b/gas/testsuite/gas/tic6x/attr-arch-opts-none-1.d @@ -0,0 +1,8 @@ +#readelf: -A +#name: C6X arch attributes, no options 1 +#as: +#source: dummy.s + +Attribute Section: c6xabi +File Attributes + Tag_C6XABI_Tag_CPU_arch: C674x diff --git a/gas/testsuite/gas/tic6x/attr-arch-opts-none-2.d b/gas/testsuite/gas/tic6x/attr-arch-opts-none-2.d new file mode 100644 index 0000000..b5f0194 --- /dev/null +++ b/gas/testsuite/gas/tic6x/attr-arch-opts-none-2.d @@ -0,0 +1,8 @@ +#readelf: -A +#name: C6X arch attributes, no options 2 +#as: +#source: empty.s + +Attribute Section: c6xabi +File Attributes + Tag_C6XABI_Tag_CPU_arch: C674x diff --git a/gas/testsuite/gas/tic6x/attr-arch-opts-override-1.d b/gas/testsuite/gas/tic6x/attr-arch-opts-override-1.d new file mode 100644 index 0000000..ff2a997 --- /dev/null +++ b/gas/testsuite/gas/tic6x/attr-arch-opts-override-1.d @@ -0,0 +1,8 @@ +#readelf: -A +#name: C6X arch attributes, -march=c674x -march=c62x +#as: -march=c674x -march=c62x +#source: dummy.s + +Attribute Section: c6xabi +File Attributes + Tag_C6XABI_Tag_CPU_arch: C62x diff --git a/gas/testsuite/gas/tic6x/attr-arch-opts-override-2.d b/gas/testsuite/gas/tic6x/attr-arch-opts-override-2.d new file mode 100644 index 0000000..2c7f835 --- /dev/null +++ b/gas/testsuite/gas/tic6x/attr-arch-opts-override-2.d @@ -0,0 +1,8 @@ +#readelf: -A +#name: C6X arch attributes, -march=c62x -march=c674x +#as: -march=c62x -march=c674x +#source: dummy.s + +Attribute Section: c6xabi +File Attributes + Tag_C6XABI_Tag_CPU_arch: C674x diff --git a/gas/testsuite/gas/tic6x/empty.s b/gas/testsuite/gas/tic6x/empty.s new file mode 100644 index 0000000..291fd40 --- /dev/null +++ b/gas/testsuite/gas/tic6x/empty.s @@ -0,0 +1 @@ +# Dummy input file with no instructions at all. |