diff --git a/gas/ChangeLog b/gas/ChangeLog
index dfaebd605e..7133f6c3c3 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,11 @@
+2016-02-02  Andrew Burgess  <andrew.burgess@embecosm.com>
+
+	* testsuite/gas/epiphany/addr-syntax.d: Remove unneeded '.l'
+	suffixes from instruction mnemonics in expected output.
+	* testsuite/gas/epiphany/allinsn.d: Likewise.
+	* testsuite/gas/epiphany/regression.d: Likewise.
+	* testsuite/gas/epiphany/sample.d: Likewise.
+
 2016-02-02  Andrew Burgess  <andrew.burgess@embecosm.com>
 
 	* testsuite/gas/epiphany/addr-syntax.d: Update expected register
diff --git a/gas/testsuite/gas/epiphany/addr-syntax.d b/gas/testsuite/gas/epiphany/addr-syntax.d
index c146bdfac1..281f4d2e19 100644
--- a/gas/testsuite/gas/epiphany/addr-syntax.d
+++ b/gas/testsuite/gas/epiphany/addr-syntax.d
@@ -8,8 +8,8 @@
 Disassembly of section \.text:
 
 00000000 \<\.text\>:
-   0:	2bcc 01ff 	ldr.l r1,\[r2,-0x7ff\]
-   4:	4c4c 0301 	ldr.l r2,\[r3\],-0x8
-   8:	107c 2201 	strd.l r8,\[r4\],\+0x8
+   0:	2bcc 01ff 	ldr r1,\[r2,-0x7ff\]
+   4:	4c4c 0301 	ldr r2,\[r3\],-0x8
+   8:	107c 2201 	strd r8,\[r4\],\+0x8
    c:	506c 2400 	ldrd r10,\[r12\]
   10:	587c 2400 	strd r10,\[lr\]
diff --git a/gas/testsuite/gas/epiphany/allinsn.d b/gas/testsuite/gas/epiphany/allinsn.d
index 600a943355..b4c84f7308 100644
--- a/gas/testsuite/gas/epiphany/allinsn.d
+++ b/gas/testsuite/gas/epiphany/allinsn.d
@@ -210,787 +210,787 @@ Disassembly of section .text:
  180:	0d5f 1c02 	jalr r59
 
 00000184 \<ldrbx16\>:
- 184:	9209 2480 	ldrb.l r12,\[r12,\+r12]
+ 184:	9209 2480 	ldrb r12,\[r12,\+r12]
  188:	6d81      	ldrb r3,\[r3,r3]
  18a:	0001      	ldrb r0,\[r0,r0]
- 18c:	6d89 2480 	ldrb.l fp,\[fp,\+fp]
- 190:	b689 2480 	ldrb.l sp,\[sp,\+sp]
- 194:	8009 2000 	ldrb.l r12,\[r0,\+r0]
- 198:	6b09 0080 	ldrb.l r3,\[r2,\+lr]
- 19c:	5189 0400 	ldrb.l r2,\[r12,\+r3]
+ 18c:	6d89 2480 	ldrb fp,\[fp,\+fp]
+ 190:	b689 2480 	ldrb sp,\[sp,\+sp]
+ 194:	8009 2000 	ldrb r12,\[r0,\+r0]
+ 198:	6b09 0080 	ldrb r3,\[r2,\+lr]
+ 19c:	5189 0400 	ldrb r2,\[r12,\+r3]
 
 000001a0 \<ldrbp16\>:
- 1a0:	a18d 2080 	ldrb.l sp,\[r0],\+fp
- 1a4:	c60d 2080 	ldrb.l lr,\[r1],\+r12
- 1a8:	618d 2080 	ldrb.l fp,\[r0],\+fp
+ 1a0:	a18d 2080 	ldrb sp,\[r0],\+fp
+ 1a4:	c60d 2080 	ldrb lr,\[r1],\+r12
+ 1a8:	618d 2080 	ldrb fp,\[r0],\+fp
 
 000001ac \<ldrbx\>:
- 1ac:	9209 2480 	ldrb.l r12,\[r12,\+r12]
- 1b0:	6d89 ff80 	ldrb.l r59,\[r59,\+r59]
- 1b4:	9209 6d80 	ldrb.l r28,\[r28,\+r28]
- 1b8:	6d89 6d80 	ldrb.l r27,\[r27,\+r27]
- 1bc:	b689 2480 	ldrb.l sp,\[sp,\+sp]
- 1c0:	2b89 aa80 	ldrb.l r41,\[r18,\+r47]
- 1c4:	6289 a900 	ldrb.l r43,\[r16,\+r21]
- 1c8:	0009 8480 	ldrb.l r32,\[r8,\+r8]
+ 1ac:	9209 2480 	ldrb r12,\[r12,\+r12]
+ 1b0:	6d89 ff80 	ldrb r59,\[r59,\+r59]
+ 1b4:	9209 6d80 	ldrb r28,\[r28,\+r28]
+ 1b8:	6d89 6d80 	ldrb r27,\[r27,\+r27]
+ 1bc:	b689 2480 	ldrb sp,\[sp,\+sp]
+ 1c0:	2b89 aa80 	ldrb r41,\[r18,\+r47]
+ 1c4:	6289 a900 	ldrb r43,\[r16,\+r21]
+ 1c8:	0009 8480 	ldrb r32,\[r8,\+r8]
 
 000001cc \<ldrbp\>:
- 1cc:	850d 9900 	ldrb.l r36,\[r49],\+r18
- 1d0:	0d0d 9f00 	ldrb.l r32,\[r59],\+r50
- 1d4:	4c8d e580 	ldrb.l r58,\[fp],\+r25
+ 1cc:	850d 9900 	ldrb r36,\[r49],\+r18
+ 1d0:	0d0d 9f00 	ldrb r32,\[r59],\+r50
+ 1d4:	4c8d e580 	ldrb r58,\[fp],\+r25
 
 000001d8 \<ldrbd16\>:
  1d8:	900c 2400 	ldrb r12,\[r12]
  1dc:	6f84      	ldrb r3,\[r3,0x7]
  1de:	0204      	ldrb r0,\[r0,0x4]
- 1e0:	6d8c 2400 	ldrb.l fp,\[fp,\+0x3]
- 1e4:	b48c 2400 	ldrb.l sp,\[sp,\+0x1]
- 1e8:	d48c 2400 	ldrb.l lr,\[sp,\+0x1]
+ 1e0:	6d8c 2400 	ldrb fp,\[fp,\+0x3]
+ 1e4:	b48c 2400 	ldrb sp,\[sp,\+0x1]
+ 1e8:	d48c 2400 	ldrb lr,\[sp,\+0x1]
  1ec:	2004      	ldrb r1,\[r0]
  1ee:	2484      	ldrb r1,\[r1,0x1]
 
 000001f0 \<ldrbd\>:
  1f0:	900c 2400 	ldrb r12,\[r12]
- 1f4:	6f8c fcff 	ldrb.l r59,\[r59,\+0x7ff]
- 1f8:	900c 6c80 	ldrb.l r28,\[r28,\+0x400]
- 1fc:	6f8c 6c7f 	ldrb.l r27,\[r27,\+0x3ff]
- 200:	b48c 2400 	ldrb.l sp,\[sp,\+0x1]
- 204:	e70c 10c4 	ldrb.l r7,\[r33,\+0x626]
- 208:	fa8c 60f4 	ldrb.l r31,\[r6,\+0x7a5]
- 20c:	438c 20e4 	ldrb.l r10,\[r0,\+0x727]
+ 1f4:	6f8c fcff 	ldrb r59,\[r59,\+0x7ff]
+ 1f8:	900c 6c80 	ldrb r28,\[r28,\+0x400]
+ 1fc:	6f8c 6c7f 	ldrb r27,\[r27,\+0x3ff]
+ 200:	b48c 2400 	ldrb sp,\[sp,\+0x1]
+ 204:	e70c 10c4 	ldrb r7,\[r33,\+0x626]
+ 208:	fa8c 60f4 	ldrb r31,\[r6,\+0x7a5]
+ 20c:	438c 20e4 	ldrb r10,\[r0,\+0x727]
 
 00000210 \<ldrhx16\>:
- 210:	9229 2480 	ldrh.l r12,\[r12,\+r12]
+ 210:	9229 2480 	ldrh r12,\[r12,\+r12]
  214:	6da1      	ldrh r3,\[r3,r3]
  216:	0021      	ldrh r0,\[r0,r0]
- 218:	6da9 2480 	ldrh.l fp,\[fp,\+fp]
- 21c:	b6a9 2480 	ldrh.l sp,\[sp,\+sp]
- 220:	0329 0080 	ldrh.l r0,\[r0,\+lr]
- 224:	daa9 2480 	ldrh.l lr,\[lr,\+sp]
- 228:	0da9 0480 	ldrh.l r0,\[fp,\+fp]
+ 218:	6da9 2480 	ldrh fp,\[fp,\+fp]
+ 21c:	b6a9 2480 	ldrh sp,\[sp,\+sp]
+ 220:	0329 0080 	ldrh r0,\[r0,\+lr]
+ 224:	daa9 2480 	ldrh lr,\[lr,\+sp]
+ 228:	0da9 0480 	ldrh r0,\[fp,\+fp]
 
 0000022c \<ldrhp16\>:
- 22c:	55ad 0480 	ldrh.l r2,\[sp],\+fp
- 230:	d5ad 4480 	ldrh.l r22,\[sp],\+fp
+ 22c:	55ad 0480 	ldrh r2,\[sp],\+fp
+ 230:	d5ad 4480 	ldrh r22,\[sp],\+fp
 
 00000234 \<ldrhx\>:
- 234:	9229 2480 	ldrh.l r12,\[r12,\+r12]
- 238:	6da9 ff80 	ldrh.l r59,\[r59,\+r59]
- 23c:	9229 6d80 	ldrh.l r28,\[r28,\+r28]
- 240:	6da9 6d80 	ldrh.l r27,\[r27,\+r27]
- 244:	b6a9 2480 	ldrh.l sp,\[sp,\+sp]
- 248:	c6a9 a900 	ldrh.l r46,\[r17,\+r21]
- 24c:	c7a9 6280 	ldrh.l r30,\[r1,\+r47]
- 250:	6e29 a900 	ldrh.l r43,\[r19,\+r20]
+ 234:	9229 2480 	ldrh r12,\[r12,\+r12]
+ 238:	6da9 ff80 	ldrh r59,\[r59,\+r59]
+ 23c:	9229 6d80 	ldrh r28,\[r28,\+r28]
+ 240:	6da9 6d80 	ldrh r27,\[r27,\+r27]
+ 244:	b6a9 2480 	ldrh sp,\[sp,\+sp]
+ 248:	c6a9 a900 	ldrh r46,\[r17,\+r21]
+ 24c:	c7a9 6280 	ldrh r30,\[r1,\+r47]
+ 250:	6e29 a900 	ldrh r43,\[r19,\+r20]
 
 00000254 \<ldrhp\>:
- 254:	1ead 8d80 	ldrh.l r32,\[r31],\+r29
- 258:	9d2d d480 	ldrh.l r52,\[r47],\+r10
- 25c:	e1ad 7400 	ldrh.l r31,\[r40],\+r3
+ 254:	1ead 8d80 	ldrh r32,\[r31],\+r29
+ 258:	9d2d d480 	ldrh r52,\[r47],\+r10
+ 25c:	e1ad 7400 	ldrh r31,\[r40],\+r3
 
 00000260 \<ldrhd16\>:
  260:	902c 2400 	ldrh r12,\[r12]
  264:	6fa4      	ldrh r3,\[r3,0x7]
  266:	0224      	ldrh r0,\[r0,0x4]
- 268:	6dac 2400 	ldrh.l fp,\[fp,\+0x3]
- 26c:	b4ac 2400 	ldrh.l sp,\[sp,\+0x1]
+ 268:	6dac 2400 	ldrh fp,\[fp,\+0x3]
+ 26c:	b4ac 2400 	ldrh sp,\[sp,\+0x1]
  270:	c82c 2000 	ldrh lr,\[r2]
  274:	63a4      	ldrh r3,\[r0,0x7]
  276:	0f24      	ldrh r0,\[r3,0x6]
 
 00000278 \<ldrhd\>:
  278:	902c 2400 	ldrh r12,\[r12]
- 27c:	6fac fcff 	ldrh.l r59,\[r59,\+0x7ff]
- 280:	902c 6c80 	ldrh.l r28,\[r28,\+0x400]
- 284:	6fac 6c7f 	ldrh.l r27,\[r27,\+0x3ff]
- 288:	b4ac 2400 	ldrh.l sp,\[sp,\+0x1]
- 28c:	a2ac ac98 	ldrh.l r45,\[r24,\+0x4c5]
- 290:	8d2c 94d9 	ldrh.l r36,\[r43,\+0x6ca]
- 294:	40ac b803 	ldrh.l r42,\[r48,\+0x19]
+ 27c:	6fac fcff 	ldrh r59,\[r59,\+0x7ff]
+ 280:	902c 6c80 	ldrh r28,\[r28,\+0x400]
+ 284:	6fac 6c7f 	ldrh r27,\[r27,\+0x3ff]
+ 288:	b4ac 2400 	ldrh sp,\[sp,\+0x1]
+ 28c:	a2ac ac98 	ldrh r45,\[r24,\+0x4c5]
+ 290:	8d2c 94d9 	ldrh r36,\[r43,\+0x6ca]
+ 294:	40ac b803 	ldrh r42,\[r48,\+0x19]
 
 00000298 \<ldrx16\>:
- 298:	9249 2480 	ldr.l r12,\[r12,\+r12]
+ 298:	9249 2480 	ldr r12,\[r12,\+r12]
  29c:	6dc1      	ldr r3,\[r3,r3]
  29e:	0041      	ldr r0,\[r0,r0]
- 2a0:	6dc9 2480 	ldr.l fp,\[fp,\+fp]
- 2a4:	b6c9 2480 	ldr.l sp,\[sp,\+sp]
- 2a8:	6f49 0480 	ldr.l r3,\[fp,\+lr]
- 2ac:	9949 2400 	ldr.l r12,\[lr,\+r2]
- 2b0:	6b49 0080 	ldr.l r3,\[r2,\+lr]
+ 2a0:	6dc9 2480 	ldr fp,\[fp,\+fp]
+ 2a4:	b6c9 2480 	ldr sp,\[sp,\+sp]
+ 2a8:	6f49 0480 	ldr r3,\[fp,\+lr]
+ 2ac:	9949 2400 	ldr r12,\[lr,\+r2]
+ 2b0:	6b49 0080 	ldr r3,\[r2,\+lr]
 
 000002b4 \<ldrp16\>:
- 2b4:	cecd 2480 	ldr.l lr,\[fp],\+sp
- 2b8:	144d 0400 	ldr.l r0,\[sp],\+r0
- 2bc:	68cd 2000 	ldr.l fp,\[r2],\+r1
+ 2b4:	cecd 2480 	ldr lr,\[fp],\+sp
+ 2b8:	144d 0400 	ldr r0,\[sp],\+r0
+ 2bc:	68cd 2000 	ldr fp,\[r2],\+r1
 
 000002c0 \<ldrx\>:
- 2c0:	9249 2480 	ldr.l r12,\[r12,\+r12]
- 2c4:	6dc9 ff80 	ldr.l r59,\[r59,\+r59]
- 2c8:	9249 6d80 	ldr.l r28,\[r28,\+r28]
- 2cc:	6dc9 6d80 	ldr.l r27,\[r27,\+r27]
- 2d0:	b6c9 2480 	ldr.l sp,\[sp,\+sp]
- 2d4:	03c9 6a80 	ldr.l r24,\[r16,\+r47]
- 2d8:	c4c9 5700 	ldr.l r22,\[r41,\+r49]
- 2dc:	cfc9 2600 	ldr.l lr,\[fp,\+r39]
+ 2c0:	9249 2480 	ldr r12,\[r12,\+r12]
+ 2c4:	6dc9 ff80 	ldr r59,\[r59,\+r59]
+ 2c8:	9249 6d80 	ldr r28,\[r28,\+r28]
+ 2cc:	6dc9 6d80 	ldr r27,\[r27,\+r27]
+ 2d0:	b6c9 2480 	ldr sp,\[sp,\+sp]
+ 2d4:	03c9 6a80 	ldr r24,\[r16,\+r47]
+ 2d8:	c4c9 5700 	ldr r22,\[r41,\+r49]
+ 2dc:	cfc9 2600 	ldr lr,\[fp,\+r39]
 
 000002e0 \<ldrp\>:
- 2e0:	b74d 4180 	ldr.l r21,\[r5],\+r30
- 2e4:	934d 8480 	ldr.l r36,\[r12],\+lr
- 2e8:	91cd 2080 	ldr.l r12,\[r4],\+fp
+ 2e0:	b74d 4180 	ldr r21,\[r5],\+r30
+ 2e4:	934d 8480 	ldr r36,\[r12],\+lr
+ 2e8:	91cd 2080 	ldr r12,\[r4],\+fp
 
 000002ec \<ldrd16\>:
  2ec:	904c 2400 	ldr r12,\[r12]
  2f0:	6fc4      	ldr r3,\[r3,0x7]
  2f2:	0244      	ldr r0,\[r0,0x4]
- 2f4:	6dcc 2400 	ldr.l fp,\[fp,\+0x3]
- 2f8:	b4cc 2400 	ldr.l sp,\[sp,\+0x1]
+ 2f4:	6dcc 2400 	ldr fp,\[fp,\+0x3]
+ 2f8:	b4cc 2400 	ldr sp,\[sp,\+0x1]
  2fc:	144c 0400 	ldr r0,\[sp]
