gas/

    * config/tc-arm.c (md_assemble): Added validation.

    gas/testsuite
    * gas/arm/thumb-w-bad.d: New test case.
    * gas/arm/thumb-w-bad.l: New file.
    * gas/arm/thumb-w-bad.s: New file.
    * gas/arm/thumb-w-good.d: New test case.
    * gas/arm/thumb-w-good.s: New file.

9 files changed, 289 insertions, 55 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 8c49ce7..e8864c8 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2009-07-14  Daniel Gutson  <dgutson@codesourcery.com>
+
+	* config/tc-arm.c (md_assemble): Added validation.
+
 2009-07-10  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* Makefile.am: Run "make dep-am".
diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index b4b83d0..95d6a8d 100644
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -15372,14 +15372,25 @@ md_assemble (char *str)
 	  return;
 	}
 
-      if (!ARM_CPU_HAS_FEATURE (variant, arm_ext_v6t2) && !inst.size_req)
+      if (!ARM_CPU_HAS_FEATURE (variant, arm_ext_v6t2))
 	{
-	  /* Implicit require narrow instructions on Thumb-1.  This avoids
-	     relaxation accidentally introducing Thumb-2 instructions.  */
 	  if (opcode->tencode != do_t_blx && opcode->tencode != do_t_branch23
-	      && !(ARM_CPU_HAS_FEATURE (*opcode->tvariant, arm_ext_msr)
-		   || ARM_CPU_HAS_FEATURE (*opcode->tvariant, arm_ext_barrier)))
-	    inst.size_req = 2;
+	      && !(ARM_CPU_HAS_FEATURE(*opcode->tvariant, arm_ext_msr)
+		   || ARM_CPU_HAS_FEATURE(*opcode->tvariant, arm_ext_barrier)))
+	    {
+	      /* Two things are addressed here.
+		 1) Implicit require narrow instructions on Thumb-1.
+		    This avoids relaxation accidentally introducing Thumb-2
+		     instructions.
+		 2) Reject wide instructions in non Thumb-2 cores.  */
+	      if (inst.size_req == 0)
+		inst.size_req = 2;
+	      else if (inst.size_req == 4)
+		{
+		  as_bad (_("selected processor does not support `%s'"), str);
+		  return;
+		}
+	    }
 	}
 
       mapping_state (MAP_THUMB);
diff --git a/gas/listing.c b/gas/listing.c
index e307be2..3af70d7 100644
--- a/gas/listing.c
+++ b/gas/listing.c
@@ -96,6 +96,7 @@
 #include "subsegs.h"
 #include "bfdver.h"
 #include <time.h>
+#include <stdarg.h>
 
 #ifndef NO_LISTING
 
@@ -213,12 +214,10 @@ static char *data_buffer;
 static void listing_message (const char *, const char *);
 static file_info_type *file_info (const char *);
 static void new_frag (void);
-static char *buffer_line (file_info_type *, char *, unsigned int);
 static void listing_page (list_info_type *);
 static unsigned int calc_hex (list_info_type *);
 static void print_lines (list_info_type *, unsigned int, char *, unsigned int);
 static void list_symbol_table (void);
-static void print_source (file_info_type *, list_info_type *, char *, unsigned int);
 static int debugging_pseudo (list_info_type *, const char *);
 static void listing_listing (char *);
 
@@ -453,14 +452,13 @@ listing_prev_line (void)
 
 /* This function returns the next source line from the file supplied,
    truncated to size.  It appends a fake line to the end of each input
-   file to make.  */
+   file to make using the returned buffer simpler.  */
 
 static char *
 buffer_line (file_info_type *file, char *line, unsigned int size)
 {
   unsigned int count = 0;
   int c;
-
   char *p = line;
 
   /* If we couldn't open the file, return an empty line.  */
@@ -491,11 +489,11 @@ buffer_line (file_info_type *file, char *line, unsigned int size)
 	fseek (last_open_file, file->pos, SEEK_SET);
     }
 
-  c = fgetc (last_open_file);
-
   /* Leave room for null.  */
   size -= 1;
 
