Testcase updates for the previous patch.

14 files changed, 326 insertions, 311 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 9075eda..4a10af7 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,18 @@
+2001-10-04  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* gas/mips/mips-gp64-fp32-pic.d: Use 32bit instructions for addresses.
+	* gas/mips/mips-gp64-fp32-pic.s: Likewise.
+	* gas/mips/mips-gp64-fp32.d: Likewise.
+	* gas/mips/mips-gp64-fp32.s: Likewise.
+	* gas/mips/mips-gp64-fp64-pic.d: Likewise.
+	* gas/mips/mips-gp64-fp64-pic.s: Likewise.
+	* gas/mips/mips-gp64-fp64.d: Likewise.
+	* gas/mips/mips-gp64-fp64.s: Likewise.
+	* gas/mips/elempic.d: Likewise.
+	* gas/mips/ld.d: Likewise.
+	* gas/mips/uld.d: Likewise.
+	* gas/mips/usd.d: Likewise.
+
 2001-09-29  H.J. Lu  <hjl@gnu.org>
 
 	* gas/i386/i386.exp: Run 64bit tests only for "i*86-*-* and
diff --git a/gas/testsuite/gas/mips/elempic.d b/gas/testsuite/gas/mips/elempic.d
index 05d8ee0..8ca29c8 100644
--- a/gas/testsuite/gas/mips/elempic.d
+++ b/gas/testsuite/gas/mips/elempic.d
@@ -120,7 +120,7 @@ Contents of section \.text:
  0070 00010000 00000000 04000000 00000000  .*
  0080 4c000000 00000000 54010000 00000000  .*
  0090 d0ffffff ffffffff 32000010 33000010  .*
- 00a0 0000033c d8006364 0000033c e8006364  .*
+ 00a0 0000033c d80063[26]4 0000033c e80063[26]4  .*
  00b0 cc000000 34000000 cc000000 00000000  .*
  00c0 34000000 00000000 00000000 32000010  .*
  00d0 33000010 34000324 3c000324 cc000000  .*
diff --git a/gas/testsuite/gas/mips/elf-rel4.d b/gas/testsuite/gas/mips/elf-rel4.d
index 21e3975..005075b 100644
--- a/gas/testsuite/gas/mips/elf-rel4.d
+++ b/gas/testsuite/gas/mips/elf-rel4.d
@@ -4,11 +4,11 @@
 .*: +file format.*
 
 Disassembly of section .text:
-0+000 <[^>]*> daddiu	a0,gp,0
+0+000 <[^>]*> addiu	a0,gp,0
 			0: R_MIPS_GPREL16	a
-0+004 <[^>]*> daddiu	a0,gp,4
+0+004 <[^>]*> addiu	a0,gp,4
 			4: R_MIPS_GPREL16	a
-0+008 <[^>]*> daddiu	a0,gp,8
+0+008 <[^>]*> addiu	a0,gp,8
 			8: R_MIPS_GPREL16	a
-0+00c <[^>]*> daddiu	a0,gp,12
+0+00c <[^>]*> addiu	a0,gp,12
 			c: R_MIPS_GPREL16	a
diff --git a/gas/testsuite/gas/mips/ld.d b/gas/testsuite/gas/mips/ld.d
index b7ef4ff..4dea809 100644
--- a/gas/testsuite/gas/mips/ld.d
+++ b/gas/testsuite/gas/mips/ld.d
@@ -628,12 +628,12 @@ Disassembly of section .text:
 0+05d0 <[^>]*> sw	a1,4\(zero\)
 0+05d4 <[^>]*> lui	a0,[-0-9x]+
 [ 	]*5d4: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
-0+05d8 <[^>]*> daddu	a0,a0,a1
+0+05d8 <[^>]*> addu	a0,a0,a1
 0+05dc <[^>]*> ld	a0,[-0-9]+\(a0\)
 [ 	]*5dc: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
 0+05e0 <[^>]*> lui	at,[-0-9x]+
 [ 	]*5e0: [A-Z0-9_]*HI[A-Z0-9_]*	.sbss.*
-0+05e4 <[^>]*> daddu	at,at,a1
+0+05e4 <[^>]*> addu	at,at,a1
 0+05e8 <[^>]*> sd	a0,[-0-9]+\(at\)
 [ 	]*5e8: [A-Z0-9_]*LO[A-Z0-9_]*	.sbss.*
 0+05ec <[^>]*> nop
diff --git a/gas/testsuite/gas/mips/mips-gp64-fp32-pic.d b/gas/testsuite/gas/mips/mips-gp64-fp32-pic.d
index 03c4097..27ad78c 100644
--- a/gas/testsuite/gas/mips/mips-gp64-fp32-pic.d
+++ b/gas/testsuite/gas/mips/mips-gp64-fp32-pic.d
@@ -10,101 +10,101 @@ Disassembly of section .text:
    0:	3c1c0000 	lui	gp,0x0
    4:	279c0000 	addiu	gp,gp,0
    8:	0399e021 	addu	gp,gp,t9
-   c:	ffbc0008 	sd	gp,8\(sp\)
-  10:	009c202d 	daddu	a0,a0,gp
+   c:	afbc0008 	sw	gp,8\(sp\)
+  10:	009c2021 	addu	a0,a0,gp
   14:	3c041234 	lui	a0,0x1234
   18:	34845678 	ori	a0,a0,0x5678
   1c:	8f840000 	lw	a0,0\(gp\)
   20:	00000000 	nop
-  24:	64840000 	daddiu	a0,a0,0
+  24:	24840000 	addiu	a0,a0,0
   28:	8f840000 	lw	a0,0\(gp\)
   2c:	00000000 	nop
-  30:	64840000 	daddiu	a0,a0,0
+  30:	24840000 	addiu	a0,a0,0
   34:	8f840000 	lw	a0,0\(gp\)
   38:	00000000 	nop
-  3c:	64840228 	daddiu	a0,a0,552
+  3c:	24840228 	addiu	a0,a0,552
   40:	10000079 	b	228 <[^>]*>
   44:	00000000 	nop
-  48:	df990000 	ld	t9,0\(gp\)
+  48:	8f990000 	lw	t9,0\(gp\)
   4c:	00000000 	nop
-  50:	67390228 	daddiu	t9,t9,552
+  50:	27390228 	addiu	t9,t9,552
   54:	0320f809 	jalr	t9
   58:	00000000 	nop
-  5c:	dfbc0008 	ld	gp,8\(sp\)
-  60:	df840000 	ld	a0,0\(gp\)
+  5c:	8fbc0008 	lw	gp,8\(sp\)
+  60:	8f840000 	lw	a0,0\(gp\)
   64:	00000000 	nop
-  68:	64840000 	daddiu	a0,a0,0
+  68:	24840000 	addiu	a0,a0,0
   6c:	8c840000 	lw	a0,0\(a0\)
-  70:	df840000 	ld	a0,0\(gp\)
+  70:	8f840000 	lw	a0,0\(gp\)
   74:	00000000 	nop
-  78:	64840000 	daddiu	a0,a0,0
+  78:	24840000 	addiu	a0,a0,0
   7c:	8c840000 	lw	a0,0\(a0\)
-  80:	df840000 	ld	a0,0\(gp\)
+  80:	8f840000 	lw	a0,0\(gp\)
   84:	00000000 	nop
-  88:	64840228 	daddiu	a0,a0,552
+  88:	24840228 	addiu	a0,a0,552
   8c:	8c840000 	lw	a0,0\(a0\)
-  90:	df840000 	ld	a0,0\(gp\)
+  90:	8f840000 	lw	a0,0\(gp\)
   94:	00000000 	nop
-  98:	64840000 	daddiu	a0,a0,0
+  98:	24840000 	addiu	a0,a0,0
   9c:	dc840000 	ld	a0,0\(a0\)
-  a0:	df840000 	ld	a0,0\(gp\)
+  a0:	8f840000 	lw	a0,0\(gp\)
   a4:	00000000 	nop
-  a8:	64840000 	daddiu	a0,a0,0
+  a8:	24840000 	addiu	a0,a0,0
   ac:	dc840000 	ld	a0,0\(a0\)
-  b0:	df840000 	ld	a0,0\(gp\)
+  b0:	8f840000 	lw	a0,0\(gp\)
   b4:	00000000 	nop
-  b8:	64840228 	daddiu	a0,a0,552
+  b8:	24840228 	addiu	a0,a0,552
   bc:	dc840000 	ld	a0,0\(a0\)
-  c0:	df810000 	ld	at,0\(gp\)
+  c0:	8f810000 	lw	at,0\(gp\)
   c4:	00000000 	nop
-  c8:	64210000 	daddiu	at,at,0
+  c8:	24210000 	addiu	at,at,0
   cc:	ac240000 	sw	a0,0\(at\)
-  d0:	df810000 	ld	at,0\(gp\)
+  d0:	8f810000 	lw	at,0\(gp\)
   d4:	00000000 	nop
-  d8:	64210000 	daddiu	at,at,0
+  d8:	24210000 	addiu	at,at,0
   dc:	ac240000 	sw	a0,0\(at\)
-  e0:	df810000 	ld	at,0\(gp\)
+  e0:	8f810000 	lw	at,0\(gp\)
   e4:	00000000 	nop
-  e8:	64210000 	daddiu	at,at,0
+  e8:	24210000 	addiu	at,at,0
   ec:	fc240000 	sd	a0,0\(at\)
-  f0:	df810000 	ld	at,0\(gp\)
+  f0:	8f810000 	lw	at,0\(gp\)
   f4:	00000000 	nop
-  f8:	64210000 	daddiu	at,at,0
+  f8:	24210000 	addiu	at,at,0
   fc:	fc240000 	sd	a0,0\(at\)
- 100:	df810000 	ld	at,0\(gp\)
+ 100:	8f810000 	lw	at,0\(gp\)
  104:	00000000 	nop
- 108:	64210000 	daddiu	at,at,0
+ 108:	24210000 	addiu	at,at,0
  10c:	80240000 	lb	a0,0\(at\)
  110:	90210001 	lbu	at,1\(at\)
  114:	00042200 	sll	a0,a0,0x8
  118:	00812025 	or	a0,a0,at
- 11c:	df810000 	ld	at,0\(gp\)
+ 11c:	8f810000 	lw	at,0\(gp\)
  120:	00000000 	nop
- 124:	64210000 	daddiu	at,at,0
+ 124:	24210000 	addiu	at,at,0
  128:	a0240001 	sb	a0,1\(at\)
  12c:	00042202 	srl	a0,a0,0x8
  130:	a0240000 	sb	a0,0\(at\)
  134:	90210001 	lbu	at,1\(at\)
  138:	00042200 	sll	a0,a0,0x8
  13c:	00812025 	or	a0,a0,at
- 140:	df810000 	ld	at,0\(gp\)
+ 140:	8f810000 	lw	at,0\(gp\)
  144:	00000000 	nop
- 148:	64210000 	daddiu	at,at,0
+ 148:	24210000 	addiu	at,at,0
  14c:	88240000 	lwl	a0,0\(at\)
  150:	98240003 	lwr	a0,3\(at\)
- 154:	df810000 	ld	at,0\(gp\)
+ 154:	8f810000 	lw	at,0\(gp\)
  158:	00000000 	nop
