[ gas/ChangeLog ]

2003-01-02  Chris Demetriou  <cgd@broadcom.com>

        * config/tc-mips.c: Update copyright years to include 2003.
        (mips_ip): Fix indentation of "+A", "+B", and "+C" handling.
        Additionally, clean up their code slightly and clean up their
        comments some more.


        * doc/c-mips.texi: Add MIPS32r2 to ".set mipsN" documentation.

[ gas/testsuite/ChangeLog ]
2003-01-02  Chris Demetriou  <cgd@broadcom.com>

        * gas/mips/elf_arch_mips32r2.d: Fix file description comment.

[ include/opcode/ChangeLog ]
2003-01-02  Chris Demetriou  <cgd@broadcom.com>

        * mips.h: Update copyright years to include 2002 (which had
        been missed previously) and 2003.  Make comments about "+A",
        "+B", and "+C" operand types more descriptive.

5 files changed, 88 insertions, 56 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 8be8c17..7af5293 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,12 @@
+2003-01-02  Chris Demetriou  <cgd@broadcom.com>
+
+	* config/tc-mips.c: Update copyright years to include 2003.
+	(mips_ip): Fix indentation of "+A", "+B", and "+C" handling.
+	Additionally, clean up their code slightly and clean up their
+	comments some more.
+
+	* doc/c-mips.texi: Add MIPS32r2 to ".set mipsN" documentation.
+
 2003-01-01  Daniel Jacobowitz  <drow@mvista.com>
 
 	* doc/Makefile.am (as.1): Depend on "asconfig.texi gasver.texi
diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index 2c46fec..b15d84f 100644
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -1,5 +1,5 @@
 /* tc-mips.c -- assemble code for a MIPS chip.
-   Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+   Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
    Free Software Foundation, Inc.
    Contributed by the OSF and Ralph Campbell.
    Written by Keith Knowles and Ralph Campbell, working independently.
@@ -8118,6 +8118,7 @@ mips_ip (str, ip)
   unsigned int regno;
   unsigned int lastregno = 0;
   unsigned int lastpos = 0;
+  unsigned int limlo, limhi;
   char *s_reset;
   char save_c = 0;
 
@@ -8286,58 +8287,76 @@ mips_ip (str, ip)
 	    case '+':		/* Opcode extension character.  */
 	      switch (*++args)
 		{
-		  case 'A':		/* ins/ext "pos".  */
-		    my_getExpression (&imm_expr, s);
-		    check_absolute_expr (ip, &imm_expr);
-		    if ((unsigned long) imm_expr.X_add_number > 31)
-		      {
-			as_bad (_("Improper position (%lu)"),
-				(unsigned long) imm_expr.X_add_number);
-			imm_expr.X_add_number = 0;
-		      }
-		    lastpos = imm_expr.X_add_number;
-		    ip->insn_opcode |= lastpos << OP_SH_SHAMT;
-		    imm_expr.X_op = O_absent;
-		    s = expr_end;
-		    continue;
-
-		  case 'B':		/* "ins" size spec (becomes MSB).  */
-		    my_getExpression (&imm_expr, s);
-		    check_absolute_expr (ip, &imm_expr);
-		    if (imm_expr.X_add_number == 0
-			|| (unsigned long) imm_expr.X_add_number > 32
-			|| ((unsigned long) imm_expr.X_add_number
-			    + lastpos) > 32)
-		      {
-			as_bad (_("Improper insert size (%lu, position %lu)"),
-				(unsigned long) imm_expr.X_add_number,
-				(unsigned long) lastpos);
-			imm_expr.X_add_number &= OP_MASK_INSMSB;
-		      }
-		    ip->insn_opcode |= (lastpos + imm_expr.X_add_number
-					- 1) << OP_SH_INSMSB;
-		    imm_expr.X_op = O_absent;
-		    s = expr_end;
-		    continue;
-
-		  case 'C':		/* "ext" size spec (becomes MSBD).  */
-		    my_getExpression (&imm_expr, s);
-		    check_absolute_expr (ip, &imm_expr);
-		    if (imm_expr.X_add_number == 0
-			|| (unsigned long) imm_expr.X_add_number > 32
-			|| ((unsigned long) imm_expr.X_add_number
-			    + lastpos) > 32)
-		      {
-			as_bad (_("Improper extract size (%lu, position %lu)"),
-				(unsigned long) imm_expr.X_add_number,
-				(unsigned long) lastpos);
-			imm_expr.X_add_number &= OP_MASK_EXTMSBD;
-		      }
-		    ip->insn_opcode |= (imm_expr.X_add_number
-					- 1) << OP_SH_EXTMSBD;
-		    imm_expr.X_op = O_absent;
-		    s = expr_end;
-		    continue;
+		case 'A':		/* ins/ext position, becomes LSB.  */
+		  limlo = 0;
+		  limhi = 31;
+		  my_getExpression (&imm_expr, s);
+		  check_absolute_expr (ip, &imm_expr);
+		  if ((unsigned long) imm_expr.X_add_number < limlo
+		      || (unsigned long) imm_expr.X_add_number > limhi)
+		    {
+		      as_bad (_("Improper position (%lu)"),
+			      (unsigned long) imm_expr.X_add_number);
+		      imm_expr.X_add_number = limlo;
+		    }
+		  lastpos = imm_expr.X_add_number;
+		  ip->insn_opcode |= (imm_expr.X_add_number
+				      & OP_MASK_SHAMT) << OP_SH_SHAMT;
+		  imm_expr.X_op = O_absent;
+		  s = expr_end;
+		  continue;
+
+		case 'B':		/* ins size, becomes MSB.  */
+		  limlo = 1;
+		  limhi = 32;
+		  my_getExpression (&imm_expr, s);
+		  check_absolute_expr (ip, &imm_expr);
+		  /* Check for negative input so that small negative numbers
+		     will not succeed incorrectly.  The checks against
+		     (pos+size) transitively check "size" itself,
+		     assuming that "pos" is reasonable.  */
+		  if ((long) imm_expr.X_add_number < 0
+		      || ((unsigned long) imm_expr.X_add_number
+			  + lastpos) < limlo
+		      || ((unsigned long) imm_expr.X_add_number
+			  + lastpos) > limhi)
+		    {
+		      as_bad (_("Improper insert size (%lu, position %lu)"),
+			      (unsigned long) imm_expr.X_add_number,
+			      (unsigned long) lastpos);
+		      imm_expr.X_add_number = limlo - lastpos;
+		    }
+		  ip->insn_opcode |= ((lastpos + imm_expr.X_add_number - 1)
+				      & OP_MASK_INSMSB) << OP_SH_INSMSB;
+		  imm_expr.X_op = O_absent;
+		  s = expr_end;
+		  continue;
+
+		case 'C':		/* ext size, becomes MSBD.  */
+		  limlo = 1;
+		  limhi = 32;
+		  my_getExpression (&imm_expr, s);
+		  check_absolute_expr (ip, &imm_expr);
+		  /* Check for negative input so that small negative numbers
+		     will not succeed incorrectly.  The checks against
+		     (pos+size) transitively check "size" itself,
+		     assuming that "pos" is reasonable.  */
+		  if ((long) imm_expr.X_add_number < 0
+		      || ((unsigned long) imm_expr.X_add_number
+			  + lastpos) < limlo
+		      || ((unsigned long) imm_expr.X_add_number
+			  + lastpos) > limhi)
+		    {
+		      as_bad (_("Improper extract size (%lu, position %lu)"),
+			      (unsigned long) imm_expr.X_add_number,
+			      (unsigned long) lastpos);
+		      imm_expr.X_add_number = limlo - lastpos;
+		    }
+		  ip->insn_opcode |= ((imm_expr.X_add_number - 1)
+				      & OP_MASK_EXTMSBD) << OP_SH_EXTMSBD;
+		  imm_expr.X_op = O_absent;
+		  s = expr_end;
+		  continue;
 
 		case 'D':
 		  /* +D is for disassembly only; never match.  */
diff --git a/gas/doc/c-mips.texi b/gas/doc/c-mips.texi
index 621efe8..4894c3f 100644
--- a/gas/doc/c-mips.texi
+++ b/gas/doc/c-mips.texi
@@ -288,8 +288,8 @@ assembly language programmers!
 @kindex @code{.set mips@var{n}}
 @sc{gnu} @code{@value{AS}} supports an additional directive to change
 the @sc{mips} Instruction Set Architecture level on the fly: @code{.set
-mips@var{n}}.  @var{n} should be a number from 0 to 5, or 32 or 64.
-The values 1 to 5, 32, and 64 make the assembler accept instructions
+mips@var{n}}.  @var{n} should be a number from 0 to 5, or 32, 32r2, or 64.
+The values other than 0 make the assembler accept instructions
 for the corresponding @sc{isa} level, from that point on in the
 assembly.  @code{.set mips@var{n}} affects not only which instructions
 are permitted, but also how certain macros are expanded.  @code{.set
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index a9c16c9..a010004 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-02  Chris Demetriou  <cgd@broadcom.com>
+
+	* gas/mips/elf_arch_mips32r2.d: Fix file description comment.
+
 2002-12-31  Chris Demetriou  <cgd@broadcom.com>
 
 	* gas/mips/cp0sel-names-mips32.d: New test.
diff --git a/gas/testsuite/gas/mips/mips32r2.d b/gas/testsuite/gas/mips/mips32r2.d
index 196cb41..1f70e9b 100644
--- a/gas/testsuite/gas/mips/mips32r2.d
+++ b/gas/testsuite/gas/mips/mips32r2.d
@@ -1,7 +1,7 @@
 #objdump: -dr --prefix-addresses --show-raw-insn -M reg-names=numeric
 #name: MIPS MIPS32r2 instructions
 
-# Check MIPS32 instruction assembly
+# Check MIPS32 Release 2 (mips32r2) instruction assembly
 
 .*: +file format .*mips.*