+  c = fgetc (last_open_file);
+
   while (c != EOF && c != '\n' && c != '\r')
     {
       if (count < size)
@@ -503,7 +501,6 @@ buffer_line (file_info_type *file, char *line, unsigned int size)
       count++;
 
       c = fgetc (last_open_file);
-
     }
 
   /* If '\r' is followed by '\n', swallow that.  Likewise, if '\n'
@@ -511,6 +508,7 @@ buffer_line (file_info_type *file, char *line, unsigned int size)
   if (c == '\r' || c == '\n')
     {
       int next = fgetc (last_open_file);
+
       if ((c == '\r' && next != '\n')
 	  || (c == '\n' && next != '\r'))
 	ungetc (next, last_open_file);
@@ -531,6 +529,117 @@ buffer_line (file_info_type *file, char *line, unsigned int size)
   return line;
 }
 
+
+/* This function rewinds the requested file back to the line requested,
+   reads it in again into the buffer provided and then restores the file
+   back to its original location.  */
+
+static char *
+rebuffer_line (file_info_type *  file,
+	       unsigned int      linenum,
+	       char *            buffer,
+	       unsigned int      size)
+{
+  unsigned int count = 0;
+  unsigned int current_line = 1;
+  char * p = buffer;
+  long pos;
+  int c;
+
+  /* Sanity checks.  */
+  if (file == NULL || buffer == NULL || size == 0 || file->linenum <= linenum)
+    return "";
+
+  /* Check the cache and see if we last used this file.  */
+  if (last_open_file_info == NULL || file != last_open_file_info)
+    {
+      if (last_open_file)
+	{
+	  last_open_file_info->pos = ftell (last_open_file);
+	  fclose (last_open_file);
+	}
+
+      /* Open the file in the binary mode so that ftell above can
+	 return a reliable value that we can feed to fseek below.  */
+      last_open_file_info = file;
+      last_open_file = fopen (file->filename, FOPEN_RB);
+      if (last_open_file == NULL)
+	{
+	  file->at_end = 1;
+	  return "";
+	}
+
+      /* Seek to where we were last time this file was open.  */
+      if (file->pos)
+	fseek (last_open_file, file->pos, SEEK_SET);
+    }
+
+  /* Remember where we are in the current file.  */
+  pos = ftell (last_open_file);
+
+  /* Go back to the beginning.  */
+  fseek (last_open_file, 0, SEEK_SET);
+
+  /* Skip lines prior to the one we are interested in.  */
+  while (current_line < linenum)
+    {
+      /* fgets only stops on newlines and has a size limit,
+	 so we read one character at a time instead.  */
+      do
+	{
+	  c = fgetc (last_open_file);
+	}
+      while (c != EOF && c != '\n' && c != '\r');
+
+      ++ current_line;
+
+      if (c == '\r' || c == '\n')
+	{
+	  int next = fgetc (last_open_file);
+
+	  /* If '\r' is followed by '\n', swallow that.  Likewise, if '\n'
+	     is followed by '\r', swallow that as well.  */
+	  if ((c == '\r' && next != '\n')
+	      || (c == '\n' && next != '\r'))
+	    ungetc (next, last_open_file);
+	}
+    }
+
+  /* Leave room for the nul at the end of the buffer.  */
+  size -= 1;
+
+  /* Read in the line.  */
+  c = fgetc (last_open_file);
+
+  while (c != EOF && c != '\n' && c != '\r')
+    {
+      if (count < size)
+	*p++ = c;
+      count++;
+
+      c = fgetc (last_open_file);
+    }
+
+  /* If '\r' is followed by '\n', swallow that.  Likewise, if '\n'
+     is followed by '\r', swallow that as well.  */
+  if (c == '\r' || c == '\n')
+    {
+      int next = fgetc (last_open_file);
+
+      if ((c == '\r' && next != '\n')
+	  || (c == '\n' && next != '\r'))
+	ungetc (next, last_open_file);
+    }
+
+  /* Terminate the line.  */
+  *p++ = 0;
+
+  /* Reset the file position.  */
+  fseek (last_open_file, pos, SEEK_SET);
+
+  return buffer;
+}
+
 static const char *fn;
 
 static unsigned int eject;	/* Eject pending */
@@ -582,6 +691,23 @@ listing_page (list_info_type *list)
     }
 }
 
+/* Print a line into the list_file.  Update the line count
+   and if necessary start a new page.  */
+
+static void
+emit_line (list_info_type * list, const char * format, ...)
+{
+  va_list args;
+
+  va_start (args, format);
+
+  vfprintf (list_file, format, args);
+  on_page++;
+  listing_page (list);
+
+  va_end (args);
+}
+
 static unsigned int
 calc_hex (list_info_type *list)
 {
@@ -672,12 +798,7 @@ print_lines (list_info_type *list, unsigned int lineno,
       for (idx = 0; idx < nchars; idx++)
 	fprintf (list_file, " ");
 
-      fprintf (list_file, "\t%s\n", string ? string : "");
-
-      on_page++;
-
-      listing_page (0);
-
+      emit_line (NULL, "\t%s\n", string ? string : "");
       return;
     }
 
@@ -710,16 +831,10 @@ print_lines (list_info_type *list, unsigned int lineno,
   for (; idx < nchars; idx++)
     fprintf (list_file, " ");
 
-  fprintf (list_file, "\t%s\n", string ? string : "");
-  on_page++;
-  listing_page (list);
+  emit_line (list, "\t%s\n", string ? string : "");
 
   if (list->message)
-    {
-      fprintf (list_file, "****  %s\n", list->message);
-      listing_page (list);
-      on_page++;
-    }
+    emit_line (list, "****  %s\n", list->message);
 
   for (lines = 0;
        lines < (unsigned int) listing_lhs_cont_lines
@@ -749,9 +864,7 @@ print_lines (list_info_type *list, unsigned int lineno,
 	    }
 	}
 
-      fprintf (list_file, "\n");
-      on_page++;
-      listing_page (list);
+      emit_line (list, "\n");
     }
 }
 