- 15c:	64210000 	daddiu	at,at,0
+ 15c:	24210000 	addiu	at,at,0
  160:	a8240000 	swl	a0,0\(at\)
  164:	b8240003 	swr	a0,3\(at\)
  168:	3404ffc0 	li	a0,0xffc0
  16c:	000423bc 	dsll32	a0,a0,0xe
- 170:	df810000 	ld	at,0\(gp\)
+ 170:	8f810000 	lw	at,0\(gp\)
  174:	dc240000 	ld	a0,0\(at\)
  178:	3c013ff0 	lui	at,0x3ff0
  17c:	44810800 	mtc1	at,\$f1
  180:	44800000 	mtc1	zero,\$f0
- 184:	df810000 	ld	at,0\(gp\)
+ 184:	8f810000 	lw	at,0\(gp\)
  188:	d4200008 	ldc1	\$f0,8\(at\)
  18c:	64a40064 	daddiu	a0,a1,100
  190:	2c840001 	sltiu	a0,a0,1
@@ -113,18 +113,18 @@ Disassembly of section .text:
  19c:	00a0202d 	move	a0,a1
  1a0:	df840000 	ld	a0,0\(gp\)
  1a4:	00000000 	nop
- 1a8:	64840000 	daddiu	a0,a0,0
+ 1a8:	24840000 	addiu	a0,a0,0
  1ac:	df840000 	ld	a0,0\(gp\)
  1b0:	00000000 	nop
- 1b4:	64840000 	daddiu	a0,a0,0
- 1b8:	df810000 	ld	at,0\(gp\)
+ 1b4:	24840000 	addiu	a0,a0,0
+ 1b8:	8f810000 	lw	at,0\(gp\)
  1bc:	00000000 	nop
- 1c0:	64210000 	daddiu	at,at,0
+ 1c0:	24210000 	addiu	at,at,0
  1c4:	68240000 	ldl	a0,0\(at\)
  1c8:	6c240007 	ldr	a0,7\(at\)
- 1cc:	df810000 	ld	at,0\(gp\)
+ 1cc:	8f810000 	lw	at,0\(gp\)
  1d0:	00000000 	nop
- 1d4:	64210000 	daddiu	at,at,0
+ 1d4:	24210000 	addiu	at,at,0
  1d8:	b0240000 	sdl	a0,0\(at\)
  1dc:	b4240007 	sdr	a0,7\(at\)
  1e0:	3c018000 	lui	at,0x8000
diff --git a/gas/testsuite/gas/mips/mips-gp64-fp32-pic.s b/gas/testsuite/gas/mips/mips-gp64-fp32-pic.s
index c67ad06..2fe4750 100644
--- a/gas/testsuite/gas/mips/mips-gp64-fp32-pic.s
+++ b/gas/testsuite/gas/mips/mips-gp64-fp32-pic.s
@@ -18,101 +18,101 @@ func:
 				# 0004 addiu	gp,gp,lo(_gp_disp)
 				# 0008 addu	gp,gp,t9
 	.set reorder
-	.cprestore 8		# 000c sd	gp,8(sp)
-	.cpadd $4		# 0010 daddu	a0,a0,gp
+	.cprestore 8		# 000c sw	gp,8(sp)
+	.cpadd $4		# 0010 addu	a0,a0,gp
 	li	$4, 0x12345678	# 0014 lui	a0,0x1234
 				# 0018 ori	a0,a0,0x5678
 	la	$4, shared	# 001c lw	a0,got(.sdata)(gp)
 				# 0020 nop
-				# 0024 daddiu	a0,a0,lo(shared)
+				# 0024 addiu	a0,a0,lo(shared)
 	la	$4, unshared	# 0028 lw	a0,got(.data)(gp)
 				# 002c nop
-				# 0030 daddiu	a0,a0,lo(unshared)
+				# 0030 addiu	a0,a0,lo(unshared)
 	la	$4, end		# 0034 lw	a0,got(.text)(gp)
 				# 0038 nop
-				# 003c daddiu	a0,a0,lo(end)
+				# 003c addiu	a0,a0,lo(end)
 	j	end		# 0040 b	end
 				# 0044 nop
-	jal	end		# 0048 ld	t9,got(.text)(gp)
+	jal	end		# 0048 lw	t9,got(.text)(gp)
 				# 004c nop
-				# 0050 daddiu	t9,t9,lo(end)
+				# 0050 addiu	t9,t9,lo(end)
 				# 0054 jalr	t9
 				# 0058 nop
-				# 005c ld	gp,8(sp)
-	lw	$4, shared	# 0060 ld	a0,got(.sdata)(gp)
+				# 005c lw	gp,8(sp)
+	lw	$4, shared	# 0060 lw	a0,got(.sdata)(gp)
 				# 0064 nop
-				# 0068 daddiu	a0,a0,lo(shared)
+				# 0068 addiu	a0,a0,lo(shared)
 				# 006c lw	a0,(a0)
-	lw	$4, unshared	# 0070 ld	a0,got(.data)(gp)
+	lw	$4, unshared	# 0070 lw	a0,got(.data)(gp)
 				# 0074 nop
-				# 0078 daddiu	a0,a0,lo(unshared)
+				# 0078 addiu	a0,a0,lo(unshared)
 				# 007c lw	a0,(a0)
-	lw	$4, end		# 0080 ld	a0,got(.text)(gp)
+	lw	$4, end		# 0080 lw	a0,got(.text)(gp)
 				# 0084 nop
-				# 0088 daddiu	a0,a0,lo(end)
+				# 0088 addiu	a0,a0,lo(end)
 				# 008c lw	a0,(a0)
-	ld	$4, shared	# 0090 ld	a0,got(.sdata)(gp)
+	ld	$4, shared	# 0090 lw	a0,got(.sdata)(gp)
 				# 0094 nop
-				# 0098 daddiu	a0,a0,lo(shared)
+				# 0098 addiu	a0,a0,lo(shared)
 				# 009c ld	a0,(a0)
-	ld	$4, unshared	# 00a0 ld	a0,got(.data)(gp)
+	ld	$4, unshared	# 00a0 lw	a0,got(.data)(gp)
 				# 00a4 nop
-				# 00a8 daddiu	a0,a0,lo(unshared)
+				# 00a8 addiu	a0,a0,lo(unshared)
 				# 00ac ld	a0,(a0)
-	ld	$4, end		# 00b0 ld	a0,got(.text)(gp)
+	ld	$4, end		# 00b0 lw	a0,got(.text)(gp)
 				# 00b4 nop
-				# 00b8 daddiu	a0,a0,lo(end)
+				# 00b8 addiu	a0,a0,lo(end)
 				# 00bc ld	a0,(a0)
-	sw	$4, shared	# 00c0 ld	at,got(.sdata)(gp)
+	sw	$4, shared	# 00c0 lw	at,got(.sdata)(gp)
 				# 00c4 nop
-				# 00c8 daddiu	at,at,lo(shared)
+				# 00c8 addiu	at,at,lo(shared)
 				# 00cc sw	a0,0(at)
-	sw	$4, unshared	# 00d0 ld	at,got(.data)(gp)
+	sw	$4, unshared	# 00d0 lw	at,got(.data)(gp)
 				# 00d4 nop
-				# 00d8 daddiu	at,at,lo(unshared)
+				# 00d8 addiu	at,at,lo(unshared)
 				# 00dc sw	a0,0(at)
-	sd	$4, shared	# 00e0 ld	at,got(.sdata)(gp)
+	sd	$4, shared	# 00e0 lw	at,got(.sdata)(gp)
 				# 00e4 nop
-				# 00e8 daddiu	at,at,lo(shared)
+				# 00e8 addiu	at,at,lo(shared)
 				# 00ec sd	a0,(at)
-	sd	$4, unshared	# 00f0 ld	at,got(.data)(gp)
+	sd	$4, unshared	# 00f0 lw	at,got(.data)(gp)
 				# 00f4 nop
-				# 00f8 daddiu	at,at,lo(unshared)
+				# 00f8 addiu	at,at,lo(unshared)
 				# 00fc sd	a0,(at)
-	ulh	$4, unshared	# 0100 ld	at,got(.data)(gp)
+	ulh	$4, unshared	# 0100 lw	at,got(.data)(gp)
 				# 0104 nop
-				# 0108 daddiu	at,at,lo(unshared)
+				# 0108 addiu	at,at,lo(unshared)
 				# 010c lb	a0,0(at)
 				# 0110 lbu	at,1(at)
 				# 0114 sll	a0,a0,8
 				# 0118 or	a0,a0,at
-	ush	$4, unshared	# 011c ld	at,got(.data)(gp)
+	ush	$4, unshared	# 011c lw	at,got(.data)(gp)
 				# 0120 nop
-				# 0124 daddiu	at,at,lo(unshared)
+				# 0124 addiu	at,at,lo(unshared)
 				# 0128 sb	a0,0(at)
 				# 012c srl	a0,a0,8
 				# 0130 sb	a0,1(at)
 				# 0134 lbu	at,0(at)
 				# 0138 sll	a0,a0,8
 				# 013c or	a0,a0,at
-	ulw	$4, unshared	# 0140 ld	at,got(.data)(gp)
+	ulw	$4, unshared	# 0140 lw	at,got(.data)(gp)
 				# 0144 nop
-				# 0148 daddiu	at,at,lo(unshared)
+				# 0148 addiu	at,at,lo(unshared)
 				# 014c lwl	a0,0(at)
 				# 0150 lwr	a0,3(at)
-	usw	$4, unshared	# 0154 ld	at,got(.data)(gp)
+	usw	$4, unshared	# 0154 lw	at,got(.data)(gp)
 				# 0158 nop
-				# 015c daddiu	at,at,lo(unshared)
+				# 015c addiu	at,at,lo(unshared)
 				# 0160 swl	a0,0(at)
 				# 0164 swr	a0,3(at)
 	li.d	$4, 1.0		# 0168 li	a0,0xffc0
 				# 016c dsll32	a0,a0,14
-	li.d	$4, 1.9		# 0170 ld	at,got(.rodata)(gp)
+	li.d	$4, 1.9		# 0170 lw	at,got(.rodata)(gp)
 				# 0174 ld	a0,lo(F1.9)(at)
 	li.d	$f0, 1.0	# 0178 lui	at,0x3ff0
 				# 017c mtc1	at,$f1
 				# 0180 mtc1	zero,$f0
-	li.d	$f0, 1.9	# 0184 ld	at,got(.rodata)(gp)
+	li.d	$f0, 1.9	# 0184 lw	at,got(.rodata)(gp)
 				# 0188 ldc1	$f0,lo(L1.9)(at)
 	seq	$4, $5, -100	# 018c daddiu	a0,a1,100
 				# 0190 sltiu	a0,a0,1
@@ -122,18 +122,18 @@ func:
 
 	dla	$4, shared	# 01a0 ld	a0,got(.sdata)(gp)
 				# 01a4 nop
-				# 01a8 daddiu	a0,a0,lo(shared) 
+				# 01a8 addiu	a0,a0,lo(shared) 
 	dla	$4, unshared	# 01ac ld	a0,got(.data)(gp)
 				# 01b0 nop
