diff options
| -rw-r--r-- | bfd/ChangeLog | 4 | ||||
| -rw-r--r-- | bfd/xtensa-isa.c | 11 | ||||
| -rw-r--r-- | gas/ChangeLog | 6 | ||||
| -rw-r--r-- | gas/config/tc-xtensa.c | 2 | ||||
| -rw-r--r-- | include/ChangeLog | 5 | ||||
| -rw-r--r-- | include/xtensa-isa-internal.h | 6 | ||||
| -rw-r--r-- | include/xtensa-isa.h | 12 |
7 files changed, 41 insertions, 5 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 650ff2e..48f3039 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,7 @@ +2008-11-21 Sterling Augustine <sterling@tensilica.com> + + * xtensa-isa.c (xtensa_state_is_shared_or): New function. + 2008-11-21 Hans-Peter Nilsson <hp@axis.com> * elf-bfd.h (struct elf_backend_data): New member got_elt_size. diff --git a/bfd/xtensa-isa.c b/bfd/xtensa-isa.c index 35b27db..138f6ec 100644 --- a/bfd/xtensa-isa.c +++ b/bfd/xtensa-isa.c @@ -1526,6 +1526,17 @@ xtensa_state_is_exported (xtensa_isa isa, xtensa_state st) } +int +xtensa_state_is_shared_or (xtensa_isa isa, xtensa_state st) +{ + xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa; + CHECK_STATE (intisa, st, XTENSA_UNDEFINED); + if ((intisa->states[st].flags & XTENSA_STATE_IS_SHARED_OR) != 0) + return 1; + return 0; +} + + /* Sysregs. */ diff --git a/gas/ChangeLog b/gas/ChangeLog index 3fdd10b..b36db8e 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,9 @@ +2008-11-21 Sterling Augustine <sterling@tensilica.com> + + * config/tc-xtensa.c (check_t1_t2_reads_and_writes): Call + xtensa_state_is_shared_or to allow multiple opcodes within a + single FLIX bundle to write to these special states. + 2008-11-19 Hans-Peter Nilsson <hp@axis.com> * config/tc-cris.c (cris_number_to_imm): Apply S_SET_THREAD_LOCAL diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c index f1ccd28..6646ef7 100644 --- a/gas/config/tc-xtensa.c +++ b/gas/config/tc-xtensa.c @@ -6539,7 +6539,7 @@ check_t1_t2_reads_and_writes (TInsn *t1, TInsn *t2) { xtensa_state t1_so = xtensa_stateOperand_state (isa, t1->opcode, i); t1_inout = xtensa_stateOperand_inout (isa, t1->opcode, i); - if (t1_so != t2_so) + if (t1_so != t2_so || xtensa_state_is_shared_or (isa, t1_so) == 1) continue; if (t2_inout == 'i' && (t1_inout == 'm' || t1_inout == 'o')) diff --git a/include/ChangeLog b/include/ChangeLog index 082147b..c6a6cae 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,8 @@ +2008-11-21 Sterling Augustine <sterling@tensilica.com> + + * xtensa-isa-internal.h (XTENSA_STATE_IS_SHARED_OR): New flag. + * xtensa-isa.h (xtensa_state_is_shared_or): New prototype. + 2008-11-19 Bob Wilson <bob.wilson@acm.org> * xtensa-config.h (XCHAL_HAVE_MUL16, XCHAL_HAVE_MUL32, XCHAL_HAVE_DIV32) diff --git a/include/xtensa-isa-internal.h b/include/xtensa-isa-internal.h index 9ea23e4..ae1f167 100644 --- a/include/xtensa-isa-internal.h +++ b/include/xtensa-isa-internal.h @@ -1,5 +1,5 @@ /* Internal definitions for configurable Xtensa ISA support. - Copyright 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright 2003, 2004, 2005, 2008 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -15,7 +15,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ + Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, + USA. */ #ifndef XTENSA_ISA_INTERNAL_H #define XTENSA_ISA_INTERNAL_H @@ -33,6 +34,7 @@ #define XTENSA_OPCODE_IS_CALL 0x00000008 #define XTENSA_STATE_IS_EXPORTED 0x00000001 +#define XTENSA_STATE_IS_SHARED_OR 0x00000002 #define XTENSA_INTERFACE_HAS_SIDE_EFFECT 0x00000001 diff --git a/include/xtensa-isa.h b/include/xtensa-isa.h index c4e31ed..69ac60d 100644 --- a/include/xtensa-isa.h +++ b/include/xtensa-isa.h @@ -1,5 +1,5 @@ /* Interface definition for configurable Xtensa ISA support. - Copyright 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + Copyright 2003, 2004, 2005, 2006, 2008 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -15,7 +15,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ + Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, + USA. */ #ifndef XTENSA_LIBISA_H #define XTENSA_LIBISA_H @@ -686,6 +687,13 @@ extern int xtensa_state_is_exported (xtensa_isa isa, xtensa_state st); +/* Check for a "shared_or" state. Returns 0 if the condition is false, + 1 if the condition is true, and XTENSA_UNDEFINED on error. */ + +extern int +xtensa_state_is_shared_or (xtensa_isa isa, xtensa_state st); + + /* Sysregs ("special registers" and "user registers"). */ |