bfd/

	* xtensa-isa.c (xtensa_isa_num_pipe_stages): Make max_stage static and
	only compute its value once.
gas/
	* config/tc-xtensa.c (xtensa_num_pipe_stages): New.
	(md_begin): Initialize it.
	(resources_conflict): Use it.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 883d2e53167858de3db9e3242e9568bd195d5942..6490fcf43929a05b0c51a511aceb4c6b7067a361 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-03  Bob Wilson  <bob.wilson@acm.org>
+       
+       * xtensa-isa.c (xtensa_isa_num_pipe_stages): Make max_stage static and
+       only compute its value once.
+       
 2008-03-03  Alan Modra  <amodra@bigpond.net.au>
 
        * elf32-spu.c (struct got_entry): Add "addend" field.

diff --git a/bfd/xtensa-isa.c b/bfd/xtensa-isa.c
index ced8257914e80b9a765b40a7e79ee85d705ebb8b..35b27db84d4b3966195d4755d0c934b416d2a281 100644 (file)
--- a/bfd/xtensa-isa.c
+++ b/bfd/xtensa-isa.c
@@ -1,5 +1,5 @@
 /* Configurable Xtensa ISA support.
-   Copyright 2003, 2004, 2005, 2007 Free Software Foundation, Inc.
+   Copyright 2003, 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
 
@@ -411,7 +411,12 @@ xtensa_isa_num_pipe_stages (xtensa_isa isa)
   xtensa_opcode opcode;
   xtensa_funcUnit_use *use;
   int num_opcodes, num_uses;
-  int i, stage, max_stage = XTENSA_UNDEFINED;
+  int i, stage;
+  static int max_stage = XTENSA_UNDEFINED;
+
+  /* Only compute the value once.  */
+  if (max_stage != XTENSA_UNDEFINED)
+    return max_stage + 1;
 
   num_opcodes = xtensa_isa_num_opcodes (isa);
   for (opcode = 0; opcode < num_opcodes; opcode++)

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 97a7aab199231254a4cafba939ce8789fa21faff..80337c444b3d7d0cb346109d361c634d74143a8d 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,10 @@
+2008-03-03  Sterling Augustine  <sterling@tensilica.com>
+           Bob Wilson  <bob.wilson@acm.org>
+       
+       * config/tc-xtensa.c (xtensa_num_pipe_stages): New.
+       (md_begin): Initialize it.
+       (resources_conflict): Use it.
+       
 2008-03-03  Sterling Augustine  <sterling@tensilica.com>
        
        * config/tc-xtensa.h (RELAX_XTENSA_NONE): New.

diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
index 1321bfbf8c45b8c31ab2c82370c573ce041dffa5..6ef182575fcafa258bcc3a63d15d2b835023ab9a 100644 (file)
--- a/gas/config/tc-xtensa.c
+++ b/gas/config/tc-xtensa.c
@@ -79,6 +79,7 @@ bfd_boolean absolute_literals_supported = XSHAL_USE_ABSOLUTE_LITERALS;
 
 static vliw_insn cur_vinsn;
 
+unsigned xtensa_num_pipe_stages;
 unsigned xtensa_fetch_width = XCHAL_INST_FETCH_WIDTH;
 
 static enum debug_info_type xt_saved_debug_type = DEBUG_NONE;
@@ -5084,6 +5085,8 @@ md_begin (void)
   xtensa_rsr_lcount_opcode = xtensa_opcode_lookup (isa, "rsr.lcount");
   xtensa_waiti_opcode = xtensa_opcode_lookup (isa, "waiti");
 
+  xtensa_num_pipe_stages = xtensa_isa_num_pipe_stages (isa);
+
   init_op_placement_info_table ();
 
   /* Set up the assembly state.  */
@@ -6006,7 +6009,7 @@ resources_conflict (vliw_insn *vinsn)
     {
       xtensa_isa isa = xtensa_default_isa;
       rt = new_resource_table
-       (isa, xtensa_isa_num_pipe_stages (isa),
+       (isa, xtensa_num_pipe_stages,
         xtensa_isa_num_funcUnits (isa),
         (unit_num_copies_func) xtensa_funcUnit_num_copies,
         (opcode_num_units_func) xtensa_opcode_num_funcUnit_uses,