- 300:	87cc 2000 	ldr.l r12,\[r1,\+0x7]
- 304:	64cc 2000 	ldr.l fp,\[r1,\+0x1]
+ 300:	87cc 2000 	ldr r12,\[r1,\+0x7]
+ 304:	64cc 2000 	ldr fp,\[r1,\+0x1]
 
 00000308 \<ldrd\>:
  308:	904c 2400 	ldr r12,\[r12]
- 30c:	6fcc fcff 	ldr.l r59,\[r59,\+0x7ff]
- 310:	904c 6c80 	ldr.l r28,\[r28,\+0x400]
- 314:	6fcc 6c7f 	ldr.l r27,\[r27,\+0x3ff]
- 318:	b4cc 2400 	ldr.l sp,\[sp,\+0x1]
- 31c:	dbcc 4c79 	ldr.l r22,\[r30,\+0x3cf]
- 320:	f0cc 14aa 	ldr.l r7,\[r44,\+0x551]
- 324:	efcc 48e7 	ldr.l r23,\[r19,\+0x73f]
+ 30c:	6fcc fcff 	ldr r59,\[r59,\+0x7ff]
+ 310:	904c 6c80 	ldr r28,\[r28,\+0x400]
+ 314:	6fcc 6c7f 	ldr r27,\[r27,\+0x3ff]
+ 318:	b4cc 2400 	ldr sp,\[sp,\+0x1]
+ 31c:	dbcc 4c79 	ldr r22,\[r30,\+0x3cf]
+ 320:	f0cc 14aa 	ldr r7,\[r44,\+0x551]
+ 324:	efcc 48e7 	ldr r23,\[r19,\+0x73f]
 
 00000328 \<ldrdx16\>:
- 328:	9269 2480 	ldrd.l r12,\[r12,\+r12]
+ 328:	9269 2480 	ldrd r12,\[r12,\+r12]
  32c:	8de1      	ldrd r4,\[r3,r3]
  32e:	0061      	ldrd r0,\[r0,r0]
- 330:	cde9 2480 	ldrd.l lr,\[fp,\+fp]
- 334:	16e9 4480 	ldrd.l r16,\[sp,\+sp]
- 338:	ca69 6080 	ldrd.l r30,\[r2,\+r12]
- 33c:	0de9 0400 	ldrd.l r0,\[fp,\+r3]
- 340:	9369 4480 	ldrd.l r20,\[r12,\+lr]
+ 330:	cde9 2480 	ldrd lr,\[fp,\+fp]
+ 334:	16e9 4480 	ldrd r16,\[sp,\+sp]
+ 338:	ca69 6080 	ldrd r30,\[r2,\+r12]
+ 33c:	0de9 0400 	ldrd r0,\[fp,\+r3]
+ 340:	9369 4480 	ldrd r20,\[r12,\+lr]
 
 00000344 \<ldrdp16\>:
  344:	8de5      	ldrd r4,\[r3],r3
- 346:	0ded 4480 	ldrd.l r16,\[fp],\+fp
- 34a:	96ed 4480 	ldrd.l r20,\[sp],\+sp
- 34e:	50ed 2400 	ldrd.l r10,\[r12],\+r1
- 352:	cf6d 6480 	ldrd.l r30,\[fp],\+lr
- 356:	daed e480 	ldrd.l r62,\[lr],\+sp
+ 346:	0ded 4480 	ldrd r16,\[fp],\+fp
+ 34a:	96ed 4480 	ldrd r20,\[sp],\+sp
+ 34e:	50ed 2400 	ldrd r10,\[r12],\+r1
+ 352:	cf6d 6480 	ldrd r30,\[fp],\+lr
+ 356:	daed e480 	ldrd r62,\[lr],\+sp
 
 0000035a \<ldrdx\>:
- 35a:	9269 2480 	ldrd.l r12,\[r12,\+r12]
- 35e:	4de9 ff80 	ldrd.l r58,\[r59,\+r59]
- 362:	9269 6d80 	ldrd.l r28,\[r28,\+r28]
- 366:	4de9 6d80 	ldrd.l r26,\[r27,\+r27]
- 36a:	96e9 2480 	ldrd.l r12,\[sp,\+sp]
- 36e:	0de9 8780 	ldrd.l r32,\[fp,\+r59]
- 372:	8769 0800 	ldrd.l r4,\[r17,\+r6]
- 376:	00e9 9400 	ldrd.l r32,\[r40,\+r1]
+ 35a:	9269 2480 	ldrd r12,\[r12,\+r12]
+ 35e:	4de9 ff80 	ldrd r58,\[r59,\+r59]
+ 362:	9269 6d80 	ldrd r28,\[r28,\+r28]
+ 366:	4de9 6d80 	ldrd r26,\[r27,\+r27]
+ 36a:	96e9 2480 	ldrd r12,\[sp,\+sp]
+ 36e:	0de9 8780 	ldrd r32,\[fp,\+r59]
+ 372:	8769 0800 	ldrd r4,\[r17,\+r6]
+ 376:	00e9 9400 	ldrd r32,\[r40,\+r1]
 
 0000037a \<ldrdp\>:
- 37a:	16ed 4480 	ldrd.l r16,\[sp],\+sp
- 37e:	c76d b180 	ldrd.l r46,\[r33],\+r30
- 382:	11ed 7380 	ldrd.l r24,\[r36],\+r59
- 386:	41ed f080 	ldrd.l r58,\[r32],\+fp
+ 37a:	16ed 4480 	ldrd r16,\[sp],\+sp
+ 37e:	c76d b180 	ldrd r46,\[r33],\+r30
+ 382:	11ed 7380 	ldrd r24,\[r36],\+r59
+ 386:	41ed f080 	ldrd r58,\[r32],\+fp
 
 0000038a \<ldrdd16\>:
  38a:	906c 2400 	ldrd r12,\[r12]
  38e:	8fe4      	ldrd r4,\[r3,0x7]
  390:	0264      	ldrd r0,\[r0,0x4]
- 392:	0dec 4400 	ldrd.l r16,\[fp,\+0x3]
- 396:	54ec 4400 	ldrd.l r18,\[sp,\+0x1]
- 39a:	0dec 0400 	ldrd.l r0,\[fp,\+0x3]
- 39e:	cfec 2400 	ldrd.l lr,\[fp,\+0x7]
- 3a2:	d0ec 2400 	ldrd.l lr,\[r12,\+0x1]
+ 392:	0dec 4400 	ldrd r16,\[fp,\+0x3]
+ 396:	54ec 4400 	ldrd r18,\[sp,\+0x1]
+ 39a:	0dec 0400 	ldrd r0,\[fp,\+0x3]
+ 39e:	cfec 2400 	ldrd lr,\[fp,\+0x7]
+ 3a2:	d0ec 2400 	ldrd lr,\[r12,\+0x1]
 
 000003a6 \<ldrdd\>:
  3a6:	906c 2400 	ldrd r12,\[r12]
- 3aa:	4fec fcff 	ldrd.l r58,\[r59,\+0x7ff]
- 3ae:	906c 6c80 	ldrd.l r28,\[r28,\+0x400]
- 3b2:	4fec 0c7f 	ldrd.l r2,\[r27,\+0x3ff]
- 3b6:	14ec 4400 	ldrd.l r16,\[sp,\+0x1]
- 3ba:	94ec 085f 	ldrd.l r4,\[r21,\+0x2f9]
- 3be:	c4ec 34c2 	ldrd.l lr,\[r41,\+0x611]
- 3c2:	d96c 04f0 	ldrd.l r6,\[lr,\+0x782]
+ 3aa:	4fec fcff 	ldrd r58,\[r59,\+0x7ff]
+ 3ae:	906c 6c80 	ldrd r28,\[r28,\+0x400]
+ 3b2:	4fec 0c7f 	ldrd r2,\[r27,\+0x3ff]
+ 3b6:	14ec 4400 	ldrd r16,\[sp,\+0x1]
+ 3ba:	94ec 085f 	ldrd r4,\[r21,\+0x2f9]
+ 3be:	c4ec 34c2 	ldrd lr,\[r41,\+0x611]
+ 3c2:	d96c 04f0 	ldrd r6,\[lr,\+0x782]
 
 000003c6 \<strbx16\>:
- 3c6:	9219 2480 	strb.l r12,\[r12,\+r12]
+ 3c6:	9219 2480 	strb r12,\[r12,\+r12]
  3ca:	6d91      	strb r3,\[r3,r3]
  3cc:	0011      	strb r0,\[r0,r0]
- 3ce:	6d99 2480 	strb.l fp,\[fp,\+fp]
- 3d2:	b699 2480 	strb.l sp,\[sp,\+sp]
- 3d6:	3999 0400 	strb.l r1,\[lr,\+r3]
- 3da:	8f19 2080 	strb.l r12,\[r3,\+lr]
- 3de:	d219 2480 	strb.l lr,\[r12,\+r12]
+ 3ce:	6d99 2480 	strb fp,\[fp,\+fp]
+ 3d2:	b699 2480 	strb sp,\[sp,\+sp]
+ 3d6:	3999 0400 	strb r1,\[lr,\+r3]
+ 3da:	8f19 2080 	strb r12,\[r3,\+lr]
+ 3de:	d219 2480 	strb lr,\[r12,\+r12]
 
 000003e2 \<strbx\>:
- 3e2:	9219 2480 	strb.l r12,\[r12,\+r12]
- 3e6:	6d99 ff80 	strb.l r59,\[r59,\+r59]
- 3ea:	9219 6d80 	strb.l r28,\[r28,\+r28]
- 3ee:	6d99 6d80 	strb.l r27,\[r27,\+r27]
- 3f2:	b699 2480 	strb.l sp,\[sp,\+sp]
- 3f6:	5e99 c480 	strb.l r50,\[r15,\+sp]
- 3fa:	ce19 2700 	strb.l lr,\[fp,\+r52]
- 3fe:	c199 2f00 	strb.l lr,\[r24,\+r51]
+ 3e2:	9219 2480 	strb r12,\[r12,\+r12]
+ 3e6:	6d99 ff80 	strb r59,\[r59,\+r59]
+ 3ea:	9219 6d80 	strb r28,\[r28,\+r28]
+ 3ee:	6d99 6d80 	strb r27,\[r27,\+r27]
+ 3f2:	b699 2480 	strb sp,\[sp,\+sp]
+ 3f6:	5e99 c480 	strb r50,\[r15,\+sp]
+ 3fa:	ce19 2700 	strb lr,\[fp,\+r52]
+ 3fe:	c199 2f00 	strb lr,\[r24,\+r51]
 
 00000402 \<strbp16\>:
- 402:	921d 2480 	strb.l r12,\[r12],\+r12
+ 402:	921d 2480 	strb r12,\[r12],\+r12
  406:	6d95      	strb r3,\[r3],r3
  408:	0015      	strb r0,\[r0],r0
- 40a:	6d9d 2480 	strb.l fp,\[fp],\+fp
- 40e:	b69d 2480 	strb.l sp,\[sp],\+sp
- 412:	4e1d 0480 	strb.l r2,\[fp],\+r12
- 416:	609d 2000 	strb.l fp,\[r0],\+r1
+ 40a:	6d9d 2480 	strb fp,\[fp],\+fp
+ 40e:	b69d 2480 	strb sp,\[sp],\+sp
+ 412:	4e1d 0480 	strb r2,\[fp],\+r12
+ 416:	609d 2000 	strb fp,\[r0],\+r1
  41a:	4995      	strb r2,\[r2],r3
 
 0000041c \<strbp\>:
- 41c:	921d 2480 	strb.l r12,\[r12],\+r12
- 420:	6d9d ff80 	strb.l r59,\[r59],\+r59
- 424:	921d 6d80 	strb.l r28,\[r28],\+r28
- 428:	6d9d 6d80 	strb.l r27,\[r27],\+r27
- 42c:	b69d 2480 	strb.l sp,\[sp],\+sp
- 430:	cd1d 3800 	strb.l lr,\[r51],\+r2
- 434:	d11d 1700 	strb.l r6,\[r44],\+r50
- 438:	849d a700 	strb.l r44,\[r9],\+r49
+ 41c:	921d 2480 	strb r12,\[r12],\+r12
+ 420:	6d9d ff80 	strb r59,\[r59],\+r59
+ 424:	921d 6d80 	strb r28,\[r28],\+r28
+ 428:	6d9d 6d80 	strb r27,\[r27],\+r27
+ 42c:	b69d 2480 	strb sp,\[sp],\+sp
+ 430:	cd1d 3800 	strb lr,\[r51],\+r2
+ 434:	d11d 1700 	strb r6,\[r44],\+r50
+ 438:	849d a700 	strb r44,\[r9],\+r49
 
 0000043c \<strbd16\>:
  43c:	901c 2400 	strb r12,\[r12]
  440:	6f94      	strb r3,\[r3,0x7]
  442:	0214      	strb r0,\[r0,0x4]
- 444:	6d9c 2400 	strb.l fp,\[fp,\+0x3]
- 448:	b49c 2400 	strb.l sp,\[sp,\+0x1]
+ 444:	6d9c 2400 	strb fp,\[fp,\+0x3]
+ 448:	b49c 2400 	strb sp,\[sp,\+0x1]
  44c:	0894      	strb r0,\[r2,0x1]
- 44e:	a99c 2000 	strb.l sp,\[r2,\+0x3]
- 452:	6a1c 2000 	strb.l fp,\[r2,\+0x4]
+ 44e:	a99c 2000 	strb sp,\[r2,\+0x3]
+ 452:	6a1c 2000 	strb fp,\[r2,\+0x4]
 
 00000456 \<strbd\>:
  456:	901c 2400 	strb r12,\[r12]
- 45a:	6f9c fcff 	strb.l r59,\[r59,\+0x7ff]
- 45e:	901c 6c80 	strb.l r28,\[r28,\+0x400]
- 462:	6f9c 6c7f 	strb.l r27,\[r27,\+0x3ff]
- 466:	b49c 2400 	strb.l sp,\[sp,\+0x1]
- 46a:	ea1c 44af 	strb.l r23,\[r10,\+0x57c]
- 46e:	8e9c 30b6 	strb.l r12,\[r35,\+0x5b5]
- 472:	c91c dc88 	strb.l r54,\[r58,\+0x442]
+ 45a:	6f9c fcff 	strb r59,\[r59,\+0x7ff]
+ 45e:	901c 6c80 	strb r28,\[r28,\+0x400]
+ 462:	6f9c 6c7f 	strb r27,\[r27,\+0x3ff]
+ 466:	b49c 2400 	strb sp,\[sp,\+0x1]
+ 46a:	ea1c 44af 	strb r23,\[r10,\+0x57c]
+ 46e:	8e9c 30b6 	strb r12,\[r35,\+0x5b5]
+ 472:	c91c dc88 	strb r54,\[r58,\+0x442]
 
 00000476 \<strhx16\>:
- 476:	9239 2480 	strh.l r12,\[r12,\+r12]
+ 476:	9239 2480 	strh r12,\[r12,\+r12]
  47a:	6db1      	strh r3,\[r3,r3]
  47c:	0031      	strh r0,\[r0,r0]
- 47e:	6db9 2480 	strh.l fp,\[fp,\+fp]
- 482:	b6b9 2480 	strh.l sp,\[sp,\+sp]
+ 47e:	6db9 2480 	strh fp,\[fp,\+fp]
+ 482:	b6b9 2480 	strh sp,\[sp,\+sp]
  486:	0cb1      	strh r0,\[r3,r1]
- 488:	2d39 0400 	strh.l r1,\[fp,\+r2]
- 48c:	6db9 0080 	strh.l r3,\[r3,\+fp]
+ 488:	2d39 0400 	strh r1,\[fp,\+r2]
+ 48c:	6db9 0080 	strh r3,\[r3,\+fp]
 
 00000490 \<strhx\>:
- 490:	9239 2480 	strh.l r12,\[r12,\+r12]
- 494:	6db9 ff80 	strh.l r59,\[r59,\+r59]
- 498:	9239 6d80 	strh.l r28,\[r28,\+r28]
- 49c:	6db9 6d80 	strh.l r27,\[r27,\+r27]
- 4a0:	b6b9 2480 	strh.l sp,\[sp,\+sp]
- 4a4:	1bb9 5180 	strh.l r16,\[r38,\+r31]
- 4a8:	1239 8580 	strh.l r32,\[r12,\+r28]
- 4ac:	2cb9 e480 	strh.l r57,\[fp,\+r9]
+ 490:	9239 2480 	strh r12,\[r12,\+r12]
+ 494:	6db9 ff80 	strh r59,\[r59,\+r59]
+ 498:	9239 6d80 	strh r28,\[r28,\+r28]
+ 49c:	6db9 6d80 	strh r27,\[r27,\+r27]
+ 4a0:	b6b9 2480 	strh sp,\[sp,\+sp]
+ 4a4:	1bb9 5180 	strh r16,\[r38,\+r31]
+ 4a8:	1239 8580 	strh r32,\[r12,\+r28]
+ 4ac:	2cb9 e480 	strh r57,\[fp,\+r9]
 
 000004b0 \<strhp16\>:
- 4b0:	923d 2480 	strh.l r12,\[r12],\+r12
+ 4b0:	923d 2480 	strh r12,\[r12],\+r12
  4b4:	6db5      	strh r3,\[r3],r3
  4b6:	0035      	strh r0,\[r0],r0