-				# 01b4 daddiu	a0,a0,lo(unshared)
-	uld	$4, unshared	# 01b8 ld	at,got(.data)(gp)
+				# 01b4 addiu	a0,a0,lo(unshared)
+	uld	$4, unshared	# 01b8 lw	at,got(.data)(gp)
 				# 01bc nop
-				# 01c0 daddiu	at,at,lo(unshared)
+				# 01c0 addiu	at,at,lo(unshared)
 				# 01c4 ldl	a0,0(at)
 				# 01c8 ldr	a0,7(at)
-	usd	$4, unshared	# 01cc ld	at,got(.data)(gp)
+	usd	$4, unshared	# 01cc lw	at,got(.data)(gp)
 				# 01d0 nop
-				# 01d4 daddiu	at,at,lo(unshared)
+				# 01d4 addiu	at,at,lo(unshared)
 				# 01d8 sdl	a0,0(at)
 				# 01dc sdr	a0,7(at)
 
diff --git a/gas/testsuite/gas/mips/mips-gp64-fp32.d b/gas/testsuite/gas/mips/mips-gp64-fp32.d
index bd0e7fd..df8d1ec 100644
--- a/gas/testsuite/gas/mips/mips-gp64-fp32.d
+++ b/gas/testsuite/gas/mips/mips-gp64-fp32.d
@@ -9,11 +9,11 @@ Disassembly of section .text:
 0+000 <[^>]*>:
    0:	3c041234 	lui	a0,0x1234
    4:	34845678 	ori	a0,a0,0x5678
-   8:	6784c000 	daddiu	a0,gp,-16384
+   8:	2784c000 	addiu	a0,gp,-16384
    c:	3c040000 	lui	a0,0x0
-  10:	64840000 	daddiu	a0,a0,0
+  10:	24840000 	addiu	a0,a0,0
   14:	3c040000 	lui	a0,0x0
-  18:	64840154 	daddiu	a0,a0,340
+  18:	24840154 	addiu	a0,a0,340
   1c:	08000055 	j	154 <[^>]*>
   20:	0c000055 	jal	154 <[^>]*>
   24:	8f84c000 	lw	a0,-16384\(gp\)
@@ -33,13 +33,13 @@ Disassembly of section .text:
   5c:	3c010000 	lui	at,0x0
   60:	fc240000 	sd	a0,0\(at\)
   64:	3c010000 	lui	at,0x0
-  68:	64210000 	daddiu	at,at,0
+  68:	24210000 	addiu	at,at,0
   6c:	80240000 	lb	a0,0\(at\)
   70:	90210001 	lbu	at,1\(at\)
   74:	00042200 	sll	a0,a0,0x8
   78:	00812025 	or	a0,a0,at
   7c:	3c010000 	lui	at,0x0
-  80:	64210000 	daddiu	at,at,0
+  80:	24210000 	addiu	at,at,0
   84:	a0240001 	sb	a0,1\(at\)
   88:	00042202 	srl	a0,a0,0x8
   8c:	a0240000 	sb	a0,0\(at\)
@@ -47,11 +47,11 @@ Disassembly of section .text:
   94:	00042200 	sll	a0,a0,0x8
   98:	00812025 	or	a0,a0,at
   9c:	3c010000 	lui	at,0x0
-  a0:	64210000 	daddiu	at,at,0
+  a0:	24210000 	addiu	at,at,0
   a4:	88240000 	lwl	a0,0\(at\)
   a8:	98240003 	lwr	a0,3\(at\)
   ac:	3c010000 	lui	at,0x0
-  b0:	64210000 	daddiu	at,at,0
+  b0:	24210000 	addiu	at,at,0
   b4:	a8240000 	swl	a0,0\(at\)
   b8:	b8240003 	swr	a0,3\(at\)
   bc:	3404ffc0 	li	a0,0xffc0
@@ -67,15 +67,15 @@ Disassembly of section .text:
   e4:	64a40064 	daddiu	a0,a1,100
   e8:	0004202b 	sltu	a0,zero,a0
   ec:	00a0202d 	move	a0,a1
-  f0:	6784c000 	daddiu	a0,gp,-16384
+  f0:	2784c000 	addiu	a0,gp,-16384
   f4:	3c040000 	lui	a0,0x0
-  f8:	64840000 	daddiu	a0,a0,0
+  f8:	24840000 	addiu	a0,a0,0
   fc:	3c010000 	lui	at,0x0
- 100:	64210000 	daddiu	at,at,0
+ 100:	24210000 	addiu	at,at,0
  104:	68240000 	ldl	a0,0\(at\)
  108:	6c240007 	ldr	a0,7\(at\)
  10c:	3c010000 	lui	at,0x0
- 110:	64210000 	daddiu	at,at,0
+ 110:	24210000 	addiu	at,at,0
  114:	b0240000 	sdl	a0,0\(at\)
  118:	b4240007 	sdr	a0,7\(at\)
  11c:	3c018000 	lui	at,0x8000
diff --git a/gas/testsuite/gas/mips/mips-gp64-fp32.s b/gas/testsuite/gas/mips/mips-gp64-fp32.s
index 2907103..17d8ea3 100644
--- a/gas/testsuite/gas/mips/mips-gp64-fp32.s
+++ b/gas/testsuite/gas/mips/mips-gp64-fp32.s
@@ -15,11 +15,11 @@ func:
 	.set noreorder
 	li	$4, 0x12345678	# 0000 lui	a0,0x1234
 				# 0004 ori	a0,a0,0x5678
-	la	$4, shared	# 0008 daddiu	a0,gp,shared
+	la	$4, shared	# 0008 addiu	a0,gp,shared
 	la	$4, unshared	# 000c lui	a0,hi(unshared)
-				# 0010 daddiu	a0,a0,lo(unshared)
+				# 0010 addiu	a0,a0,lo(unshared)
 	la	$4, end		# 0014 lui	a0,hi(end)
-				# 0018 daddiu	a0,a0,lo(end)
+				# 0018 addiu	a0,a0,lo(end)
 	j	end		# 001c j	end
 	jal	end		# 0020 jal	end
 	lw	$4, shared	# 0024 lw	a0,shared(gp)
@@ -39,13 +39,13 @@ func:
 	sd	$4, unshared	# 005c lui	at,hi(unshared)
 				# 0060 sd	a0,lo(unshared)(at)
 	ulh	$4, unshared	# 0064 lui	at,hi(unshared)
-				# 0068 daddiu	at,at,lo(unshared)
+				# 0068 addiu	at,at,lo(unshared)
 				# 006c lb	a0,0(at)
 				# 0070 lbu	at,1(at)
 				# 0074 sll	a0,a0,8
 				# 0078 or	a0,a0,at
 	ush	$4, unshared	# 007c lui	at,hi(unshared)
-				# 0080 daddiu	at,at,lo(unshared)
+				# 0080 addiu	at,at,lo(unshared)
 				# 0084 sb	a0,1(at)
 				# 0088 srl	a0,a0,8
 				# 008c sb	a0,0(at)
@@ -53,11 +53,11 @@ func:
 				# 0094 sll	a0,a0,8
 				# 0098 or	a0,a0,at
 	ulw	$4, unshared	# 009c lui	at,hi(unshared)
-				# 00a0 daddiu	at,at,lo(unshared)
+				# 00a0 addiu	at,at,lo(unshared)
 				# 00a4 lwl	a0,0(at)
 				# 00a8 lwr	a0,3(at)
 	usw	$4, unshared	# 00ac lui	at,hi(unshared)
-				# 00b0 daddiu	at,at,lo(unshared)
+				# 00b0 addiu	at,at,lo(unshared)
 				# 00b4 swl	a0,0(at)
 				# 00b8 swr	a0,3(at)
 	li.d	$4, 1.0		# 00bc li	a0,0xffc0
@@ -74,15 +74,15 @@ func:
 				# 00e8 sltu	a0,zero,a0
 	move	$4, $5		# 00ec move	a0,a1
 
-	dla	$4, shared	# 00f0 daddiu	a0,gp,shared
+	dla	$4, shared	# 00f0 addiu	a0,gp,shared
 	dla	$4, unshared	# 00f4 lui	a0,hi(unshared)
-				# 00f8 daddiu	a0,a0,lo(unshared)
+				# 00f8 addiu	a0,a0,lo(unshared)
 	uld	$4, unshared	# 00fc lui	at,hi(unshared)
-				# 0100 daddiu	at,at,lo(unshared)
+				# 0100 addiu	at,at,lo(unshared)
 				# 0104 ldl	a0,0(at)
 				# 0108 ldr	a0,7(at)
 	usd	$4, unshared	# 010c lui	at,hi(unshared)
-				# 0110 daddiu	at,at,lo(unshared)
+				# 0110 addiu	at,at,lo(unshared)
 				# 0114 sdl	a0,0(at)
 				# 0118 sdr	a0,7(at)
 
diff --git a/gas/testsuite/gas/mips/mips-gp64-fp64-pic.d b/gas/testsuite/gas/mips/mips-gp64-fp64-pic.d
index 513cee5..449e67c 100644
--- a/gas/testsuite/gas/mips/mips-gp64-fp64-pic.d
+++ b/gas/testsuite/gas/mips/mips-gp64-fp64-pic.d
@@ -10,101 +10,101 @@ Disassembly of section .text:
    0:	3c1c0000 	lui	gp,0x0
    4:	279c0000 	addiu	gp,gp,0
    8:	0399e021 	addu	gp,gp,t9
-   c:	ffbc0008 	sd	gp,8\(sp\)
-  10:	009c202d 	daddu	a0,a0,gp
+   c:	afbc0008 	sw	gp,8\(sp\)
+  10:	009c2021 	addu	a0,a0,gp
   14:	3c041234 	lui	a0,0x1234
   18:	34845678 	ori	a0,a0,0x5678
   1c:	8f840000 	lw	a0,0\(gp\)
   20:	00000000 	nop
-  24:	64840000 	daddiu	a0,a0,0
+  24:	24840000 	addiu	a0,a0,0
   28:	8f840000 	lw	a0,0\(gp\)
   2c:	00000000 	nop
-  30:	64840000 	daddiu	a0,a0,0
+  30:	24840000 	addiu	a0,a0,0
   34:	8f840000 	lw	a0,0\(gp\)
   38:	00000000 	nop
-  3c:	6484022c 	daddiu	a0,a0,556
+  3c:	2484022c 	addiu	a0,a0,556
   40:	1000007a 	b	22c <[^>]*>
   44:	00000000 	nop
-  48:	df990000 	ld	t9,0\(gp\)
+  48:	8f990000 	lw	t9,0\(gp\)
   4c:	00000000 	nop
-  50:	6739022c 	daddiu	t9,t9,556
+  50:	2739022c 	addiu	t9,t9,556
   54:	0320f809 	jalr	t9
   58:	00000000 	nop
-  5c:	dfbc0008 	ld	gp,8\(sp\)
-  60:	df840000 	ld	a0,0\(gp\)
+  5c:	8fbc0008 	lw	gp,8\(sp\)
+  60:	8f840000 	lw	a0,0\(gp\)
   64:	00000000 	nop
-  68:	64840000 	daddiu	a0,a0,0
+  68:	24840000 	addiu	a0,a0,0
   6c:	8c840000 	lw	a0,0\(a0\)
-  70:	df840000 	ld	a0,0\(gp\)
+  70:	8f840000 	lw	a0,0\(gp\)
   74:	00000000 	nop
