[ gas/ChangeLog ]

	* config/tc-mips.c (mips16_ip): Fix argument register handling
	for restore instruction.

	[ gas/testsuite/ChangeLog ]
	* gas/mips/mips16-save.d: Fix testcase.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 07c02c14687d4397640f757685e9b92e56ed9664..e39501622822de5371793e1d50ddab4e249cee2c 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-12  Thiemo Seufer  <ths@networkno.de>
+
+       * config/tc-mips.c (mips16_ip): Fix argument register handling
+       for restore instruction.
+
 2006-08-08  Bob Wilson  <bob.wilson@acm.org>
 
        * dwarf2dbg.c (DWARF2_USE_FIXED_ADVANCE_PC): New.

diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index e89145430841075378bec139876cf3bc6fbea316..0a8c48d374113cbb26f2d7a4796ed3e483e5b681 100644 (file)
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -10201,7 +10201,7 @@ mips16_ip (char *str, struct mips_cl_insn *ip)
                      {
                        if (reg1 >= 4 && reg1 <= 7)
                          {
-                           if (c == 'm' && !seen_framesz)
+                           if (!seen_framesz)
                                /* args $a0-$a3 */
                                args |= 1 << (reg1 - 4);
                            else

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 63a4c0d703f573fed72b719a17f0d76ab6627118..fad1588b1ce7895b6dc4fc6ea9210326fd2dcdc6 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2006-08-12  Thiemo Seufer  <ths@networkno.de>
+
+       * gas/mips/mips16-save.d: Fix testcase.
+
 2006-08-08  Bob Wilson  <bob.wilson@acm.org>
 
        * gas/lns/lns-common-1-alt.d: New file.

diff --git a/gas/testsuite/gas/mips/mips16e-save.d b/gas/testsuite/gas/mips/mips16e-save.d
index 6e18d8c32060d7eba821f1a82a707b9344481d2d..5f836866b9bcccaba9ea4bb634069a4ae2e6680c 100644 (file)
--- a/gas/testsuite/gas/mips/mips16e-save.d
+++ b/gas/testsuite/gas/mips/mips16e-save.d
@@ -39,5 +39,5 @@ Disassembly of section .text:
   60:[         ]+6470[         ]+restore[      ]+128,ra,s0-s1
   62:[         ]+f010 6441[    ]+restore[      ]+136,ra
   66:[         ]+f100 6408[    ]+restore[      ]+64,s2
-  6a:[         ]+f71b 6470[    ]+restore[      ]+128,ra,s0-s8,a0-a3
+  6a:[         ]+f71a 6470[    ]+restore[      ]+a0-a1,128,ra,s0-s8,a2-a3
   6e:[         ]+6500[         ]+nop