- 4b8:	6dbd 2480 	strh.l fp,\[fp],\+fp
- 4bc:	b6bd 2480 	strh.l sp,\[sp],\+sp
- 4c0:	0abd 0080 	strh.l r0,\[r2],\+sp
- 4c4:	ac3d 2000 	strh.l sp,\[r3],\+r0
+ 4b8:	6dbd 2480 	strh fp,\[fp],\+fp
+ 4bc:	b6bd 2480 	strh sp,\[sp],\+sp
+ 4c0:	0abd 0080 	strh r0,\[r2],\+sp
+ 4c4:	ac3d 2000 	strh sp,\[r3],\+r0
  4c8:	2035      	strh r1,\[r0],r0
 
 000004ca \<strhp\>:
- 4ca:	923d 2480 	strh.l r12,\[r12],\+r12
- 4ce:	6dbd ff80 	strh.l r59,\[r59],\+r59
- 4d2:	923d 6d80 	strh.l r28,\[r28],\+r28
- 4d6:	6dbd 6d80 	strh.l r27,\[r27],\+r27
- 4da:	b6bd 2480 	strh.l sp,\[sp],\+sp
- 4de:	773d 1300 	strh.l r3,\[r37],\+r54
- 4e2:	98bd 1980 	strh.l r4,\[r54],\+r25
- 4e6:	a0bd 1180 	strh.l r5,\[r32],\+r25
+ 4ca:	923d 2480 	strh r12,\[r12],\+r12
+ 4ce:	6dbd ff80 	strh r59,\[r59],\+r59
+ 4d2:	923d 6d80 	strh r28,\[r28],\+r28
+ 4d6:	6dbd 6d80 	strh r27,\[r27],\+r27
+ 4da:	b6bd 2480 	strh sp,\[sp],\+sp
+ 4de:	773d 1300 	strh r3,\[r37],\+r54
+ 4e2:	98bd 1980 	strh r4,\[r54],\+r25
+ 4e6:	a0bd 1180 	strh r5,\[r32],\+r25
 
 000004ea \<strhd16\>:
  4ea:	903c 2400 	strh r12,\[r12]
  4ee:	6fb4      	strh r3,\[r3,0x7]
  4f0:	0234      	strh r0,\[r0,0x4]
- 4f2:	6dbc 2400 	strh.l fp,\[fp,\+0x3]
- 4f6:	b4bc 2400 	strh.l sp,\[sp,\+0x1]
+ 4f2:	6dbc 2400 	strh fp,\[fp,\+0x3]
+ 4f6:	b4bc 2400 	strh sp,\[sp,\+0x1]
  4fa:	61b4      	strh r3,\[r0,0x3]
- 4fc:	d3bc 2400 	strh.l lr,\[r12,\+0x7]
+ 4fc:	d3bc 2400 	strh lr,\[r12,\+0x7]
  500:	6bb4      	strh r3,\[r2,0x7]
 
 00000502 \<strhd\>:
  502:	903c 2400 	strh r12,\[r12]
- 506:	6fbc fcff 	strh.l r59,\[r59,\+0x7ff]
- 50a:	903c 6c80 	strh.l r28,\[r28,\+0x400]
- 50e:	6fbc 6c7f 	strh.l r27,\[r27,\+0x3ff]
- 512:	b4bc 2400 	strh.l sp,\[sp,\+0x1]
- 516:	fabc 1093 	strh.l r7,\[r38,\+0x49d]
- 51a:	32bc 6009 	strh.l r25,\[r4,\+0x4d]
- 51e:	6fbc 244e 	strh.l fp,\[fp,\+0x277]
+ 506:	6fbc fcff 	strh r59,\[r59,\+0x7ff]
+ 50a:	903c 6c80 	strh r28,\[r28,\+0x400]
+ 50e:	6fbc 6c7f 	strh r27,\[r27,\+0x3ff]
+ 512:	b4bc 2400 	strh sp,\[sp,\+0x1]
+ 516:	fabc 1093 	strh r7,\[r38,\+0x49d]
+ 51a:	32bc 6009 	strh r25,\[r4,\+0x4d]
+ 51e:	6fbc 244e 	strh fp,\[fp,\+0x277]
 
 00000522 \<strx16\>:
- 522:	9259 2480 	str.l r12,\[r12,\+r12]
+ 522:	9259 2480 	str r12,\[r12,\+r12]
  526:	6dd1      	str r3,\[r3,r3]
  528:	0051      	str r0,\[r0,r0]
- 52a:	6dd9 2480 	str.l fp,\[fp,\+fp]
- 52e:	b6d9 2480 	str.l sp,\[sp,\+sp]
- 532:	cdd9 2000 	str.l lr,\[r3,\+r3]
- 536:	6c59 0400 	str.l r3,\[fp,\+r0]
- 53a:	94d9 2400 	str.l r12,\[sp,\+r1]
+ 52a:	6dd9 2480 	str fp,\[fp,\+fp]
+ 52e:	b6d9 2480 	str sp,\[sp,\+sp]
+ 532:	cdd9 2000 	str lr,\[r3,\+r3]
+ 536:	6c59 0400 	str r3,\[fp,\+r0]
+ 53a:	94d9 2400 	str r12,\[sp,\+r1]
 
 0000053e \<strx\>:
- 53e:	9259 2480 	str.l r12,\[r12,\+r12]
- 542:	6dd9 ff80 	str.l r59,\[r59,\+r59]
- 546:	9259 6d80 	str.l r28,\[r28,\+r28]
- 54a:	6dd9 6d80 	str.l r27,\[r27,\+r27]
- 54e:	b6d9 2480 	str.l sp,\[sp,\+sp]
- 552:	b659 cd80 	str.l r53,\[r29,\+r28]
- 556:	d959 6a00 	str.l r30,\[r22,\+r34]
- 55a:	9259 6e80 	str.l r28,\[r28,\+r44]
+ 53e:	9259 2480 	str r12,\[r12,\+r12]
+ 542:	6dd9 ff80 	str r59,\[r59,\+r59]
+ 546:	9259 6d80 	str r28,\[r28,\+r28]
+ 54a:	6dd9 6d80 	str r27,\[r27,\+r27]
+ 54e:	b6d9 2480 	str sp,\[sp,\+sp]
+ 552:	b659 cd80 	str r53,\[r29,\+r28]
+ 556:	d959 6a00 	str r30,\[r22,\+r34]
+ 55a:	9259 6e80 	str r28,\[r28,\+r44]
 
 0000055e \<strp16\>:
- 55e:	925d 2480 	str.l r12,\[r12],\+r12
+ 55e:	925d 2480 	str r12,\[r12],\+r12
  562:	6dd5      	str r3,\[r3],r3
  564:	0055      	str r0,\[r0],r0
- 566:	6ddd 2480 	str.l fp,\[fp],\+fp
- 56a:	b6dd 2480 	str.l sp,\[sp],\+sp
- 56e:	c05d 2000 	str.l lr,\[r0],\+r0
- 572:	62dd 2080 	str.l fp,\[r0],\+sp
- 576:	6c5d 0400 	str.l r3,\[fp],\+r0
+ 566:	6ddd 2480 	str fp,\[fp],\+fp
+ 56a:	b6dd 2480 	str sp,\[sp],\+sp
+ 56e:	c05d 2000 	str lr,\[r0],\+r0
+ 572:	62dd 2080 	str fp,\[r0],\+sp
+ 576:	6c5d 0400 	str r3,\[fp],\+r0
 
 0000057a \<strp\>:
- 57a:	925d 2480 	str.l r12,\[r12],\+r12
- 57e:	6ddd ff80 	str.l r59,\[r59],\+r59
- 582:	925d 6d80 	str.l r28,\[r28],\+r28
- 586:	6ddd 6d80 	str.l r27,\[r27],\+r27
- 58a:	b6dd 2480 	str.l sp,\[sp],\+sp
- 58e:	d3dd 5080 	str.l r22,\[r36],\+r15
- 592:	97dd a680 	str.l r44,\[sp],\+r47
- 596:	62dd 5880 	str.l r19,\[r48],\+sp
+ 57a:	925d 2480 	str r12,\[r12],\+r12
+ 57e:	6ddd ff80 	str r59,\[r59],\+r59
+ 582:	925d 6d80 	str r28,\[r28],\+r28
+ 586:	6ddd 6d80 	str r27,\[r27],\+r27
+ 58a:	b6dd 2480 	str sp,\[sp],\+sp
+ 58e:	d3dd 5080 	str r22,\[r36],\+r15
+ 592:	97dd a680 	str r44,\[sp],\+r47
+ 596:	62dd 5880 	str r19,\[r48],\+sp
 
 0000059a \<strd16\>:
  59a:	905c 2400 	str r12,\[r12]
  59e:	6fd4      	str r3,\[r3,0x7]
  5a0:	0254      	str r0,\[r0,0x4]
- 5a2:	6ddc 2400 	str.l fp,\[fp,\+0x3]
- 5a6:	b4dc 2400 	str.l sp,\[sp,\+0x1]
- 5aa:	6ddc 0400 	str.l r3,\[fp,\+0x3]
- 5ae:	b35c 2400 	str.l sp,\[r12,\+0x6]
- 5b2:	39dc 0400 	str.l r1,\[lr,\+0x3]
+ 5a2:	6ddc 2400 	str fp,\[fp,\+0x3]
+ 5a6:	b4dc 2400 	str sp,\[sp,\+0x1]
+ 5aa:	6ddc 0400 	str r3,\[fp,\+0x3]
+ 5ae:	b35c 2400 	str sp,\[r12,\+0x6]
+ 5b2:	39dc 0400 	str r1,\[lr,\+0x3]
 
 000005b6 \<strd\>:
  5b6:	905c 2400 	str r12,\[r12]
- 5ba:	6fdc fcff 	str.l r59,\[r59,\+0x7ff]
- 5be:	905c 6c80 	str.l r28,\[r28,\+0x400]
- 5c2:	6fdc 6c7f 	str.l r27,\[r27,\+0x3ff]
- 5c6:	b4dc 2400 	str.l sp,\[sp,\+0x1]
- 5ca:	b15c b409 	str.l r45,\[r44,\+0x4a]
- 5ce:	495c f82e 	str.l r58,\[r50,\+0x172]
- 5d2:	0d5c a04e 	str.l r40,\[r3,\+0x272]
+ 5ba:	6fdc fcff 	str r59,\[r59,\+0x7ff]
+ 5be:	905c 6c80 	str r28,\[r28,\+0x400]
+ 5c2:	6fdc 6c7f 	str r27,\[r27,\+0x3ff]
+ 5c6:	b4dc 2400 	str sp,\[sp,\+0x1]
+ 5ca:	b15c b409 	str r45,\[r44,\+0x4a]
+ 5ce:	495c f82e 	str r58,\[r50,\+0x172]
+ 5d2:	0d5c a04e 	str r40,\[r3,\+0x272]
 
 000005d6 \<strdx16\>:
- 5d6:	9279 2480 	strd.l r12,\[r12,\+r12]
+ 5d6:	9279 2480 	strd r12,\[r12,\+r12]
  5da:	4df1      	strd r2,\[r3,r3]
  5dc:	0071      	strd r0,\[r0,r0]
- 5de:	0df9 4480 	strd.l r16,\[fp,\+fp]
- 5e2:	56f9 4480 	strd.l r18,\[sp,\+sp]
- 5e6:	8cf9 2000 	strd.l r12,\[r3,\+r1]
- 5ea:	59f9 0480 	strd.l r2,\[lr,\+fp]
- 5ee:	8979 2000 	strd.l r12,\[r2,\+r2]
+ 5de:	0df9 4480 	strd r16,\[fp,\+fp]
+ 5e2:	56f9 4480 	strd r18,\[sp,\+sp]
+ 5e6:	8cf9 2000 	strd r12,\[r3,\+r1]
+ 5ea:	59f9 0480 	strd r2,\[lr,\+fp]
+ 5ee:	8979 2000 	strd r12,\[r2,\+r2]
 
 000005f2 \<strdx\>:
- 5f2:	9279 2480 	strd.l r12,\[r12,\+r12]
- 5f6:	4df9 ff80 	strd.l r58,\[r59,\+r59]
- 5fa:	9279 6d80 	strd.l r28,\[r28,\+r28]
- 5fe:	4df9 6d80 	strd.l r26,\[r27,\+r27]
- 602:	d6f9 2480 	strd.l lr,\[sp,\+sp]
- 606:	d779 9880 	strd.l r38,\[r53,\+lr]
- 60a:	0df9 6a80 	strd.l r24,\[r19,\+r43]
- 60e:	8b79 2580 	strd.l r12,\[r10,\+r30]
+ 5f2:	9279 2480 	strd r12,\[r12,\+r12]
+ 5f6:	4df9 ff80 	strd r58,\[r59,\+r59]
+ 5fa:	9279 6d80 	strd r28,\[r28,\+r28]
+ 5fe:	4df9 6d80 	strd r26,\[r27,\+r27]
+ 602:	d6f9 2480 	strd lr,\[sp,\+sp]
+ 606:	d779 9880 	strd r38,\[r53,\+lr]
+ 60a:	0df9 6a80 	strd r24,\[r19,\+r43]
+ 60e:	8b79 2580 	strd r12,\[r10,\+r30]
 
 00000612 \<strdp16\>:
- 612:	927d 2480 	strd.l r12,\[r12],\+r12
+ 612:	927d 2480 	strd r12,\[r12],\+r12
  616:	4df5      	strd r2,\[r3],r3
  618:	0075      	strd r0,\[r0],r0
- 61a:	cdfd 0480 	strd.l r6,\[fp],\+fp
- 61e:	96fd 0480 	strd.l r4,\[sp],\+sp
+ 61a:	cdfd 0480 	strd r6,\[fp],\+fp
+ 61e:	96fd 0480 	strd r4,\[sp],\+sp
  622:	4c75      	strd r2,\[r3],r0
  624:	40f5      	strd r2,\[r0],r1
- 626:	58fd 0400 	strd.l r2,\[lr],\+r1
+ 626:	58fd 0400 	strd r2,\[lr],\+r1
 
 0000062a \<strdp\>:
- 62a:	927d 2480 	strd.l r12,\[r12],\+r12
- 62e:	4dfd ff80 	strd.l r58,\[r59],\+r59
- 632:	927d 6d80 	strd.l r28,\[r28],\+r28
- 636:	4dfd 6d80 	strd.l r26,\[r27],\+r27
- 63a:	d6fd 4480 	strd.l r22,\[sp],\+sp
- 63e:	ca7d 0680 	strd.l r6,\[r10],\+r44
- 642:	4efd 3400 	strd.l r10,\[r43],\+r5
- 646:	c77d a880 	strd.l r46,\[r17],\+lr
+ 62a:	927d 2480 	strd r12,\[r12],\+r12
+ 62e:	4dfd ff80 	strd r58,\[r59],\+r59
+ 632:	927d 6d80 	strd r28,\[r28],\+r28
+ 636:	4dfd 6d80 	strd r26,\[r27],\+r27
+ 63a:	d6fd 4480 	strd r22,\[sp],\+sp
+ 63e:	ca7d 0680 	strd r6,\[r10],\+r44
+ 642:	4efd 3400 	strd r10,\[r43],\+r5
+ 646:	c77d a880 	strd r46,\[r17],\+lr
 
 0000064a \<strdd16\>:
  64a:	107c 0400 	strd r0,\[r12]
  64e:	4ff4      	strd r2,\[r3,0x7]
  650:	0274      	strd r0,\[r0,0x4]
- 652:	4dfc 0400 	strd.l r2,\[fp,\+0x3]
- 656:	94fc 0400 	strd.l r4,\[sp,\+0x1]
+ 652:	4dfc 0400 	strd r2,\[fp,\+0x3]
+ 656:	94fc 0400 	strd r4,\[sp,\+0x1]
  65a:	4af4      	strd r2,\[r2,0x5]
  65c:	cff4      	strd r6,\[r3,0x7]
  65e:	c574      	strd r6,\[r1,0x2]
 
 00000660 \<strdd\>:
  660:	907c 2400 	strd r12,\[r12]
- 664:	4ffc fcff 	strd.l r58,\[r59,\+0x7ff]
- 668:	907c 6c80 	strd.l r28,\[r28,\+0x400]
- 66c:	4ffc 6c7f 	strd.l r26,\[r27,\+0x3ff]
- 670:	d4fc 2400 	strd.l lr,\[sp,\+0x1]
- 674:	93fc 7859 	strd.l r28,\[r52,\+0x2cf]
- 678:	157c b8f9 	strd.l r40,\[r53,\+0x7ca]
- 67c:	877c bc3d 	strd.l r44,\[r57,\+0x1ee]
+ 664:	4ffc fcff 	strd r58,\[r59,\+0x7ff]
+ 668:	907c 6c80 	strd r28,\[r28,\+0x400]
+ 66c:	4ffc 6c7f 	strd r26,\[r27,\+0x3ff]
+ 670:	d4fc 2400 	strd lr,\[sp,\+0x1]
+ 674:	93fc 7859 	strd r28,\[r52,\+0x2cf]
+ 678:	157c b8f9 	strd r40,\[r53,\+0x7ca]
+ 67c:	877c bc3d 	strd r44,\[r57,\+0x1ee]
 
 00000680 \<mov16EQ\>:
- 680:	900f 2402 	moveq.l r12,r12
+ 680:	900f 2402 	moveq r12,r12
  684:	6c02      	moveq r3,r3
  686:	0002      	moveq r0,r0