-  78:	64840000 	daddiu	a0,a0,0
+  78:	24840000 	addiu	a0,a0,0
   7c:	8c840000 	lw	a0,0\(a0\)
-  80:	df840000 	ld	a0,0\(gp\)
+  80:	8f840000 	lw	a0,0\(gp\)
   84:	00000000 	nop
-  88:	6484022c 	daddiu	a0,a0,556
+  88:	2484022c 	addiu	a0,a0,556
   8c:	8c840000 	lw	a0,0\(a0\)
-  90:	df840000 	ld	a0,0\(gp\)
+  90:	8f840000 	lw	a0,0\(gp\)
   94:	00000000 	nop
-  98:	64840000 	daddiu	a0,a0,0
+  98:	24840000 	addiu	a0,a0,0
   9c:	dc840000 	ld	a0,0\(a0\)
-  a0:	df840000 	ld	a0,0\(gp\)
+  a0:	8f840000 	lw	a0,0\(gp\)
   a4:	00000000 	nop
-  a8:	64840000 	daddiu	a0,a0,0
+  a8:	24840000 	addiu	a0,a0,0
   ac:	dc840000 	ld	a0,0\(a0\)
-  b0:	df840000 	ld	a0,0\(gp\)
+  b0:	8f840000 	lw	a0,0\(gp\)
   b4:	00000000 	nop
-  b8:	6484022c 	daddiu	a0,a0,556
+  b8:	2484022c 	addiu	a0,a0,556
   bc:	dc840000 	ld	a0,0\(a0\)
-  c0:	df810000 	ld	at,0\(gp\)
+  c0:	8f810000 	lw	at,0\(gp\)
   c4:	00000000 	nop
-  c8:	64210000 	daddiu	at,at,0
+  c8:	24210000 	addiu	at,at,0
   cc:	ac240000 	sw	a0,0\(at\)
-  d0:	df810000 	ld	at,0\(gp\)
+  d0:	8f810000 	lw	at,0\(gp\)
   d4:	00000000 	nop
-  d8:	64210000 	daddiu	at,at,0
+  d8:	24210000 	addiu	at,at,0
   dc:	ac240000 	sw	a0,0\(at\)
-  e0:	df810000 	ld	at,0\(gp\)
+  e0:	8f810000 	lw	at,0\(gp\)
   e4:	00000000 	nop
-  e8:	64210000 	daddiu	at,at,0
+  e8:	24210000 	addiu	at,at,0
   ec:	fc240000 	sd	a0,0\(at\)
-  f0:	df810000 	ld	at,0\(gp\)
+  f0:	8f810000 	lw	at,0\(gp\)
   f4:	00000000 	nop
-  f8:	64210000 	daddiu	at,at,0
+  f8:	24210000 	addiu	at,at,0
   fc:	fc240000 	sd	a0,0\(at\)
- 100:	df810000 	ld	at,0\(gp\)
+ 100:	8f810000 	lw	at,0\(gp\)
  104:	00000000 	nop
- 108:	64210000 	daddiu	at,at,0
+ 108:	24210000 	addiu	at,at,0
  10c:	80240000 	lb	a0,0\(at\)
  110:	90210001 	lbu	at,1\(at\)
  114:	00042200 	sll	a0,a0,0x8
  118:	00812025 	or	a0,a0,at
- 11c:	df810000 	ld	at,0\(gp\)
+ 11c:	8f810000 	lw	at,0\(gp\)
  120:	00000000 	nop
- 124:	64210000 	daddiu	at,at,0
+ 124:	24210000 	addiu	at,at,0
  128:	a0240001 	sb	a0,1\(at\)
  12c:	00042202 	srl	a0,a0,0x8
  130:	a0240000 	sb	a0,0\(at\)
  134:	90210001 	lbu	at,1\(at\)
  138:	00042200 	sll	a0,a0,0x8
  13c:	00812025 	or	a0,a0,at
- 140:	df810000 	ld	at,0\(gp\)
+ 140:	8f810000 	lw	at,0\(gp\)
  144:	00000000 	nop
- 148:	64210000 	daddiu	at,at,0
+ 148:	24210000 	addiu	at,at,0
  14c:	88240000 	lwl	a0,0\(at\)
  150:	98240003 	lwr	a0,3\(at\)
- 154:	df810000 	ld	at,0\(gp\)
+ 154:	8f810000 	lw	at,0\(gp\)
  158:	00000000 	nop
- 15c:	64210000 	daddiu	at,at,0
+ 15c:	24210000 	addiu	at,at,0
  160:	a8240000 	swl	a0,0\(at\)
  164:	b8240003 	swr	a0,3\(at\)
  168:	3404ffc0 	li	a0,0xffc0
  16c:	000423bc 	dsll32	a0,a0,0xe
- 170:	df810000 	ld	at,0\(gp\)
+ 170:	8f810000 	lw	at,0\(gp\)
  174:	dc240000 	ld	a0,0\(at\)
  178:	3401ffc0 	li	at,0xffc0
  17c:	00010bbc 	dsll32	at,at,0xe
  180:	44a10000 	dmtc1	at,\$f0
- 184:	df810000 	ld	at,0\(gp\)
+ 184:	8f810000 	lw	at,0\(gp\)
  188:	d4200008 	ldc1	\$f0,8\(at\)
  18c:	64a40064 	daddiu	a0,a1,100
  190:	2c840001 	sltiu	a0,a0,1
@@ -113,18 +113,18 @@ Disassembly of section .text:
  19c:	00a0202d 	move	a0,a1
  1a0:	df840000 	ld	a0,0\(gp\)
  1a4:	00000000 	nop
- 1a8:	64840000 	daddiu	a0,a0,0
+ 1a8:	24840000 	addiu	a0,a0,0
  1ac:	df840000 	ld	a0,0\(gp\)
  1b0:	00000000 	nop
- 1b4:	64840000 	daddiu	a0,a0,0
- 1b8:	df810000 	ld	at,0\(gp\)
+ 1b4:	24840000 	addiu	a0,a0,0
+ 1b8:	8f810000 	lw	at,0\(gp\)
  1bc:	00000000 	nop
- 1c0:	64210000 	daddiu	at,at,0
+ 1c0:	24210000 	addiu	at,at,0
  1c4:	68240000 	ldl	a0,0\(at\)
  1c8:	6c240007 	ldr	a0,7\(at\)
- 1cc:	df810000 	ld	at,0\(gp\)
+ 1cc:	8f810000 	lw	at,0\(gp\)
  1d0:	00000000 	nop
- 1d4:	64210000 	daddiu	at,at,0
+ 1d4:	24210000 	addiu	at,at,0
  1d8:	b0240000 	sdl	a0,0\(at\)
  1dc:	b4240007 	sdr	a0,7\(at\)
  1e0:	3c018000 	lui	at,0x8000
diff --git a/gas/testsuite/gas/mips/mips-gp64-fp64-pic.s b/gas/testsuite/gas/mips/mips-gp64-fp64-pic.s
index 1f144f5..75cd97f 100644
--- a/gas/testsuite/gas/mips/mips-gp64-fp64-pic.s
+++ b/gas/testsuite/gas/mips/mips-gp64-fp64-pic.s
@@ -18,101 +18,101 @@ func:
 				# 0004 addiu	gp,gp,lo(_gp_disp)
 				# 0008 addu	gp,gp,t9
 	.set reorder
-	.cprestore 8		# 000c sd	gp,8(sp)
-	.cpadd $4		# 0010 daddu	a0,a0,gp
+	.cprestore 8		# 000c sw	gp,8(sp)
+	.cpadd $4		# 0010 addu	a0,a0,gp
 	li	$4, 0x12345678	# 0014 lui	a0,0x1234
 				# 0018 ori	a0,a0,0x5678
 	la	$4, shared	# 001c lw	a0,got(.sdata)(gp)
 				# 0020 nop
-				# 0024 daddiu	a0,a0,lo(shared)
+				# 0024 addiu	a0,a0,lo(shared)
 	la	$4, unshared	# 0028 lw	a0,got(.data)(gp)
 				# 002c nop
-				# 0030 daddiu	a0,a0,lo(unshared)
+				# 0030 addiu	a0,a0,lo(unshared)
 	la	$4, end		# 0034 lw	a0,got(.text)(gp)
 				# 0038 nop
-				# 003c daddiu	a0,a0,lo(end)
+				# 003c addiu	a0,a0,lo(end)
 	j	end		# 0040 b	end
 				# 0044 nop
-	jal	end		# 0048 ld	t9,got(.text)(gp)
+	jal	end		# 0048 lw	t9,got(.text)(gp)
 				# 004c nop
-				# 0050 daddiu	t9,t9,lo(end)
+				# 0050 addiu	t9,t9,lo(end)
 				# 0054 jalr	t9
 				# 0058 nop
-				# 005c ld	gp,8(sp)
-	lw	$4, shared	# 0060 ld	a0,got(.sdata)(gp)
+				# 005c lw	gp,8(sp)
+	lw	$4, shared	# 0060 lw	a0,got(.sdata)(gp)
 				# 0064 nop
-				# 0068 daddiu	a0,a0,lo(shared)
+				# 0068 addiu	a0,a0,lo(shared)
 				# 006c lw	a0,(a0)
-	lw	$4, unshared	# 0070 ld	a0,got(.data)(gp)
+	lw	$4, unshared	# 0070 lw	a0,got(.data)(gp)
 				# 0074 nop
-				# 0078 daddiu	a0,a0,lo(unshared)
+				# 0078 addiu	a0,a0,lo(unshared)
 				# 007c lw	a0,(a0)
-	lw	$4, end		# 0080 ld	a0,got(.text)(gp)
+	lw	$4, end		# 0080 lw	a0,got(.text)(gp)
 				# 0084 nop
-				# 0088 daddiu	a0,a0,lo(end)
+				# 0088 addiu	a0,a0,lo(end)
 				# 008c lw	a0,(a0)
-	ld	$4, shared	# 0090 ld	a0,got(.sdata)(gp)
+	ld	$4, shared	# 0090 lw	a0,got(.sdata)(gp)
 				# 0094 nop
-				# 0098 daddiu	a0,a0,lo(shared)
+				# 0098 addiu	a0,a0,lo(shared)
 				# 009c ld	a0,(a0)
-	ld	$4, unshared	# 00a0 ld	a0,got(.data)(gp)
+	ld	$4, unshared	# 00a0 lw	a0,got(.data)(gp)
 				# 00a4 nop
-				# 00a8 daddiu	a0,a0,lo(unshared)
+				# 00a8 addiu	a0,a0,lo(unshared)
 				# 00ac ld	a0,(a0)
-	ld	$4, end		# 00b0 ld	a0,got(.text)(gp)
+	ld	$4, end		# 00b0 lw	a0,got(.text)(gp)
 				# 00b4 nop
-				# 00b8 daddiu	a0,a0,lo(end)
+				# 00b8 addiu	a0,a0,lo(end)
 				# 00bc ld	a0,(a0)
-	sw	$4, shared	# 00c0 ld	at,got(.sdata)(gp)
+	sw	$4, shared	# 00c0 lw	at,got(.sdata)(gp)
 				# 00c4 nop