@@ -763,7 +876,7 @@ list_symbol_table (void)
 
   symbolS *ptr;
   eject = 1;
-  listing_page (0);
+  listing_page (NULL);
 
   for (ptr = symbol_rootP; ptr != (symbolS *) NULL; ptr = symbol_next (ptr))
     {
@@ -819,7 +932,7 @@ list_symbol_table (void)
 		}
 
 	      on_page++;
-	      listing_page (0);
+	      listing_page (NULL);
 	    }
 	}
 
@@ -829,9 +942,7 @@ list_symbol_table (void)
       fprintf (list_file, "NO DEFINED SYMBOLS\n");
       on_page++;
     }
-  fprintf (list_file, "\n");
-  on_page++;
-  listing_page (0);
+  emit_line (NULL, "\n");
 
   got_some = 0;
 
@@ -844,39 +955,111 @@ list_symbol_table (void)
 	      if (!got_some)
 		{
 		  got_some = 1;
-		  fprintf (list_file, "UNDEFINED SYMBOLS\n");
-		  on_page++;
-		  listing_page (0);
+
+		  emit_line (NULL, "UNDEFINED SYMBOLS\n");
 		}
-	      fprintf (list_file, "%s\n", S_GET_NAME (ptr));
-	      on_page++;
-	      listing_page (0);
+
+	      emit_line (NULL, "%s\n", S_GET_NAME (ptr));
 	    }
 	}
     }
+
   if (!got_some)
-    {
-      fprintf (list_file, "NO UNDEFINED SYMBOLS\n");
-      on_page++;
-      listing_page (0);
-    }
+    emit_line (NULL, "NO UNDEFINED SYMBOLS\n");
 }
 
+typedef struct cached_line
+{
+  file_info_type * file;
+  unsigned int     line;
+  char             buffer [LISTING_RHS_WIDTH];
+} cached_line;
+
 static void
-print_source (file_info_type *current_file, list_info_type *list,
-	      char *buffer, unsigned int width)
+print_source (file_info_type *  current_file,
+	      list_info_type *  list,
+	      unsigned int      width)
 {
+#define NUM_CACHE_LINES  3
+  static cached_line cached_lines[NUM_CACHE_LINES];
+  static int next_free_line = 0;
+  cached_line * cache;
+
+  if (current_file->linenum > list->hll_line
+      && list->hll_line > 0)
+    {
+      /* This can happen with modern optimizing compilers.  The source
+	 lines from the high level language input program are split up
+	 and interleaved, meaning the line number we want to display
+	 (list->hll_line) can have already been displayed.  We have
+	 three choices:
+
+	   a. Do nothing, since we have already displayed the source
+	      line.  This was the old behaviour.
+
+	   b. Display the particular line requested again, but only
+	      that line.  This is the new behaviour.
+
+	   c. Display the particular line requested again and reset
+	      the current_file->line_num value so that we redisplay
+	      all the following lines as well the next time we
+	      encounter a larger line number.  */
+      int i;
+
+      /* Check the cache, maybe we already have the line saved.  */
+      for (i = 0; i < NUM_CACHE_LINES; i++)
+	if (cached_lines[i].file == current_file
+	    && cached_lines[i].line == list->hll_line)
+	  {
+	    cache = cached_lines + i;
+	    break;
+	  }
+
+      if (i == NUM_CACHE_LINES)
+	{
+	  cache = cached_lines + next_free_line;
+	  next_free_line ++;
+	  if (next_free_line == NUM_CACHE_LINES)
+	    next_free_line = 0;
+
+	  cache->file = current_file;
+	  cache->line = list->hll_line;
+	  cache->buffer[0] = 0;
+	  rebuffer_line (current_file, cache->line, cache->buffer, width);
+	}
+
+      emit_line (list, "%4u:%-13s **** %s\n",
+		 cache->line, cache->file->filename, cache->buffer);
+      return;
+    }
+
   if (!current_file->at_end)
     {
+      int num_lines_shown = 0;
+
       while (current_file->linenum < list->hll_line
 	     && !current_file->at_end)
 	{
-	  char *p = buffer_line (current_file, buffer, width);
+	  cached_line * cache = cached_lines + next_free_line;
+	  char *p;
+
+	  cache->file = current_file;
+	  cache->line = current_file->linenum;
+	  cache->buffer[0] = 0;
+	  p = buffer_line (current_file, cache->buffer, width);
+
+	  /* Cache optimization:  If printing a group of lines
+	     cache the first and last lines in the group.  */
+	  if (num_lines_shown == 0)
+	    {
+	      next_free_line ++;
+	      if (next_free_line == NUM_CACHE_LINES)
+		next_free_line = 0;
+	    }
 
-	  fprintf (list_file, "%4u:%-13s **** %s\n", current_file->linenum,
-		   current_file->filename, p);
-	  on_page++;
-	  listing_page (list);
+	  emit_line (list, "%4u:%-13s **** %s\n",
+		     cache->line, cache->file->filename, p);
+	  num_lines_shown ++;
 	}
     }
 }