- 688:	6c0f 2402 	moveq.l fp,fp
- 68c:	b40f 2402 	moveq.l sp,sp
- 690:	880f 2002 	moveq.l r12,r2
- 694:	4c0f 0402 	moveq.l r2,fp
- 698:	740f 2402 	moveq.l fp,sp
+ 688:	6c0f 2402 	moveq fp,fp
+ 68c:	b40f 2402 	moveq sp,sp
+ 690:	880f 2002 	moveq r12,r2
+ 694:	4c0f 0402 	moveq r2,fp
+ 698:	740f 2402 	moveq fp,sp
 
 0000069c \<movEQ\>:
- 69c:	900f 2402 	moveq.l r12,r12
- 6a0:	6c0f fc02 	moveq.l r59,r59
- 6a4:	900f 6c02 	moveq.l r28,r28
- 6a8:	6c0f 6c02 	moveq.l r27,r27
- 6ac:	b40f 2402 	moveq.l sp,sp
- 6b0:	180f 8c02 	moveq.l r32,r30
- 6b4:	7c0f b002 	moveq.l r43,r39
- 6b8:	240f 7002 	moveq.l r25,r33
+ 69c:	900f 2402 	moveq r12,r12
+ 6a0:	6c0f fc02 	moveq r59,r59
+ 6a4:	900f 6c02 	moveq r28,r28
+ 6a8:	6c0f 6c02 	moveq r27,r27
+ 6ac:	b40f 2402 	moveq sp,sp
+ 6b0:	180f 8c02 	moveq r32,r30
+ 6b4:	7c0f b002 	moveq r43,r39
+ 6b8:	240f 7002 	moveq r25,r33
 
 000006bc \<mov16NE\>:
- 6bc:	901f 2402 	movne.l r12,r12
+ 6bc:	901f 2402 	movne r12,r12
  6c0:	6c12      	movne r3,r3
  6c2:	0012      	movne r0,r0
- 6c4:	6c1f 2402 	movne.l fp,fp
- 6c8:	b41f 2402 	movne.l sp,sp
+ 6c4:	6c1f 2402 	movne fp,fp
+ 6c8:	b41f 2402 	movne sp,sp
  6cc:	6c12      	movne r3,r3
- 6ce:	0c1f 0402 	movne.l r0,fp
- 6d2:	6c1f 2402 	movne.l fp,fp
+ 6ce:	0c1f 0402 	movne r0,fp
+ 6d2:	6c1f 2402 	movne fp,fp
 
 000006d6 \<movNE\>:
- 6d6:	901f 2402 	movne.l r12,r12
- 6da:	6c1f fc02 	movne.l r59,r59
- 6de:	901f 6c02 	movne.l r28,r28
- 6e2:	6c1f 6c02 	movne.l r27,r27
- 6e6:	b41f 2402 	movne.l sp,sp
+ 6d6:	901f 2402 	movne r12,r12
+ 6da:	6c1f fc02 	movne r59,r59
+ 6de:	901f 6c02 	movne r28,r28
+ 6e2:	6c1f 6c02 	movne r27,r27
+ 6e6:	b41f 2402 	movne sp,sp
  6ea:	8c12      	movne r4,r3
- 6ec:	8c1f 6402 	movne.l r28,fp
- 6f0:	fc1f 5002 	movne.l r23,r39
+ 6ec:	8c1f 6402 	movne r28,fp
+ 6f0:	fc1f 5002 	movne r23,r39
 
 000006f4 \<mov16GT\>:
- 6f4:	906f 2402 	movgt.l r12,r12
+ 6f4:	906f 2402 	movgt r12,r12
  6f8:	6c62      	movgt r3,r3
  6fa:	0062      	movgt r0,r0
- 6fc:	6c6f 2402 	movgt.l fp,fp
- 700:	b46f 2402 	movgt.l sp,sp
+ 6fc:	6c6f 2402 	movgt fp,fp
+ 700:	b46f 2402 	movgt sp,sp
  704:	2c62      	movgt r1,r3
- 706:	cc6f 2002 	movgt.l lr,r3
- 70a:	306f 0402 	movgt.l r1,r12
+ 706:	cc6f 2002 	movgt lr,r3
+ 70a:	306f 0402 	movgt r1,r12
 
 0000070e \<movGT\>:
- 70e:	906f 2402 	movgt.l r12,r12
- 712:	6c6f fc02 	movgt.l r59,r59
- 716:	906f 6c02 	movgt.l r28,r28
- 71a:	6c6f 6c02 	movgt.l r27,r27
- 71e:	b46f 2402 	movgt.l sp,sp
- 722:	346f 0802 	movgt.l r1,r21
- 726:	ac6f 2002 	movgt.l sp,r3
- 72a:	8c6f 7402 	movgt.l r28,r43
+ 70e:	906f 2402 	movgt r12,r12
+ 712:	6c6f fc02 	movgt r59,r59
+ 716:	906f 6c02 	movgt r28,r28
+ 71a:	6c6f 6c02 	movgt r27,r27
+ 71e:	b46f 2402 	movgt sp,sp
+ 722:	346f 0802 	movgt r1,r21
+ 726:	ac6f 2002 	movgt sp,r3
+ 72a:	8c6f 7402 	movgt r28,r43
 
 0000072e \<mov16GTU\>:
- 72e:	902f 2402 	movgtu.l r12,r12
+ 72e:	902f 2402 	movgtu r12,r12
  732:	6c22      	movgtu r3,r3
  734:	0022      	movgtu r0,r0
- 736:	6c2f 2402 	movgtu.l fp,fp
- 73a:	b42f 2402 	movgtu.l sp,sp
- 73e:	982f 2402 	movgtu.l r12,lr
- 742:	b02f 2402 	movgtu.l sp,r12
- 746:	942f 2402 	movgtu.l r12,sp
+ 736:	6c2f 2402 	movgtu fp,fp
+ 73a:	b42f 2402 	movgtu sp,sp
+ 73e:	982f 2402 	movgtu r12,lr
+ 742:	b02f 2402 	movgtu sp,r12
+ 746:	942f 2402 	movgtu r12,sp
 
 0000074a \<movGTU\>:
- 74a:	902f 2402 	movgtu.l r12,r12
- 74e:	6c2f fc02 	movgtu.l r59,r59
- 752:	902f 6c02 	movgtu.l r28,r28
- 756:	6c2f 6c02 	movgtu.l r27,r27
- 75a:	b42f 2402 	movgtu.l sp,sp
- 75e:	442f 9002 	movgtu.l r34,r33
- 762:	202f 5802 	movgtu.l r17,r48
- 766:	602f 8c02 	movgtu.l r35,r24
+ 74a:	902f 2402 	movgtu r12,r12
+ 74e:	6c2f fc02 	movgtu r59,r59
+ 752:	902f 6c02 	movgtu r28,r28
+ 756:	6c2f 6c02 	movgtu r27,r27
+ 75a:	b42f 2402 	movgtu sp,sp
+ 75e:	442f 9002 	movgtu r34,r33
+ 762:	202f 5802 	movgtu r17,r48
+ 766:	602f 8c02 	movgtu r35,r24
 
 0000076a \<mov16GTE\>:
- 76a:	907f 2402 	movgte.l r12,r12
+ 76a:	907f 2402 	movgte r12,r12
  76e:	6c72      	movgte r3,r3
  770:	0072      	movgte r0,r0
- 772:	6c7f 2402 	movgte.l fp,fp
- 776:	b47f 2402 	movgte.l sp,sp
+ 772:	6c7f 2402 	movgte fp,fp
+ 776:	b47f 2402 	movgte sp,sp
  77a:	0072      	movgte r0,r0
- 77c:	547f 0402 	movgte.l r2,sp
- 780:	c87f 2002 	movgte.l lr,r2
+ 77c:	547f 0402 	movgte r2,sp
+ 780:	c87f 2002 	movgte lr,r2
 
 00000784 \<movGTE\>:
- 784:	907f 2402 	movgte.l r12,r12
- 788:	6c7f fc02 	movgte.l r59,r59
- 78c:	907f 6c02 	movgte.l r28,r28
- 790:	6c7f 6c02 	movgte.l r27,r27
- 794:	b47f 2402 	movgte.l sp,sp
- 798:	8c7f 3c02 	movgte.l r12,r59
- 79c:	a87f 9402 	movgte.l r37,r42
- 7a0:	887f ac02 	movgte.l r44,r26
+ 784:	907f 2402 	movgte r12,r12
+ 788:	6c7f fc02 	movgte r59,r59
+ 78c:	907f 6c02 	movgte r28,r28
+ 790:	6c7f 6c02 	movgte r27,r27
+ 794:	b47f 2402 	movgte sp,sp
+ 798:	8c7f 3c02 	movgte r12,r59
+ 79c:	a87f 9402 	movgte r37,r42
+ 7a0:	887f ac02 	movgte r44,r26
 
 000007a4 \<mov16GTEU\>:
- 7a4:	903f 2402 	movgteu.l r12,r12
+ 7a4:	903f 2402 	movgteu r12,r12
  7a8:	6c32      	movgteu r3,r3
  7aa:	0032      	movgteu r0,r0
- 7ac:	6c3f 2402 	movgteu.l fp,fp
- 7b0:	b43f 2402 	movgteu.l sp,sp
- 7b4:	d03f 2402 	movgteu.l lr,r12
- 7b8:	a43f 2002 	movgteu.l sp,r1
- 7bc:	983f 2402 	movgteu.l r12,lr
+ 7ac:	6c3f 2402 	movgteu fp,fp
+ 7b0:	b43f 2402 	movgteu sp,sp
+ 7b4:	d03f 2402 	movgteu lr,r12
+ 7b8:	a43f 2002 	movgteu sp,r1
+ 7bc:	983f 2402 	movgteu r12,lr
 
 000007c0 \<movGTEU\>:
- 7c0:	903f 2402 	movgteu.l r12,r12
- 7c4:	6c3f fc02 	movgteu.l r59,r59
- 7c8:	903f 6c02 	movgteu.l r28,r28
- 7cc:	6c3f 6c02 	movgteu.l r27,r27
- 7d0:	b43f 2402 	movgteu.l sp,sp
- 7d4:	5c3f f402 	movgteu.l r58,r47
- 7d8:	143f e002 	movgteu.l r56,r5
- 7dc:	903f 5802 	movgteu.l r20,r52
+ 7c0:	903f 2402 	movgteu r12,r12
+ 7c4:	6c3f fc02 	movgteu r59,r59
+ 7c8:	903f 6c02 	movgteu r28,r28
+ 7cc:	6c3f 6c02 	movgteu r27,r27
+ 7d0:	b43f 2402 	movgteu sp,sp
+ 7d4:	5c3f f402 	movgteu r58,r47
+ 7d8:	143f e002 	movgteu r56,r5
+ 7dc:	903f 5802 	movgteu r20,r52
 
 000007e0 \<mov16LT\>:
- 7e0:	908f 2402 	movlt.l r12,r12
+ 7e0:	908f 2402 	movlt r12,r12
  7e4:	6c82      	movlt r3,r3
  7e6:	0082      	movlt r0,r0
- 7e8:	6c8f 2402 	movlt.l fp,fp
- 7ec:	b48f 2402 	movlt.l sp,sp
+ 7e8:	6c8f 2402 	movlt fp,fp
+ 7ec:	b48f 2402 	movlt sp,sp
  7f0:	6c82      	movlt r3,r3
  7f2:	4882      	movlt r2,r2
- 7f4:	988f 2402 	movlt.l r12,lr
+ 7f4:	988f 2402 	movlt r12,lr
 
 000007f8 \<movLT\>:
- 7f8:	908f 2402 	movlt.l r12,r12
- 7fc:	6c8f fc02 	movlt.l r59,r59
- 800:	908f 6c02 	movlt.l r28,r28
- 804:	6c8f 6c02 	movlt.l r27,r27
- 808:	b48f 2402 	movlt.l sp,sp
- 80c:	908f c402 	movlt.l r52,r12
- 810:	388f e802 	movlt.l r57,r22
- 814:	1c8f 2002 	movlt.l r8,r7
+ 7f8:	908f 2402 	movlt r12,r12
+ 7fc:	6c8f fc02 	movlt r59,r59
+ 800:	908f 6c02 	movlt r28,r28
+ 804:	6c8f 6c02 	movlt r27,r27
+ 808:	b48f 2402 	movlt sp,sp
+ 80c:	908f c402 	movlt r52,r12
+ 810:	388f e802 	movlt r57,r22
+ 814:	1c8f 2002 	movlt r8,r7
 
 00000818 \<mov16LTU\>:
- 818:	905f 2402 	movltu.l r12,r12
+ 818:	905f 2402 	movltu r12,r12
  81c:	6c52      	movltu r3,r3
  81e:	0052      	movltu r0,r0
- 820:	6c5f 2402 	movltu.l fp,fp
- 824:	b45f 2402 	movltu.l sp,sp
- 828:	885f 2002 	movltu.l r12,r2
- 82c:	b05f 2402 	movltu.l sp,r12
+ 820:	6c5f 2402 	movltu fp,fp
+ 824:	b45f 2402 	movltu sp,sp
+ 828:	885f 2002 	movltu r12,r2
+ 82c:	b05f 2402 	movltu sp,r12
  830:	2052      	movltu r1,r0
 
 00000832 \<movLTU\>:
- 832:	905f 2402 	movltu.l r12,r12
- 836:	6c5f fc02 	movltu.l r59,r59
- 83a:	905f 6c02 	movltu.l r28,r28
- 83e:	6c5f 6c02 	movltu.l r27,r27
- 842:	b45f 2402 	movltu.l sp,sp
- 846:	bc5f 2c02 	movltu.l sp,r31
- 84a:	705f a402 	movltu.l r43,r12
- 84e:	e05f 1c02 	movltu.l r7,r56
+ 832:	905f 2402 	movltu r12,r12
+ 836:	6c5f fc02 	movltu r59,r59
+ 83a:	905f 6c02 	movltu r28,r28
+ 83e:	6c5f 6c02 	movltu r27,r27
+ 842:	b45f 2402 	movltu sp,sp
+ 846:	bc5f 2c02 	movltu sp,r31
+ 84a:	705f a402 	movltu r43,r12
+ 84e:	e05f 1c02 	movltu r7,r56
 
 00000852 \<mov16LTE\>:
- 852:	909f 2402 	movlte.l r12,r12
+ 852:	909f 2402 	movlte r12,r12
  856:	6c92      	movlte r3,r3
  858:	0092      	movlte r0,r0
- 85a:	6c9f 2402 	movlte.l fp,fp
- 85e:	b49f 2402 	movlte.l sp,sp
+ 85a:	6c9f 2402 	movlte fp,fp
+ 85e:	b49f 2402 	movlte sp,sp
  862:	0c92      	movlte r0,r3
- 864:	709f 0402 	movlte.l r3,r12
- 868:	789f 0402 	movlte.l r3,lr
+ 864:	709f 0402 	movlte r3,r12
+ 868:	789f 0402 	movlte r3,lr
 
 0000086c \<movLTE\>:
- 86c:	909f 2402 	movlte.l r12,r12
- 870:	6c9f fc02 	movlte.l r59,r59
- 874:	909f 6c02 	movlte.l r28,r28
- 878:	6c9f 6c02 	movlte.l r27,r27
- 87c:	b49f 2402 	movlte.l sp,sp
- 880:	cc9f 6c02 	movlte.l r30,r27
- 884:	709f 9802 	movlte.l r35,r52
- 888:	f49f 3802 	movlte.l r15,r53
+ 86c:	909f 2402 	movlte r12,r12
+ 870:	6c9f fc02 	movlte r59,r59
+ 874:	909f 6c02 	movlte r28,r28
+ 878:	6c9f 6c02 	movlte r27,r27
+ 87c:	b49f 2402 	movlte sp,sp
+ 880:	cc9f 6c02 	movlte r30,r27
+ 884:	709f 9802 	movlte r35,r52
+ 888:	f49f 3802 	movlte r15,r53
 
 0000088c \<mov16LTEU\>:
- 88c:	904f 2402 	movlteu.l r12,r12
+ 88c:	904f 2402 	movlteu r12,r12
  890:	6c42      	movlteu r3,r3
  892:	0042      	movlteu r0,r0
- 894:	6c4f 2402 	movlteu.l fp,fp
- 898:	b44f 2402 	movlteu.l sp,sp
- 89c:	984f 2402 	movlteu.l r12,lr
+ 894:	6c4f 2402 	movlteu fp,fp
+ 898:	b44f 2402 	movlteu sp,sp
+ 89c:	984f 2402 	movlteu r12,lr
  8a0:	4842      	movlteu r2,r2
- 8a2:	4c4f 0402 	movlteu.l r2,fp
+ 8a2:	4c4f 0402 	movlteu r2,fp
 
 000008a6 \<movLTEU\>:
- 8a6:	904f 2402 	movlteu.l r12,r12
- 8aa:	6c4f fc02 	movlteu.l r59,r59
- 8ae:	904f 6c02 	movlteu.l r28,r28
- 8b2:	6c4f 6c02 	movlteu.l r27,r27
- 8b6:	b44f 2402 	movlteu.l sp,sp
- 8ba:	f04f 7002 	movlteu.l r31,r36
- 8be:	084f 7802 	movlteu.l r24,r50
- 8c2:	984f d802 	movlteu.l r52,r54
+ 8a6:	904f 2402 	movlteu r12,r12
+ 8aa:	6c4f fc02 	movlteu r59,r59
+ 8ae:	904f 6c02 	movlteu r28,r28
+ 8b2:	6c4f 6c02 	movlteu r27,r27
+ 8b6:	b44f 2402 	movlteu sp,sp
+ 8ba:	f04f 7002 	movlteu r31,r36
+ 8be:	084f 7802 	movlteu r24,r50
+ 8c2:	984f d802 	movlteu r52,r54
 
 000008c6 \<mov16B\>:
- 8c6:	90ef 2402 	mov.l r12,r12
+ 8c6:	90ef 2402 	mov r12,r12
  8ca:	6ce2      	mov r3,r3
  8cc:	00e2      	mov r0,r0
- 8ce:	6cef 2402 	mov.l fp,fp
- 8d2:	b4ef 2402 	mov.l sp,sp
- 8d6:	84ef 2002 	mov.l r12,r1
- 8da:	80ef 2002 	mov.l r12,r0
- 8de:	10ef 0402 	mov.l r0,r12
+ 8ce:	6cef 2402 	mov fp,fp
+ 8d2:	b4ef 2402 	mov sp,sp
+ 8d6:	84ef 2002 	mov r12,r1
+ 8da:	80ef 2002 	mov r12,r0
+ 8de:	10ef 0402 	mov r0,r12
 
 000008e2 \<movB\>:
- 8e2:	90ef 2402 	mov.l r12,r12
- 8e6:	6cef fc02 	mov.l r59,r59
- 8ea:	90ef 6c02 	mov.l r28,r28
- 8ee:	6cef 6c02 	mov.l r27,r27
- 8f2:	b4ef 2402 	mov.l sp,sp
- 8f6:	2cef 1c02 	mov.l r1,r59
- 8fa:	90ef 6402 	mov.l r28,r12
- 8fe:	a8ef 1402 	mov.l r5,r42
+ 8e2:	90ef 2402 	mov r12,r12
+ 8e6:	6cef fc02 	mov r59,r59
+ 8ea:	90ef 6c02 	mov r28,r28
+ 8ee:	6cef 6c02 	mov r27,r27
+ 8f2:	b4ef 2402 	mov sp,sp
+ 8f6:	2cef 1c02 	mov r1,r59
+ 8fa:	90ef 6402 	mov r28,r12
+ 8fe:	a8ef 1402 	mov r5,r42
 
 00000902 \<mov16BEQ\>:
- 902:	90af 2402 	movbeq.l r12,r12
+ 902:	90af 2402 	movbeq r12,r12
  906:	6ca2      	movbeq r3,r3
  908:	00a2      	movbeq r0,r0
- 90a:	6caf 2402 	movbeq.l fp,fp
- 90e:	b4af 2402 	movbeq.l sp,sp
- 912:	c8af 2002 	movbeq.l lr,r2
- 916:	68af 2002 	movbeq.l fp,r2
- 91a:	84af 2002 	movbeq.l r12,r1
+ 90a:	6caf 2402 	movbeq fp,fp
+ 90e:	b4af 2402 	movbeq sp,sp
+ 912:	c8af 2002 	movbeq lr,r2
+ 916:	68af 2002 	movbeq fp,r2
+ 91a:	84af 2002 	movbeq r12,r1
 
 0000091e \<movBEQ\>:
- 91e:	90af 2402 	movbeq.l r12,r12
- 922:	6caf fc02 	movbeq.l r59,r59
- 926:	90af 6c02 	movbeq.l r28,r28
- 92a:	6caf 6c02 	movbeq.l r27,r27
- 92e:	b4af 2402 	movbeq.l sp,sp
- 932:	a0af 6802 	movbeq.l r29,r16
- 936:	58af 5402 	movbeq.l r18,r46
- 93a:	c4af 2002 	movbeq.l lr,r1
+ 91e:	90af 2402 	movbeq r12,r12
+ 922:	6caf fc02 	movbeq r59,r59
+ 926:	90af 6c02 	movbeq r28,r28
+ 92a:	6caf 6c02 	movbeq r27,r27
+ 92e:	b4af 2402 	movbeq sp,sp
+ 932:	a0af 6802 	movbeq r29,r16
+ 936:	58af 5402 	movbeq r18,r46
+ 93a:	c4af 2002 	movbeq lr,r1
 
 0000093e \<mov16BNE\>:
- 93e:	90bf 2402 	movbne.l r12,r12
+ 93e:	90bf 2402 	movbne r12,r12
  942:	6cb2      	movbne r3,r3
  944:	00b2      	movbne r0,r0
- 946:	6cbf 2402 	movbne.l fp,fp
- 94a:	b4bf 2402 	movbne.l sp,sp
+ 946:	6cbf 2402 	movbne fp,fp
+ 94a:	b4bf 2402 	movbne sp,sp
  94e:	28b2      	movbne r1,r2
- 950:	84bf 2002 	movbne.l r12,r1
- 954:	8cbf 2002 	movbne.l r12,r3
+ 950:	84bf 2002 	movbne r12,r1
+ 954:	8cbf 2002 	movbne r12,r3
 
 00000958 \<movBNE\>:
- 958:	90bf 2402 	movbne.l r12,r12
- 95c:	6cbf fc02 	movbne.l r59,r59
- 960:	90bf 6c02 	movbne.l r28,r28
- 964:	6cbf 6c02 	movbne.l r27,r27
- 968:	b4bf 2402 	movbne.l sp,sp
- 96c:	fcbf 2002 	movbne.l r15,r7
- 970:	0cbf 7402 	movbne.l r24,r43
- 974:	f0bf 5802 	movbne.l r23,r52
+ 958:	90bf 2402 	movbne r12,r12
+ 95c:	6cbf fc02 	movbne r59,r59
+ 960:	90bf 6c02 	movbne r28,r28
+ 964:	6cbf 6c02 	movbne r27,r27
+ 968:	b4bf 2402 	movbne sp,sp
+ 96c:	fcbf 2002 	movbne r15,r7
+ 970:	0cbf 7402 	movbne r24,r43
+ 974:	f0bf 5802 	movbne r23,r52
 
 00000978 \<mov16BLT\>:
- 978:	90cf 2402 	movblt.l r12,r12
+ 978:	90cf 2402 	movblt r12,r12
  97c:	6cc2      	movblt r3,r3
  97e:	00c2      	movblt r0,r0
- 980:	6ccf 2402 	movblt.l fp,fp
- 984:	b4cf 2402 	movblt.l sp,sp
- 988:	b8cf 2402 	movblt.l sp,lr
- 98c:	98cf 2402 	movblt.l r12,lr
- 990:	d4cf 2402 	movblt.l lr,sp
+ 980:	6ccf 2402 	movblt fp,fp
+ 984:	b4cf 2402 	movblt sp,sp
+ 988:	b8cf 2402 	movblt sp,lr
+ 98c:	98cf 2402 	movblt r12,lr
+ 990:	d4cf 2402 	movblt lr,sp
 
 00000994 \<movBLT\>:
- 994:	90cf 2402 	movblt.l r12,r12
- 998:	6ccf fc02 	movblt.l r59,r59
- 99c:	90cf 6c02 	movblt.l r28,r28
- 9a0:	6ccf 6c02 	movblt.l r27,r27
- 9a4:	b4cf 2402 	movblt.l sp,sp
- 9a8:	90cf d402 	movblt.l r52,r44
- 9ac:	2ccf f002 	movblt.l r57,r35
- 9b0:	a4cf d002 	movblt.l r53,r33
+ 994:	90cf 2402 	movblt r12,r12
+ 998:	6ccf fc02 	movblt r59,r59
+ 99c:	90cf 6c02 	movblt r28,r28
+ 9a0:	6ccf 6c02 	movblt r27,r27
+ 9a4:	b4cf 2402 	movblt sp,sp
+ 9a8:	90cf d402 	movblt r52,r44
+ 9ac:	2ccf f002 	movblt r57,r35
+ 9b0:	a4cf d002 	movblt r53,r33
 
 000009b4 \<mov16BLTE\>:
- 9b4:	90df 2402 	movblte.l r12,r12
+ 9b4:	90df 2402 	movblte r12,r12
  9b8:	6cd2      	movblte r3,r3
  9ba:	00d2      	movblte r0,r0
- 9bc:	6cdf 2402 	movblte.l fp,fp
- 9c0:	b4df 2402 	movblte.l sp,sp
- 9c4:	b0df 2402 	movblte.l sp,r12
- 9c8:	0cdf 0402 	movblte.l r0,fp
- 9cc:	14df 0402 	movblte.l r0,sp
+ 9bc:	6cdf 2402 	movblte fp,fp
+ 9c0:	b4df 2402 	movblte sp,sp
+ 9c4:	b0df 2402 	movblte sp,r12
+ 9c8:	0cdf 0402 	movblte r0,fp
+ 9cc:	14df 0402 	movblte r0,sp
 
 000009d0 \<movBLTE\>:
- 9d0:	90df 2402 	movblte.l r12,r12
- 9d4:	6cdf fc02 	movblte.l r59,r59
- 9d8:	90df 6c02 	movblte.l r28,r28
- 9dc:	6cdf 6c02 	movblte.l r27,r27
- 9e0:	b4df 2402 	movblte.l sp,sp
- 9e4:	50df f402 	movblte.l r58,r44
- 9e8:	78df 8802 	movblte.l r35,r22
- 9ec:	08df 2002 	movblte.l r8,r2
+ 9d0:	90df 2402 	movblte r12,r12
+ 9d4:	6cdf fc02 	movblte r59,r59
+ 9d8:	90df 6c02 	movblte r28,r28
+ 9dc:	6cdf 6c02 	movblte r27,r27
+ 9e0:	b4df 2402 	movblte sp,sp
+ 9e4:	50df f402 	movblte r58,r44
+ 9e8:	78df 8802 	movblte r35,r22
+ 9ec:	08df 2002 	movblte r8,r2
 
 000009f0 \<movts16\>:
- 9f0:	810f 2002 	movts.l config,r12
- 9f4:	750f 0402 	movts.l ipend,r3
- 9f8:	010f 0402 	movts.l iret,r0
- 9fc:	6d0f 2002 	movts.l debug,fp
- a00:	a50f 2002 	movts.l status,sp
- a04:	650f 2002 	movts.l status,fp
- a08:	690f 2002 	movts.l pc,fp
- a0c:	050f 0402 	movts.l imask,r0
+ 9f0:	810f 2002 	movts config,r12
+ 9f4:	750f 0402 	movts ipend,r3
+ 9f8:	010f 0402 	movts iret,r0
+ 9fc:	6d0f 2002 	movts debug,fp
+ a00:	a50f 2002 	movts status,sp
+ a04:	650f 2002 	movts status,fp
+ a08:	690f 2002 	movts pc,fp
+ a0c:	050f 0402 	movts imask,r0
 
 00000a10 \<movts\>:
- a10:	810f 2002 	movts.l config,r12
- a14:	750f e402 	movts.l ipend,r59
- a18:	810f 6402 	movts.l iret,r28
- a1c:	6d0f 6002 	movts.l debug,r27
- a20:	a50f 2002 	movts.l status,sp
- a24:	4d0f c002 	movts.l debug,r50
- a28:	350f 8402 	movts.l ipend,r33
- a2c:	850f 2002 	movts.l status,r12
+ a10:	810f 2002 	movts config,r12
+ a14:	750f e402 	movts ipend,r59
+ a18:	810f 6402 	movts iret,r28
+ a1c:	6d0f 6002 	movts debug,r27
+ a20:	a50f 2002 	movts status,sp
+ a24:	4d0f c002 	movts debug,r50
+ a28:	350f 8402 	movts ipend,r33
+ a2c:	850f 2002 	movts status,r12
 
 00000a30 \<movfs16\>:
- a30:	811f 2002 	movfs.l r12,config
- a34:	751f 0402 	movfs.l r3,ipend
- a38:	011f 0402 	movfs.l r0,iret
- a3c:	6d1f 2002 	movfs.l fp,debug
- a40:	a51f 2002 	movfs.l sp,status
- a44:	211f 0402 	movfs.l r1,iret
+ a30:	811f 2002 	movfs r12,config
+ a34:	751f 0402 	movfs r3,ipend
+ a38:	011f 0402 	movfs r0,iret
+ a3c:	6d1f 2002 	movfs fp,debug
+ a40:	a51f 2002 	movfs sp,status
+ a44:	211f 0402 	movfs r1,iret
  a48:	4512      	movfs r2,status
- a4a:	cd1f 2002 	movfs.l lr,debug
+ a4a:	cd1f 2002 	movfs lr,debug
 
 00000a4e \<movfs\>:
- a4e:	811f 2002 	movfs.l r12,config
- a52:	751f e402 	movfs.l r59,ipend
- a56:	811f 6402 	movfs.l r28,iret
- a5a:	6d1f 6002 	movfs.l r27,debug
- a5e:	a51f 2002 	movfs.l sp,status
- a62:	ad1f 2002 	movfs.l sp,debug
- a66:	e51f 2002 	movfs.l r15,status
- a6a:	051f 4402 	movfs.l r16,imask
+ a4e:	811f 2002 	movfs r12,config
+ a52:	751f e402 	movfs r59,ipend
+ a56:	811f 6402 	movfs r28,iret
+ a5a:	6d1f 6002 	movfs r27,debug
+ a5e:	a51f 2002 	movfs sp,status
+ a62:	ad1f 2002 	movfs sp,debug
+ a66:	e51f 2002 	movfs r15,status
+ a6a:	051f 4402 	movfs r16,imask
 
 00000a6e \<nop\>:
  a6e:	01a2      	nop
@@ -1015,164 +1015,164 @@ Disassembly of section .text:
  a84:	17e2      	trap 0x5
 
 00000a86 \<add16\>:
- a86:	921f 248a 	add.l r12,r12,r12
+ a86:	921f 248a 	add r12,r12,r12
  a8a:	6d9a      	add r3,r3,r3
  a8c:	001a      	add r0,r0,r0
- a8e:	6d9f 248a 	add.l fp,fp,fp
- a92:	b69f 248a 	add.l sp,sp,sp
- a96:	ab1f 208a 	add.l sp,r2,lr
+ a8e:	6d9f 248a 	add fp,fp,fp
+ a92:	b69f 248a 	add sp,sp,sp
+ a96:	ab1f 208a 	add sp,r2,lr
  a9a:	089a      	add r0,r2,r1
- a9c:	8d9f 248a 	add.l r12,fp,fp
+ a9c:	8d9f 248a 	add r12,fp,fp
 
 00000aa0 \<add\>:
- aa0:	921f 248a 	add.l r12,r12,r12
- aa4:	6d9f ff8a 	add.l r59,r59,r59
- aa8:	921f 6d8a 	add.l r28,r28,r28
- aac:	6d9f 6d8a 	add.l r27,r27,r27
- ab0:	b69f 248a 	add.l sp,sp,sp
- ab4:	081f e50a 	add.l r56,r10,r16
- ab8:	851f 8e0a 	add.l r36,r25,r34
- abc:	449f 190a 	add.l r2,r49,r17
+ aa0:	921f 248a 	add r12,r12,r12
+ aa4:	6d9f ff8a 	add r59,r59,r59
+ aa8:	921f 6d8a 	add r28,r28,r28
+ aac:	6d9f 6d8a 	add r27,r27,r27
+ ab0:	b69f 248a 	add sp,sp,sp
+ ab4:	081f e50a 	add r56,r10,r16
+ ab8:	851f 8e0a 	add r36,r25,r34
+ abc:	449f 190a 	add r2,r49,r17
 
 00000ac0 \<sub16\>:
- ac0:	923f 248a 	sub.l r12,r12,r12
+ ac0:	923f 248a 	sub r12,r12,r12
  ac4:	6dba      	sub r3,r3,r3
  ac6:	003a      	sub r0,r0,r0
- ac8:	6dbf 248a 	sub.l fp,fp,fp
- acc:	b6bf 248a 	sub.l sp,sp,sp
- ad0:	533f 048a 	sub.l r2,r12,lr
- ad4:	d83f 240a 	sub.l lr,lr,r0
+ ac8:	6dbf 248a 	sub fp,fp,fp
+ acc:	b6bf 248a 	sub sp,sp,sp
+ ad0:	533f 048a 	sub r2,r12,lr
+ ad4:	d83f 240a 	sub lr,lr,r0
  ad8:	6dba      	sub r3,r3,r3
 
 00000ada \<sub\>:
- ada:	923f 248a 	sub.l r12,r12,r12
- ade:	6dbf ff8a 	sub.l r59,r59,r59
- ae2:	923f 6d8a 	sub.l r28,r28,r28
- ae6:	6dbf 6d8a 	sub.l r27,r27,r27
- aea:	b6bf 248a 	sub.l sp,sp,sp
- aee:	9a3f 250a 	sub.l r12,lr,r20
- af2:	1bbf ca8a 	sub.l r48,r22,r47
- af6:	62bf 588a 	sub.l r19,r48,sp
+ ada:	923f 248a 	sub r12,r12,r12
+ ade:	6dbf ff8a 	sub r59,r59,r59
+ ae2:	923f 6d8a 	sub r28,r28,r28
+ ae6:	6dbf 6d8a 	sub r27,r27,r27
+ aea:	b6bf 248a 	sub sp,sp,sp
+ aee:	9a3f 250a 	sub r12,lr,r20
+ af2:	1bbf ca8a 	sub r48,r22,r47
+ af6:	62bf 588a 	sub r19,r48,sp
 
 00000afa \<and16\>:
- afa:	925f 248a 	and.l r12,r12,r12
+ afa:	925f 248a 	and r12,r12,r12
  afe:	6dda      	and r3,r3,r3
  b00:	005a      	and r0,r0,r0
- b02:	6ddf 248a 	and.l fp,fp,fp
- b06:	b6df 248a 	and.l sp,sp,sp
- b0a:	75df 240a 	and.l fp,sp,r3
+ b02:	6ddf 248a 	and fp,fp,fp
+ b06:	b6df 248a 	and sp,sp,sp
+ b0a:	75df 240a 	and fp,sp,r3
  b0e:	6dda      	and r3,r3,r3