-				# 00c8 daddiu	at,at,lo(shared)
+				# 00c8 addiu	at,at,lo(shared)
 				# 00cc sw	a0,0(at)
-	sw	$4, unshared	# 00d0 ld	at,got(.data)(gp)
+	sw	$4, unshared	# 00d0 lw	at,got(.data)(gp)
 				# 00d4 nop
-				# 00d8 daddiu	at,at,lo(unshared)
+				# 00d8 addiu	at,at,lo(unshared)
 				# 00dc sw	a0,0(at)
-	sd	$4, shared	# 00e0 ld	at,got(.sdata)(gp)
+	sd	$4, shared	# 00e0 lw	at,got(.sdata)(gp)
 				# 00e4 nop
-				# 00e8 daddiu	at,at,lo(shared)
+				# 00e8 addiu	at,at,lo(shared)
 				# 00ec sd	a0,(at)
-	sd	$4, unshared	# 00f0 ld	at,got(.data)(gp)
+	sd	$4, unshared	# 00f0 lw	at,got(.data)(gp)
 				# 00f4 nop
-				# 00f8 daddiu	at,at,lo(unshared)
+				# 00f8 addiu	at,at,lo(unshared)
 				# 00fc sd	a0,(at)
-	ulh	$4, unshared	# 0100 ld	at,got(.data)(gp)
+	ulh	$4, unshared	# 0100 lw	at,got(.data)(gp)
 				# 0104 nop
-				# 0108 daddiu	at,at,lo(unshared)
+				# 0108 addiu	at,at,lo(unshared)
 				# 010c lb	a0,0(at)
 				# 0110 lbu	at,1(at)
 				# 0114 sll	a0,a0,8
 				# 0118 or	a0,a0,at
-	ush	$4, unshared	# 011c ld	at,got(.data)(gp)
+	ush	$4, unshared	# 011c lw	at,got(.data)(gp)
 				# 0120 nop
-				# 0124 daddiu	at,at,lo(unshared)
+				# 0124 addiu	at,at,lo(unshared)
 				# 0128 sb	a0,0(at)
 				# 012c srl	a0,a0,8
 				# 0130 sb	a0,1(at)
 				# 0134 lbu	at,0(at)
 				# 0138 sll	a0,a0,8
 				# 013c or	a0,a0,at
-	ulw	$4, unshared	# 0140 ld	at,got(.data)(gp)
+	ulw	$4, unshared	# 0140 lw	at,got(.data)(gp)
 				# 0144 nop
-				# 0148 daddiu	at,at,lo(unshared)
+				# 0148 addiu	at,at,lo(unshared)
 				# 014c lwl	a0,0(at)
 				# 0150 lwr	a0,3(at)
-	usw	$4, unshared	# 0154 ld	at,got(.data)(gp)
+	usw	$4, unshared	# 0154 lw	at,got(.data)(gp)
 				# 0158 nop
-				# 015c daddiu	at,at,lo(unshared)
+				# 015c addiu	at,at,lo(unshared)
 				# 0160 swl	a0,0(at)
 				# 0164 swr	a0,3(at)
 	li.d	$4, 1.0		# 0168 li	a0,0xffc0
 				# 016c dsll32	a0,a0,14
-	li.d	$4, 1.9		# 0170 ld	at,got(.rodata)(gp)
+	li.d	$4, 1.9		# 0170 lw	at,got(.rodata)(gp)
 				# 0174 ld	a0,lo(F1.9)(at)
 	li.d	$f0, 1.0	# 0178 li	at,0xffc0
 				# 017c dsll32	at,at,14
 				# 0180 dmtc1	at,$f0
-	li.d	$f0, 1.9	# 0184 ld	at,got(.rodata)(gp)
+	li.d	$f0, 1.9	# 0184 lw	at,got(.rodata)(gp)
 				# 0188 ldc1	$f0,lo(L1.9)(at)
 	seq	$4, $5, -100	# 018c daddiu	a0,a1,100
 				# 0190 sltiu	a0,a0,1
@@ -122,18 +122,18 @@ func:
 
 	dla	$4, shared	# 01a0 ld	a0,got(.sdata)(gp)
 				# 01a4 nop
-				# 01a8 daddiu	a0,a0,lo(shared) 
+				# 01a8 addiu	a0,a0,lo(shared) 
 	dla	$4, unshared	# 01ac ld	a0,got(.data)(gp)
 				# 01b0 nop
-				# 01b4 daddiu	a0,a0,lo(unshared)
-	uld	$4, unshared	# 01b8 ld	at,got(.data)(gp)
+				# 01b4 addiu	a0,a0,lo(unshared)
+	uld	$4, unshared	# 01b8 lw	at,got(.data)(gp)
 				# 01bc nop
-				# 01c0 daddiu	at,at,lo(unshared)
+				# 01c0 addiu	at,at,lo(unshared)
 				# 01c4 ldl	a0,0(at)
 				# 01c8 ldr	a0,7(at)
-	usd	$4, unshared	# 01cc ld	at,got(.data)(gp)
+	usd	$4, unshared	# 01cc lw	at,got(.data)(gp)
 				# 01d0 nop
-				# 01d4 daddiu	at,at,lo(unshared)
+				# 01d4 addiu	at,at,lo(unshared)
 				# 01d8 sdl	a0,0(at)
 				# 01dc sdr	a0,7(at)
 
diff --git a/gas/testsuite/gas/mips/mips-gp64-fp64.d b/gas/testsuite/gas/mips/mips-gp64-fp64.d
index 1f1df3e..804f01e 100644
--- a/gas/testsuite/gas/mips/mips-gp64-fp64.d
+++ b/gas/testsuite/gas/mips/mips-gp64-fp64.d
@@ -9,11 +9,11 @@ Disassembly of section .text:
 0+000 <[^>]*>:
    0:	3c041234 	lui	a0,0x1234
    4:	34845678 	ori	a0,a0,0x5678
-   8:	6784c000 	daddiu	a0,gp,-16384
+   8:	2784c000 	addiu	a0,gp,-16384
    c:	3c040000 	lui	a0,0x0
-  10:	64840000 	daddiu	a0,a0,0
+  10:	24840000 	addiu	a0,a0,0
   14:	3c040000 	lui	a0,0x0
-  18:	64840158 	daddiu	a0,a0,344
+  18:	24840158 	addiu	a0,a0,344
   1c:	08000056 	j	158 <[^>]*>
   20:	0c000056 	jal	158 <[^>]*>
   24:	8f84c000 	lw	a0,-16384\(gp\)
@@ -33,13 +33,13 @@ Disassembly of section .text:
   5c:	3c010000 	lui	at,0x0
   60:	fc240000 	sd	a0,0\(at\)
   64:	3c010000 	lui	at,0x0
-  68:	64210000 	daddiu	at,at,0
+  68:	24210000 	addiu	at,at,0
   6c:	80240000 	lb	a0,0\(at\)
   70:	90210001 	lbu	at,1\(at\)
   74:	00042200 	sll	a0,a0,0x8
   78:	00812025 	or	a0,a0,at
   7c:	3c010000 	lui	at,0x0
-  80:	64210000 	daddiu	at,at,0
+  80:	24210000 	addiu	at,at,0
   84:	a0240001 	sb	a0,1\(at\)
   88:	00042202 	srl	a0,a0,0x8
   8c:	a0240000 	sb	a0,0\(at\)
@@ -47,11 +47,11 @@ Disassembly of section .text:
   94:	00042200 	sll	a0,a0,0x8
   98:	00812025 	or	a0,a0,at
   9c:	3c010000 	lui	at,0x0
-  a0:	64210000 	daddiu	at,at,0
+  a0:	24210000 	addiu	at,at,0
   a4:	88240000 	lwl	a0,0\(at\)
   a8:	98240003 	lwr	a0,3\(at\)
   ac:	3c010000 	lui	at,0x0
-  b0:	64210000 	daddiu	at,at,0
+  b0:	24210000 	addiu	at,at,0
   b4:	a8240000 	swl	a0,0\(at\)
   b8:	b8240003 	swr	a0,3\(at\)
   bc:	3404ffc0 	li	a0,0xffc0
@@ -67,15 +67,15 @@ Disassembly of section .text:
   e4:	64a40064 	daddiu	a0,a1,100
   e8:	0004202b 	sltu	a0,zero,a0
   ec:	00a0202d 	move	a0,a1
-  f0:	6784c000 	daddiu	a0,gp,-16384
+  f0:	2784c000 	addiu	a0,gp,-16384
   f4:	3c040000 	lui	a0,0x0
-  f8:	64840000 	daddiu	a0,a0,0
+  f8:	24840000 	addiu	a0,a0,0
   fc:	3c010000 	lui	at,0x0
- 100:	64210000 	daddiu	at,at,0
+ 100:	24210000 	addiu	at,at,0
  104:	68240000 	ldl	a0,0\(at\)
  108:	6c240007 	ldr	a0,7\(at\)
  10c:	3c010000 	lui	at,0x0
- 110:	64210000 	daddiu	at,at,0
+ 110:	24210000 	addiu	at,at,0
  114:	b0240000 	sdl	a0,0\(at\)
  118:	b4240007 	sdr	a0,7\(at\)
  11c:	3c018000 	lui	at,0x8000
diff --git a/gas/testsuite/gas/mips/mips-gp64-fp64.s b/gas/testsuite/gas/mips/mips-gp64-fp64.s
index 8698fb4..b691262 100644
--- a/gas/testsuite/gas/mips/mips-gp64-fp64.s
+++ b/gas/testsuite/gas/mips/mips-gp64-fp64.s
@@ -15,11 +15,11 @@ func:
 	.set noreorder
 	li	$4, 0x12345678	# 0000 lui	a0,0x1234
 				# 0004 ori	a0,a0,0x5678
-	la	$4, shared	# 0008 daddiu	a0,gp,shared
+	la	$4, shared	# 0008 addiu	a0,gp,shared
 	la	$4, unshared	# 000c lui	a0,hi(unshared)
-				# 0010 daddiu	a0,a0,lo(unshared)
+				# 0010 addiu	a0,a0,lo(unshared)
 	la	$4, end		# 0014 lui	a0,hi(end)
-				# 0018 daddiu	a0,a0,lo(end)
+				# 0018 addiu	a0,a0,lo(end)
 	j	end		# 001c j	end
 	jal	end		# 0020 jal	end
 	lw	$4, shared	# 0024 lw	a0,shared(gp)
@@ -39,13 +39,13 @@ func:
 	sd	$4, unshared	# 005c lui	at,hi(unshared)
 				# 0060 sd	a0,lo(unshared)(at)
 	ulh	$4, unshared	# 0064 lui	at,hi(unshared)
-				# 0068 daddiu	at,at,lo(unshared)
+				# 0068 addiu	at,at,lo(unshared)
 				# 006c lb	a0,0(at)
 				# 0070 lbu	at,1(at)
 				# 0074 sll	a0,a0,8
 				# 0078 or	a0,a0,at
 	ush	$4, unshared	# 007c lui	at,hi(unshared)
-				# 0080 daddiu	at,at,lo(unshared)
+				# 0080 addiu	at,at,lo(unshared)
 				# 0084 sb	a0,1(at)
 				# 0088 srl	a0,a0,8
 				# 008c sb	a0,0(at)