@@ -1029,7 +1212,7 @@ listing_listing (char *name ATTRIBUTE_UNUSED)
 	    current_hll_file = list->hll_file;
 
 	  if (current_hll_file && list->hll_line && (listing & LISTING_HLL))
-	    print_source (current_hll_file, list, buffer, width);
+	    print_source (current_hll_file, list, width);
 
 	  if (list->line_contents)
 	    {
@@ -1150,7 +1333,7 @@ listing_general_info (char ** argv)
 {
   /* Print the stuff on the first line.  */
   eject = 1;
-  listing_page (0);
+  listing_page (NULL);
 
   fprintf (list_file,
            _(" GNU assembler version %s (%s)\n\t using BFD version %s."),
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index b30d117..94af320 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2009-07-14  Daniel Gutson  <dgutson@codesourcery.com>
+
+	* gas/arm/thumb-w-bad.d: New test case.
+	* gas/arm/thumb-w-bad.l: New file.
+	* gas/arm/thumb-w-bad.s: New file.
+	* gas/arm/thumb-w-good.d: New test case.
+	* gas/arm/thumb-w-good.s: New file.
+
 2009-07-09  Daniel Gutson  <dgutson@codesourcery.com>
 
 	* gas/arm/inst-po.d: New testcase.
diff --git a/gas/testsuite/gas/arm/thumb-w-bad.d b/gas/testsuite/gas/arm/thumb-w-bad.d
new file mode 100644
index 0000000..7b3b2c0
--- /dev/null
+++ b/gas/testsuite/gas/arm/thumb-w-bad.d
@@ -0,0 +1,3 @@
+#name: Wide instruction rejected in non-Thumb2 cores.
+#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#error-output: thumb-w-bad.l
diff --git a/gas/testsuite/gas/arm/thumb-w-bad.l b/gas/testsuite/gas/arm/thumb-w-bad.l
new file mode 100644
index 0000000..85ce74c
--- /dev/null
+++ b/gas/testsuite/gas/arm/thumb-w-bad.l
@@ -0,0 +1,3 @@
+[^:]*: Assembler messages:
+[^:]*:4: Error: selected processor does not support `mov.w r1,r2'
+[^:]*:5: Error: selected processor does not support `mrs.w r0,apsr'
diff --git a/gas/testsuite/gas/arm/thumb-w-bad.s b/gas/testsuite/gas/arm/thumb-w-bad.s
new file mode 100644
index 0000000..c41f793
--- /dev/null
+++ b/gas/testsuite/gas/arm/thumb-w-bad.s
@@ -0,0 +1,6 @@
+.syntax unified
+.arch armv4t
+.thumb
+mov.w r1, r2
+mrs.w r0, apsr
+
diff --git a/gas/testsuite/gas/arm/thumb-w-good.d b/gas/testsuite/gas/arm/thumb-w-good.d
new file mode 100644
index 0000000..645a951
--- /dev/null
+++ b/gas/testsuite/gas/arm/thumb-w-good.d
@@ -0,0 +1,9 @@
+#name: Wide instruction acceptance in Thumb-2 cores
+#objdump: -d --prefix-addresses --show-raw-insn
+#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+
+.*: +file format .*arm.*
+
+Disassembly of section .text:
+00000000 <.text> f7ff fffe 	bl	00000000 <foo>
+00000004 <foo\+0x4> f3ef 8000 	mrs	r0, CPSR
diff --git a/gas/testsuite/gas/arm/thumb-w-good.s b/gas/testsuite/gas/arm/thumb-w-good.s
new file mode 100644
index 0000000..cbbd07a
--- /dev/null
+++ b/gas/testsuite/gas/arm/thumb-w-good.s
@@ -0,0 +1,7 @@
+.thumb
+.syntax unified
+.arch armv4t
+bl.w foo
+.arch armv6-m
+mrs.w r0, apsr
+