- b10:	96df 248a 	and.l r12,sp,sp
+ b10:	96df 248a 	and r12,sp,sp
 
 00000b14 \<and\>:
- b14:	925f 248a 	and.l r12,r12,r12
- b18:	6ddf ff8a 	and.l r59,r59,r59
- b1c:	925f 6d8a 	and.l r28,r28,r28
- b20:	6ddf 6d8a 	and.l r27,r27,r27
- b24:	b6df 248a 	and.l sp,sp,sp
- b28:	935f c68a 	and.l r52,r12,r46
- b2c:	825f b68a 	and.l r44,r40,r44
- b30:	0bdf 7d8a 	and.l r24,r58,r31
+ b14:	925f 248a 	and r12,r12,r12
+ b18:	6ddf ff8a 	and r59,r59,r59
+ b1c:	925f 6d8a 	and r28,r28,r28
+ b20:	6ddf 6d8a 	and r27,r27,r27
+ b24:	b6df 248a 	and sp,sp,sp
+ b28:	935f c68a 	and r52,r12,r46
+ b2c:	825f b68a 	and r44,r40,r44
+ b30:	0bdf 7d8a 	and r24,r58,r31
 
 00000b34 \<orr16\>:
- b34:	927f 248a 	orr.l r12,r12,r12
+ b34:	927f 248a 	orr r12,r12,r12
  b38:	6dfa      	orr r3,r3,r3
  b3a:	007a      	orr r0,r0,r0
- b3c:	6dff 248a 	orr.l fp,fp,fp
- b40:	b6ff 248a 	orr.l sp,sp,sp
- b44:	c6ff 208a 	orr.l lr,r1,sp
- b48:	7b7f 048a 	orr.l r3,lr,lr
+ b3c:	6dff 248a 	orr fp,fp,fp
+ b40:	b6ff 248a 	orr sp,sp,sp
+ b44:	c6ff 208a 	orr lr,r1,sp
+ b48:	7b7f 048a 	orr r3,lr,lr
  b4c:	4d7a      	orr r2,r3,r2
 
 00000b4e \<orr\>:
- b4e:	927f 248a 	orr.l r12,r12,r12
- b52:	6dff ff8a 	orr.l r59,r59,r59
- b56:	927f 6d8a 	orr.l r28,r28,r28
- b5a:	6dff 6d8a 	orr.l r27,r27,r27
- b5e:	b6ff 248a 	orr.l sp,sp,sp
- b62:	95ff c38a 	orr.l r52,r5,r59
- b66:	e1ff 328a 	orr.l r15,r32,r43
- b6a:	167f ee8a 	orr.l r56,r29,r44
+ b4e:	927f 248a 	orr r12,r12,r12
+ b52:	6dff ff8a 	orr r59,r59,r59
+ b56:	927f 6d8a 	orr r28,r28,r28
+ b5a:	6dff 6d8a 	orr r27,r27,r27
+ b5e:	b6ff 248a 	orr sp,sp,sp
+ b62:	95ff c38a 	orr r52,r5,r59
+ b66:	e1ff 328a 	orr r15,r32,r43
+ b6a:	167f ee8a 	orr r56,r29,r44
 
 00000b6e \<eor16\>:
- b6e:	920f 248a 	eor.l r12,r12,r12
+ b6e:	920f 248a 	eor r12,r12,r12
  b72:	6d8a      	eor r3,r3,r3
  b74:	000a      	eor r0,r0,r0
- b76:	6d8f 248a 	eor.l fp,fp,fp
- b7a:	b68f 248a 	eor.l sp,sp,sp
- b7e:	8d0f 200a 	eor.l r12,r3,r2
- b82:	750f 040a 	eor.l r3,sp,r2
- b86:	750f 240a 	eor.l fp,sp,r2
+ b76:	6d8f 248a 	eor fp,fp,fp
+ b7a:	b68f 248a 	eor sp,sp,sp
+ b7e:	8d0f 200a 	eor r12,r3,r2
+ b82:	750f 040a 	eor r3,sp,r2
+ b86:	750f 240a 	eor fp,sp,r2
 
 00000b8a \<eor\>:
- b8a:	920f 248a 	eor.l r12,r12,r12
- b8e:	6d8f ff8a 	eor.l r59,r59,r59
- b92:	920f 6d8a 	eor.l r28,r28,r28
- b96:	6d8f 6d8a 	eor.l r27,r27,r27
- b9a:	b68f 248a 	eor.l sp,sp,sp
- b9e:	228f 5d8a 	eor.l r17,r56,r29
- ba2:	a58f 358a 	eor.l sp,r41,r27
- ba6:	698f 268a 	eor.l fp,r10,r43
+ b8a:	920f 248a 	eor r12,r12,r12
+ b8e:	6d8f ff8a 	eor r59,r59,r59
+ b92:	920f 6d8a 	eor r28,r28,r28
+ b96:	6d8f 6d8a 	eor r27,r27,r27
+ b9a:	b68f 248a 	eor sp,sp,sp
+ b9e:	228f 5d8a 	eor r17,r56,r29
+ ba2:	a58f 358a 	eor sp,r41,r27
+ ba6:	698f 268a 	eor fp,r10,r43
 
 00000baa \<asr16\>:
- baa:	926f 248a 	asr.l r12,r12,r12
+ baa:	926f 248a 	asr r12,r12,r12
  bae:	6dea      	asr r3,r3,r3
  bb0:	006a      	asr r0,r0,r0
- bb2:	6def 248a 	asr.l fp,fp,fp
- bb6:	b6ef 248a 	asr.l sp,sp,sp
+ bb2:	6def 248a 	asr fp,fp,fp
+ bb6:	b6ef 248a 	asr sp,sp,sp
  bba:	61ea      	asr r3,r0,r3
- bbc:	676f 008a 	asr.l r3,r1,lr
- bc0:	0eef 048a 	asr.l r0,fp,sp
+ bbc:	676f 008a 	asr r3,r1,lr
+ bc0:	0eef 048a 	asr r0,fp,sp
 
 00000bc4 \<asr\>:
- bc4:	926f 248a 	asr.l r12,r12,r12
- bc8:	6def ff8a 	asr.l r59,r59,r59
- bcc:	926f 6d8a 	asr.l r28,r28,r28
- bd0:	6def 6d8a 	asr.l r27,r27,r27
- bd4:	b6ef 248a 	asr.l sp,sp,sp
- bd8:	44ef 858a 	asr.l r34,r9,r25
- bdc:	64ef ca0a 	asr.l r51,r17,r33
- be0:	9def 208a 	asr.l r12,r7,fp
+ bc4:	926f 248a 	asr r12,r12,r12
+ bc8:	6def ff8a 	asr r59,r59,r59
+ bcc:	926f 6d8a 	asr r28,r28,r28
+ bd0:	6def 6d8a 	asr r27,r27,r27
+ bd4:	b6ef 248a 	asr sp,sp,sp
+ bd8:	44ef 858a 	asr r34,r9,r25
+ bdc:	64ef ca0a 	asr r51,r17,r33
+ be0:	9def 208a 	asr r12,r7,fp
 
 00000be4 \<lsr16\>:
- be4:	924f 248a 	lsr.l r12,r12,r12
+ be4:	924f 248a 	lsr r12,r12,r12
  be8:	6dca      	lsr r3,r3,r3
  bea:	004a      	lsr r0,r0,r0
- bec:	6dcf 248a 	lsr.l fp,fp,fp
- bf0:	b6cf 248a 	lsr.l sp,sp,sp
- bf4:	adcf 208a 	lsr.l sp,r3,fp
- bf8:	674f 208a 	lsr.l fp,r1,lr
- bfc:	c94f 200a 	lsr.l lr,r2,r2
+ bec:	6dcf 248a 	lsr fp,fp,fp
+ bf0:	b6cf 248a 	lsr sp,sp,sp
+ bf4:	adcf 208a 	lsr sp,r3,fp
+ bf8:	674f 208a 	lsr fp,r1,lr
+ bfc:	c94f 200a 	lsr lr,r2,r2
 
 00000c00 \<lsr\>:
- c00:	924f 248a 	lsr.l r12,r12,r12
- c04:	6dcf ff8a 	lsr.l r59,r59,r59
- c08:	924f 6d8a 	lsr.l r28,r28,r28
- c0c:	6dcf 6d8a 	lsr.l r27,r27,r27
- c10:	b6cf 248a 	lsr.l sp,sp,sp
- c14:	c5cf 0d0a 	lsr.l r6,r25,r19
- c18:	984f 3a0a 	lsr.l r12,r54,r32
- c1c:	b64f 248a 	lsr.l sp,sp,r12
+ c00:	924f 248a 	lsr r12,r12,r12
+ c04:	6dcf ff8a 	lsr r59,r59,r59
+ c08:	924f 6d8a 	lsr r28,r28,r28
+ c0c:	6dcf 6d8a 	lsr r27,r27,r27
+ c10:	b6cf 248a 	lsr sp,sp,sp
+ c14:	c5cf 0d0a 	lsr r6,r25,r19
+ c18:	984f 3a0a 	lsr r12,r54,r32
+ c1c:	b64f 248a 	lsr sp,sp,r12
 
 00000c20 \<lsl16\>:
- c20:	922f 248a 	lsl.l r12,r12,r12
+ c20:	922f 248a 	lsl r12,r12,r12
  c24:	6daa      	lsl r3,r3,r3
  c26:	002a      	lsl r0,r0,r0
- c28:	6daf 248a 	lsl.l fp,fp,fp
- c2c:	b6af 248a 	lsl.l sp,sp,sp
- c30:	922f 248a 	lsl.l r12,r12,r12
- c34:	c62f 208a 	lsl.l lr,r1,r12
- c38:	d5af 240a 	lsl.l lr,sp,r3
+ c28:	6daf 248a 	lsl fp,fp,fp
+ c2c:	b6af 248a 	lsl sp,sp,sp
+ c30:	922f 248a 	lsl r12,r12,r12
+ c34:	c62f 208a 	lsl lr,r1,r12
+ c38:	d5af 240a 	lsl lr,sp,r3
 
 00000c3c \<lsl\>:
- c3c:	922f 248a 	lsl.l r12,r12,r12
- c40:	6daf ff8a 	lsl.l r59,r59,r59
- c44:	922f 6d8a 	lsl.l r28,r28,r28
- c48:	6daf 6d8a 	lsl.l r27,r27,r27
- c4c:	b6af 248a 	lsl.l sp,sp,sp
- c50:	8faf 948a 	lsl.l r36,r43,r15
- c54:	5eaf 920a 	lsl.l r34,r39,r37
- c58:	e6af 518a 	lsl.l r23,r33,r29
+ c3c:	922f 248a 	lsl r12,r12,r12
+ c40:	6daf ff8a 	lsl r59,r59,r59
+ c44:	922f 6d8a 	lsl r28,r28,r28
+ c48:	6daf 6d8a 	lsl r27,r27,r27
+ c4c:	b6af 248a 	lsl sp,sp,sp
+ c50:	8faf 948a 	lsl r36,r43,r15
+ c54:	5eaf 920a 	lsl r34,r39,r37
+ c58:	e6af 518a 	lsl r23,r33,r29
 
 00000c5c \<addi16\>:
  c5c:	901b 2400 	add r12,r12,0
@@ -1215,64 +1215,64 @@ Disassembly of section .text:
  cd6:	f03b c03d 	sub r55,r4,488
 
 00000cda \<lsri16\>:
- cda:	900f 2406 	lsr.l r12,r12,0x0
+ cda:	900f 2406 	lsr r12,r12,0x0
  cde:	6fe6      	lsr r3,r3,0x1f
  ce0:	0206      	lsr r0,r0,0x10
- ce2:	6def 2406 	lsr.l fp,fp,0xf
- ce6:	b42f 2406 	lsr.l sp,sp,0x1
+ ce2:	6def 2406 	lsr fp,fp,0xf
+ ce6:	b42f 2406 	lsr sp,sp,0x1
  cea:	0cc6      	lsr r0,r3,0x6
  cec:	2906      	lsr r1,r2,0x8
- cee:	79cf 2406 	lsr.l fp,lr,0xe
+ cee:	79cf 2406 	lsr fp,lr,0xe
 
 00000cf2 \<lsri32\>:
- cf2:	900f 2406 	lsr.l r12,r12,0x0
- cf6:	6fef fc06 	lsr.l r59,r59,0x1f
- cfa:	920f 6c06 	lsr.l r28,r28,0x10
- cfe:	6def 6c06 	lsr.l r27,r27,0xf
- d02:	b42f 2406 	lsr.l sp,sp,0x1
- d06:	c26f 7806 	lsr.l r30,r48,0x13
- d0a:	7eef a006 	lsr.l r43,r7,0x17
- d0e:	8b8f 6006 	lsr.l r28,r2,0x1c
+ cf2:	900f 2406 	lsr r12,r12,0x0
+ cf6:	6fef fc06 	lsr r59,r59,0x1f
+ cfa:	920f 6c06 	lsr r28,r28,0x10
+ cfe:	6def 6c06 	lsr r27,r27,0xf
+ d02:	b42f 2406 	lsr sp,sp,0x1
+ d06:	c26f 7806 	lsr r30,r48,0x13
+ d0a:	7eef a006 	lsr r43,r7,0x17
+ d0e:	8b8f 6006 	lsr r28,r2,0x1c
 
 00000d12 \<lsli16\>:
- d12:	901f 2406 	lsl.l r12,r12,0x0
+ d12:	901f 2406 	lsl r12,r12,0x0
  d16:	6ff6      	lsl r3,r3,0x1f
  d18:	0216      	lsl r0,r0,0x10
- d1a:	6dff 2406 	lsl.l fp,fp,0xf
- d1e:	b43f 2406 	lsl.l sp,sp,0x1
+ d1a:	6dff 2406 	lsl fp,fp,0xf
+ d1e:	b43f 2406 	lsl sp,sp,0x1
  d22:	4d76      	lsl r2,r3,0xb
- d24:	c8df 2006 	lsl.l lr,r2,0x6
+ d24:	c8df 2006 	lsl lr,r2,0x6
  d28:	0a16      	lsl r0,r2,0x10
 
 00000d2a \<lsli32\>:
- d2a:	901f 2406 	lsl.l r12,r12,0x0
- d2e:	6fff fc06 	lsl.l r59,r59,0x1f
- d32:	921f 6c06 	lsl.l r28,r28,0x10
- d36:	6dff 6c06 	lsl.l r27,r27,0xf
- d3a:	b43f 2406 	lsl.l sp,sp,0x1
- d3e:	0e7f f806 	lsl.l r56,r51,0x13
- d42:	3e7f 5006 	lsl.l r17,r39,0x13
- d46:	519f 0406 	lsl.l r2,r12,0xc
+ d2a:	901f 2406 	lsl r12,r12,0x0
+ d2e:	6fff fc06 	lsl r59,r59,0x1f
+ d32:	921f 6c06 	lsl r28,r28,0x10
+ d36:	6dff 6c06 	lsl r27,r27,0xf
+ d3a:	b43f 2406 	lsl sp,sp,0x1
+ d3e:	0e7f f806 	lsl r56,r51,0x13
+ d42:	3e7f 5006 	lsl r17,r39,0x13
+ d46:	519f 0406 	lsl r2,r12,0xc
 
 00000d4a \<asri16\>:
- d4a:	900f 240e 	asr.l r12,r12,0x0
+ d4a:	900f 240e 	asr r12,r12,0x0
  d4e:	6fee      	asr r3,r3,0x1f
  d50:	020e      	asr r0,r0,0x10
- d52:	6def 240e 	asr.l fp,fp,0xf
- d56:	b42f 240e 	asr.l sp,sp,0x1
- d5a:	d2af 240e 	asr.l lr,r12,0x15
+ d52:	6def 240e 	asr fp,fp,0xf
+ d56:	b42f 240e 	asr sp,sp,0x1
+ d5a:	d2af 240e 	asr lr,r12,0x15
  d5e:	6ece      	asr r3,r3,0x16
  d60:	6d2e      	asr r3,r3,0x9
 
 00000d62 \<asri32\>:
- d62:	900f 240e 	asr.l r12,r12,0x0
- d66:	6fef fc0e 	asr.l r59,r59,0x1f
- d6a:	920f 6c0e 	asr.l r28,r28,0x10
- d6e:	6def 6c0e 	asr.l r27,r27,0xf
- d72:	b42f 240e 	asr.l sp,sp,0x1
- d76:	9a2f d40e 	asr.l r52,r46,0x11
- d7a:	e2cf 5c0e 	asr.l r23,r56,0x16
- d7e:	bb8f 540e 	asr.l r21,r46,0x1c
+ d62:	900f 240e 	asr r12,r12,0x0
+ d66:	6fef fc0e 	asr r59,r59,0x1f
+ d6a:	920f 6c0e 	asr r28,r28,0x10
+ d6e:	6def 6c0e 	asr r27,r27,0xf
+ d72:	b42f 240e 	asr sp,sp,0x1
+ d76:	9a2f d40e 	asr r52,r46,0x11
+ d7a:	e2cf 5c0e 	asr r23,r56,0x16
+ d7e:	bb8f 540e 	asr r21,r46,0x1c
 
 00000d82 \<mov8\>:
  d82:	800b 2002 	mov r12,0x0
@@ -1295,106 +1295,106 @@ Disassembly of section .text:
  db8:	044b 48e2 	mov r16,0x8e22
 
 00000dbc \<faddf16\>:
- dbc:	920f 2487 	fadd.l r12,r12,r12
+ dbc:	920f 2487 	fadd r12,r12,r12
  dc0:	6d87      	fadd r3,r3,r3
  dc2:	0007      	fadd r0,r0,r0
- dc4:	6d8f 2487 	fadd.l fp,fp,fp
- dc8:	b68f 2487 	fadd.l sp,sp,sp
- dcc:	b10f 2407 	fadd.l sp,r12,r2
- dd0:	a90f 2007 	fadd.l sp,r2,r2
- dd4:	b98f 2487 	fadd.l sp,lr,fp
+ dc4:	6d8f 2487 	fadd fp,fp,fp
+ dc8:	b68f 2487 	fadd sp,sp,sp
+ dcc:	b10f 2407 	fadd sp,r12,r2
+ dd0:	a90f 2007 	fadd sp,r2,r2
+ dd4:	b98f 2487 	fadd sp,lr,fp
 
 00000dd8 \<faddf32\>:
- dd8:	920f 2487 	fadd.l r12,r12,r12
- ddc:	6d8f ff87 	fadd.l r59,r59,r59
- de0:	920f 6d87 	fadd.l r28,r28,r28
- de4:	6d8f 6d87 	fadd.l r27,r27,r27
- de8:	b68f 2487 	fadd.l sp,sp,sp
- dec:	b78f 2e07 	fadd.l sp,r29,r39
- df0:	018f 9407 	fadd.l r32,r40,r3
- df4:	170f ac87 	fadd.l r40,r29,lr
+ dd8:	920f 2487 	fadd r12,r12,r12
+ ddc:	6d8f ff87 	fadd r59,r59,r59
+ de0:	920f 6d87 	fadd r28,r28,r28
+ de4:	6d8f 6d87 	fadd r27,r27,r27
+ de8:	b68f 2487 	fadd sp,sp,sp
+ dec:	b78f 2e07 	fadd sp,r29,r39
+ df0:	018f 9407 	fadd r32,r40,r3
+ df4:	170f ac87 	fadd r40,r29,lr
 
 00000df8 \<fsubf16\>:
- df8:	921f 2487 	fsub.l r12,r12,r12
+ df8:	921f 2487 	fsub r12,r12,r12
  dfc:	6d97      	fsub r3,r3,r3
  dfe:	0017      	fsub r0,r0,r0
- e00:	6d9f 2487 	fsub.l fp,fp,fp
- e04:	b69f 2487 	fsub.l sp,sp,sp
- e08:	5a9f 0487 	fsub.l r2,lr,sp
- e0c:	661f 0087 	fsub.l r3,r1,r12
- e10:	711f 0407 	fsub.l r3,r12,r2
+ e00:	6d9f 2487 	fsub fp,fp,fp
+ e04:	b69f 2487 	fsub sp,sp,sp
+ e08:	5a9f 0487 	fsub r2,lr,sp
+ e0c:	661f 0087 	fsub r3,r1,r12
+ e10:	711f 0407 	fsub r3,r12,r2
 
 00000e14 \<fsubf32\>:
- e14:	921f 2487 	fsub.l r12,r12,r12
- e18:	6d9f ff87 	fsub.l r59,r59,r59
- e1c:	921f 6d87 	fsub.l r28,r28,r28
- e20:	6d9f 6d87 	fsub.l r27,r27,r27
- e24:	b69f 2487 	fsub.l sp,sp,sp
- e28:	219f 1c87 	fsub.l r1,r56,fp
- e2c:	7b9f 0887 	fsub.l r3,r22,r15
- e30:	c29f 1a87 	fsub.l r6,r48,r45
+ e14:	921f 2487 	fsub r12,r12,r12
+ e18:	6d9f ff87 	fsub r59,r59,r59
+ e1c:	921f 6d87 	fsub r28,r28,r28
+ e20:	6d9f 6d87 	fsub r27,r27,r27
+ e24:	b69f 2487 	fsub sp,sp,sp
+ e28:	219f 1c87 	fsub r1,r56,fp
+ e2c:	7b9f 0887 	fsub r3,r22,r15
+ e30:	c29f 1a87 	fsub r6,r48,r45
 
 00000e34 \<fmulf16\>:
- e34:	922f 2487 	fmul.l r12,r12,r12
+ e34:	922f 2487 	fmul r12,r12,r12
  e38:	6da7      	fmul r3,r3,r3
  e3a:	0027      	fmul r0,r0,r0
- e3c:	6daf 2487 	fmul.l fp,fp,fp
- e40:	b6af 2487 	fmul.l sp,sp,sp
- e44:	71af 0487 	fmul.l r3,r12,fp
- e48:	c52f 2007 	fmul.l lr,r1,r2
- e4c:	bb2f 2487 	fmul.l sp,lr,lr
+ e3c:	6daf 2487 	fmul fp,fp,fp
+ e40:	b6af 2487 	fmul sp,sp,sp
+ e44:	71af 0487 	fmul r3,r12,fp
+ e48:	c52f 2007 	fmul lr,r1,r2
+ e4c:	bb2f 2487 	fmul sp,lr,lr
 
 00000e50 \<fmulf32\>:
- e50:	922f 2487 	fmul.l r12,r12,r12
- e54:	6daf ff87 	fmul.l r59,r59,r59
- e58:	922f 6d87 	fmul.l r28,r28,r28
- e5c:	6daf 6d87 	fmul.l r27,r27,r27
- e60:	b6af 2487 	fmul.l sp,sp,sp
- e64:	5daf eb07 	fmul.l r58,r23,r51
- e68:	cbaf 4287 	fmul.l r22,r2,r47
- e6c:	d92f a487 	fmul.l r46,lr,r10
+ e50:	922f 2487 	fmul r12,r12,r12
+ e54:	6daf ff87 	fmul r59,r59,r59
+ e58:	922f 6d87 	fmul r28,r28,r28
+ e5c:	6daf 6d87 	fmul r27,r27,r27
+ e60:	b6af 2487 	fmul sp,sp,sp
+ e64:	5daf eb07 	fmul r58,r23,r51
+ e68:	cbaf 4287 	fmul r22,r2,r47
+ e6c:	d92f a487 	fmul r46,lr,r10
 
 00000e70 \<fmaddf16\>:
- e70:	923f 2487 	fmadd.l r12,r12,r12
+ e70:	923f 2487 	fmadd r12,r12,r12
  e74:	6db7      	fmadd r3,r3,r3
  e76:	0037      	fmadd r0,r0,r0
- e78:	6dbf 2487 	fmadd.l fp,fp,fp
- e7c:	b6bf 2487 	fmadd.l sp,sp,sp
- e80:	a5bf 2007 	fmadd.l sp,r1,r3
+ e78:	6dbf 2487 	fmadd fp,fp,fp
+ e7c:	b6bf 2487 	fmadd sp,sp,sp
+ e80:	a5bf 2007 	fmadd sp,r1,r3
  e84:	6c37      	fmadd r3,r3,r0
- e86:	523f 0487 	fmadd.l r2,r12,r12
+ e86:	523f 0487 	fmadd r2,r12,r12
 
 00000e8a \<fmaddf32\>:
- e8a:	923f 2487 	fmadd.l r12,r12,r12
- e8e:	6dbf ff87 	fmadd.l r59,r59,r59
- e92:	923f 6d87 	fmadd.l r28,r28,r28
- e96:	6dbf 6d87 	fmadd.l r27,r27,r27
- e9a:	b6bf 2487 	fmadd.l sp,sp,sp
- e9e:	983f 7a07 	fmadd.l r28,r54,r32
- ea2:	89bf 2087 	fmadd.l r12,r2,fp
- ea6:	633f 3507 	fmadd.l fp,r40,r22
+ e8a:	923f 2487 	fmadd r12,r12,r12
+ e8e:	6dbf ff87 	fmadd r59,r59,r59
+ e92:	923f 6d87 	fmadd r28,r28,r28
+ e96:	6dbf 6d87 	fmadd r27,r27,r27
+ e9a:	b6bf 2487 	fmadd sp,sp,sp
+ e9e:	983f 7a07 	fmadd r28,r54,r32
+ ea2:	89bf 2087 	fmadd r12,r2,fp
+ ea6:	633f 3507 	fmadd fp,r40,r22
 
 00000eaa \<fmsubf16\>:
- eaa:	924f 2487 	fmsub.l r12,r12,r12
+ eaa:	924f 2487 	fmsub r12,r12,r12
  eae:	6dc7      	fmsub r3,r3,r3
  eb0:	0047      	fmsub r0,r0,r0
- eb2:	6dcf 2487 	fmsub.l fp,fp,fp
- eb6:	b6cf 2487 	fmsub.l sp,sp,sp
- eba:	accf 2407 	fmsub.l sp,fp,r1
- ebe:	2ecf 0487 	fmsub.l r1,fp,sp
+ eb2:	6dcf 2487 	fmsub fp,fp,fp
+ eb6:	b6cf 2487 	fmsub sp,sp,sp
+ eba:	accf 2407 	fmsub sp,fp,r1
+ ebe:	2ecf 0487 	fmsub r1,fp,sp
  ec2:	0c47      	fmsub r0,r3,r0
 
 00000ec4 \<fmsubf32\>:
- ec4:	924f 2487 	fmsub.l r12,r12,r12
- ec8:	6dcf ff87 	fmsub.l r59,r59,r59
- ecc:	924f 6d87 	fmsub.l r28,r28,r28
- ed0:	6dcf 6d87 	fmsub.l r27,r27,r27
- ed4:	b6cf 2487 	fmsub.l sp,sp,sp
- ed8:	50cf a887 	fmsub.l r42,r20,r9
- edc:	c14f 4e87 	fmsub.l r22,r24,r42
- ee0:	f9cf 2907 	fmsub.l r15,r22,r19
- ee4:	2a4c 0101 	ldr.l r1,\[r2,-0xc]
- ee8:	dbbc 4dff 	strh.l r22,\[r30,-0x7ff]
- eec:	9bec 24ff 	ldrd.l r12,\[lr,\+0x7ff]
+ ec4:	924f 2487 	fmsub r12,r12,r12
+ ec8:	6dcf ff87 	fmsub r59,r59,r59
+ ecc:	924f 6d87 	fmsub r28,r28,r28
+ ed0:	6dcf 6d87 	fmsub r27,r27,r27
+ ed4:	b6cf 2487 	fmsub sp,sp,sp
+ ed8:	50cf a887 	fmsub r42,r20,r9
+ edc:	c14f 4e87 	fmsub r22,r24,r42
+ ee0:	f9cf 2907 	fmsub r15,r22,r19
+ ee4:	2a4c 0101 	ldr r1,\[r2,-0xc]
+ ee8:	dbbc 4dff 	strh r22,\[r30,-0x7ff]
+ eec:	9bec 24ff 	ldrd r12,\[lr,\+0x7ff]
  ef0:	201e      	bitr r1,r0
- ef2:	fc1f 640e 	bitr.l r31,r15
+ ef2:	fc1f 640e 	bitr r31,r15
diff --git a/gas/testsuite/gas/epiphany/regression.d b/gas/testsuite/gas/epiphany/regression.d
index 1bb680fc13..c993f23bde 100644
--- a/gas/testsuite/gas/epiphany/regression.d
+++ b/gas/testsuite/gas/epiphany/regression.d
@@ -12,10 +12,10 @@ Disassembly of section \.text:
    4:	0056      	lsl r0,r0,0x2
    6:	c0c3      	mov r6,0x6
    8:	6063      	mov r3,0x3
-   a:	ff1f fc0a 	add.l r63,r63,r6
-   e:	fd1f fc0a 	add.l r63,r63,r2
+   a:	ff1f fc0a 	add r63,r63,r6
+   e:	fd1f fc0a 	add r63,r63,r2
   12:	dc0b e072 	mov r62,0x7e0
-  16:	ff3f ff8a 	sub.l r63,r63,r62
+  16:	ff3f ff8a 	sub r63,r63,r62
   1a:	0300      	beq 20 \<BRANCH1\>
   1c:	0023      	mov r0,0x1
   1e:	0fe2      	trap 0x3
@@ -78,15 +78,15 @@ Disassembly of section \.text:
 0000006e \<NEXT\>:
   6e:	8014      	strb r4,\[r0\]
   70:	e00c e000 	ldrb r63,\[r0\]
-  74:	fe3f fc0a 	sub.l r63,r63,r4
+  74:	fe3f fc0a 	sub r63,r63,r4
   78:	0300      	beq 7e \<STOREB\>
   7a:	0023      	mov r0,0x1
   7c:	0fe2      	trap 0x3
 
 0000007e \<STOREB\>:
-  7e:	a39c 0001 	strb.l r5,\[r0,\+0xf\]
-  82:	e38c e001 	ldrb.l r63,\[r0,\+0xf\]
-  86:	febf fc0a 	sub.l r63,r63,r5
+  7e:	a39c 0001 	strb r5,\[r0,\+0xf\]
+  82:	e38c e001 	ldrb r63,\[r0,\+0xf\]
+  86:	febf fc0a 	sub r63,r63,r5
   8a:	0300      	beq 90 \<STORES\>
   8c:	0023      	mov r0,0x1
   8e:	0fe2      	trap 0x3
@@ -94,15 +94,15 @@ Disassembly of section \.text:
 00000090 \<STORES\>:
   90:	8034      	strh r4,\[r0\]
   92:	e02c e000 	ldrh r63,\[r0\]
-  96:	fe3f fc0a 	sub.l r63,r63,r4
+  96:	fe3f fc0a 	sub r63,r63,r4
   9a:	0300      	beq a0 \<STORES2\>
   9c:	0023      	mov r0,0x1
   9e:	0fe2      	trap 0x3
 
 000000a0 \<STORES2\>:
-  a0:	a33c 0001 	strh.l r5,\[r0,\+0xe\]
-  a4:	e32c e001 	ldrh.l r63,\[r0,\+0xe\]
-  a8:	febf fc0a 	sub.l r63,r63,r5
+  a0:	a33c 0001 	strh r5,\[r0,\+0xe\]
+  a4:	e32c e001 	ldrh r63,\[r0,\+0xe\]
+  a8:	febf fc0a 	sub r63,r63,r5
   ac:	0300      	beq b2 \<STORE\>
   ae:	0023      	mov r0,0x1
   b0:	0fe2      	trap 0x3
@@ -110,39 +110,39 @@ Disassembly of section \.text:
 000000b2 \<STORE\>:
   b2:	8054      	str r4,\[r0\]
   b4:	e04c e000 	ldr r63,\[r0\]
-  b8:	fe3f fc0a 	sub.l r63,r63,r4
+  b8:	fe3f fc0a 	sub r63,r63,r4
   bc:	0300      	beq c2 \<STORE2\>
   be:	0023      	mov r0,0x1
   c0:	0fe2      	trap 0x3
 
 000000c2 \<STORE2\>:
-  c2:	a25c 0001 	str.l r5,\[r0,\+0xc\]
-  c6:	e24c e001 	ldr.l r63,\[r0,\+0xc\]
-  ca:	febf fc0a 	sub.l r63,r63,r5
+  c2:	a25c 0001 	str r5,\[r0,\+0xc\]
+  c6:	e24c e001 	ldr r63,\[r0,\+0xc\]
+  ca:	febf fc0a 	sub r63,r63,r5
   ce:	0300      	beq d4 \<STOREBI\>
   d0:	0023      	mov r0,0x1
   d2:	0fe2      	trap 0x3
 
 000000d4 \<STOREBI\>:
   d4:	8211      	strb r4,\[r0,r4\]
-  d6:	e209 e000 	ldrb.l r63,\[r0,\+r4\]
-  da:	fe3f fc0a 	sub.l r63,r63,r4
+  d6:	e209 e000 	ldrb r63,\[r0,\+r4\]
+  da:	fe3f fc0a 	sub r63,r63,r4
   de:	0300      	beq e4 \<STORESI\>
   e0:	0023      	mov r0,0x1
   e2:	0fe2      	trap 0x3
 
 000000e4 \<STORESI\>:
   e4:	a231      	strh r5,\[r0,r4\]
-  e6:	e229 e000 	ldrh.l r63,\[r0,\+r4\]
-  ea:	febf fc0a 	sub.l r63,r63,r5
+  e6:	e229 e000 	ldrh r63,\[r0,\+r4\]
+  ea:	febf fc0a 	sub r63,r63,r5
   ee:	0300      	beq f4 \<STOREI\>
   f0:	0023      	mov r0,0x1
   f2:	0fe2      	trap 0x3
 
 000000f4 \<STOREI\>:
   f4:	c251      	str r6,\[r0,r4\]
-  f6:	e249 e000 	ldr.l r63,\[r0,\+r4\]
-  fa:	ff3f fc0a 	sub.l r63,r63,r6
+  f6:	e249 e000 	ldr r63,\[r0,\+r4\]
+  fa:	ff3f fc0a 	sub r63,r63,r6
   fe:	0300      	beq 104 \<PMB\>
  100:	0023      	mov r0,0x1
  102:	0fe2      	trap 0x3
@@ -150,9 +150,9 @@ Disassembly of section \.text:
 00000104 \<PMB\>:
  104:	8215      	strb r4,\[r0\],r4
  106:	023b 0000 	sub r0,r0,4
- 10a:	e20d e000 	ldrb.l r63,\[r0\],\+r4
+ 10a:	e20d e000 	ldrb r63,\[r0\],\+r4
  10e:	023b 0000 	sub r0,r0,4
- 112:	fe3f fc0a 	sub.l r63,r63,r4
+ 112:	fe3f fc0a 	sub r63,r63,r4
  116:	0300      	beq 11c \<PMS\>
  118:	0023      	mov r0,0x1
  11a:	0fe2      	trap 0x3