@@ -53,11 +53,11 @@ func:
 				# 0094 sll	a0,a0,8
 				# 0098 or	a0,a0,at
 	ulw	$4, unshared	# 009c lui	at,hi(unshared)
-				# 00a0 daddiu	at,at,lo(unshared)
+				# 00a0 addiu	at,at,lo(unshared)
 				# 00a4 lwl	a0,0(at)
 				# 00a8 lwr	a0,3(at)
 	usw	$4, unshared	# 00ac lui	at,hi(unshared)
-				# 00b0 daddiu	at,at,lo(unshared)
+				# 00b0 addiu	at,at,lo(unshared)
 				# 00b4 swl	a0,0(at)
 				# 00b8 swr	a0,3(at)
 	li.d	$4, 1.0		# 00bc li	a0,0xffc0
@@ -74,15 +74,15 @@ func:
 				# 00e8 sltu	a0,zero,a0
 	move	$4, $5		# 00ec move	a0,a1
 
-	dla	$4, shared	# 00f0 daddiu	a0,gp,shared
+	dla	$4, shared	# 00f0 addiu	a0,gp,shared
 	dla	$4, unshared	# 00f4 lui	a0,hi(unshared)
-				# 00f8 daddiu	a0,a0,lo(unshared)
+				# 00f8 addiu	a0,a0,lo(unshared)
 	uld	$4, unshared	# 00fc lui	at,hi(unshared)
-				# 0100 daddiu	at,at,lo(unshared)
+				# 0100 addiu	at,at,lo(unshared)
 				# 0104 ldl	a0,0(at)
 				# 0108 ldr	a0,7(at)
 	usd	$4, unshared	# 010c lui	at,hi(unshared)
-				# 0110 daddiu	at,at,lo(unshared)
+				# 0110 addiu	at,at,lo(unshared)
 				# 0114 sdl	a0,0(at)
 				# 0118 sdr	a0,7(at)
 
diff --git a/gas/testsuite/gas/mips/uld.d b/gas/testsuite/gas/mips/uld.d
index b563292..88551f8 100644
--- a/gas/testsuite/gas/mips/uld.d
+++ b/gas/testsuite/gas/mips/uld.d
@@ -29,241 +29,241 @@ Disassembly of section .text:
 0+004c <[^>]*> ldr	a0,[-0-9]+\(a1\)
 0+0050 <[^>]*> lui	at,[-0-9x]+
 [ 	]*50: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
-0+0054 <[^>]*> daddiu	at,at,[-0-9]+
+0+0054 <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*54: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
 0+0058 <[^>]*> ldl	a0,[07]\(at\)
 0+005c <[^>]*> ldr	a0,[07]\(at\)
 0+0060 <[^>]*> lui	at,0x0
 [ 	]*60: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
-0+0064 <[^>]*> daddiu	at,at,[-0-9]+
+0+0064 <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*64: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
 0+0068 <[^>]*> ldl	a0,[07]\(at\)
 0+006c <[^>]*> ldr	a0,[07]\(at\)
-0+0070 <[^>]*> daddiu	at,gp,0
+0+0070 <[^>]*> addiu	at,gp,0
 [ 	]*70: [A-Z0-9_]*GPREL[A-Z0-9_]*	small_external_data_label
 0+0074 <[^>]*> ldl	a0,[07]\(at\)
 0+0078 <[^>]*> ldr	a0,[07]\(at\)
 0+007c <[^>]*> lui	at,0x0
 [ 	]*7c: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
-0+0080 <[^>]*> daddiu	at,at,[-0-9]+
+0+0080 <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*80: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
 0+0084 <[^>]*> ldl	a0,[07]\(at\)
 0+0088 <[^>]*> ldr	a0,[07]\(at\)
-0+008c <[^>]*> daddiu	at,gp,0
+0+008c <[^>]*> addiu	at,gp,0
 [ 	]*8c: [A-Z0-9_]*GPREL[A-Z0-9_]*	small_external_common
 0+0090 <[^>]*> ldl	a0,[07]\(at\)
 0+0094 <[^>]*> ldr	a0,[07]\(at\)
 0+0098 <[^>]*> lui	at,[-0-9x]+
 [ 	]*98: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
-0+009c <[^>]*> daddiu	at,at,[-0-9]+
+0+009c <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*9c: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
 0+00a0 <[^>]*> ldl	a0,[07]\(at\)
 0+00a4 <[^>]*> ldr	a0,[07]\(at\)
-0+00a8 <[^>]*> daddiu	at,gp,[-0-9]+
+0+00a8 <[^>]*> addiu	at,gp,[-0-9]+
 [ 	]*a8: [A-Z0-9_]*GPREL[A-Z0-9_]*	.sbss.*
 0+00ac <[^>]*> ldl	a0,[07]\(at\)
 0+00b0 <[^>]*> ldr	a0,[07]\(at\)
 0+00b4 <[^>]*> lui	at,0x0
 [ 	]*b4: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
-0+00b8 <[^>]*> daddiu	at,at,[-0-9]+
+0+00b8 <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*b8: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
 0+00bc <[^>]*> ldl	a0,[07]\(at\)
 0+00c0 <[^>]*> ldr	a0,[07]\(at\)
 0+00c4 <[^>]*> lui	at,0x0
 [ 	]*c4: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
-0+00c8 <[^>]*> daddiu	at,at,[-0-9]+
+0+00c8 <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*c8: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
 0+00cc <[^>]*> ldl	a0,[07]\(at\)
 0+00d0 <[^>]*> ldr	a0,[07]\(at\)
-0+00d4 <[^>]*> daddiu	at,gp,1
+0+00d4 <[^>]*> addiu	at,gp,1
 [ 	]*d4: [A-Z0-9_]*GPREL[A-Z0-9_]*	small_external_data_label
 0+00d8 <[^>]*> ldl	a0,[07]\(at\)
 0+00dc <[^>]*> ldr	a0,[07]\(at\)
 0+00e0 <[^>]*> lui	at,0x0
 [ 	]*e0: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
-0+00e4 <[^>]*> daddiu	at,at,[-0-9]+
+0+00e4 <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*e4: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
 0+00e8 <[^>]*> ldl	a0,[07]\(at\)
 0+00ec <[^>]*> ldr	a0,[07]\(at\)
-0+00f0 <[^>]*> daddiu	at,gp,1
+0+00f0 <[^>]*> addiu	at,gp,1
 [ 	]*f0: [A-Z0-9_]*GPREL[A-Z0-9_]*	small_external_common
 0+00f4 <[^>]*> ldl	a0,[07]\(at\)
 0+00f8 <[^>]*> ldr	a0,[07]\(at\)
 0+00fc <[^>]*> lui	at,0x0
 [ 	]*fc: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
-0+0100 <[^>]*> daddiu	at,at,[-0-9]+
+0+0100 <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*100: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
 0+0104 <[^>]*> ldl	a0,[07]\(at\)
 0+0108 <[^>]*> ldr	a0,[07]\(at\)
-0+010c <[^>]*> daddiu	at,gp,[-0-9]+
+0+010c <[^>]*> addiu	at,gp,[-0-9]+
 [ 	]*10c: [A-Z0-9_]*GPREL[A-Z0-9_]*	.sbss.*
 0+0110 <[^>]*> ldl	a0,[07]\(at\)
 0+0114 <[^>]*> ldr	a0,[07]\(at\)
 0+0118 <[^>]*> lui	at,[-0-9x]+
 [ 	]*118: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
-0+011c <[^>]*> daddiu	at,at,[-0-9]+
+0+011c <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*11c: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
 0+0120 <[^>]*> ldl	a0,[07]\(at\)
 0+0124 <[^>]*> ldr	a0,[07]\(at\)
 0+0128 <[^>]*> lui	at,[-0-9x]+
 [ 	]*128: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
-0+012c <[^>]*> daddiu	at,at,[-0-9]+
+0+012c <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*12c: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
 0+0130 <[^>]*> ldl	a0,[07]\(at\)
 0+0134 <[^>]*> ldr	a0,[07]\(at\)
 0+0138 <[^>]*> lui	at,[-0-9x]+
 [ 	]*138: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_data_label
-0+013c <[^>]*> daddiu	at,at,[-0-9]+
+0+013c <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*13c: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_data_label
 0+0140 <[^>]*> ldl	a0,[07]\(at\)
 0+0144 <[^>]*> ldr	a0,[07]\(at\)
 0+0148 <[^>]*> lui	at,[-0-9x]+
 [ 	]*148: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
-0+014c <[^>]*> daddiu	at,at,[-0-9]+
+0+014c <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*14c: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
 0+0150 <[^>]*> ldl	a0,[07]\(at\)
 0+0154 <[^>]*> ldr	a0,[07]\(at\)
 0+0158 <[^>]*> lui	at,[-0-9x]+
 [ 	]*158: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_common
-0+015c <[^>]*> daddiu	at,at,[-0-9]+
+0+015c <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*15c: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_common
 0+0160 <[^>]*> ldl	a0,[07]\(at\)
 0+0164 <[^>]*> ldr	a0,[07]\(at\)
 0+0168 <[^>]*> lui	at,[-0-9x]+
 [ 	]*168: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
-0+016c <[^>]*> daddiu	at,at,[-0-9]+
+0+016c <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*16c: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
 0+0170 <[^>]*> ldl	a0,[07]\(at\)
 0+0174 <[^>]*> ldr	a0,[07]\(at\)
 0+0178 <[^>]*> lui	at,[-0-9x]+
 [ 	]*178: [A-Z0-9_]*HI[A-Z0-9_]*	.sbss.*
-0+017c <[^>]*> daddiu	at,at,[-0-9]+
+0+017c <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*17c: [A-Z0-9_]*LO[A-Z0-9_]*	.sbss.*
 0+0180 <[^>]*> ldl	a0,[07]\(at\)
 0+0184 <[^>]*> ldr	a0,[07]\(at\)
 0+0188 <[^>]*> lui	at,0x0
 [ 	]*188: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
-0+018c <[^>]*> daddiu	at,at,[-0-9]+
+0+018c <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*18c: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
 0+0190 <[^>]*> ldl	a0,[07]\(at\)
 0+0194 <[^>]*> ldr	a0,[07]\(at\)
 0+0198 <[^>]*> lui	at,0x0
 [ 	]*198: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
-0+019c <[^>]*> daddiu	at,at,[-0-9]+
+0+019c <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*19c: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
 0+01a0 <[^>]*> ldl	a0,[07]\(at\)
 0+01a4 <[^>]*> ldr	a0,[07]\(at\)
 0+01a8 <[^>]*> lui	at,0x0
 [ 	]*1a8: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_data_label
-0+01ac <[^>]*> daddiu	at,at,[-0-9]+
+0+01ac <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*1ac: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_data_label
 0+01b0 <[^>]*> ldl	a0,[07]\(at\)
 0+01b4 <[^>]*> ldr	a0,[07]\(at\)
 0+01b8 <[^>]*> lui	at,0x0
 [ 	]*1b8: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
-0+01bc <[^>]*> daddiu	at,at,[-0-9]+
+0+01bc <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*1bc: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
 0+01c0 <[^>]*> ldl	a0,[07]\(at\)
 0+01c4 <[^>]*> ldr	a0,[07]\(at\)
 0+01c8 <[^>]*> lui	at,0x0
 [ 	]*1c8: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_common