@@ -160,8 +160,8 @@ Disassembly of section \.text:
 0000011c \<PMS\>:
  11c:	a235      	strh r5,\[r0\],r4
  11e:	023b 0000 	sub r0,r0,4
- 122:	e22d e000 	ldrh.l r63,\[r0\],\+r4
- 126:	febf fc0a 	sub.l r63,r63,r5
+ 122:	e22d e000 	ldrh r63,\[r0\],\+r4
+ 126:	febf fc0a 	sub r63,r63,r5
  12a:	0300      	beq 130 \<PM\>
  12c:	0023      	mov r0,0x1
  12e:	0fe2      	trap 0x3
@@ -170,9 +170,9 @@ Disassembly of section \.text:
  130:	023b 0000 	sub r0,r0,4
  134:	c255      	str r6,\[r0\],r4
  136:	023b 0000 	sub r0,r0,4
- 13a:	e24d e000 	ldr.l r63,\[r0\],\+r4
+ 13a:	e24d e000 	ldr r63,\[r0\],\+r4
  13e:	023b 0000 	sub r0,r0,4
- 142:	ff3f fc0a 	sub.l r63,r63,r6
+ 142:	ff3f fc0a 	sub r63,r63,r6
  146:	0300      	beq 14c \<MOVLAB\>
  148:	0023      	mov r0,0x1
  14a:	0fe2      	trap 0x3
@@ -180,7 +180,7 @@ Disassembly of section \.text:
 0000014c \<MOVLAB\>:
  14c:	ffeb e002 	mov r63,0xff
  150:	3fe3      	mov r1,0xff
- 152:	fcbf fc0a 	sub.l r63,r63,r1
+ 152:	fcbf fc0a 	sub r63,r63,r1
  156:	0300      	beq 15c \<ADDLAB\>
  158:	0023      	mov r0,0x1
  15a:	0fe2      	trap 0x3
@@ -200,28 +200,28 @@ Disassembly of section \.text:
  176:	0fe2      	trap 0x3
 
 00000178 \<LSRLAB\>:
- 178:	f84f e006 	lsr.l r63,r6,0x2
+ 178:	f84f e006 	lsr r63,r6,0x2
  17c:	fcbb fc00 	sub r63,r63,1
  180:	0300      	beq 186 \<LSLLAB\>
  182:	0023      	mov r0,0x1
  184:	0fe2      	trap 0x3
 
 00000186 \<LSLLAB\>:
- 186:	ec5f e006 	lsl.l r63,r3,0x2
+ 186:	ec5f e006 	lsl r63,r3,0x2
  18a:	fe3b fc01 	sub r63,r63,12
  18e:	0300      	beq 194 \<LSRILAB\>
  190:	0023      	mov r0,0x1
  192:	0fe2      	trap 0x3
 
 00000194 \<LSRILAB\>:
- 194:	f94f e00a 	lsr.l r63,r6,r2
+ 194:	f94f e00a 	lsr r63,r6,r2
  198:	fcbb fc00 	sub r63,r63,1
  19c:	0300      	beq 1a2 \<LSLILAB\>
  19e:	0023      	mov r0,0x1
  1a0:	0fe2      	trap 0x3
 
 000001a2 \<LSLILAB\>:
- 1a2:	ed2f e00a 	lsl.l r63,r3,r2
+ 1a2:	ed2f e00a 	lsl r63,r3,r2
  1a6:	fe3b fc01 	sub r63,r63,12
  1aa:	0300      	beq 1b0 \<ORRLAB\>
  1ac:	0023      	mov r0,0x1
@@ -249,21 +249,21 @@ Disassembly of section \.text:
  1d2:	0fe2      	trap 0x3
 
 000001d4 \<ADD3LAB\>:
- 1d4:	e99f e00a 	add.l r63,r2,r3
+ 1d4:	e99f e00a 	add r63,r2,r3
  1d8:	febb fc00 	sub r63,r63,5
  1dc:	0300      	beq 1e2 \<SUB3LAB\>
  1de:	0023      	mov r0,0x1
  1e0:	0fe2      	trap 0x3
 
 000001e2 \<SUB3LAB\>:
- 1e2:	fa3f e00a 	sub.l r63,r6,r4
+ 1e2:	fa3f e00a 	sub r63,r6,r4
  1e6:	fd3b fc00 	sub r63,r63,2
  1ea:	0300      	beq 1f0 \<MOVRLAB\>
  1ec:	0023      	mov r0,0x1
  1ee:	0fe2      	trap 0x3
 
 000001f0 \<MOVRLAB\>:
- 1f0:	e8ef e002 	mov.l r63,r2
+ 1f0:	e8ef e002 	mov r63,r2
  1f4:	fd3b fc00 	sub r63,r63,2
  1f8:	0b00      	beq 20e \<NOPLAB\>
  1fa:	0023      	mov r0,0x1
@@ -271,8 +271,8 @@ Disassembly of section \.text:
 
 000001fe \<MOVTFLAB\>:
  1fe:	0502      	movts status,r0
- 200:	e51f e002 	movfs.l r63,status
- 204:	fc3f fc0a 	sub.l r63,r63,r0
+ 200:	e51f e002 	movfs r63,status
+ 204:	fc3f fc0a 	sub r63,r63,r0
  208:	fb00      	beq 1fe \<MOVTFLAB\>
  20a:	0023      	mov r0,0x1
  20c:	0fe2      	trap 0x3
diff --git a/gas/testsuite/gas/epiphany/sample.d b/gas/testsuite/gas/epiphany/sample.d
index 3e534dd178..655f806ae5 100644
--- a/gas/testsuite/gas/epiphany/sample.d
+++ b/gas/testsuite/gas/epiphany/sample.d
@@ -60,128 +60,128 @@ Disassembly of section \.text:
 
 0000002a \<add\>:
   2a:	299a      	add r1,r2,r3
-  2c:	051f 920a 	add.l r32,r33,r34
+  2c:	051f 920a 	add r32,r33,r34
   30:	2993      	add r1,r2,3
   32:	681b 2002 	add fp,r2,16
 
 00000036 \<sub\>:
   36:	29ba      	sub r1,r2,r3
-  38:	053f 920a 	sub.l r32,r33,r34
+  38:	053f 920a 	sub r32,r33,r34
   3c:	29b3      	sub r1,r2,3
   3e:	683b 2002 	sub fp,r2,16
 
 00000042 \<asr\>:
   42:	29ea      	asr r1,r2,r3
-  44:	056f 920a 	asr.l r32,r33,r34
+  44:	056f 920a 	asr r32,r33,r34
   48:	286e      	asr r1,r2,0x3
-  4a:	6a0f 200e 	asr.l fp,r2,0x10
+  4a:	6a0f 200e 	asr fp,r2,0x10
 
 0000004e \<lsr\>:
   4e:	29ca      	lsr r1,r2,r3
-  50:	054f 920a 	lsr.l r32,r33,r34
+  50:	054f 920a 	lsr r32,r33,r34
   54:	2866      	lsr r1,r2,0x3
-  56:	6a0f 2006 	lsr.l fp,r2,0x10
+  56:	6a0f 2006 	lsr fp,r2,0x10
 
 0000005a \<lsl\>:
   5a:	29aa      	lsl r1,r2,r3
-  5c:	052f 920a 	lsl.l r32,r33,r34
+  5c:	052f 920a 	lsl r32,r33,r34
   60:	2876      	lsl r1,r2,0x3
-  62:	6a1f 2006 	lsl.l fp,r2,0x10
+  62:	6a1f 2006 	lsl fp,r2,0x10
 
 00000066 \<orr\>:
   66:	29fa      	orr r1,r2,r3
-  68:	72ff 248a 	orr.l fp,r12,sp
+  68:	72ff 248a 	orr fp,r12,sp
 
 0000006c \<and\>:
   6c:	29da      	and r1,r2,r3
-  6e:	72df 248a 	and.l fp,r12,sp
+  6e:	72df 248a 	and fp,r12,sp
 
 00000072 \<eor\>:
   72:	298a      	eor r1,r2,r3
-  74:	728f 248a 	eor.l fp,r12,sp
+  74:	728f 248a 	eor fp,r12,sp
   78:	0584      	ldrb r0,\[r1,0x3\]
-  7a:	478c 201f 	ldrb.l r10,\[r1,\+0xff\]
+  7a:	478c 201f 	ldrb r10,\[r1,\+0xff\]
   7e:	0501      	ldrb r0,\[r1,r2\]
-  80:	0589 0080 	ldrb.l r0,\[r1,\+fp\]
+  80:	0589 0080 	ldrb r0,\[r1,\+fp\]
   84:	0d05      	ldrb r0,\[r3\],r2
-  86:	528d 2480 	ldrb.l r10,\[r12\],\+sp
+  86:	528d 2480 	ldrb r10,\[r12\],\+sp
   8a:	05a4      	ldrh r0,\[r1,0x3\]
-  8c:	47ac 201f 	ldrh.l r10,\[r1,\+0xff\]
+  8c:	47ac 201f 	ldrh r10,\[r1,\+0xff\]
   90:	0521      	ldrh r0,\[r1,r2\]
-  92:	05a9 0080 	ldrh.l r0,\[r1,\+fp\]
+  92:	05a9 0080 	ldrh r0,\[r1,\+fp\]
   96:	0d25      	ldrh r0,\[r3\],r2
-  98:	52ad 2480 	ldrh.l r10,\[r12\],\+sp
+  98:	52ad 2480 	ldrh r10,\[r12\],\+sp
   9c:	05c4      	ldr r0,\[r1,0x3\]
-  9e:	47cc 201f 	ldr.l r10,\[r1,\+0xff\]
+  9e:	47cc 201f 	ldr r10,\[r1,\+0xff\]
   a2:	0541      	ldr r0,\[r1,r2\]
-  a4:	05c9 0080 	ldr.l r0,\[r1,\+fp\]
+  a4:	05c9 0080 	ldr r0,\[r1,\+fp\]
   a8:	0d45      	ldr r0,\[r3\],r2
-  aa:	52cd 2480 	ldr.l r10,\[r12\],\+sp
+  aa:	52cd 2480 	ldr r10,\[r12\],\+sp
   ae:	05e4      	ldrd r0,\[r1,0x3\]
-  b0:	47ec 201f 	ldrd.l r10,\[r1,\+0xff\]
+  b0:	47ec 201f 	ldrd r10,\[r1,\+0xff\]
   b4:	0561      	ldrd r0,\[r1,r2\]
-  b6:	05e9 0080 	ldrd.l r0,\[r1,\+fp\]
+  b6:	05e9 0080 	ldrd r0,\[r1,\+fp\]
   ba:	0d65      	ldrd r0,\[r3\],r2
-  bc:	52ed 2480 	ldrd.l r10,\[r12\],\+sp
+  bc:	52ed 2480 	ldrd r10,\[r12\],\+sp
   c0:	0594      	strb r0,\[r1,0x3\]
-  c2:	479c 201f 	strb.l r10,\[r1,\+0xff\]
+  c2:	479c 201f 	strb r10,\[r1,\+0xff\]
   c6:	0511      	strb r0,\[r1,r2\]
-  c8:	0599 0080 	strb.l r0,\[r1,\+fp\]
+  c8:	0599 0080 	strb r0,\[r1,\+fp\]
   cc:	0d15      	strb r0,\[r3\],r2
-  ce:	529d 2480 	strb.l r10,\[r12\],\+sp
+  ce:	529d 2480 	strb r10,\[r12\],\+sp
   d2:	05b4      	strh r0,\[r1,0x3\]
-  d4:	47bc 201f 	strh.l r10,\[r1,\+0xff\]
+  d4:	47bc 201f 	strh r10,\[r1,\+0xff\]
   d8:	0531      	strh r0,\[r1,r2\]
-  da:	05b9 0080 	strh.l r0,\[r1,\+fp\]
+  da:	05b9 0080 	strh r0,\[r1,\+fp\]
   de:	0d35      	strh r0,\[r3\],r2
-  e0:	52bd 2480 	strh.l r10,\[r12\],\+sp
+  e0:	52bd 2480 	strh r10,\[r12\],\+sp
   e4:	05d4      	str r0,\[r1,0x3\]
-  e6:	47dc 201f 	str.l r10,\[r1,\+0xff\]
+  e6:	47dc 201f 	str r10,\[r1,\+0xff\]
   ea:	0551      	str r0,\[r1,r2\]
-  ec:	05d9 0080 	str.l r0,\[r1,\+fp\]
+  ec:	05d9 0080 	str r0,\[r1,\+fp\]
   f0:	0d55      	str r0,\[r3\],r2
-  f2:	52dd 2480 	str.l r10,\[r12\],\+sp
+  f2:	52dd 2480 	str r10,\[r12\],\+sp
   f6:	05f4      	strd r0,\[r1,0x3\]
-  f8:	47fc 201f 	strd.l r10,\[r1,\+0xff\]
+  f8:	47fc 201f 	strd r10,\[r1,\+0xff\]
   fc:	0571      	strd r0,\[r1,r2\]
-  fe:	05f9 0080 	strd.l r0,\[r1,\+fp\]
+  fe:	05f9 0080 	strd r0,\[r1,\+fp\]
  102:	0d75      	strd r0,\[r3\],r2
- 104:	52fd 2480 	strd.l r10,\[r12\],\+sp
+ 104:	52fd 2480 	strd r10,\[r12\],\+sp
 
 00000108 \<mov\>:
  108:	dfe3      	mov r6,0xff
  10a:	ffeb 6ff2 	mov r31,0xffff
  10e:	004b 0102 	mov r0,0x1002
  112:	2802      	moveq r1,r2
- 114:	700f 2402 	moveq.l fp,r12
+ 114:	700f 2402 	moveq fp,r12
  118:	2812      	movne r1,r2
- 11a:	701f 2402 	movne.l fp,r12
+ 11a:	701f 2402 	movne fp,r12
  11e:	2822      	movgtu r1,r2
- 120:	702f 2402 	movgtu.l fp,r12
+ 120:	702f 2402 	movgtu fp,r12
  124:	2832      	movgteu r1,r2
- 126:	703f 2402 	movgteu.l fp,r12
+ 126:	703f 2402 	movgteu fp,r12
  12a:	2842      	movlteu r1,r2
- 12c:	704f 2402 	movlteu.l fp,r12
+ 12c:	704f 2402 	movlteu fp,r12
  130:	2852      	movltu r1,r2
- 132:	705f 2402 	movltu.l fp,r12
+ 132:	705f 2402 	movltu fp,r12
  136:	2862      	movgt r1,r2
- 138:	706f 2402 	movgt.l fp,r12
+ 138:	706f 2402 	movgt fp,r12
  13c:	2872      	movgte r1,r2
- 13e:	707f 2402 	movgte.l fp,r12
+ 13e:	707f 2402 	movgte fp,r12
  142:	2882      	movlt r1,r2
- 144:	708f 2402 	movlt.l fp,r12
+ 144:	708f 2402 	movlt fp,r12
  148:	2892      	movlte r1,r2
- 14a:	709f 2402 	movlte.l fp,r12
+ 14a:	709f 2402 	movlte fp,r12
  14e:	28a2      	movbeq r1,r2
- 150:	70af 2402 	movbeq.l fp,r12
+ 150:	70af 2402 	movbeq fp,r12
  154:	28b2      	movbne r1,r2
- 156:	70bf 2402 	movbne.l fp,r12
+ 156:	70bf 2402 	movbne fp,r12
  15a:	28c2      	movblt r1,r2
- 15c:	70cf 2402 	movblt.l fp,r12
+ 15c:	70cf 2402 	movblt fp,r12
  160:	28d2      	movblte r1,r2
- 162:	70df 2402 	movblte.l fp,r12
+ 162:	70df 2402 	movblte fp,r12
  166:	28e2      	mov r1,r2
- 168:	70ef 2402 	mov.l fp,r12
+ 168:	70ef 2402 	mov fp,r12
 
 0000016c \<nop\>:
  16c:	01a2      	nop
@@ -194,27 +194,27 @@ Disassembly of section \.text:
 
 00000172 \<fadd\>:
  172:	2987      	fadd r1,r2,r3
- 174:	728f 2487 	fadd.l fp,r12,sp
+ 174:	728f 2487 	fadd fp,r12,sp
 
 00000178 \<fsub\>:
  178:	2997      	fsub r1,r2,r3
- 17a:	729f 2487 	fsub.l fp,r12,sp
+ 17a:	729f 2487 	fsub fp,r12,sp
 
 0000017e \<fmul\>:
  17e:	29a7      	fmul r1,r2,r3
- 180:	72af 2487 	fmul.l fp,r12,sp
+ 180:	72af 2487 	fmul fp,r12,sp
 
 00000184 \<fmadd\>:
  184:	29b7      	fmadd r1,r2,r3
- 186:	72bf 2487 	fmadd.l fp,r12,sp
+ 186:	72bf 2487 	fmadd fp,r12,sp
 
 0000018a \<fmsub\>:
  18a:	29c7      	fmsub r1,r2,r3
- 18c:	72cf 2487 	fmsub.l fp,r12,sp
+ 18c:	72cf 2487 	fmsub fp,r12,sp
  190:	2102      	movts config,r1
- 192:	e50f 6002 	movts.l status,r31
- 196:	251f 0402 	movfs.l r1,imask
- 19a:	e91f 6002 	movfs.l r31,pc
+ 192:	e50f 6002 	movts status,r31
+ 196:	251f 0402 	movfs r1,imask
+ 19a:	e91f 6002 	movfs r31,pc
 
 0000019e \<trap\>:
  19e:	03e2      	trap 0x0