-0+01cc <[^>]*> daddiu	at,at,[-0-9]+
+0+01cc <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*1cc: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_common
 0+01d0 <[^>]*> ldl	a0,[07]\(at\)
 0+01d4 <[^>]*> ldr	a0,[07]\(at\)
 0+01d8 <[^>]*> lui	at,0x0
 [ 	]*1d8: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
-0+01dc <[^>]*> daddiu	at,at,[-0-9]+
+0+01dc <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*1dc: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
 0+01e0 <[^>]*> ldl	a0,[07]\(at\)
 0+01e4 <[^>]*> ldr	a0,[07]\(at\)
 0+01e8 <[^>]*> lui	at,0x0
 [ 	]*1e8: [A-Z0-9_]*HI[A-Z0-9_]*	.sbss.*
-0+01ec <[^>]*> daddiu	at,at,[-0-9]+
+0+01ec <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*1ec: [A-Z0-9_]*LO[A-Z0-9_]*	.sbss.*
 0+01f0 <[^>]*> ldl	a0,[07]\(at\)
 0+01f4 <[^>]*> ldr	a0,[07]\(at\)
 0+01f8 <[^>]*> lui	at,[-0-9x]+
 [ 	]*1f8: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
-0+01fc <[^>]*> daddiu	at,at,[-0-9]+
+0+01fc <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*1fc: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
 0+0200 <[^>]*> ldl	a0,[07]\(at\)
 0+0204 <[^>]*> ldr	a0,[07]\(at\)
 0+0208 <[^>]*> lui	at,[-0-9x]+
 [ 	]*208: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
-0+020c <[^>]*> daddiu	at,at,0
+0+020c <[^>]*> addiu	at,at,0
 [ 	]*20c: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
 0+0210 <[^>]*> ldl	a0,[07]\(at\)
 0+0214 <[^>]*> ldr	a0,[07]\(at\)
 0+0218 <[^>]*> lui	at,[-0-9x]+
 [ 	]*218: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_data_label
-0+021c <[^>]*> daddiu	at,at,0
+0+021c <[^>]*> addiu	at,at,0
 [ 	]*21c: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_data_label
 0+0220 <[^>]*> ldl	a0,[07]\(at\)
 0+0224 <[^>]*> ldr	a0,[07]\(at\)
 0+0228 <[^>]*> lui	at,[-0-9x]+
 [ 	]*228: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
-0+022c <[^>]*> daddiu	at,at,0
+0+022c <[^>]*> addiu	at,at,0
 [ 	]*22c: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
 0+0230 <[^>]*> ldl	a0,[07]\(at\)
 0+0234 <[^>]*> ldr	a0,[07]\(at\)
 0+0238 <[^>]*> lui	at,[-0-9x]+
 [ 	]*238: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_common
-0+023c <[^>]*> daddiu	at,at,0
+0+023c <[^>]*> addiu	at,at,0
 [ 	]*23c: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_common
 0+0240 <[^>]*> ldl	a0,[07]\(at\)
 0+0244 <[^>]*> ldr	a0,[07]\(at\)
 0+0248 <[^>]*> lui	at,[-0-9x]+
 [ 	]*248: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
-0+024c <[^>]*> daddiu	at,at,[-0-9]+
+0+024c <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*24c: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
 0+0250 <[^>]*> ldl	a0,[07]\(at\)
 0+0254 <[^>]*> ldr	a0,[07]\(at\)
 0+0258 <[^>]*> lui	at,[-0-9x]+
 [ 	]*258: [A-Z0-9_]*HI[A-Z0-9_]*	.sbss.*
-0+025c <[^>]*> daddiu	at,at,[-0-9]+
+0+025c <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*25c: [A-Z0-9_]*LO[A-Z0-9_]*	.sbss.*
 0+0260 <[^>]*> ldl	a0,[07]\(at\)
 0+0264 <[^>]*> ldr	a0,[07]\(at\)
 0+0268 <[^>]*> lui	at,[-0-9x]+
 [ 	]*268: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
-0+026c <[^>]*> daddiu	at,at,[-0-9]+
+0+026c <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*26c: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
 0+0270 <[^>]*> ldl	a0,[07]\(at\)
 0+0274 <[^>]*> ldr	a0,[07]\(at\)
 0+0278 <[^>]*> lui	at,[-0-9x]+
 [ 	]*278: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
-0+027c <[^>]*> daddiu	at,at,[-0-9]+
+0+027c <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*27c: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
 0+0280 <[^>]*> ldl	a0,[07]\(at\)
 0+0284 <[^>]*> ldr	a0,[07]\(at\)
 0+0288 <[^>]*> lui	at,[-0-9x]+
 [ 	]*288: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_data_label
-0+028c <[^>]*> daddiu	at,at,[-0-9]+
+0+028c <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*28c: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_data_label
 0+0290 <[^>]*> ldl	a0,[07]\(at\)
 0+0294 <[^>]*> ldr	a0,[07]\(at\)
 0+0298 <[^>]*> lui	at,[-0-9x]+
 [ 	]*298: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
-0+029c <[^>]*> daddiu	at,at,[-0-9]+
+0+029c <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*29c: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
 0+02a0 <[^>]*> ldl	a0,[07]\(at\)
 0+02a4 <[^>]*> ldr	a0,[07]\(at\)
 0+02a8 <[^>]*> lui	at,[-0-9x]+
 [ 	]*2a8: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_common
-0+02ac <[^>]*> daddiu	at,at,[-0-9]+
+0+02ac <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*2ac: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_common
 0+02b0 <[^>]*> ldl	a0,[07]\(at\)
 0+02b4 <[^>]*> ldr	a0,[07]\(at\)
 0+02b8 <[^>]*> lui	at,[-0-9x]+
 [ 	]*2b8: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
-0+02bc <[^>]*> daddiu	at,at,[-0-9]+
+0+02bc <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*2bc: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
 0+02c0 <[^>]*> ldl	a0,[07]\(at\)
 0+02c4 <[^>]*> ldr	a0,[07]\(at\)
 0+02c8 <[^>]*> lui	at,[-0-9x]+
 [ 	]*2c8: [A-Z0-9_]*HI[A-Z0-9_]*	.sbss.*
-0+02cc <[^>]*> daddiu	at,at,[-0-9]+
+0+02cc <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*2cc: [A-Z0-9_]*LO[A-Z0-9_]*	.sbss.*
 0+02d0 <[^>]*> ldl	a0,[07]\(at\)
 0+02d4 <[^>]*> ldr	a0,[07]\(at\)
diff --git a/gas/testsuite/gas/mips/usd.d b/gas/testsuite/gas/mips/usd.d
index 0e9da49..d3631a9 100644
--- a/gas/testsuite/gas/mips/usd.d
+++ b/gas/testsuite/gas/mips/usd.d
@@ -29,241 +29,241 @@ Disassembly of section .text:
 0+004c <[^>]*> sdr	a0,[-0-9]+\(a1\)
 0+0050 <[^>]*> lui	at,[-0-9x]+
 [ 	]*50: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
-0+0054 <[^>]*> daddiu	at,at,[-0-9]+
+0+0054 <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*54: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
 0+0058 <[^>]*> sdl	a0,[07]\(at\)
 0+005c <[^>]*> sdr	a0,[07]\(at\)
 0+0060 <[^>]*> lui	at,[-0-9x]+
 [ 	]*60: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
-0+0064 <[^>]*> daddiu	at,at,[-0-9]+
+0+0064 <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*64: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
 0+0068 <[^>]*> sdl	a0,[07]\(at\)
 0+006c <[^>]*> sdr	a0,[07]\(at\)
-0+0070 <[^>]*> daddiu	at,gp,0
+0+0070 <[^>]*> addiu	at,gp,0
 [ 	]*70: [A-Z0-9_]*GPREL[A-Z0-9_]*	small_external_data_label
 0+0074 <[^>]*> sdl	a0,[07]\(at\)
 0+0078 <[^>]*> sdr	a0,[07]\(at\)
 0+007c <[^>]*> lui	at,0x0
 [ 	]*7c: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
-0+0080 <[^>]*> daddiu	at,at,[-0-9]+
+0+0080 <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*80: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
 0+0084 <[^>]*> sdl	a0,[07]\(at\)
 0+0088 <[^>]*> sdr	a0,[07]\(at\)
-0+008c <[^>]*> daddiu	at,gp,0
+0+008c <[^>]*> addiu	at,gp,0
 [ 	]*8c: [A-Z0-9_]*GPREL[A-Z0-9_]*	small_external_common
 0+0090 <[^>]*> sdl	a0,[07]\(at\)
 0+0094 <[^>]*> sdr	a0,[07]\(at\)
 0+0098 <[^>]*> lui	at,[-0-9x]+
 [ 	]*98: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
-0+009c <[^>]*> daddiu	at,at,[-0-9]+
+0+009c <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*9c: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
 0+00a0 <[^>]*> sdl	a0,[07]\(at\)
 0+00a4 <[^>]*> sdr	a0,[07]\(at\)
-0+00a8 <[^>]*> daddiu	at,gp,[-0-9]+
+0+00a8 <[^>]*> addiu	at,gp,[-0-9]+
 [ 	]*a8: [A-Z0-9_]*GPREL[A-Z0-9_]*	.sbss.*
 0+00ac <[^>]*> sdl	a0,[07]\(at\)
 0+00b0 <[^>]*> sdr	a0,[07]\(at\)
 0+00b4 <[^>]*> lui	at,0x0
 [ 	]*b4: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
-0+00b8 <[^>]*> daddiu	at,at,[-0-9]+
+0+00b8 <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*b8: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
 0+00bc <[^>]*> sdl	a0,[07]\(at\)
 0+00c0 <[^>]*> sdr	a0,[07]\(at\)
 0+00c4 <[^>]*> lui	at,0x0
 [ 	]*c4: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
-0+00c8 <[^>]*> daddiu	at,at,[-0-9]+
+0+00c8 <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*c8: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
 0+00cc <[^>]*> sdl	a0,[07]\(at\)
 0+00d0 <[^>]*> sdr	a0,[07]\(at\)
-0+00d4 <[^>]*> daddiu	at,gp,1
+0+00d4 <[^>]*> addiu	at,gp,1
 [ 	]*d4: [A-Z0-9_]*GPREL[A-Z0-9_]*	small_external_data_label
 0+00d8 <[^>]*> sdl	a0,[07]\(at\)
 0+00dc <[^>]*> sdr	a0,[07]\(at\)
 0+00e0 <[^>]*> lui	at,0x0
 [ 	]*e0: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
-0+00e4 <[^>]*> daddiu	at,at,[-0-9]+
+0+00e4 <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*e4: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
 0+00e8 <[^>]*> sdl	a0,[07]\(at\)
 0+00ec <[^>]*> sdr	a0,[07]\(at\)
-0+00f0 <[^>]*> daddiu	at,gp,1
+0+00f0 <[^>]*> addiu	at,gp,1
 [ 	]*f0: [A-Z0-9_]*GPREL[A-Z0-9_]*	small_external_common
 0+00f4 <[^>]*> sdl	a0,[07]\(at\)
 0+00f8 <[^>]*> sdr	a0,[07]\(at\)
 0+00fc <[^>]*> lui	at,0x0
 [ 	]*fc: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
-0+0100 <[^>]*> daddiu	at,at,[-0-9]+
+0+0100 <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*100: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
 0+0104 <[^>]*> sdl	a0,[07]\(at\)
 0+0108 <[^>]*> sdr	a0,[07]\(at\)
-0+010c <[^>]*> daddiu	at,gp,[-0-9]+
+0+010c <[^>]*> addiu	at,gp,[-0-9]+
 [ 	]*10c: [A-Z0-9_]*GPREL[A-Z0-9_]*	.sbss.*
 0+0110 <[^>]*> sdl	a0,[07]\(at\)
 0+0114 <[^>]*> sdr	a0,[07]\(at\)
 0+0118 <[^>]*> lui	at,[-0-9x]+
 [ 	]*118: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
-0+011c <[^>]*> daddiu	at,at,[-0-9]+
+0+011c <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*11c: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
 0+0120 <[^>]*> sdl	a0,[07]\(at\)
 0+0124 <[^>]*> sdr	a0,[07]\(at\)
 0+0128 <[^>]*> lui	at,[-0-9x]+
 [ 	]*128: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
-0+012c <[^>]*> daddiu	at,at,[-0-9]+
+0+012c <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*12c: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
 0+0130 <[^>]*> sdl	a0,[07]\(at\)
 0+0134 <[^>]*> sdr	a0,[07]\(at\)
 0+0138 <[^>]*> lui	at,[-0-9x]+
 [ 	]*138: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_data_label
-0+013c <[^>]*> daddiu	at,at,[-0-9]+
+0+013c <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*13c: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_data_label
 0+0140 <[^>]*> sdl	a0,[07]\(at\)
 0+0144 <[^>]*> sdr	a0,[07]\(at\)
 0+0148 <[^>]*> lui	at,[-0-9x]+
 [ 	]*148: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
-0+014c <[^>]*> daddiu	at,at,[-0-9]+
+0+014c <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*14c: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
 0+0150 <[^>]*> sdl	a0,[07]\(at\)
 0+0154 <[^>]*> sdr	a0,[07]\(at\)
 0+0158 <[^>]*> lui	at,[-0-9x]+
 [ 	]*158: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_common
-0+015c <[^>]*> daddiu	at,at,[-0-9]+
+0+015c <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*15c: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_common
 0+0160 <[^>]*> sdl	a0,[07]\(at\)
 0+0164 <[^>]*> sdr	a0,[07]\(at\)
 0+0168 <[^>]*> lui	at,[-0-9x]+
 [ 	]*168: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
-0+016c <[^>]*> daddiu	at,at,[-0-9]+
+0+016c <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*16c: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
 0+0170 <[^>]*> sdl	a0,[07]\(at\)
 0+0174 <[^>]*> sdr	a0,[07]\(at\)
 0+0178 <[^>]*> lui	at,[-0-9x]+
 [ 	]*178: [A-Z0-9_]*HI[A-Z0-9_]*	.sbss.*
-0+017c <[^>]*> daddiu	at,at,[-0-9]+
+0+017c <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*17c: [A-Z0-9_]*LO[A-Z0-9_]*	.sbss.*
 0+0180 <[^>]*> sdl	a0,[07]\(at\)
 0+0184 <[^>]*> sdr	a0,[07]\(at\)
 0+0188 <[^>]*> lui	at,0x0
 [ 	]*188: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
-0+018c <[^>]*> daddiu	at,at,[-0-9]+
+0+018c <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*18c: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
 0+0190 <[^>]*> sdl	a0,[07]\(at\)
 0+0194 <[^>]*> sdr	a0,[07]\(at\)
 0+0198 <[^>]*> lui	at,0x0
 [ 	]*198: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
-0+019c <[^>]*> daddiu	at,at,[-0-9]+
+0+019c <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*19c: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
 0+01a0 <[^>]*> sdl	a0,[07]\(at\)
 0+01a4 <[^>]*> sdr	a0,[07]\(at\)
 0+01a8 <[^>]*> lui	at,0x0
 [ 	]*1a8: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_data_label
-0+01ac <[^>]*> daddiu	at,at,[-0-9]+
+0+01ac <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*1ac: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_data_label
 0+01b0 <[^>]*> sdl	a0,[07]\(at\)
 0+01b4 <[^>]*> sdr	a0,[07]\(at\)
 0+01b8 <[^>]*> lui	at,0x0
 [ 	]*1b8: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
-0+01bc <[^>]*> daddiu	at,at,[-0-9]+
+0+01bc <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*1bc: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
 0+01c0 <[^>]*> sdl	a0,[07]\(at\)
 0+01c4 <[^>]*> sdr	a0,[07]\(at\)
 0+01c8 <[^>]*> lui	at,0x0
 [ 	]*1c8: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_common
-0+01cc <[^>]*> daddiu	at,at,[-0-9]+
+0+01cc <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*1cc: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_common
 0+01d0 <[^>]*> sdl	a0,[07]\(at\)
 0+01d4 <[^>]*> sdr	a0,[07]\(at\)
 0+01d8 <[^>]*> lui	at,0x0
 [ 	]*1d8: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
-0+01dc <[^>]*> daddiu	at,at,[-0-9]+
+0+01dc <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*1dc: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
 0+01e0 <[^>]*> sdl	a0,[07]\(at\)
 0+01e4 <[^>]*> sdr	a0,[07]\(at\)
 0+01e8 <[^>]*> lui	at,0x0
 [ 	]*1e8: [A-Z0-9_]*HI[A-Z0-9_]*	.sbss.*
-0+01ec <[^>]*> daddiu	at,at,[-0-9]+
+0+01ec <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*1ec: [A-Z0-9_]*LO[A-Z0-9_]*	.sbss.*
 0+01f0 <[^>]*> sdl	a0,[07]\(at\)
 0+01f4 <[^>]*> sdr	a0,[07]\(at\)
 0+01f8 <[^>]*> lui	at,[-0-9x]+
 [ 	]*1f8: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
-0+01fc <[^>]*> daddiu	at,at,[-0-9]+
+0+01fc <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*1fc: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
 0+0200 <[^>]*> sdl	a0,[07]\(at\)
 0+0204 <[^>]*> sdr	a0,[07]\(at\)
 0+0208 <[^>]*> lui	at,[-0-9x]+
 [ 	]*208: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
-0+020c <[^>]*> daddiu	at,at,0
+0+020c <[^>]*> addiu	at,at,0
 [ 	]*20c: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
 0+0210 <[^>]*> sdl	a0,[07]\(at\)
 0+0214 <[^>]*> sdr	a0,[07]\(at\)
 0+0218 <[^>]*> lui	at,[-0-9x]+
 [ 	]*218: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_data_label
-0+021c <[^>]*> daddiu	at,at,0
+0+021c <[^>]*> addiu	at,at,0
 [ 	]*21c: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_data_label
 0+0220 <[^>]*> sdl	a0,[07]\(at\)
 0+0224 <[^>]*> sdr	a0,[07]\(at\)
 0+0228 <[^>]*> lui	at,[-0-9x]+
 [ 	]*228: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
-0+022c <[^>]*> daddiu	at,at,0
+0+022c <[^>]*> addiu	at,at,0
 [ 	]*22c: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
 0+0230 <[^>]*> sdl	a0,[07]\(at\)
 0+0234 <[^>]*> sdr	a0,[07]\(at\)
 0+0238 <[^>]*> lui	at,[-0-9x]+
 [ 	]*238: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_common
-0+023c <[^>]*> daddiu	at,at,0
+0+023c <[^>]*> addiu	at,at,0
 [ 	]*23c: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_common
 0+0240 <[^>]*> sdl	a0,[07]\(at\)
 0+0244 <[^>]*> sdr	a0,[07]\(at\)
 0+0248 <[^>]*> lui	at,[-0-9x]+
 [ 	]*248: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
-0+024c <[^>]*> daddiu	at,at,[-0-9]+
+0+024c <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*24c: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
 0+0250 <[^>]*> sdl	a0,[07]\(at\)
 0+0254 <[^>]*> sdr	a0,[07]\(at\)
 0+0258 <[^>]*> lui	at,[-0-9x]+
 [ 	]*258: [A-Z0-9_]*HI[A-Z0-9_]*	.sbss.*
-0+025c <[^>]*> daddiu	at,at,[-0-9]+
+0+025c <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*25c: [A-Z0-9_]*LO[A-Z0-9_]*	.sbss.*
 0+0260 <[^>]*> sdl	a0,[07]\(at\)
 0+0264 <[^>]*> sdr	a0,[07]\(at\)
 0+0268 <[^>]*> lui	at,[-0-9x]+
 [ 	]*268: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
-0+026c <[^>]*> daddiu	at,at,[-0-9]+
+0+026c <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*26c: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
 0+0270 <[^>]*> sdl	a0,[07]\(at\)
 0+0274 <[^>]*> sdr	a0,[07]\(at\)
 0+0278 <[^>]*> lui	at,[-0-9x]+
 [ 	]*278: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
-0+027c <[^>]*> daddiu	at,at,[-0-9]+
+0+027c <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*27c: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
 0+0280 <[^>]*> sdl	a0,[07]\(at\)
 0+0284 <[^>]*> sdr	a0,[07]\(at\)
 0+0288 <[^>]*> lui	at,[-0-9x]+
 [ 	]*288: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_data_label
-0+028c <[^>]*> daddiu	at,at,[-0-9]+
+0+028c <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*28c: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_data_label
 0+0290 <[^>]*> sdl	a0,[07]\(at\)
 0+0294 <[^>]*> sdr	a0,[07]\(at\)
 0+0298 <[^>]*> lui	at,[-0-9x]+
 [ 	]*298: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
-0+029c <[^>]*> daddiu	at,at,[-0-9]+
+0+029c <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*29c: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
 0+02a0 <[^>]*> sdl	a0,[07]\(at\)
 0+02a4 <[^>]*> sdr	a0,[07]\(at\)
 0+02a8 <[^>]*> lui	at,[-0-9x]+
 [ 	]*2a8: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_common
-0+02ac <[^>]*> daddiu	at,at,[-0-9]+
+0+02ac <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*2ac: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_common
 0+02b0 <[^>]*> sdl	a0,[07]\(at\)
 0+02b4 <[^>]*> sdr	a0,[07]\(at\)
 0+02b8 <[^>]*> lui	at,[-0-9x]+
 [ 	]*2b8: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
-0+02bc <[^>]*> daddiu	at,at,[-0-9]+
+0+02bc <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*2bc: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
 0+02c0 <[^>]*> sdl	a0,[07]\(at\)
 0+02c4 <[^>]*> sdr	a0,[07]\(at\)
 0+02c8 <[^>]*> lui	at,[-0-9x]+
 [ 	]*2c8: [A-Z0-9_]*HI[A-Z0-9_]*	.sbss.*
-0+02cc <[^>]*> daddiu	at,at,[-0-9]+
+0+02cc <[^>]*> addiu	at,at,[-0-9]+
 [ 	]*2cc: [A-Z0-9_]*LO[A-Z0-9_]*	.sbss.*
 0+02d0 <[^>]*> sdl	a0,[07]\(at\)
 0+02d4 <[^>]*> sdr	a0,[07]\(at\)