aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--binutils/testsuite/binutils-all/mips/mips-ase-1.d2
-rw-r--r--binutils/testsuite/binutils-all/mips/mips-xpa-virt-1.d4
-rw-r--r--binutils/testsuite/binutils-all/mips/mips-xpa-virt-2.d4
-rw-r--r--binutils/testsuite/binutils-all/mips/mips-xpa-virt-3.d2
-rw-r--r--binutils/testsuite/binutils-all/mips/mips1-branch-alias.d4
-rw-r--r--binutils/testsuite/binutils-all/mips/mips1-branch-noalias.d4
-rw-r--r--binutils/testsuite/binutils-all/mips/mips16-extend-noinsn.d24
-rw-r--r--binutils/testsuite/binutils-all/mips/mips16-pcrel.d16
-rw-r--r--binutils/testsuite/binutils-all/mips/mips32r6-branch-alias.d4
-rw-r--r--binutils/testsuite/binutils-all/mips/mips32r6-branch-noalias.d4
-rw-r--r--gas/testsuite/gas/mips/interaptiv-mr2@mcu.d112
-rw-r--r--gas/testsuite/gas/mips/mips16-32@mips16-asmacro.d6
-rw-r--r--gas/testsuite/gas/mips/mips16-32@mips16-sub.d436
-rw-r--r--gas/testsuite/gas/mips/mips16-32@mips16e-64-sub.d4
-rw-r--r--gas/testsuite/gas/mips/mips16-32@mips16e-sub.d66
-rw-r--r--gas/testsuite/gas/mips/mips16@save-sub.d68
-rw-r--r--gas/testsuite/gas/mips/mips1@isa-override-1.d16
-rw-r--r--gas/testsuite/gas/mips/mips1@save-sub.d68
-rw-r--r--gas/testsuite/gas/mips/mips2@isa-override-1.d12
-rw-r--r--gas/testsuite/gas/mips/mips32@isa-override-1.d14
-rw-r--r--gas/testsuite/gas/mips/mips32r2@isa-override-1.d14
-rw-r--r--gas/testsuite/gas/mips/set-arch.d208
-rw-r--r--gas/testsuite/gas/mips/tls-o32.d4
-rw-r--r--opcodes/mips-dis.c9
24 files changed, 554 insertions, 551 deletions
diff --git a/binutils/testsuite/binutils-all/mips/mips-ase-1.d b/binutils/testsuite/binutils-all/mips/mips-ase-1.d
index cfcefdd..8d9a1a8 100644
--- a/binutils/testsuite/binutils-all/mips/mips-ase-1.d
+++ b/binutils/testsuite/binutils-all/mips/mips-ase-1.d
@@ -22,7 +22,7 @@ FLAGS 1: .*
FLAGS 2: .*
Disassembly of section \.text:
-[0-9a-f]+ <[^>]*> 7aa2080b 0x7aa2080b
+[0-9a-f]+ <[^>]*> 7aa2080b .word 0x7aa2080b
[0-9a-f]+ <[^>]*> 46c520c0 add\.ps \$f3,\$f4,\$f5
[0-9a-f]+ <[^>]*> 46c83998 addr\.ps \$f6,\$f7,\$f8
\.\.\.
diff --git a/binutils/testsuite/binutils-all/mips/mips-xpa-virt-1.d b/binutils/testsuite/binutils-all/mips/mips-xpa-virt-1.d
index 1fe1c2f..228a9bd 100644
--- a/binutils/testsuite/binutils-all/mips/mips-xpa-virt-1.d
+++ b/binutils/testsuite/binutils-all/mips/mips-xpa-virt-1.d
@@ -8,6 +8,6 @@
Disassembly of section \.text:
[0-9a-f]+ <[^>]*> 40020800 mfc0 v0,c0_random
[0-9a-f]+ <[^>]*> 40420800 cfc0 v0,\$1
-[0-9a-f]+ <[^>]*> 40620800 0x40620800
-[0-9a-f]+ <[^>]*> 40620c00 0x40620c00
+[0-9a-f]+ <[^>]*> 40620800 .word 0x40620800
+[0-9a-f]+ <[^>]*> 40620c00 .word 0x40620c00
\.\.\.
diff --git a/binutils/testsuite/binutils-all/mips/mips-xpa-virt-2.d b/binutils/testsuite/binutils-all/mips/mips-xpa-virt-2.d
index 2be4c8a..b254a29 100644
--- a/binutils/testsuite/binutils-all/mips/mips-xpa-virt-2.d
+++ b/binutils/testsuite/binutils-all/mips/mips-xpa-virt-2.d
@@ -8,6 +8,6 @@
Disassembly of section \.text:
[0-9a-f]+ <[^>]*> 40020800 mfc0 v0,c0_random
[0-9a-f]+ <[^>]*> 40420800 mfhc0 v0,c0_random
-[0-9a-f]+ <[^>]*> 40620800 0x40620800
-[0-9a-f]+ <[^>]*> 40620c00 0x40620c00
+[0-9a-f]+ <[^>]*> 40620800 .word 0x40620800
+[0-9a-f]+ <[^>]*> 40620c00 .word 0x40620c00
\.\.\.
diff --git a/binutils/testsuite/binutils-all/mips/mips-xpa-virt-3.d b/binutils/testsuite/binutils-all/mips/mips-xpa-virt-3.d
index cc4b34c..20c8635 100644
--- a/binutils/testsuite/binutils-all/mips/mips-xpa-virt-3.d
+++ b/binutils/testsuite/binutils-all/mips/mips-xpa-virt-3.d
@@ -9,5 +9,5 @@ Disassembly of section \.text:
[0-9a-f]+ <[^>]*> 40020800 mfc0 v0,c0_random
[0-9a-f]+ <[^>]*> 40420800 cfc0 v0,\$1
[0-9a-f]+ <[^>]*> 40620800 mfgc0 v0,c0_random
-[0-9a-f]+ <[^>]*> 40620c00 0x40620c00
+[0-9a-f]+ <[^>]*> 40620c00 .word 0x40620c00
\.\.\.
diff --git a/binutils/testsuite/binutils-all/mips/mips1-branch-alias.d b/binutils/testsuite/binutils-all/mips/mips1-branch-alias.d
index 467775f..1e6305c 100644
--- a/binutils/testsuite/binutils-all/mips/mips1-branch-alias.d
+++ b/binutils/testsuite/binutils-all/mips/mips1-branch-alias.d
@@ -12,6 +12,6 @@ Disassembly of section \.text:
[0-9a-f]+ <[^>]*> 04100000 bltzal zero,[0-9a-f]+ <[^>]*>
[0-9a-f]+ <[^>]*> 10200000 beqz at,[0-9a-f]+ <[^>]*>
[0-9a-f]+ <[^>]*> 14200000 bnez at,[0-9a-f]+ <[^>]*>
-[0-9a-f]+ <[^>]*> 50200000 0x50200000
-[0-9a-f]+ <[^>]*> 54200000 0x54200000
+[0-9a-f]+ <[^>]*> 50200000 .word 0x50200000
+[0-9a-f]+ <[^>]*> 54200000 .word 0x54200000
\.\.\.
diff --git a/binutils/testsuite/binutils-all/mips/mips1-branch-noalias.d b/binutils/testsuite/binutils-all/mips/mips1-branch-noalias.d
index b3fa8a0..6cc62e6 100644
--- a/binutils/testsuite/binutils-all/mips/mips1-branch-noalias.d
+++ b/binutils/testsuite/binutils-all/mips/mips1-branch-noalias.d
@@ -12,6 +12,6 @@ Disassembly of section \.text:
[0-9a-f]+ <[^>]*> 04100000 bltzal zero,[0-9a-f]+ <[^>]*>
[0-9a-f]+ <[^>]*> 10200000 beq at,zero,[0-9a-f]+ <[^>]*>
[0-9a-f]+ <[^>]*> 14200000 bne at,zero,[0-9a-f]+ <[^>]*>
-[0-9a-f]+ <[^>]*> 50200000 0x50200000
-[0-9a-f]+ <[^>]*> 54200000 0x54200000
+[0-9a-f]+ <[^>]*> 50200000 .word 0x50200000
+[0-9a-f]+ <[^>]*> 54200000 .word 0x54200000
\.\.\.
diff --git a/binutils/testsuite/binutils-all/mips/mips16-extend-noinsn.d b/binutils/testsuite/binutils-all/mips/mips16-extend-noinsn.d
index 5200efe..41bb49e 100644
--- a/binutils/testsuite/binutils-all/mips/mips16-extend-noinsn.d
+++ b/binutils/testsuite/binutils-all/mips/mips16-extend-noinsn.d
@@ -17,22 +17,22 @@ Disassembly of section \.text:
[0-9a-f]+ <[^>]*> 1c00 0000 jalx 00000000 <foo>
[0-9a-f]+ <[^>]*> 6500 nop
[0-9a-f]+ <[^>]*> f123 extend 0x123
-[0-9a-f]+ <[^>]*> 6621 0x6621
+[0-9a-f]+ <[^>]*> 6621 .short 0x6621
[0-9a-f]+ <[^>]*> f456 extend 0x456
-[0-9a-f]+ <[^>]*> e935 0xe935
+[0-9a-f]+ <[^>]*> e935 .short 0xe935
[0-9a-f]+ <[^>]*> f765 extend 0x765
-[0-9a-f]+ <[^>]*> ea60 0xea60
+[0-9a-f]+ <[^>]*> ea60 .short 0xea60
[0-9a-f]+ <[^>]*> f432 extend 0x432
-[0-9a-f]+ <[^>]*> ece0 0xece0
+[0-9a-f]+ <[^>]*> ece0 .short 0xece0
[0-9a-f]+ <[^>]*> f5aa extend 0x5aa
-[0-9a-f]+ <[^>]*> e971 0xe971
+[0-9a-f]+ <[^>]*> e971 .short 0xe971
[0-9a-f]+ <[^>]*> f655 extend 0x655
-[0-9a-f]+ <[^>]*> ebf1 0xebf1
-[0-9a-f]+ <[^>]*> 6621 0x6621
-[0-9a-f]+ <[^>]*> e935 0xe935
-[0-9a-f]+ <[^>]*> ea60 0xea60
-[0-9a-f]+ <[^>]*> ece0 0xece0
-[0-9a-f]+ <[^>]*> e971 0xe971
-[0-9a-f]+ <[^>]*> ebf1 0xebf1
+[0-9a-f]+ <[^>]*> ebf1 .short 0xebf1
+[0-9a-f]+ <[^>]*> 6621 .short 0x6621
+[0-9a-f]+ <[^>]*> e935 .short 0xe935
+[0-9a-f]+ <[^>]*> ea60 .short 0xea60
+[0-9a-f]+ <[^>]*> ece0 .short 0xece0
+[0-9a-f]+ <[^>]*> e971 .short 0xe971
+[0-9a-f]+ <[^>]*> ebf1 .short 0xebf1
[0-9a-f]+ <[^>]*> 6500 nop
\.\.\.
diff --git a/binutils/testsuite/binutils-all/mips/mips16-pcrel.d b/binutils/testsuite/binutils-all/mips/mips16-pcrel.d
index 9ce5cb3..898f2f5 100644
--- a/binutils/testsuite/binutils-all/mips/mips16-pcrel.d
+++ b/binutils/testsuite/binutils-all/mips/mips16-pcrel.d
@@ -108,21 +108,21 @@ Disassembly of section \.text:
00005020 <[^>]*> fcbf ld a1,00005110 <foo5\+0x110>
\.\.\.
00006000 <[^>]*> 6500 nop
-00006002 <[^>]*> e860 0xe860
+00006002 <[^>]*> e860 .short 0xe860
00006004 <[^>]*> 0aff la v0,00006400 <foo6\+0x400>
00006006 <[^>]*> 6500 nop
00006008 <[^>]*> 6500 nop
-0000600a <[^>]*> e860 0xe860
+0000600a <[^>]*> e860 .short 0xe860
0000600c <[^>]*> b3ff lw v1,00006408 <foo6\+0x408>
0000600e <[^>]*> 6500 nop
00006010 <[^>]*> 6500 nop
-00006012 <[^>]*> e860 0xe860
+00006012 <[^>]*> e860 .short 0xe860
00006014 <[^>]*> fe9f dla a0,00006090 <foo6\+0x90>
00006016 <[^>]*> 6500 nop
00006018 <[^>]*> 6500 nop
0000601a <[^>]*> 6500 nop
0000601c <[^>]*> 6500 nop
-0000601e <[^>]*> e860 0xe860
+0000601e <[^>]*> e860 .short 0xe860
00006020 <[^>]*> fcbf ld a1,00006118 <foo6\+0x118>
\.\.\.
00007000 <[^>]*> 6500 nop
@@ -180,20 +180,20 @@ Disassembly of section \.text:
00009020 <[^>]*> fcbf ld a1,00009118 <foo9\+0x118>
\.\.\.
0000a000 <[^>]*> 6500 nop
-0000a002 <[^>]*> e960 0xe960
+0000a002 <[^>]*> e960 .short 0xe960
0000a004 <[^>]*> 0aff la v0,0000a400 <fooa\+0x400>
0000a006 <[^>]*> 6500 nop
0000a008 <[^>]*> 6500 nop
-0000a00a <[^>]*> e960 0xe960
+0000a00a <[^>]*> e960 .short 0xe960
0000a00c <[^>]*> b3ff lw v1,0000a408 <fooa\+0x408>
0000a00e <[^>]*> 6500 nop
0000a010 <[^>]*> 6500 nop
-0000a012 <[^>]*> e960 0xe960
+0000a012 <[^>]*> e960 .short 0xe960
0000a014 <[^>]*> fe9f dla a0,0000a090 <fooa\+0x90>
0000a016 <[^>]*> 6500 nop
0000a018 <[^>]*> 6500 nop
0000a01a <[^>]*> 6500 nop
0000a01c <[^>]*> 6500 nop
-0000a01e <[^>]*> e960 0xe960
+0000a01e <[^>]*> e960 .short 0xe960
0000a020 <[^>]*> fcbf ld a1,0000a118 <fooa\+0x118>
\.\.\.
diff --git a/binutils/testsuite/binutils-all/mips/mips32r6-branch-alias.d b/binutils/testsuite/binutils-all/mips/mips32r6-branch-alias.d
index aebbb26..002cdf8 100644
--- a/binutils/testsuite/binutils-all/mips/mips32r6-branch-alias.d
+++ b/binutils/testsuite/binutils-all/mips/mips32r6-branch-alias.d
@@ -12,6 +12,6 @@ Disassembly of section \.text:
[0-9a-f]+ <[^>]*> 04100000 nal
[0-9a-f]+ <[^>]*> 10200000 beqz at,[0-9a-f]+ <[^>]*>
[0-9a-f]+ <[^>]*> 14200000 bnez at,[0-9a-f]+ <[^>]*>
-[0-9a-f]+ <[^>]*> 50200000 0x50200000
-[0-9a-f]+ <[^>]*> 54200000 0x54200000
+[0-9a-f]+ <[^>]*> 50200000 .word 0x50200000
+[0-9a-f]+ <[^>]*> 54200000 .word 0x54200000
\.\.\.
diff --git a/binutils/testsuite/binutils-all/mips/mips32r6-branch-noalias.d b/binutils/testsuite/binutils-all/mips/mips32r6-branch-noalias.d
index d7d512f..b219b01 100644
--- a/binutils/testsuite/binutils-all/mips/mips32r6-branch-noalias.d
+++ b/binutils/testsuite/binutils-all/mips/mips32r6-branch-noalias.d
@@ -12,6 +12,6 @@ Disassembly of section \.text:
[0-9a-f]+ <[^>]*> 04100000 nal
[0-9a-f]+ <[^>]*> 10200000 beq at,zero,[0-9a-f]+ <[^>]*>
[0-9a-f]+ <[^>]*> 14200000 bne at,zero,[0-9a-f]+ <[^>]*>
-[0-9a-f]+ <[^>]*> 50200000 0x50200000
-[0-9a-f]+ <[^>]*> 54200000 0x54200000
+[0-9a-f]+ <[^>]*> 50200000 .word 0x50200000
+[0-9a-f]+ <[^>]*> 54200000 .word 0x54200000
\.\.\.
diff --git a/gas/testsuite/gas/mips/interaptiv-mr2@mcu.d b/gas/testsuite/gas/mips/interaptiv-mr2@mcu.d
index 143bbf0..651bb5f 100644
--- a/gas/testsuite/gas/mips/interaptiv-mr2@mcu.d
+++ b/gas/testsuite/gas/mips/interaptiv-mr2@mcu.d
@@ -9,102 +9,102 @@ Disassembly of section \.text:
[0-9a-f]+ <foo>:
[ 0-9a-f]+: 42000038 c0 0x38
-[ 0-9a-f]+: 04070000 0x4070000
-[ 0-9a-f]+: 04070000 0x4070000
-[ 0-9a-f]+: 04070000 0x4070000
-[ 0-9a-f]+: 04071000 0x4071000
-[ 0-9a-f]+: 04072000 0x4072000
-[ 0-9a-f]+: 04073000 0x4073000
-[ 0-9a-f]+: 04074000 0x4074000
-[ 0-9a-f]+: 04075000 0x4075000
-[ 0-9a-f]+: 04076000 0x4076000
-[ 0-9a-f]+: 04077000 0x4077000
-[ 0-9a-f]+: 04477000 0x4477000
-[ 0-9a-f]+: 07e77000 0x7e77000
-[ 0-9a-f]+: 07e777ff 0x7e777ff
-[ 0-9a-f]+: 07e77800 0x7e77800
+[ 0-9a-f]+: 04070000 .word 0x4070000
+[ 0-9a-f]+: 04070000 .word 0x4070000
+[ 0-9a-f]+: 04070000 .word 0x4070000
+[ 0-9a-f]+: 04071000 .word 0x4071000
+[ 0-9a-f]+: 04072000 .word 0x4072000
+[ 0-9a-f]+: 04073000 .word 0x4073000
+[ 0-9a-f]+: 04074000 .word 0x4074000
+[ 0-9a-f]+: 04075000 .word 0x4075000
+[ 0-9a-f]+: 04076000 .word 0x4076000
+[ 0-9a-f]+: 04077000 .word 0x4077000
+[ 0-9a-f]+: 04477000 .word 0x4477000
+[ 0-9a-f]+: 07e77000 .word 0x7e77000
+[ 0-9a-f]+: 07e777ff .word 0x7e777ff
+[ 0-9a-f]+: 07e77800 .word 0x7e77800
[ 0-9a-f]+: 27e10800 addiu at,ra,2048
-[ 0-9a-f]+: 04277000 0x4277000
+[ 0-9a-f]+: 04277000 .word 0x4277000
[ 0-9a-f]+: 27e1f7ff addiu at,ra,-2049
-[ 0-9a-f]+: 04277000 0x4277000
+[ 0-9a-f]+: 04277000 .word 0x4277000
[ 0-9a-f]+: 27e17fff addiu at,ra,32767
-[ 0-9a-f]+: 04277000 0x4277000
+[ 0-9a-f]+: 04277000 .word 0x4277000
[ 0-9a-f]+: 27e18000 addiu at,ra,-32768
-[ 0-9a-f]+: 04277000 0x4277000
+[ 0-9a-f]+: 04277000 .word 0x4277000
[ 0-9a-f]+: 3c010001 lui at,0x1
[ 0-9a-f]+: 00240821 addu at,at,a0
-[ 0-9a-f]+: 04277fff 0x4277fff
+[ 0-9a-f]+: 04277fff .word 0x4277fff
[ 0-9a-f]+: 3c010001 lui at,0x1
[ 0-9a-f]+: 00240821 addu at,at,a0
-[ 0-9a-f]+: 04277000 0x4277000
+[ 0-9a-f]+: 04277000 .word 0x4277000
[ 0-9a-f]+: 3c01ffff lui at,0xffff
[ 0-9a-f]+: 00240821 addu at,at,a0
-[ 0-9a-f]+: 04277000 0x4277000
+[ 0-9a-f]+: 04277000 .word 0x4277000
[ 0-9a-f]+: 24818000 addiu at,a0,-32768
-[ 0-9a-f]+: 04277000 0x4277000
+[ 0-9a-f]+: 04277000 .word 0x4277000
[ 0-9a-f]+: 3c01ffff lui at,0xffff
[ 0-9a-f]+: 00240821 addu at,at,a0
-[ 0-9a-f]+: 04277001 0x4277001
+[ 0-9a-f]+: 04277001 .word 0x4277001
[ 0-9a-f]+: 24818001 addiu at,a0,-32767
-[ 0-9a-f]+: 04277000 0x4277000
+[ 0-9a-f]+: 04277000 .word 0x4277000
[ 0-9a-f]+: 3c01f000 lui at,0xf000
[ 0-9a-f]+: 00240821 addu at,at,a0
-[ 0-9a-f]+: 04277000 0x4277000
-[ 0-9a-f]+: 04877fff 0x4877fff
+[ 0-9a-f]+: 04277000 .word 0x4277000
+[ 0-9a-f]+: 04877fff .word 0x4877fff
[ 0-9a-f]+: 3c011234 lui at,0x1234
[ 0-9a-f]+: 34215000 ori at,at,0x5000
[ 0-9a-f]+: 00240821 addu at,at,a0
-[ 0-9a-f]+: 04277678 0x4277678
+[ 0-9a-f]+: 04277678 .word 0x4277678
[ 0-9a-f]+: 24610000 addiu at,v1,0
[ ]*[0-9a-f]+: R_MIPS_LO16 foo
-[ 0-9a-f]+: 04271000 0x4271000
+[ 0-9a-f]+: 04271000 .word 0x4271000
[ 0-9a-f]+: 24610000 addiu at,v1,0
[ ]*[0-9a-f]+: R_MIPS_LO16 foo
-[ 0-9a-f]+: 04279000 0x4279000
-[ 0-9a-f]+: 04078000 0x4078000
-[ 0-9a-f]+: 04078000 0x4078000
-[ 0-9a-f]+: 04078000 0x4078000
-[ 0-9a-f]+: 04079000 0x4079000
-[ 0-9a-f]+: 0407a000 0x407a000
-[ 0-9a-f]+: 0407b000 0x407b000
-[ 0-9a-f]+: 0407c000 0x407c000
-[ 0-9a-f]+: 0407d000 0x407d000
-[ 0-9a-f]+: 0407e000 0x407e000
-[ 0-9a-f]+: 0407f000 0x407f000
-[ 0-9a-f]+: 0447f000 0x447f000
-[ 0-9a-f]+: 07e7f000 0x7e7f000
-[ 0-9a-f]+: 07e7f7ff 0x7e7f7ff
-[ 0-9a-f]+: 07e7f800 0x7e7f800
+[ 0-9a-f]+: 04279000 .word 0x4279000
+[ 0-9a-f]+: 04078000 .word 0x4078000
+[ 0-9a-f]+: 04078000 .word 0x4078000
+[ 0-9a-f]+: 04078000 .word 0x4078000
+[ 0-9a-f]+: 04079000 .word 0x4079000
+[ 0-9a-f]+: 0407a000 .word 0x407a000
+[ 0-9a-f]+: 0407b000 .word 0x407b000
+[ 0-9a-f]+: 0407c000 .word 0x407c000
+[ 0-9a-f]+: 0407d000 .word 0x407d000
+[ 0-9a-f]+: 0407e000 .word 0x407e000
+[ 0-9a-f]+: 0407f000 .word 0x407f000
+[ 0-9a-f]+: 0447f000 .word 0x447f000
+[ 0-9a-f]+: 07e7f000 .word 0x7e7f000
+[ 0-9a-f]+: 07e7f7ff .word 0x7e7f7ff
+[ 0-9a-f]+: 07e7f800 .word 0x7e7f800
[ 0-9a-f]+: 27e10800 addiu at,ra,2048
-[ 0-9a-f]+: 0427f000 0x427f000
+[ 0-9a-f]+: 0427f000 .word 0x427f000
[ 0-9a-f]+: 27e1f7ff addiu at,ra,-2049
-[ 0-9a-f]+: 0427f000 0x427f000
+[ 0-9a-f]+: 0427f000 .word 0x427f000
[ 0-9a-f]+: 27e17fff addiu at,ra,32767
-[ 0-9a-f]+: 0427f000 0x427f000
+[ 0-9a-f]+: 0427f000 .word 0x427f000
[ 0-9a-f]+: 27e18000 addiu at,ra,-32768
-[ 0-9a-f]+: 0427f000 0x427f000
+[ 0-9a-f]+: 0427f000 .word 0x427f000
[ 0-9a-f]+: 3c010001 lui at,0x1
[ 0-9a-f]+: 00240821 addu at,at,a0
-[ 0-9a-f]+: 0427ffff 0x427ffff
+[ 0-9a-f]+: 0427ffff .word 0x427ffff
[ 0-9a-f]+: 3c010001 lui at,0x1
[ 0-9a-f]+: 00240821 addu at,at,a0
-[ 0-9a-f]+: 0427f000 0x427f000
+[ 0-9a-f]+: 0427f000 .word 0x427f000
[ 0-9a-f]+: 3c01ffff lui at,0xffff
[ 0-9a-f]+: 00240821 addu at,at,a0
-[ 0-9a-f]+: 0427f000 0x427f000
+[ 0-9a-f]+: 0427f000 .word 0x427f000
[ 0-9a-f]+: 24818000 addiu at,a0,-32768
-[ 0-9a-f]+: 0427f000 0x427f000
+[ 0-9a-f]+: 0427f000 .word 0x427f000
[ 0-9a-f]+: 3c01ffff lui at,0xffff
[ 0-9a-f]+: 00240821 addu at,at,a0
-[ 0-9a-f]+: 0427f001 0x427f001
+[ 0-9a-f]+: 0427f001 .word 0x427f001
[ 0-9a-f]+: 24818001 addiu at,a0,-32767
-[ 0-9a-f]+: 0427f000 0x427f000
+[ 0-9a-f]+: 0427f000 .word 0x427f000
[ 0-9a-f]+: 3c01f000 lui at,0xf000
[ 0-9a-f]+: 00240821 addu at,at,a0
-[ 0-9a-f]+: 0427f000 0x427f000
-[ 0-9a-f]+: 0487ffff 0x487ffff
+[ 0-9a-f]+: 0427f000 .word 0x427f000
+[ 0-9a-f]+: 0487ffff .word 0x487ffff
[ 0-9a-f]+: 3c011234 lui at,0x1234
[ 0-9a-f]+: 34215000 ori at,at,0x5000
[ 0-9a-f]+: 00240821 addu at,at,a0
-[ 0-9a-f]+: 0427f678 0x427f678
+[ 0-9a-f]+: 0427f678 .word 0x427f678
\.\.\.
diff --git a/gas/testsuite/gas/mips/mips16-32@mips16-asmacro.d b/gas/testsuite/gas/mips/mips16-32@mips16-asmacro.d
index 7842b08..98f707b 100644
--- a/gas/testsuite/gas/mips/mips16-32@mips16-asmacro.d
+++ b/gas/testsuite/gas/mips/mips16-32@mips16-asmacro.d
@@ -6,15 +6,15 @@
Disassembly of section \.text:
[0-9a-f]+ <[^>]*> f000 extend 0x0
-[0-9a-f]+ <[^>]*> e000 0xe000
+[0-9a-f]+ <[^>]*> e000 .short 0xe000
[0-9a-f]+ <[^>]*> f0a4 extend 0xa4
[0-9a-f]+ <[^>]*> e341 addu s0,v1,v0
[0-9a-f]+ <[^>]*> f0e0 extend 0xe0
[0-9a-f]+ <[^>]*> e71f subu a3,s0
[0-9a-f]+ <[^>]*> f501 extend 0x501
-[0-9a-f]+ <[^>]*> e264 0xe264
+[0-9a-f]+ <[^>]*> e264 .short 0xe264
[0-9a-f]+ <[^>]*> f71f extend 0x71f
-[0-9a-f]+ <[^>]*> e0e0 0xe0e0
+[0-9a-f]+ <[^>]*> e0e0 .short 0xe0e0
[0-9a-f]+ <[^>]*> f7ff extend 0x7ff
[0-9a-f]+ <[^>]*> e7ff subu a3,a3
\.\.\.
diff --git a/gas/testsuite/gas/mips/mips16-32@mips16-sub.d b/gas/testsuite/gas/mips/mips16-32@mips16-sub.d
index 1ecdfbb..99874da 100644
--- a/gas/testsuite/gas/mips/mips16-32@mips16-sub.d
+++ b/gas/testsuite/gas/mips/mips16-32@mips16-sub.d
@@ -7,158 +7,158 @@
Disassembly of section \.text:
[0-9a-f]+ <[^>]*> 00000000 nop
-[0-9a-f]+ <[^>]*> 3b40 0x3b40
+[0-9a-f]+ <[^>]*> 3b40 .short 0x3b40
[0-9a-f]+ <[^>]*> f000 extend 0x0
-[0-9a-f]+ <[^>]*> 3b41 0x3b41
+[0-9a-f]+ <[^>]*> 3b41 .short 0x3b41
[0-9a-f]+ <[^>]*> f000 extend 0x0
-[0-9a-f]+ <[^>]*> 3b42 0x3b42
+[0-9a-f]+ <[^>]*> 3b42 .short 0x3b42
[0-9a-f]+ <[^>]*> f000 extend 0x0
-[0-9a-f]+ <[^>]*> 3b43 0x3b43
+[0-9a-f]+ <[^>]*> 3b43 .short 0x3b43
[0-9a-f]+ <[^>]*> f000 extend 0x0
-[0-9a-f]+ <[^>]*> 3b44 0x3b44
-[0-9a-f]+ <[^>]*> 3b41 0x3b41
-[0-9a-f]+ <[^>]*> 3b42 0x3b42
-[0-9a-f]+ <[^>]*> 3b44 0x3b44
-[0-9a-f]+ <[^>]*> 3b48 0x3b48
-[0-9a-f]+ <[^>]*> 3b50 0x3b50
+[0-9a-f]+ <[^>]*> 3b44 .short 0x3b44
+[0-9a-f]+ <[^>]*> 3b41 .short 0x3b41
+[0-9a-f]+ <[^>]*> 3b42 .short 0x3b42
+[0-9a-f]+ <[^>]*> 3b44 .short 0x3b44
+[0-9a-f]+ <[^>]*> 3b48 .short 0x3b48
+[0-9a-f]+ <[^>]*> 3b50 .short 0x3b50
[0-9a-f]+ <[^>]*> f100 extend 0x100
-[0-9a-f]+ <[^>]*> 3b40 0x3b40
+[0-9a-f]+ <[^>]*> 3b40 .short 0x3b40
[0-9a-f]+ <[^>]*> f200 extend 0x200
-[0-9a-f]+ <[^>]*> 3b40 0x3b40
+[0-9a-f]+ <[^>]*> 3b40 .short 0x3b40
[0-9a-f]+ <[^>]*> f400 extend 0x400
-[0-9a-f]+ <[^>]*> 3b40 0x3b40
+[0-9a-f]+ <[^>]*> 3b40 .short 0x3b40
[0-9a-f]+ <[^>]*> f001 extend 0x1
-[0-9a-f]+ <[^>]*> 3b40 0x3b40
+[0-9a-f]+ <[^>]*> 3b40 .short 0x3b40
[0-9a-f]+ <[^>]*> f7ff extend 0x7ff
-[0-9a-f]+ <[^>]*> 3b5f 0x3b5f
+[0-9a-f]+ <[^>]*> 3b5f .short 0x3b5f
[0-9a-f]+ <[^>]*> f7ff extend 0x7ff
-[0-9a-f]+ <[^>]*> 3b5e 0x3b5e
+[0-9a-f]+ <[^>]*> 3b5e .short 0x3b5e
[0-9a-f]+ <[^>]*> f7ff extend 0x7ff
-[0-9a-f]+ <[^>]*> 3b5d 0x3b5d
+[0-9a-f]+ <[^>]*> 3b5d .short 0x3b5d
[0-9a-f]+ <[^>]*> f7ff extend 0x7ff
-[0-9a-f]+ <[^>]*> 3b5c 0x3b5c
+[0-9a-f]+ <[^>]*> 3b5c .short 0x3b5c
[0-9a-f]+ <[^>]*> f7ff extend 0x7ff
-[0-9a-f]+ <[^>]*> 3b58 0x3b58
+[0-9a-f]+ <[^>]*> 3b58 .short 0x3b58
[0-9a-f]+ <[^>]*> f7ff extend 0x7ff
-[0-9a-f]+ <[^>]*> 3b50 0x3b50
+[0-9a-f]+ <[^>]*> 3b50 .short 0x3b50
[0-9a-f]+ <[^>]*> f7ff extend 0x7ff
-[0-9a-f]+ <[^>]*> 3b40 0x3b40
+[0-9a-f]+ <[^>]*> 3b40 .short 0x3b40
[0-9a-f]+ <[^>]*> f7df extend 0x7df
-[0-9a-f]+ <[^>]*> 3b40 0x3b40
+[0-9a-f]+ <[^>]*> 3b40 .short 0x3b40
[0-9a-f]+ <[^>]*> f79f extend 0x79f
-[0-9a-f]+ <[^>]*> 3b40 0x3b40
+[0-9a-f]+ <[^>]*> 3b40 .short 0x3b40
[0-9a-f]+ <[^>]*> f71f extend 0x71f
-[0-9a-f]+ <[^>]*> 3b40 0x3b40
+[0-9a-f]+ <[^>]*> 3b40 .short 0x3b40
[0-9a-f]+ <[^>]*> f61f extend 0x61f
-[0-9a-f]+ <[^>]*> 3b40 0x3b40
+[0-9a-f]+ <[^>]*> 3b40 .short 0x3b40
[0-9a-f]+ <[^>]*> f41f extend 0x41f
-[0-9a-f]+ <[^>]*> 3b40 0x3b40
+[0-9a-f]+ <[^>]*> 3b40 .short 0x3b40
[0-9a-f]+ <[^>]*> f01f extend 0x1f
-[0-9a-f]+ <[^>]*> 3b40 0x3b40
+[0-9a-f]+ <[^>]*> 3b40 .short 0x3b40
[0-9a-f]+ <[^>]*> f7bf extend 0x7bf
-[0-9a-f]+ <[^>]*> fc40 0xfc40
+[0-9a-f]+ <[^>]*> fc40 .short 0xfc40
[0-9a-f]+ <[^>]*> f6a0 extend 0x6a0
-[0-9a-f]+ <[^>]*> fc54 0xfc54
+[0-9a-f]+ <[^>]*> fc54 .short 0xfc54
[0-9a-f]+ <[^>]*> f001 extend 0x1
-[0-9a-f]+ <[^>]*> fc40 0xfc40
+[0-9a-f]+ <[^>]*> fc40 .short 0xfc40
[0-9a-f]+ <[^>]*> f0c1 extend 0xc1
-[0-9a-f]+ <[^>]*> fc40 0xfc40
-[0-9a-f]+ <[^>]*> f840 0xf840
+[0-9a-f]+ <[^>]*> fc40 .short 0xfc40
+[0-9a-f]+ <[^>]*> f840 .short 0xf840
[0-9a-f]+ <[^>]*> f000 extend 0x0
-[0-9a-f]+ <[^>]*> f841 0xf841
+[0-9a-f]+ <[^>]*> f841 .short 0xf841
[0-9a-f]+ <[^>]*> f000 extend 0x0
-[0-9a-f]+ <[^>]*> f842 0xf842
+[0-9a-f]+ <[^>]*> f842 .short 0xf842
[0-9a-f]+ <[^>]*> f000 extend 0x0
-[0-9a-f]+ <[^>]*> f843 0xf843
+[0-9a-f]+ <[^>]*> f843 .short 0xf843
[0-9a-f]+ <[^>]*> f000 extend 0x0
-[0-9a-f]+ <[^>]*> f844 0xf844
-[0-9a-f]+ <[^>]*> f841 0xf841
-[0-9a-f]+ <[^>]*> f842 0xf842
-[0-9a-f]+ <[^>]*> f844 0xf844
-[0-9a-f]+ <[^>]*> f848 0xf848
-[0-9a-f]+ <[^>]*> f850 0xf850
+[0-9a-f]+ <[^>]*> f844 .short 0xf844
+[0-9a-f]+ <[^>]*> f841 .short 0xf841
+[0-9a-f]+ <[^>]*> f842 .short 0xf842
+[0-9a-f]+ <[^>]*> f844 .short 0xf844
+[0-9a-f]+ <[^>]*> f848 .short 0xf848
+[0-9a-f]+ <[^>]*> f850 .short 0xf850
[0-9a-f]+ <[^>]*> f100 extend 0x100
-[0-9a-f]+ <[^>]*> f840 0xf840
+[0-9a-f]+ <[^>]*> f840 .short 0xf840
[0-9a-f]+ <[^>]*> f200 extend 0x200
-[0-9a-f]+ <[^>]*> f840 0xf840
+[0-9a-f]+ <[^>]*> f840 .short 0xf840
[0-9a-f]+ <[^>]*> f400 extend 0x400
-[0-9a-f]+ <[^>]*> f840 0xf840
+[0-9a-f]+ <[^>]*> f840 .short 0xf840
[0-9a-f]+ <[^>]*> f001 extend 0x1
-[0-9a-f]+ <[^>]*> f840 0xf840
+[0-9a-f]+ <[^>]*> f840 .short 0xf840
[0-9a-f]+ <[^>]*> f7ff extend 0x7ff
-[0-9a-f]+ <[^>]*> f85f 0xf85f
+[0-9a-f]+ <[^>]*> f85f .short 0xf85f
[0-9a-f]+ <[^>]*> f7ff extend 0x7ff
-[0-9a-f]+ <[^>]*> f85e 0xf85e
+[0-9a-f]+ <[^>]*> f85e .short 0xf85e
[0-9a-f]+ <[^>]*> f7ff extend 0x7ff
-[0-9a-f]+ <[^>]*> f85d 0xf85d
+[0-9a-f]+ <[^>]*> f85d .short 0xf85d
[0-9a-f]+ <[^>]*> f7ff extend 0x7ff
-[0-9a-f]+ <[^>]*> f85c 0xf85c
+[0-9a-f]+ <[^>]*> f85c .short 0xf85c
[0-9a-f]+ <[^>]*> f7ff extend 0x7ff
-[0-9a-f]+ <[^>]*> f858 0xf858
+[0-9a-f]+ <[^>]*> f858 .short 0xf858
[0-9a-f]+ <[^>]*> f7ff extend 0x7ff
-[0-9a-f]+ <[^>]*> f850 0xf850
+[0-9a-f]+ <[^>]*> f850 .short 0xf850
[0-9a-f]+ <[^>]*> f7ff extend 0x7ff
-[0-9a-f]+ <[^>]*> f840 0xf840
+[0-9a-f]+ <[^>]*> f840 .short 0xf840
[0-9a-f]+ <[^>]*> f7df extend 0x7df
-[0-9a-f]+ <[^>]*> f840 0xf840
+[0-9a-f]+ <[^>]*> f840 .short 0xf840
[0-9a-f]+ <[^>]*> f79f extend 0x79f
-[0-9a-f]+ <[^>]*> f840 0xf840
+[0-9a-f]+ <[^>]*> f840 .short 0xf840
[0-9a-f]+ <[^>]*> f71f extend 0x71f
-[0-9a-f]+ <[^>]*> f840 0xf840
+[0-9a-f]+ <[^>]*> f840 .short 0xf840
[0-9a-f]+ <[^>]*> f61f extend 0x61f
-[0-9a-f]+ <[^>]*> f840 0xf840
+[0-9a-f]+ <[^>]*> f840 .short 0xf840
[0-9a-f]+ <[^>]*> f41f extend 0x41f
-[0-9a-f]+ <[^>]*> f840 0xf840
+[0-9a-f]+ <[^>]*> f840 .short 0xf840
[0-9a-f]+ <[^>]*> f01f extend 0x1f
-[0-9a-f]+ <[^>]*> f840 0xf840
-[0-9a-f]+ <[^>]*> bb40 0xbb40
+[0-9a-f]+ <[^>]*> f840 .short 0xf840
+[0-9a-f]+ <[^>]*> bb40 .short 0xbb40
[0-9a-f]+ <[^>]*> f000 extend 0x0
-[0-9a-f]+ <[^>]*> bb41 0xbb41
+[0-9a-f]+ <[^>]*> bb41 .short 0xbb41
[0-9a-f]+ <[^>]*> f000 extend 0x0
-[0-9a-f]+ <[^>]*> bb42 0xbb42
+[0-9a-f]+ <[^>]*> bb42 .short 0xbb42
[0-9a-f]+ <[^>]*> f000 extend 0x0
-[0-9a-f]+ <[^>]*> bb43 0xbb43
-[0-9a-f]+ <[^>]*> bb41 0xbb41
-[0-9a-f]+ <[^>]*> bb42 0xbb42
-[0-9a-f]+ <[^>]*> bb44 0xbb44
-[0-9a-f]+ <[^>]*> bb48 0xbb48
-[0-9a-f]+ <[^>]*> bb50 0xbb50
+[0-9a-f]+ <[^>]*> bb43 .short 0xbb43
+[0-9a-f]+ <[^>]*> bb41 .short 0xbb41
+[0-9a-f]+ <[^>]*> bb42 .short 0xbb42
+[0-9a-f]+ <[^>]*> bb44 .short 0xbb44
+[0-9a-f]+ <[^>]*> bb48 .short 0xbb48
+[0-9a-f]+ <[^>]*> bb50 .short 0xbb50
[0-9a-f]+ <[^>]*> f080 extend 0x80
-[0-9a-f]+ <[^>]*> bb40 0xbb40
+[0-9a-f]+ <[^>]*> bb40 .short 0xbb40
[0-9a-f]+ <[^>]*> f100 extend 0x100
-[0-9a-f]+ <[^>]*> bb40 0xbb40
+[0-9a-f]+ <[^>]*> bb40 .short 0xbb40
[0-9a-f]+ <[^>]*> f200 extend 0x200
-[0-9a-f]+ <[^>]*> bb40 0xbb40
+[0-9a-f]+ <[^>]*> bb40 .short 0xbb40
[0-9a-f]+ <[^>]*> f400 extend 0x400
-[0-9a-f]+ <[^>]*> bb40 0xbb40
+[0-9a-f]+ <[^>]*> bb40 .short 0xbb40
[0-9a-f]+ <[^>]*> f001 extend 0x1
-[0-9a-f]+ <[^>]*> bb40 0xbb40
+[0-9a-f]+ <[^>]*> bb40 .short 0xbb40
[0-9a-f]+ <[^>]*> f7ff extend 0x7ff
-[0-9a-f]+ <[^>]*> bb5f 0xbb5f
+[0-9a-f]+ <[^>]*> bb5f .short 0xbb5f
[0-9a-f]+ <[^>]*> f7ff extend 0x7ff
-[0-9a-f]+ <[^>]*> bb5e 0xbb5e
+[0-9a-f]+ <[^>]*> bb5e .short 0xbb5e
[0-9a-f]+ <[^>]*> f7ff extend 0x7ff
-[0-9a-f]+ <[^>]*> bb5d 0xbb5d
+[0-9a-f]+ <[^>]*> bb5d .short 0xbb5d
[0-9a-f]+ <[^>]*> f7ff extend 0x7ff
-[0-9a-f]+ <[^>]*> bb5c 0xbb5c
+[0-9a-f]+ <[^>]*> bb5c .short 0xbb5c
[0-9a-f]+ <[^>]*> f7ff extend 0x7ff
-[0-9a-f]+ <[^>]*> bb58 0xbb58
+[0-9a-f]+ <[^>]*> bb58 .short 0xbb58
[0-9a-f]+ <[^>]*> f7ff extend 0x7ff
-[0-9a-f]+ <[^>]*> bb50 0xbb50
+[0-9a-f]+ <[^>]*> bb50 .short 0xbb50
[0-9a-f]+ <[^>]*> f7ff extend 0x7ff
-[0-9a-f]+ <[^>]*> bb40 0xbb40
+[0-9a-f]+ <[^>]*> bb40 .short 0xbb40
[0-9a-f]+ <[^>]*> f7df extend 0x7df
-[0-9a-f]+ <[^>]*> bb40 0xbb40
+[0-9a-f]+ <[^>]*> bb40 .short 0xbb40
[0-9a-f]+ <[^>]*> f79f extend 0x79f
-[0-9a-f]+ <[^>]*> bb40 0xbb40
+[0-9a-f]+ <[^>]*> bb40 .short 0xbb40
[0-9a-f]+ <[^>]*> f71f extend 0x71f
-[0-9a-f]+ <[^>]*> bb40 0xbb40
+[0-9a-f]+ <[^>]*> bb40 .short 0xbb40
[0-9a-f]+ <[^>]*> f61f extend 0x61f
-[0-9a-f]+ <[^>]*> bb40 0xbb40
+[0-9a-f]+ <[^>]*> bb40 .short 0xbb40
[0-9a-f]+ <[^>]*> f41f extend 0x41f
-[0-9a-f]+ <[^>]*> bb40 0xbb40
+[0-9a-f]+ <[^>]*> bb40 .short 0xbb40
[0-9a-f]+ <[^>]*> f01f extend 0x1f
-[0-9a-f]+ <[^>]*> bb40 0xbb40
+[0-9a-f]+ <[^>]*> bb40 .short 0xbb40
[0-9a-f]+ <[^>]*> 9b40 lw v0,0\(v1\)
[0-9a-f]+ <[^>]*> f000 9b41 lw v0,1\(v1\)
[0-9a-f]+ <[^>]*> f000 9b42 lw v0,2\(v1\)
@@ -325,147 +325,147 @@ Disassembly of section \.text:
[0-9a-f]+ <[^>]*> f61f a340 lbu v0,-512\(v1\)
[0-9a-f]+ <[^>]*> f41f a340 lbu v0,-1024\(v1\)
[0-9a-f]+ <[^>]*> f01f a340 lbu v0,-2048\(v1\)
-[0-9a-f]+ <[^>]*> 7b40 0x7b40
+[0-9a-f]+ <[^>]*> 7b40 .short 0x7b40
[0-9a-f]+ <[^>]*> f000 extend 0x0
-[0-9a-f]+ <[^>]*> 7b41 0x7b41
+[0-9a-f]+ <[^>]*> 7b41 .short 0x7b41
[0-9a-f]+ <[^>]*> f000 extend 0x0
-[0-9a-f]+ <[^>]*> 7b42 0x7b42
+[0-9a-f]+ <[^>]*> 7b42 .short 0x7b42
[0-9a-f]+ <[^>]*> f000 extend 0x0
-[0-9a-f]+ <[^>]*> 7b43 0x7b43
+[0-9a-f]+ <[^>]*> 7b43 .short 0x7b43
[0-9a-f]+ <[^>]*> f000 extend 0x0
-[0-9a-f]+ <[^>]*> 7b44 0x7b44
-[0-9a-f]+ <[^>]*> 7b41 0x7b41
-[0-9a-f]+ <[^>]*> 7b42 0x7b42
-[0-9a-f]+ <[^>]*> 7b44 0x7b44
-[0-9a-f]+ <[^>]*> 7b48 0x7b48
-[0-9a-f]+ <[^>]*> 7b50 0x7b50
+[0-9a-f]+ <[^>]*> 7b44 .short 0x7b44
+[0-9a-f]+ <[^>]*> 7b41 .short 0x7b41
+[0-9a-f]+ <[^>]*> 7b42 .short 0x7b42
+[0-9a-f]+ <[^>]*> 7b44 .short 0x7b44
+[0-9a-f]+ <[^>]*> 7b48 .short 0x7b48
+[0-9a-f]+ <[^>]*> 7b50 .short 0x7b50
[0-9a-f]+ <[^>]*> f100 extend 0x100
-[0-9a-f]+ <[^>]*> 7b40 0x7b40
+[0-9a-f]+ <[^>]*> 7b40 .short 0x7b40
[0-9a-f]+ <[^>]*> f200 extend 0x200
-[0-9a-f]+ <[^>]*> 7b40 0x7b40
+[0-9a-f]+ <[^>]*> 7b40 .short 0x7b40
[0-9a-f]+ <[^>]*> f400 extend 0x400
-[0-9a-f]+ <[^>]*> 7b40 0x7b40
+[0-9a-f]+ <[^>]*> 7b40 .short 0x7b40
[0-9a-f]+ <[^>]*> f001 extend 0x1
-[0-9a-f]+ <[^>]*> 7b40 0x7b40
+[0-9a-f]+ <[^>]*> 7b40 .short 0x7b40
[0-9a-f]+ <[^>]*> f7ff extend 0x7ff
-[0-9a-f]+ <[^>]*> 7b5f 0x7b5f
+[0-9a-f]+ <[^>]*> 7b5f .short 0x7b5f
[0-9a-f]+ <[^>]*> f7ff extend 0x7ff
-[0-9a-f]+ <[^>]*> 7b5e 0x7b5e
+[0-9a-f]+ <[^>]*> 7b5e .short 0x7b5e
[0-9a-f]+ <[^>]*> f7ff extend 0x7ff
-[0-9a-f]+ <[^>]*> 7b5d 0x7b5d
+[0-9a-f]+ <[^>]*> 7b5d .short 0x7b5d
[0-9a-f]+ <[^>]*> f7ff extend 0x7ff
-[0-9a-f]+ <[^>]*> 7b5c 0x7b5c
+[0-9a-f]+ <[^>]*> 7b5c .short 0x7b5c
[0-9a-f]+ <[^>]*> f7ff extend 0x7ff
-[0-9a-f]+ <[^>]*> 7b58 0x7b58
+[0-9a-f]+ <[^>]*> 7b58 .short 0x7b58
[0-9a-f]+ <[^>]*> f7ff extend 0x7ff
-[0-9a-f]+ <[^>]*> 7b50 0x7b50
+[0-9a-f]+ <[^>]*> 7b50 .short 0x7b50
[0-9a-f]+ <[^>]*> f7ff extend 0x7ff
-[0-9a-f]+ <[^>]*> 7b40 0x7b40
+[0-9a-f]+ <[^>]*> 7b40 .short 0x7b40
[0-9a-f]+ <[^>]*> f7df extend 0x7df
-[0-9a-f]+ <[^>]*> 7b40 0x7b40
+[0-9a-f]+ <[^>]*> 7b40 .short 0x7b40
[0-9a-f]+ <[^>]*> f79f extend 0x79f
-[0-9a-f]+ <[^>]*> 7b40 0x7b40
+[0-9a-f]+ <[^>]*> 7b40 .short 0x7b40
[0-9a-f]+ <[^>]*> f71f extend 0x71f
-[0-9a-f]+ <[^>]*> 7b40 0x7b40
+[0-9a-f]+ <[^>]*> 7b40 .short 0x7b40
[0-9a-f]+ <[^>]*> f61f extend 0x61f
-[0-9a-f]+ <[^>]*> 7b40 0x7b40
+[0-9a-f]+ <[^>]*> 7b40 .short 0x7b40
[0-9a-f]+ <[^>]*> f41f extend 0x41f
-[0-9a-f]+ <[^>]*> 7b40 0x7b40
+[0-9a-f]+ <[^>]*> 7b40 .short 0x7b40
[0-9a-f]+ <[^>]*> f01f extend 0x1f
-[0-9a-f]+ <[^>]*> 7b40 0x7b40
-[0-9a-f]+ <[^>]*> f940 0xf940
+[0-9a-f]+ <[^>]*> 7b40 .short 0x7b40
+[0-9a-f]+ <[^>]*> f940 .short 0xf940
[0-9a-f]+ <[^>]*> f000 extend 0x0
-[0-9a-f]+ <[^>]*> f941 0xf941
+[0-9a-f]+ <[^>]*> f941 .short 0xf941
[0-9a-f]+ <[^>]*> f000 extend 0x0
-[0-9a-f]+ <[^>]*> f942 0xf942
+[0-9a-f]+ <[^>]*> f942 .short 0xf942
[0-9a-f]+ <[^>]*> f000 extend 0x0
-[0-9a-f]+ <[^>]*> f943 0xf943
+[0-9a-f]+ <[^>]*> f943 .short 0xf943
[0-9a-f]+ <[^>]*> f000 extend 0x0
-[0-9a-f]+ <[^>]*> f944 0xf944
-[0-9a-f]+ <[^>]*> f941 0xf941
-[0-9a-f]+ <[^>]*> f942 0xf942
-[0-9a-f]+ <[^>]*> f944 0xf944
-[0-9a-f]+ <[^>]*> f948 0xf948
-[0-9a-f]+ <[^>]*> f950 0xf950
+[0-9a-f]+ <[^>]*> f944 .short 0xf944
+[0-9a-f]+ <[^>]*> f941 .short 0xf941
+[0-9a-f]+ <[^>]*> f942 .short 0xf942
+[0-9a-f]+ <[^>]*> f944 .short 0xf944
+[0-9a-f]+ <[^>]*> f948 .short 0xf948
+[0-9a-f]+ <[^>]*> f950 .short 0xf950
[0-9a-f]+ <[^>]*> f100 extend 0x100
-[0-9a-f]+ <[^>]*> f940 0xf940
+[0-9a-f]+ <[^>]*> f940 .short 0xf940
[0-9a-f]+ <[^>]*> f200 extend 0x200
-[0-9a-f]+ <[^>]*> f940 0xf940
+[0-9a-f]+ <[^>]*> f940 .short 0xf940
[0-9a-f]+ <[^>]*> f400 extend 0x400
-[0-9a-f]+ <[^>]*> f940 0xf940
+[0-9a-f]+ <[^>]*> f940 .short 0xf940
[0-9a-f]+ <[^>]*> f001 extend 0x1
-[0-9a-f]+ <[^>]*> f940 0xf940
+[0-9a-f]+ <[^>]*> f940 .short 0xf940
[0-9a-f]+ <[^>]*> f7ff extend 0x7ff
-[0-9a-f]+ <[^>]*> f95f 0xf95f
+[0-9a-f]+ <[^>]*> f95f .short 0xf95f
[0-9a-f]+ <[^>]*> f7ff extend 0x7ff
-[0-9a-f]+ <[^>]*> f95e 0xf95e
+[0-9a-f]+ <[^>]*> f95e .short 0xf95e
[0-9a-f]+ <[^>]*> f7ff extend 0x7ff
-[0-9a-f]+ <[^>]*> f95d 0xf95d
+[0-9a-f]+ <[^>]*> f95d .short 0xf95d
[0-9a-f]+ <[^>]*> f7ff extend 0x7ff
-[0-9a-f]+ <[^>]*> f95c 0xf95c
+[0-9a-f]+ <[^>]*> f95c .short 0xf95c
[0-9a-f]+ <[^>]*> f7ff extend 0x7ff
-[0-9a-f]+ <[^>]*> f958 0xf958
+[0-9a-f]+ <[^>]*> f958 .short 0xf958
[0-9a-f]+ <[^>]*> f7ff extend 0x7ff
-[0-9a-f]+ <[^>]*> f950 0xf950
+[0-9a-f]+ <[^>]*> f950 .short 0xf950
[0-9a-f]+ <[^>]*> f7ff extend 0x7ff
-[0-9a-f]+ <[^>]*> f940 0xf940
+[0-9a-f]+ <[^>]*> f940 .short 0xf940
[0-9a-f]+ <[^>]*> f7df extend 0x7df
-[0-9a-f]+ <[^>]*> f940 0xf940
+[0-9a-f]+ <[^>]*> f940 .short 0xf940
[0-9a-f]+ <[^>]*> f79f extend 0x79f
-[0-9a-f]+ <[^>]*> f940 0xf940
+[0-9a-f]+ <[^>]*> f940 .short 0xf940
[0-9a-f]+ <[^>]*> f71f extend 0x71f
-[0-9a-f]+ <[^>]*> f940 0xf940
+[0-9a-f]+ <[^>]*> f940 .short 0xf940
[0-9a-f]+ <[^>]*> f61f extend 0x61f
-[0-9a-f]+ <[^>]*> f940 0xf940
+[0-9a-f]+ <[^>]*> f940 .short 0xf940
[0-9a-f]+ <[^>]*> f41f extend 0x41f
-[0-9a-f]+ <[^>]*> f940 0xf940
+[0-9a-f]+ <[^>]*> f940 .short 0xf940
[0-9a-f]+ <[^>]*> f01f extend 0x1f
-[0-9a-f]+ <[^>]*> f940 0xf940
-[0-9a-f]+ <[^>]*> fa00 0xfa00
+[0-9a-f]+ <[^>]*> f940 .short 0xf940
+[0-9a-f]+ <[^>]*> fa00 .short 0xfa00
[0-9a-f]+ <[^>]*> f000 extend 0x0
-[0-9a-f]+ <[^>]*> fa01 0xfa01
+[0-9a-f]+ <[^>]*> fa01 .short 0xfa01
[0-9a-f]+ <[^>]*> f000 extend 0x0
-[0-9a-f]+ <[^>]*> fa02 0xfa02
+[0-9a-f]+ <[^>]*> fa02 .short 0xfa02
[0-9a-f]+ <[^>]*> f000 extend 0x0
-[0-9a-f]+ <[^>]*> fa03 0xfa03
+[0-9a-f]+ <[^>]*> fa03 .short 0xfa03
[0-9a-f]+ <[^>]*> f000 extend 0x0
-[0-9a-f]+ <[^>]*> fa04 0xfa04
-[0-9a-f]+ <[^>]*> fa01 0xfa01
-[0-9a-f]+ <[^>]*> fa02 0xfa02
-[0-9a-f]+ <[^>]*> fa04 0xfa04
-[0-9a-f]+ <[^>]*> fa08 0xfa08
-[0-9a-f]+ <[^>]*> fa10 0xfa10
-[0-9a-f]+ <[^>]*> fa20 0xfa20
-[0-9a-f]+ <[^>]*> fa40 0xfa40
-[0-9a-f]+ <[^>]*> fa80 0xfa80
+[0-9a-f]+ <[^>]*> fa04 .short 0xfa04
+[0-9a-f]+ <[^>]*> fa01 .short 0xfa01
+[0-9a-f]+ <[^>]*> fa02 .short 0xfa02
+[0-9a-f]+ <[^>]*> fa04 .short 0xfa04
+[0-9a-f]+ <[^>]*> fa08 .short 0xfa08
+[0-9a-f]+ <[^>]*> fa10 .short 0xfa10
+[0-9a-f]+ <[^>]*> fa20 .short 0xfa20
+[0-9a-f]+ <[^>]*> fa40 .short 0xfa40
+[0-9a-f]+ <[^>]*> fa80 .short 0xfa80
[0-9a-f]+ <[^>]*> f001 extend 0x1
-[0-9a-f]+ <[^>]*> fa00 0xfa00
+[0-9a-f]+ <[^>]*> fa00 .short 0xfa00
[0-9a-f]+ <[^>]*> f7ff extend 0x7ff
-[0-9a-f]+ <[^>]*> fa1f 0xfa1f
+[0-9a-f]+ <[^>]*> fa1f .short 0xfa1f
[0-9a-f]+ <[^>]*> f7ff extend 0x7ff
-[0-9a-f]+ <[^>]*> fa1e 0xfa1e
+[0-9a-f]+ <[^>]*> fa1e .short 0xfa1e
[0-9a-f]+ <[^>]*> f7ff extend 0x7ff
-[0-9a-f]+ <[^>]*> fa1d 0xfa1d
+[0-9a-f]+ <[^>]*> fa1d .short 0xfa1d
[0-9a-f]+ <[^>]*> f7ff extend 0x7ff
-[0-9a-f]+ <[^>]*> fa1c 0xfa1c
+[0-9a-f]+ <[^>]*> fa1c .short 0xfa1c
[0-9a-f]+ <[^>]*> f7ff extend 0x7ff
-[0-9a-f]+ <[^>]*> fa18 0xfa18
+[0-9a-f]+ <[^>]*> fa18 .short 0xfa18
[0-9a-f]+ <[^>]*> f7ff extend 0x7ff
-[0-9a-f]+ <[^>]*> fa10 0xfa10
+[0-9a-f]+ <[^>]*> fa10 .short 0xfa10
[0-9a-f]+ <[^>]*> f7ff extend 0x7ff
-[0-9a-f]+ <[^>]*> fa00 0xfa00
+[0-9a-f]+ <[^>]*> fa00 .short 0xfa00
[0-9a-f]+ <[^>]*> f7df extend 0x7df
-[0-9a-f]+ <[^>]*> fa00 0xfa00
+[0-9a-f]+ <[^>]*> fa00 .short 0xfa00
[0-9a-f]+ <[^>]*> f79f extend 0x79f
-[0-9a-f]+ <[^>]*> fa00 0xfa00
+[0-9a-f]+ <[^>]*> fa00 .short 0xfa00
[0-9a-f]+ <[^>]*> f71f extend 0x71f
-[0-9a-f]+ <[^>]*> fa00 0xfa00
+[0-9a-f]+ <[^>]*> fa00 .short 0xfa00
[0-9a-f]+ <[^>]*> f61f extend 0x61f
-[0-9a-f]+ <[^>]*> fa00 0xfa00
+[0-9a-f]+ <[^>]*> fa00 .short 0xfa00
[0-9a-f]+ <[^>]*> f41f extend 0x41f
-[0-9a-f]+ <[^>]*> fa00 0xfa00
+[0-9a-f]+ <[^>]*> fa00 .short 0xfa00
[0-9a-f]+ <[^>]*> f01f extend 0x1f
-[0-9a-f]+ <[^>]*> fa00 0xfa00
+[0-9a-f]+ <[^>]*> fa00 .short 0xfa00
[0-9a-f]+ <[^>]*> db40 sw v0,0\(v1\)
[0-9a-f]+ <[^>]*> f000 db41 sw v0,1\(v1\)
[0-9a-f]+ <[^>]*> f000 db42 sw v0,2\(v1\)
@@ -606,52 +606,52 @@ Disassembly of section \.text:
[0-9a-f]+ <[^>]*> f100 6a00 li v0,256
[0-9a-f]+ <[^>]*> 675e move v0,s8
[0-9a-f]+ <[^>]*> 6592 move s4,v0
-[0-9a-f]+ <[^>]*> 4350 0x4350
-[0-9a-f]+ <[^>]*> 4351 0x4351
-[0-9a-f]+ <[^>]*> 435f 0x435f
+[0-9a-f]+ <[^>]*> 4350 .short 0x4350
+[0-9a-f]+ <[^>]*> 4351 .short 0x4351
+[0-9a-f]+ <[^>]*> 435f .short 0x435f
[0-9a-f]+ <[^>]*> f010 extend 0x10
-[0-9a-f]+ <[^>]*> 4350 0x4350
+[0-9a-f]+ <[^>]*> 4350 .short 0x4350
[0-9a-f]+ <[^>]*> f7ff extend 0x7ff
-[0-9a-f]+ <[^>]*> 4350 0x4350
-[0-9a-f]+ <[^>]*> e388 0xe388
-[0-9a-f]+ <[^>]*> fd40 0xfd40
-[0-9a-f]+ <[^>]*> fd41 0xfd41
-[0-9a-f]+ <[^>]*> fd5f 0xfd5f
+[0-9a-f]+ <[^>]*> 4350 .short 0x4350
+[0-9a-f]+ <[^>]*> e388 .short 0xe388
+[0-9a-f]+ <[^>]*> fd40 .short 0xfd40
+[0-9a-f]+ <[^>]*> fd41 .short 0xfd41
+[0-9a-f]+ <[^>]*> fd5f .short 0xfd5f
[0-9a-f]+ <[^>]*> f020 extend 0x20
-[0-9a-f]+ <[^>]*> fd40 0xfd40
+[0-9a-f]+ <[^>]*> fd40 .short 0xfd40
[0-9a-f]+ <[^>]*> f7ff extend 0x7ff
-[0-9a-f]+ <[^>]*> fd40 0xfd40
+[0-9a-f]+ <[^>]*> fd40 .short 0xfd40
[0-9a-f]+ <[^>]*> f080 extend 0x80
-[0-9a-f]+ <[^>]*> fd40 0xfd40
+[0-9a-f]+ <[^>]*> fd40 .short 0xfd40
[0-9a-f]+ <[^>]*> f79f extend 0x79f
-[0-9a-f]+ <[^>]*> fd40 0xfd40
+[0-9a-f]+ <[^>]*> fd40 .short 0xfd40
[0-9a-f]+ <[^>]*> f17f extend 0x17f
-[0-9a-f]+ <[^>]*> fe48 0xfe48
+[0-9a-f]+ <[^>]*> fe48 .short 0xfe48
[0-9a-f]+ <[^>]*> f080 extend 0x80
-[0-9a-f]+ <[^>]*> fe40 0xfe40
+[0-9a-f]+ <[^>]*> fe40 .short 0xfe40
[0-9a-f]+ <[^>]*> f1c0 extend 0x1c0
-[0-9a-f]+ <[^>]*> fe48 0xfe48
+[0-9a-f]+ <[^>]*> fe48 .short 0xfe48
[0-9a-f]+ <[^>]*> f280 extend 0x280
-[0-9a-f]+ <[^>]*> fe4c 0xfe4c
-[0-9a-f]+ <[^>]*> fb00 0xfb00
+[0-9a-f]+ <[^>]*> fe4c .short 0xfe4c
+[0-9a-f]+ <[^>]*> fb00 .short 0xfb00
[0-9a-f]+ <[^>]*> f000 extend 0x0
-[0-9a-f]+ <[^>]*> fb01 0xfb01
+[0-9a-f]+ <[^>]*> fb01 .short 0xfb01
[0-9a-f]+ <[^>]*> f7ff extend 0x7ff
-[0-9a-f]+ <[^>]*> fb1f 0xfb1f
-[0-9a-f]+ <[^>]*> fb20 0xfb20
-[0-9a-f]+ <[^>]*> fbe0 0xfbe0
-[0-9a-f]+ <[^>]*> ff40 0xff40
+[0-9a-f]+ <[^>]*> fb1f .short 0xfb1f
+[0-9a-f]+ <[^>]*> fb20 .short 0xfb20
+[0-9a-f]+ <[^>]*> fbe0 .short 0xfbe0
+[0-9a-f]+ <[^>]*> ff40 .short 0xff40
[0-9a-f]+ <[^>]*> f000 extend 0x0
-[0-9a-f]+ <[^>]*> ff41 0xff41
+[0-9a-f]+ <[^>]*> ff41 .short 0xff41
[0-9a-f]+ <[^>]*> f7ff extend 0x7ff
-[0-9a-f]+ <[^>]*> ff5f 0xff5f
-[0-9a-f]+ <[^>]*> ff48 0xff48
+[0-9a-f]+ <[^>]*> ff5f .short 0xff5f
+[0-9a-f]+ <[^>]*> ff48 .short 0xff48
[0-9a-f]+ <[^>]*> f7ff extend 0x7ff
-[0-9a-f]+ <[^>]*> ff40 0xff40
+[0-9a-f]+ <[^>]*> ff40 .short 0xff40
[0-9a-f]+ <[^>]*> f080 extend 0x80
-[0-9a-f]+ <[^>]*> ff40 0xff40
+[0-9a-f]+ <[^>]*> ff40 .short 0xff40
[0-9a-f]+ <[^>]*> f79f extend 0x79f
-[0-9a-f]+ <[^>]*> ff40 0xff40
+[0-9a-f]+ <[^>]*> ff40 .short 0xff40
[0-9a-f]+ <[^>]*> 4340 addiu v0,v1,0
[0-9a-f]+ <[^>]*> 4341 addiu v0,v1,1
[0-9a-f]+ <[^>]*> 434f addiu v0,v1,-1
@@ -682,7 +682,7 @@ Disassembly of section \.text:
[0-9a-f]+ <[^>]*> 0220 addiu v0,sp,128
[0-9a-f]+ <[^>]*> f79f 0200 addiu v0,sp,-128
[0-9a-f]+ <[^>]*> 00000000 nop
-[0-9a-f]+ <[^>]*> e38a 0xe38a
+[0-9a-f]+ <[^>]*> e38a .short 0xe38a
[0-9a-f]+ <[^>]*> e38b subu v0,v1,a0
[0-9a-f]+ <[^>]*> ea6b neg v0,v1
[0-9a-f]+ <[^>]*> ea6c and v0,v1
@@ -707,32 +707,32 @@ Disassembly of section \.text:
[0-9a-f]+ <[^>]*> f100 7200 cmpi v0,256
[0-9a-f]+ <[^>]*> ea6a cmp v0,v1
[0-9a-f]+ <[^>]*> f000 extend 0x0
-[0-9a-f]+ <[^>]*> 3261 0x3261
-[0-9a-f]+ <[^>]*> 3265 0x3265
-[0-9a-f]+ <[^>]*> 3261 0x3261
+[0-9a-f]+ <[^>]*> 3261 .short 0x3261
+[0-9a-f]+ <[^>]*> 3265 .short 0x3265
+[0-9a-f]+ <[^>]*> 3261 .short 0x3261
[0-9a-f]+ <[^>]*> f240 extend 0x240
-[0-9a-f]+ <[^>]*> 3261 0x3261
+[0-9a-f]+ <[^>]*> 3261 .short 0x3261
[0-9a-f]+ <[^>]*> f7e0 extend 0x7e0
-[0-9a-f]+ <[^>]*> 3261 0x3261
-[0-9a-f]+ <[^>]*> eb54 0xeb54
+[0-9a-f]+ <[^>]*> 3261 .short 0x3261
+[0-9a-f]+ <[^>]*> eb54 .short 0xeb54
[0-9a-f]+ <[^>]*> f000 extend 0x0
-[0-9a-f]+ <[^>]*> e848 0xe848
-[0-9a-f]+ <[^>]*> e948 0xe948
-[0-9a-f]+ <[^>]*> e848 0xe848
+[0-9a-f]+ <[^>]*> e848 .short 0xe848
+[0-9a-f]+ <[^>]*> e948 .short 0xe948
+[0-9a-f]+ <[^>]*> e848 .short 0xe848
[0-9a-f]+ <[^>]*> f240 extend 0x240
-[0-9a-f]+ <[^>]*> e848 0xe848
+[0-9a-f]+ <[^>]*> e848 .short 0xe848
[0-9a-f]+ <[^>]*> f7e0 extend 0x7e0
-[0-9a-f]+ <[^>]*> e848 0xe848
-[0-9a-f]+ <[^>]*> eb56 0xeb56
+[0-9a-f]+ <[^>]*> e848 .short 0xe848
+[0-9a-f]+ <[^>]*> eb56 .short 0xeb56
[0-9a-f]+ <[^>]*> f000 extend 0x0
-[0-9a-f]+ <[^>]*> e853 0xe853
-[0-9a-f]+ <[^>]*> e953 0xe953
-[0-9a-f]+ <[^>]*> e853 0xe853
+[0-9a-f]+ <[^>]*> e853 .short 0xe853
+[0-9a-f]+ <[^>]*> e953 .short 0xe953
+[0-9a-f]+ <[^>]*> e853 .short 0xe853
[0-9a-f]+ <[^>]*> f240 extend 0x240
-[0-9a-f]+ <[^>]*> e853 0xe853
+[0-9a-f]+ <[^>]*> e853 .short 0xe853
[0-9a-f]+ <[^>]*> f7e0 extend 0x7e0
-[0-9a-f]+ <[^>]*> e853 0xe853
-[0-9a-f]+ <[^>]*> eb57 0xeb57
+[0-9a-f]+ <[^>]*> e853 .short 0xe853
+[0-9a-f]+ <[^>]*> eb57 .short 0xeb57
[0-9a-f]+ <[^>]*> ea12 mflo v0
[0-9a-f]+ <[^>]*> eb10 mfhi v1
[0-9a-f]+ <[^>]*> f000 3260 sll v0,v1,0
@@ -753,15 +753,15 @@ Disassembly of section \.text:
[0-9a-f]+ <[^>]*> f240 3263 sra v0,v1,9
[0-9a-f]+ <[^>]*> f7c0 3263 sra v0,v1,31
[0-9a-f]+ <[^>]*> eb47 srav v0,v1
-[0-9a-f]+ <[^>]*> ea7c 0xea7c
-[0-9a-f]+ <[^>]*> ea7d 0xea7d
-[0-9a-f]+ <[^>]*> ea7e 0xea7e
+[0-9a-f]+ <[^>]*> ea7c .short 0xea7c
+[0-9a-f]+ <[^>]*> ea7d .short 0xea7d
+[0-9a-f]+ <[^>]*> ea7e .short 0xea7e
[0-9a-f]+ <[^>]*> 2b01 bnez v1,000007d4 <insns2\+0xb4>
[0-9a-f]+ <[^>]*> e8e5 break 0x7
[0-9a-f]+ <[^>]*> ea12 mflo v0
[0-9a-f]+ <[^>]*> 6500 nop
[0-9a-f]+ <[^>]*> 6500 nop
-[0-9a-f]+ <[^>]*> ea7f 0xea7f
+[0-9a-f]+ <[^>]*> ea7f .short 0xea7f
[0-9a-f]+ <[^>]*> 2b01 bnez v1,000007e0 <insns2\+0xc0>
[0-9a-f]+ <[^>]*> e8e5 break 0x7
[0-9a-f]+ <[^>]*> ea12 mflo v0
diff --git a/gas/testsuite/gas/mips/mips16-32@mips16e-64-sub.d b/gas/testsuite/gas/mips/mips16-32@mips16e-64-sub.d
index aa9c279..1dcdc03 100644
--- a/gas/testsuite/gas/mips/mips16-32@mips16e-64-sub.d
+++ b/gas/testsuite/gas/mips/mips16-32@mips16e-64-sub.d
@@ -6,8 +6,8 @@
.*: +file format .*mips.*
Disassembly of section \.text:
-[0-9a-f]+ <[^>]*> ecd1 0xecd1
-[0-9a-f]+ <[^>]*> ec51 0xec51
+[0-9a-f]+ <[^>]*> ecd1 .short 0xecd1
+[0-9a-f]+ <[^>]*> ec51 .short 0xec51
[0-9a-f]+ <[^>]*> 6500 nop
[0-9a-f]+ <[^>]*> 6500 nop
[0-9a-f]+ <[^>]*> 6500 nop
diff --git a/gas/testsuite/gas/mips/mips16-32@mips16e-sub.d b/gas/testsuite/gas/mips/mips16-32@mips16e-sub.d
index 7211562..e9b7551 100644
--- a/gas/testsuite/gas/mips/mips16-32@mips16e-sub.d
+++ b/gas/testsuite/gas/mips/mips16-32@mips16e-sub.d
@@ -6,51 +6,51 @@
.*: +file format .*mips.*
Disassembly of section \.text:
-[0-9a-f]+ <[^>]*> eac0 0xeac0
-[0-9a-f]+ <[^>]*> eac0 0xeac0
-[0-9a-f]+ <[^>]*> e8a0 0xe8a0
-[0-9a-f]+ <[^>]*> ea80 0xea80
-[0-9a-f]+ <[^>]*> eac0 0xeac0
-[0-9a-f]+ <[^>]*> eac0 0xeac0
-[0-9a-f]+ <[^>]*> eac0 0xeac0
-[0-9a-f]+ <[^>]*> eac0 0xeac0
-[0-9a-f]+ <[^>]*> e8a0 0xe8a0
-[0-9a-f]+ <[^>]*> ea80 0xea80
-[0-9a-f]+ <[^>]*> e8a0 0xe8a0
-[0-9a-f]+ <[^>]*> ea80 0xea80
-[0-9a-f]+ <[^>]*> eac0 0xeac0
+[0-9a-f]+ <[^>]*> eac0 .short 0xeac0
+[0-9a-f]+ <[^>]*> eac0 .short 0xeac0
+[0-9a-f]+ <[^>]*> e8a0 .short 0xe8a0
+[0-9a-f]+ <[^>]*> ea80 .short 0xea80
+[0-9a-f]+ <[^>]*> eac0 .short 0xeac0
+[0-9a-f]+ <[^>]*> eac0 .short 0xeac0
+[0-9a-f]+ <[^>]*> eac0 .short 0xeac0
+[0-9a-f]+ <[^>]*> eac0 .short 0xeac0
+[0-9a-f]+ <[^>]*> e8a0 .short 0xe8a0
+[0-9a-f]+ <[^>]*> ea80 .short 0xea80
+[0-9a-f]+ <[^>]*> e8a0 .short 0xe8a0
+[0-9a-f]+ <[^>]*> ea80 .short 0xea80
+[0-9a-f]+ <[^>]*> eac0 .short 0xeac0
[0-9a-f]+ <[^>]*> 1800 0000 jal 00000000 <stuff>
[ ]*[0-9a-f]+: R_MIPS16_26 foo
[0-9a-f]+ <[^>]*> 4281 addiu a0,v0,1
-[0-9a-f]+ <[^>]*> eac0 0xeac0
+[0-9a-f]+ <[^>]*> eac0 .short 0xeac0
[0-9a-f]+ <[^>]*> 1800 0000 jal 00000000 <stuff>
[ ]*[0-9a-f]+: R_MIPS16_26 foo
[0-9a-f]+ <[^>]*> 6500 nop
[0-9a-f]+ <[^>]*> 6782 move a0,v0
-[0-9a-f]+ <[^>]*> eac0 0xeac0
+[0-9a-f]+ <[^>]*> eac0 .short 0xeac0
[0-9a-f]+ <[^>]*> 6782 move a0,v0
-[0-9a-f]+ <[^>]*> ea80 0xea80
+[0-9a-f]+ <[^>]*> ea80 .short 0xea80
[0-9a-f]+ <[^>]*> 6782 move a0,v0
-[0-9a-f]+ <[^>]*> e8a0 0xe8a0
-[0-9a-f]+ <[^>]*> ec91 0xec91
-[0-9a-f]+ <[^>]*> ecb1 0xecb1
-[0-9a-f]+ <[^>]*> ec11 0xec11
-[0-9a-f]+ <[^>]*> ec31 0xec31
-[0-9a-f]+ <[^>]*> 64c1 0x64c1
-[0-9a-f]+ <[^>]*> 64c0 0x64c0
-[0-9a-f]+ <[^>]*> 64e2 0x64e2
-[0-9a-f]+ <[^>]*> 64f2 0x64f2
-[0-9a-f]+ <[^>]*> 64df 0x64df
+[0-9a-f]+ <[^>]*> e8a0 .short 0xe8a0
+[0-9a-f]+ <[^>]*> ec91 .short 0xec91
+[0-9a-f]+ <[^>]*> ecb1 .short 0xecb1
+[0-9a-f]+ <[^>]*> ec11 .short 0xec11
+[0-9a-f]+ <[^>]*> ec31 .short 0xec31
+[0-9a-f]+ <[^>]*> 64c1 .short 0x64c1
+[0-9a-f]+ <[^>]*> 64c0 .short 0x64c0
+[0-9a-f]+ <[^>]*> 64e2 .short 0x64e2
+[0-9a-f]+ <[^>]*> 64f2 .short 0x64f2
+[0-9a-f]+ <[^>]*> 64df .short 0x64df
[0-9a-f]+ <[^>]*> f010 extend 0x10
-[0-9a-f]+ <[^>]*> 64e1 0x64e1
+[0-9a-f]+ <[^>]*> 64e1 .short 0x64e1
[0-9a-f]+ <[^>]*> f004 extend 0x4
-[0-9a-f]+ <[^>]*> 64f2 0x64f2
+[0-9a-f]+ <[^>]*> 64f2 .short 0x64f2
[0-9a-f]+ <[^>]*> f308 extend 0x308
-[0-9a-f]+ <[^>]*> 64e2 0x64e2
+[0-9a-f]+ <[^>]*> 64e2 .short 0x64e2
[0-9a-f]+ <[^>]*> f30c extend 0x30c
-[0-9a-f]+ <[^>]*> 64f2 0x64f2
+[0-9a-f]+ <[^>]*> 64f2 .short 0x64f2
[0-9a-f]+ <[^>]*> f70e extend 0x70e
-[0-9a-f]+ <[^>]*> 64d2 0x64d2
+[0-9a-f]+ <[^>]*> 64d2 .short 0x64d2
[0-9a-f]+ <[^>]*> f30a extend 0x30a
-[0-9a-f]+ <[^>]*> 64e2 0x64e2
-[0-9a-f]+ <[^>]*> 6441 0x6441
+[0-9a-f]+ <[^>]*> 64e2 .short 0x64e2
+[0-9a-f]+ <[^>]*> 6441 .short 0x6441
diff --git a/gas/testsuite/gas/mips/mips16@save-sub.d b/gas/testsuite/gas/mips/mips16@save-sub.d
index 1237d63..55fde98 100644
--- a/gas/testsuite/gas/mips/mips16@save-sub.d
+++ b/gas/testsuite/gas/mips/mips16@save-sub.d
@@ -7,59 +7,59 @@
Disassembly of section .text:
00000000 <func>:
- 0:[ ]+6481[ ]+0x6481
- 2:[ ]+64c2[ ]+0x64c2
- 4:[ ]+64a3[ ]+0x64a3
- 6:[ ]+6494[ ]+0x6494
- 8:[ ]+64b5[ ]+0x64b5
- a:[ ]+64e6[ ]+0x64e6
- c:[ ]+64d7[ ]+0x64d7
- e:[ ]+64f8[ ]+0x64f8
- 10:[ ]+64f9[ ]+0x64f9
- 12:[ ]+64fa[ ]+0x64fa
- 14:[ ]+64fb[ ]+0x64fb
- 16:[ ]+64f0[ ]+0x64f0
+ 0:[ ]+6481[ ]+.short[ ]0x6481
+ 2:[ ]+64c2[ ]+.short[ ]0x64c2
+ 4:[ ]+64a3[ ]+.short[ ]0x64a3
+ 6:[ ]+6494[ ]+.short[ ]0x6494
+ 8:[ ]+64b5[ ]+.short[ ]0x64b5
+ a:[ ]+64e6[ ]+.short[ ]0x64e6
+ c:[ ]+64d7[ ]+.short[ ]0x64d7
+ e:[ ]+64f8[ ]+.short[ ]0x64f8
+ 10:[ ]+64f9[ ]+.short[ ]0x64f9
+ 12:[ ]+64fa[ ]+.short[ ]0x64fa
+ 14:[ ]+64fb[ ]+.short[ ]0x64fb
+ 16:[ ]+64f0[ ]+.short[ ]0x64f0
18:[ ]+f010[ ]+extend[ ]0x10
- 1a:[ ]+6481[ ]+0x6481
+ 1a:[ ]+6481[ ]+.short[ ]0x6481
1c:[ ]+f010[ ]+extend[ ]0x10
- 1e:[ ]+64c2[ ]+0x64c2
+ 1e:[ ]+64c2[ ]+.short[ ]0x64c2
20:[ ]+f010[ ]+extend[ ]0x10
- 22:[ ]+64b3[ ]+0x64b3
+ 22:[ ]+64b3[ ]+.short[ ]0x64b3
24:[ ]+f100[ ]+extend[ ]0x100
- 26:[ ]+6488[ ]+0x6488
+ 26:[ ]+6488[ ]+.short[ ]0x6488
28:[ ]+f600[ ]+extend[ ]0x600
- 2a:[ ]+6489[ ]+0x6489
+ 2a:[ ]+6489[ ]+.short[ ]0x6489
2c:[ ]+f700[ ]+extend[ ]0x700
- 2e:[ ]+648a[ ]+0x648a
+ 2e:[ ]+648a[ ]+.short[ ]0x648a
30:[ ]+f700[ ]+extend[ ]0x700
- 32:[ ]+64bb[ ]+0x64bb
+ 32:[ ]+64bb[ ]+.short[ ]0x64bb
34:[ ]+f001[ ]+extend[ ]0x1
- 36:[ ]+6488[ ]+0x6488
+ 36:[ ]+6488[ ]+.short[ ]0x6488
38:[ ]+f012[ ]+extend[ ]0x12
- 3a:[ ]+6480[ ]+0x6480
+ 3a:[ ]+6480[ ]+.short[ ]0x6480
3c:[ ]+f02b[ ]+extend[ ]0x2b
- 3e:[ ]+6480[ ]+0x6480
+ 3e:[ ]+6480[ ]+.short[ ]0x6480
40:[ ]+f024[ ]+extend[ ]0x24
- 42:[ ]+6480[ ]+0x6480
+ 42:[ ]+6480[ ]+.short[ ]0x6480
44:[ ]+f018[ ]+extend[ ]0x18
- 46:[ ]+6480[ ]+0x6480
+ 46:[ ]+6480[ ]+.short[ ]0x6480
48:[ ]+f00e[ ]+extend[ ]0xe
- 4a:[ ]+6488[ ]+0x6488
+ 4a:[ ]+6488[ ]+.short[ ]0x6488
4c:[ ]+f015[ ]+extend[ ]0x15
- 4e:[ ]+6480[ ]+0x6480
+ 4e:[ ]+6480[ ]+.short[ ]0x6480
50:[ ]+f017[ ]+extend[ ]0x17
- 52:[ ]+6480[ ]+0x6480
+ 52:[ ]+6480[ ]+.short[ ]0x6480
54:[ ]+f01a[ ]+extend[ ]0x1a
- 56:[ ]+6480[ ]+0x6480
+ 56:[ ]+6480[ ]+.short[ ]0x6480
58:[ ]+f01d[ ]+extend[ ]0x1d
- 5a:[ ]+6480[ ]+0x6480
+ 5a:[ ]+6480[ ]+.short[ ]0x6480
5c:[ ]+f71a[ ]+extend[ ]0x71a
- 5e:[ ]+64f0[ ]+0x64f0
- 60:[ ]+6470[ ]+0x6470
+ 5e:[ ]+64f0[ ]+.short[ ]0x64f0
+ 60:[ ]+6470[ ]+.short[ ]0x6470
62:[ ]+f010[ ]+extend[ ]0x10
- 64:[ ]+6441[ ]+0x6441
+ 64:[ ]+6441[ ]+.short[ ]0x6441
66:[ ]+f100[ ]+extend[ ]0x100
- 68:[ ]+6408[ ]+0x6408
+ 68:[ ]+6408[ ]+.short[ ]0x6408
6a:[ ]+f71a[ ]+extend[ ]0x71a
- 6c:[ ]+6470[ ]+0x6470
+ 6c:[ ]+6470[ ]+.short[ ]0x6470
\.\.\.
diff --git a/gas/testsuite/gas/mips/mips1@isa-override-1.d b/gas/testsuite/gas/mips/mips1@isa-override-1.d
index 80371b8..78a05be 100644
--- a/gas/testsuite/gas/mips/mips1@isa-override-1.d
+++ b/gas/testsuite/gas/mips/mips1@isa-override-1.d
@@ -16,20 +16,20 @@ Disassembly of section \.text:
[0-9a-f]+ <[^>]*> 44811800 mtc1 at,\$f3
[0-9a-f]+ <[^>]*> 3c0189ab lui at,0x89ab
[0-9a-f]+ <[^>]*> 44811000 mtc1 at,\$f2
-[0-9a-f]+ <[^>]*> dc820000 0xdc820000
+[0-9a-f]+ <[^>]*> dc820000 .word 0xdc820000
[0-9a-f]+ <[^>]*> 340189ab li at,0x89ab
-[0-9a-f]+ <[^>]*> 00010c38 0x10c38
+[0-9a-f]+ <[^>]*> 00010c38 .word 0x10c38
[0-9a-f]+ <[^>]*> 00411025 or v0,v0,at
[0-9a-f]+ <[^>]*> 3c029000 lui v0,0x9000
-[0-9a-f]+ <[^>]*> 00021438 0x21438
+[0-9a-f]+ <[^>]*> 00021438 .word 0x21438
[0-9a-f]+ <[^>]*> 34428000 ori v0,v0,0x8000
-[0-9a-f]+ <[^>]*> 00021438 0x21438
-[0-9a-f]+ <[^>]*> d4820000 0xd4820000
+[0-9a-f]+ <[^>]*> 00021438 .word 0x21438
+[0-9a-f]+ <[^>]*> d4820000 .word 0xd4820000
[0-9a-f]+ <[^>]*> 3c013ff0 lui at,0x3ff0
-[0-9a-f]+ <[^>]*> 00010c38 0x10c38
+[0-9a-f]+ <[^>]*> 00010c38 .word 0x10c38
[0-9a-f]+ <[^>]*> 342189ab ori at,at,0x89ab
-[0-9a-f]+ <[^>]*> 00010c38 0x10c38
-[0-9a-f]+ <[^>]*> 44a11000 0x44a11000
+[0-9a-f]+ <[^>]*> 00010c38 .word 0x10c38
+[0-9a-f]+ <[^>]*> 44a11000 .word 0x44a11000
[0-9a-f]+ <[^>]*> 8c820000 lw v0,0\(a0\)
[0-9a-f]+ <[^>]*> 8c830004 lw v1,4\(a0\)
[0-9a-f]+ <[^>]*> 3c0189ab lui at,0x89ab
diff --git a/gas/testsuite/gas/mips/mips1@save-sub.d b/gas/testsuite/gas/mips/mips1@save-sub.d
index a83cea6..8c65b2d 100644
--- a/gas/testsuite/gas/mips/mips1@save-sub.d
+++ b/gas/testsuite/gas/mips/mips1@save-sub.d
@@ -7,38 +7,38 @@
Disassembly of section .text:
00000000 <func>:
- 0:[ ]+7000205f[ ]+0x7000205f
- 4:[ ]+7000309f[ ]+0x7000309f
- 8:[ ]+700028df[ ]+0x700028df
- c:[ ]+7000251f[ ]+0x7000251f
- 10:[ ]+70002d5f[ ]+0x70002d5f
- 14:[ ]+7000399f[ ]+0x7000399f
- 18:[ ]+700035df[ ]+0x700035df
- 1c:[ ]+70003e1f[ ]+0x70003e1f
- 20:[ ]+70003e5f[ ]+0x70003e5f
- 24:[ ]+70003e9f[ ]+0x70003e9f
- 28:[ ]+70003edf[ ]+0x70003edf
- 2c:[ ]+70083c1f[ ]+0x70083c1f
- 30:[ ]+7008205f[ ]+0x7008205f
- 34:[ ]+7008309f[ ]+0x7008309f
- 38:[ ]+70082cdf[ ]+0x70082cdf
- 3c:[ ]+7080221f[ ]+0x7080221f
- 40:[ ]+7300225f[ ]+0x7300225f
- 44:[ ]+7380229f[ ]+0x7380229f
- 48:[ ]+73802edf[ ]+0x73802edf
- 4c:[ ]+7000a21f[ ]+0x7000a21f
- 50:[ ]+7009201f[ ]+0x7009201f
- 54:[ ]+7015a01f[ ]+0x7015a01f
- 58:[ ]+7012201f[ ]+0x7012201f
- 5c:[ ]+700c201f[ ]+0x700c201f
- 60:[ ]+7007221f[ ]+0x7007221f
- 64:[ ]+700aa01f[ ]+0x700aa01f
- 68:[ ]+700ba01f[ ]+0x700ba01f
- 6c:[ ]+700d201f[ ]+0x700d201f
- 70:[ ]+700ea01f[ ]+0x700ea01f
- 74:[ ]+738d3c1f[ ]+0x738d3c1f
- 78:[ ]+70081c1f[ ]+0x70081c1f
- 7c:[ ]+7008105f[ ]+0x7008105f
- 80:[ ]+7080021f[ ]+0x7080021f
- 84:[ ]+738d1c1f[ ]+0x738d1c1f
+ 0:[ ]+7000205f[ ]+.word[ ]0x7000205f
+ 4:[ ]+7000309f[ ]+.word[ ]0x7000309f
+ 8:[ ]+700028df[ ]+.word[ ]0x700028df
+ c:[ ]+7000251f[ ]+.word[ ]0x7000251f
+ 10:[ ]+70002d5f[ ]+.word[ ]0x70002d5f
+ 14:[ ]+7000399f[ ]+.word[ ]0x7000399f
+ 18:[ ]+700035df[ ]+.word[ ]0x700035df
+ 1c:[ ]+70003e1f[ ]+.word[ ]0x70003e1f
+ 20:[ ]+70003e5f[ ]+.word[ ]0x70003e5f
+ 24:[ ]+70003e9f[ ]+.word[ ]0x70003e9f
+ 28:[ ]+70003edf[ ]+.word[ ]0x70003edf
+ 2c:[ ]+70083c1f[ ]+.word[ ]0x70083c1f
+ 30:[ ]+7008205f[ ]+.word[ ]0x7008205f
+ 34:[ ]+7008309f[ ]+.word[ ]0x7008309f
+ 38:[ ]+70082cdf[ ]+.word[ ]0x70082cdf
+ 3c:[ ]+7080221f[ ]+.word[ ]0x7080221f
+ 40:[ ]+7300225f[ ]+.word[ ]0x7300225f
+ 44:[ ]+7380229f[ ]+.word[ ]0x7380229f
+ 48:[ ]+73802edf[ ]+.word[ ]0x73802edf
+ 4c:[ ]+7000a21f[ ]+.word[ ]0x7000a21f
+ 50:[ ]+7009201f[ ]+.word[ ]0x7009201f
+ 54:[ ]+7015a01f[ ]+.word[ ]0x7015a01f
+ 58:[ ]+7012201f[ ]+.word[ ]0x7012201f
+ 5c:[ ]+700c201f[ ]+.word[ ]0x700c201f
+ 60:[ ]+7007221f[ ]+.word[ ]0x7007221f
+ 64:[ ]+700aa01f[ ]+.word[ ]0x700aa01f
+ 68:[ ]+700ba01f[ ]+.word[ ]0x700ba01f
+ 6c:[ ]+700d201f[ ]+.word[ ]0x700d201f
+ 70:[ ]+700ea01f[ ]+.word[ ]0x700ea01f
+ 74:[ ]+738d3c1f[ ]+.word[ ]0x738d3c1f
+ 78:[ ]+70081c1f[ ]+.word[ ]0x70081c1f
+ 7c:[ ]+7008105f[ ]+.word[ ]0x7008105f
+ 80:[ ]+7080021f[ ]+.word[ ]0x7080021f
+ 84:[ ]+738d1c1f[ ]+.word[ ]0x738d1c1f
\.\.\.
diff --git a/gas/testsuite/gas/mips/mips2@isa-override-1.d b/gas/testsuite/gas/mips/mips2@isa-override-1.d
index 5341e0d..087c8d3 100644
--- a/gas/testsuite/gas/mips/mips2@isa-override-1.d
+++ b/gas/testsuite/gas/mips/mips2@isa-override-1.d
@@ -17,18 +17,18 @@ Disassembly of section \.text:
[0-9a-f]+ <[^>]*> 44811000 mtc1 at,\$f2
[0-9a-f]+ <[^>]*> dc820000 ldc3 \$2,0\(a0\)
[0-9a-f]+ <[^>]*> 340189ab li at,0x89ab
-[0-9a-f]+ <[^>]*> 00010c38 0x10c38
+[0-9a-f]+ <[^>]*> 00010c38 .word 0x10c38
[0-9a-f]+ <[^>]*> 00411025 or v0,v0,at
[0-9a-f]+ <[^>]*> 3c029000 lui v0,0x9000
-[0-9a-f]+ <[^>]*> 00021438 0x21438
+[0-9a-f]+ <[^>]*> 00021438 .word 0x21438
[0-9a-f]+ <[^>]*> 34428000 ori v0,v0,0x8000
-[0-9a-f]+ <[^>]*> 00021438 0x21438
+[0-9a-f]+ <[^>]*> 00021438 .word 0x21438
[0-9a-f]+ <[^>]*> d4820000 ldc1 \$f2,0\(a0\)
[0-9a-f]+ <[^>]*> 3c013ff0 lui at,0x3ff0
-[0-9a-f]+ <[^>]*> 00010c38 0x10c38
+[0-9a-f]+ <[^>]*> 00010c38 .word 0x10c38
[0-9a-f]+ <[^>]*> 342189ab ori at,at,0x89ab
-[0-9a-f]+ <[^>]*> 00010c38 0x10c38
-[0-9a-f]+ <[^>]*> 44a11000 0x44a11000
+[0-9a-f]+ <[^>]*> 00010c38 .word 0x10c38
+[0-9a-f]+ <[^>]*> 44a11000 .word 0x44a11000
[0-9a-f]+ <[^>]*> 8c820000 lw v0,0\(a0\)
[0-9a-f]+ <[^>]*> 8c830004 lw v1,4\(a0\)
[0-9a-f]+ <[^>]*> 3c0189ab lui at,0x89ab
diff --git a/gas/testsuite/gas/mips/mips32@isa-override-1.d b/gas/testsuite/gas/mips/mips32@isa-override-1.d
index 27a42fd..342a696 100644
--- a/gas/testsuite/gas/mips/mips32@isa-override-1.d
+++ b/gas/testsuite/gas/mips/mips32@isa-override-1.d
@@ -15,20 +15,20 @@ Disassembly of section \.text:
[0-9a-f]+ <[^>]*> 44811800 mtc1 at,\$f3
[0-9a-f]+ <[^>]*> 3c0189ab lui at,0x89ab
[0-9a-f]+ <[^>]*> 44811000 mtc1 at,\$f2
-[0-9a-f]+ <[^>]*> dc820000 0xdc820000
+[0-9a-f]+ <[^>]*> dc820000 .word 0xdc820000
[0-9a-f]+ <[^>]*> 340189ab li at,0x89ab
-[0-9a-f]+ <[^>]*> 00010c38 0x10c38
+[0-9a-f]+ <[^>]*> 00010c38 .word 0x10c38
[0-9a-f]+ <[^>]*> 00411025 or v0,v0,at
[0-9a-f]+ <[^>]*> 3c029000 lui v0,0x9000
-[0-9a-f]+ <[^>]*> 00021438 0x21438
+[0-9a-f]+ <[^>]*> 00021438 .word 0x21438
[0-9a-f]+ <[^>]*> 34428000 ori v0,v0,0x8000
-[0-9a-f]+ <[^>]*> 00021438 0x21438
+[0-9a-f]+ <[^>]*> 00021438 .word 0x21438
[0-9a-f]+ <[^>]*> d4820000 ldc1 \$f2,0\(a0\)
[0-9a-f]+ <[^>]*> 3c013ff0 lui at,0x3ff0
-[0-9a-f]+ <[^>]*> 00010c38 0x10c38
+[0-9a-f]+ <[^>]*> 00010c38 .word 0x10c38
[0-9a-f]+ <[^>]*> 342189ab ori at,at,0x89ab
-[0-9a-f]+ <[^>]*> 00010c38 0x10c38
-[0-9a-f]+ <[^>]*> 44a11000 0x44a11000
+[0-9a-f]+ <[^>]*> 00010c38 .word 0x10c38
+[0-9a-f]+ <[^>]*> 44a11000 .word 0x44a11000
[0-9a-f]+ <[^>]*> 8c820000 lw v0,0\(a0\)
[0-9a-f]+ <[^>]*> 8c830004 lw v1,4\(a0\)
[0-9a-f]+ <[^>]*> 3c0189ab lui at,0x89ab
diff --git a/gas/testsuite/gas/mips/mips32r2@isa-override-1.d b/gas/testsuite/gas/mips/mips32r2@isa-override-1.d
index 77b6d3a..8d0957a 100644
--- a/gas/testsuite/gas/mips/mips32r2@isa-override-1.d
+++ b/gas/testsuite/gas/mips/mips32r2@isa-override-1.d
@@ -15,20 +15,20 @@ Disassembly of section \.text:
[0-9a-f]+ <[^>]*> 44811000 mtc1 at,\$f2
[0-9a-f]+ <[^>]*> 3c013ff0 lui at,0x3ff0
[0-9a-f]+ <[^>]*> 44e11000 mthc1 at,\$f2
-[0-9a-f]+ <[^>]*> dc820000 0xdc820000
+[0-9a-f]+ <[^>]*> dc820000 .word 0xdc820000
[0-9a-f]+ <[^>]*> 340189ab li at,0x89ab
-[0-9a-f]+ <[^>]*> 00010c38 0x10c38
+[0-9a-f]+ <[^>]*> 00010c38 .word 0x10c38
[0-9a-f]+ <[^>]*> 00411025 or v0,v0,at
[0-9a-f]+ <[^>]*> 3c029000 lui v0,0x9000
-[0-9a-f]+ <[^>]*> 00021438 0x21438
+[0-9a-f]+ <[^>]*> 00021438 .word 0x21438
[0-9a-f]+ <[^>]*> 34428000 ori v0,v0,0x8000
-[0-9a-f]+ <[^>]*> 00021438 0x21438
+[0-9a-f]+ <[^>]*> 00021438 .word 0x21438
[0-9a-f]+ <[^>]*> d4820000 ldc1 \$f2,0\(a0\)
[0-9a-f]+ <[^>]*> 3c013ff0 lui at,0x3ff0
-[0-9a-f]+ <[^>]*> 00010c38 0x10c38
+[0-9a-f]+ <[^>]*> 00010c38 .word 0x10c38
[0-9a-f]+ <[^>]*> 342189ab ori at,at,0x89ab
-[0-9a-f]+ <[^>]*> 00010c38 0x10c38
-[0-9a-f]+ <[^>]*> 44a11000 0x44a11000
+[0-9a-f]+ <[^>]*> 00010c38 .word 0x10c38
+[0-9a-f]+ <[^>]*> 44a11000 .word 0x44a11000
[0-9a-f]+ <[^>]*> 8c820000 lw v0,0\(a0\)
[0-9a-f]+ <[^>]*> 8c830004 lw v1,4\(a0\)
[0-9a-f]+ <[^>]*> 3c0189ab lui at,0x89ab
diff --git a/gas/testsuite/gas/mips/set-arch.d b/gas/testsuite/gas/mips/set-arch.d
index 1579594..d1799dc 100644
--- a/gas/testsuite/gas/mips/set-arch.d
+++ b/gas/testsuite/gas/mips/set-arch.d
@@ -14,11 +14,11 @@ Disassembly of section \.text:
00000018 <[^>]*> 0100380a movz a3,t0,zero
0000001c <[^>]*> 0109001e ddiv zero,t0,t1
00000020 <[^>]*> 012a001f ddivu zero,t1,t2
-00000024 <[^>]*> 016c5005 0x16c5005
+00000024 <[^>]*> 016c5005 .word 0x16c5005
00000028 <[^>]*> 018d5801 movt t3,t4,\$fcc3
0000002c <[^>]*> 42000020 wait
00000030 <[^>]*> bdc40010 cache 0x4,16\(t6\)
-00000034 <[^>]*> 71ee0010 0x71ee0010
+00000034 <[^>]*> 71ee0010 .word 0x71ee0010
00000038 <[^>]*> 42000023 c0 0x23
0000003c <[^>]*> 42000021 c0 0x21
00000040 <[^>]*> 42000022 c0 0x22
@@ -166,42 +166,42 @@ Disassembly of section \.text:
00000278 <[^>]*> 7000003f sdbbp
0000027c <[^>]*> 7159e27f sdbbp 0x56789
00000280 <[^>]*> 000000c0 ehb
-00000284 <[^>]*> 7ca43980 0x7ca43980
-00000288 <[^>]*> 7ca46984 0x7ca46984
+00000284 <[^>]*> 7ca43980 .word 0x7ca43980
+00000288 <[^>]*> 7ca46984 .word 0x7ca46984
0000028c <[^>]*> 0100fc09 jalr.hb t0
00000290 <[^>]*> 0120a409 jalr.hb s4,t1
00000294 <[^>]*> 01000408 jr.hb t0
-00000298 <[^>]*> 7c0a003b 0x7c0a003b
-0000029c <[^>]*> 7c0b083b 0x7c0b083b
-000002a0 <[^>]*> 7c0c103b 0x7c0c103b
-000002a4 <[^>]*> 7c0d183b 0x7c0d183b
-000002a8 <[^>]*> 7c0e203b 0x7c0e203b
-000002ac <[^>]*> 7c0f283b 0x7c0f283b
-000002b0 <[^>]*> 002acf02 0x2acf02
-000002b4 <[^>]*> 002ac902 0x2ac902
+00000298 <[^>]*> 7c0a003b .word 0x7c0a003b
+0000029c <[^>]*> 7c0b083b .word 0x7c0b083b
+000002a0 <[^>]*> 7c0c103b .word 0x7c0c103b
+000002a4 <[^>]*> 7c0d183b .word 0x7c0d183b
+000002a8 <[^>]*> 7c0e203b .word 0x7c0e203b
+000002ac <[^>]*> 7c0f283b .word 0x7c0f283b
+000002b0 <[^>]*> 002acf02 .word 0x2acf02
+000002b4 <[^>]*> 002ac902 .word 0x2ac902
000002b8 <[^>]*> 0004c823 negu t9,a0
-000002bc <[^>]*> 032ac846 0x32ac846
-000002c0 <[^>]*> 008ac846 0x8ac846
-000002c4 <[^>]*> 008ac846 0x8ac846
-000002c8 <[^>]*> 7c073c20 0x7c073c20
-000002cc <[^>]*> 7c0a4420 0x7c0a4420
-000002d0 <[^>]*> 7c073e20 0x7c073e20
-000002d4 <[^>]*> 7c0a4620 0x7c0a4620
-000002d8 <[^>]*> 055f5555 0x55f5555
-000002dc <[^>]*> 7c0738a0 0x7c0738a0
-000002e0 <[^>]*> 7c0a40a0 0x7c0a40a0
-000002e4 <[^>]*> 41606000 0x41606000
-000002e8 <[^>]*> 41606000 0x41606000
-000002ec <[^>]*> 416a6000 0x416a6000
-000002f0 <[^>]*> 41606020 0x41606020
-000002f4 <[^>]*> 41606020 0x41606020
-000002f8 <[^>]*> 416a6020 0x416a6020
-000002fc <[^>]*> 41595000 0x41595000
-00000300 <[^>]*> 41d95000 0x41d95000
-00000304 <[^>]*> 44710000 0x44710000
-00000308 <[^>]*> 44f10000 0x44f10000
-0000030c <[^>]*> 48715555 0x48715555
-00000310 <[^>]*> 48f15555 0x48f15555
+000002bc <[^>]*> 032ac846 .word 0x32ac846
+000002c0 <[^>]*> 008ac846 .word 0x8ac846
+000002c4 <[^>]*> 008ac846 .word 0x8ac846
+000002c8 <[^>]*> 7c073c20 .word 0x7c073c20
+000002cc <[^>]*> 7c0a4420 .word 0x7c0a4420
+000002d0 <[^>]*> 7c073e20 .word 0x7c073e20
+000002d4 <[^>]*> 7c0a4620 .word 0x7c0a4620
+000002d8 <[^>]*> 055f5555 .word 0x55f5555
+000002dc <[^>]*> 7c0738a0 .word 0x7c0738a0
+000002e0 <[^>]*> 7c0a40a0 .word 0x7c0a40a0
+000002e4 <[^>]*> 41606000 .word 0x41606000
+000002e8 <[^>]*> 41606000 .word 0x41606000
+000002ec <[^>]*> 416a6000 .word 0x416a6000
+000002f0 <[^>]*> 41606020 .word 0x41606020
+000002f4 <[^>]*> 41606020 .word 0x41606020
+000002f8 <[^>]*> 416a6020 .word 0x416a6020
+000002fc <[^>]*> 41595000 .word 0x41595000
+00000300 <[^>]*> 41d95000 .word 0x41d95000
+00000304 <[^>]*> 44710000 .word 0x44710000
+00000308 <[^>]*> 44f10000 .word 0x44f10000
+0000030c <[^>]*> 48715555 .word 0x48715555
+00000310 <[^>]*> 48f15555 .word 0x48f15555
00000314 <[^>]*> 70410825 dclo at,v0
00000318 <[^>]*> 70831824 dclz v1,a0
0000031c <[^>]*> 48232000 dmfc2 v1,\$4
@@ -210,61 +210,61 @@ Disassembly of section \.text:
00000328 <[^>]*> 48a63800 dmtc2 a2,\$7
0000032c <[^>]*> 48a74000 dmtc2 a3,\$8
00000330 <[^>]*> 48a84807 dmtc2 t0,\$9,7
-00000334 <[^>]*> 00850029 0x850029
-00000338 <[^>]*> 00a60028 0xa60028
+00000334 <[^>]*> 00850029 .word 0x850029
+00000338 <[^>]*> 00a60028 .word 0xa60028
0000033c <[^>]*> 00002012 mflo a0
-00000340 <[^>]*> 00a62029 0xa62029
-00000344 <[^>]*> 00a62229 0xa62229
-00000348 <[^>]*> 00a62629 0xa62629
-0000034c <[^>]*> 00a62269 0xa62269
-00000350 <[^>]*> 00a62669 0xa62669
-00000354 <[^>]*> 00a62429 0xa62429
-00000358 <[^>]*> 00a62069 0xa62069
-0000035c <[^>]*> 00a62469 0xa62469
+00000340 <[^>]*> 00a62029 .word 0xa62029
+00000344 <[^>]*> 00a62229 .word 0xa62229
+00000348 <[^>]*> 00a62629 .word 0xa62629
+0000034c <[^>]*> 00a62269 .word 0xa62269
+00000350 <[^>]*> 00a62669 .word 0xa62669
+00000354 <[^>]*> 00a62429 .word 0xa62429
+00000358 <[^>]*> 00a62069 .word 0xa62069
+0000035c <[^>]*> 00a62469 .word 0xa62469
00000360 <[^>]*> 00002012 mflo a0
-00000364 <[^>]*> 00a62028 0xa62028
-00000368 <[^>]*> 00a62228 0xa62228
-0000036c <[^>]*> 00a62628 0xa62628
-00000370 <[^>]*> 00a62268 0xa62268
-00000374 <[^>]*> 00a62668 0xa62668
-00000378 <[^>]*> 00a62428 0xa62428
-0000037c <[^>]*> 00a62068 0xa62068
-00000380 <[^>]*> 00a62468 0xa62468
-00000384 <[^>]*> 00a62059 0xa62059
-00000388 <[^>]*> 00a62258 0xa62258
-0000038c <[^>]*> 00a62259 0xa62259
-00000390 <[^>]*> 00a620d8 0xa620d8
-00000394 <[^>]*> 00a620d9 0xa620d9
-00000398 <[^>]*> 00a622d8 0xa622d8
-0000039c <[^>]*> 00a622d9 0xa622d9
-000003a0 <[^>]*> 00a62158 0xa62158
-000003a4 <[^>]*> 00a62159 0xa62159
-000003a8 <[^>]*> 00a62358 0xa62358
-000003ac <[^>]*> 00a62359 0xa62359
-000003b0 <[^>]*> 00a621d8 0xa621d8
-000003b4 <[^>]*> 00a621d9 0xa621d9
-000003b8 <[^>]*> 00a623d8 0xa623d8
-000003bc <[^>]*> 00a623d9 0xa623d9
-000003c0 <[^>]*> 00252642 0x252642
-000003c4 <[^>]*> 00c52046 0xc52046
-000003c8 <[^>]*> 0025267a 0x25267a
-000003cc <[^>]*> 0025267e 0x25267e
-000003d0 <[^>]*> 0025267e 0x25267e
-000003d4 <[^>]*> 00c52056 0xc52056
+00000364 <[^>]*> 00a62028 .word 0xa62028
+00000368 <[^>]*> 00a62228 .word 0xa62228
+0000036c <[^>]*> 00a62628 .word 0xa62628
+00000370 <[^>]*> 00a62268 .word 0xa62268
+00000374 <[^>]*> 00a62668 .word 0xa62668
+00000378 <[^>]*> 00a62428 .word 0xa62428
+0000037c <[^>]*> 00a62068 .word 0xa62068
+00000380 <[^>]*> 00a62468 .word 0xa62468
+00000384 <[^>]*> 00a62059 .word 0xa62059
+00000388 <[^>]*> 00a62258 .word 0xa62258
+0000038c <[^>]*> 00a62259 .word 0xa62259
+00000390 <[^>]*> 00a620d8 .word 0xa620d8
+00000394 <[^>]*> 00a620d9 .word 0xa620d9
+00000398 <[^>]*> 00a622d8 .word 0xa622d8
+0000039c <[^>]*> 00a622d9 .word 0xa622d9
+000003a0 <[^>]*> 00a62158 .word 0xa62158
+000003a4 <[^>]*> 00a62159 .word 0xa62159
+000003a8 <[^>]*> 00a62358 .word 0xa62358
+000003ac <[^>]*> 00a62359 .word 0xa62359
+000003b0 <[^>]*> 00a621d8 .word 0xa621d8
+000003b4 <[^>]*> 00a621d9 .word 0xa621d9
+000003b8 <[^>]*> 00a623d8 .word 0xa623d8
+000003bc <[^>]*> 00a623d9 .word 0xa623d9
+000003c0 <[^>]*> 00252642 .word 0x252642
+000003c4 <[^>]*> 00c52046 .word 0xc52046
+000003c8 <[^>]*> 0025267a .word 0x25267a
+000003cc <[^>]*> 0025267e .word 0x25267e
+000003d0 <[^>]*> 0025267e .word 0x25267e
+000003d4 <[^>]*> 00c52056 .word 0xc52056
000003d8 <[^>]*> 7000003f sdbbp
-000003dc <[^>]*> 7000003e 0x7000003e
-000003e0 <[^>]*> 7003183d 0x7003183d
-000003e4 <[^>]*> 7083183d 0x7083183d
+000003dc <[^>]*> 7000003e .word 0x7000003e
+000003e0 <[^>]*> 7003183d .word 0x7003183d
+000003e4 <[^>]*> 7083183d .word 0x7083183d
000003e8 <[^>]*> 4004c803 mfc0 a0,c0_perfcnt,3
000003ec <[^>]*> 4004c802 mfc0 a0,c0_perfcnt,2
000003f0 <[^>]*> 4084c803 mtc0 a0,c0_perfcnt,3
000003f4 <[^>]*> 4084c802 mtc0 a0,c0_perfcnt,2
000003f8 <[^>]*> 4ac4100b c2 0xc4100b
-000003fc <[^>]*> 4886208b 0x4886208b
+000003fc <[^>]*> 4886208b .word 0x4886208b
00000400 <[^>]*> 4bcf218b c2 0x1cf218b
00000404 <[^>]*> 4bdf310b c2 0x1df310b
00000408 <[^>]*> 4ac4100c c2 0xc4100c
-0000040c <[^>]*> 4886208c 0x4886208c
+0000040c <[^>]*> 4886208c .word 0x4886208c
00000410 <[^>]*> 4bcf218c c2 0x1cf218c
00000414 <[^>]*> 4bdf310c c2 0x1df310c
00000418 <[^>]*> 4ac20001 c2 0xc20001
@@ -280,77 +280,77 @@ Disassembly of section \.text:
00000440 <[^>]*> 4bcf3004 c2 0x1cf3004
00000444 <[^>]*> 4bdf2004 c2 0x1df2004
00000448 <[^>]*> 4ac41007 c2 0xc41007
-0000044c <[^>]*> 48862087 0x48862087
+0000044c <[^>]*> 48862087 .word 0x48862087
00000450 <[^>]*> 4bcf2187 c2 0x1cf2187
00000454 <[^>]*> 4bdf3107 c2 0x1df3107
00000458 <[^>]*> 4ac41006 c2 0xc41006
-0000045c <[^>]*> 48862086 0x48862086
+0000045c <[^>]*> 48862086 .word 0x48862086
00000460 <[^>]*> 4bcf2186 c2 0x1cf2186
00000464 <[^>]*> 4bdf3106 c2 0x1df3106
00000468 <[^>]*> 4ac41030 c2 0xc41030
-0000046c <[^>]*> 488620b0 0x488620b0
+0000046c <[^>]*> 488620b0 .word 0x488620b0
00000470 <[^>]*> 4bcf21b0 c2 0x1cf21b0
00000474 <[^>]*> 4bdf3130 c2 0x1df3130
00000478 <[^>]*> 4ac20033 c2 0xc20033
-0000047c <[^>]*> 48862033 0x48862033
+0000047c <[^>]*> 48862033 .word 0x48862033
00000480 <[^>]*> 4bcf3033 c2 0x1cf3033
00000484 <[^>]*> 4bdf2033 c2 0x1df2033
00000488 <[^>]*> 4ac20433 c2 0xc20433
-0000048c <[^>]*> 48862433 0x48862433
+0000048c <[^>]*> 48862433 .word 0x48862433
00000490 <[^>]*> 4bcf3433 c2 0x1cf3433
00000494 <[^>]*> 4bdf2433 c2 0x1df2433
00000498 <[^>]*> 4ac20032 c2 0xc20032
-0000049c <[^>]*> 48862032 0x48862032
+0000049c <[^>]*> 48862032 .word 0x48862032
000004a0 <[^>]*> 4bcf3032 c2 0x1cf3032
000004a4 <[^>]*> 4bdf2032 c2 0x1df2032
000004a8 <[^>]*> 4ac20432 c2 0xc20432
-000004ac <[^>]*> 48862432 0x48862432
+000004ac <[^>]*> 48862432 .word 0x48862432
000004b0 <[^>]*> 4bcf3432 c2 0x1cf3432
000004b4 <[^>]*> 4bdf2432 c2 0x1df2432
000004b8 <[^>]*> 4ac4100f c2 0xc4100f
-000004bc <[^>]*> 4886208f 0x4886208f
+000004bc <[^>]*> 4886208f .word 0x4886208f
000004c0 <[^>]*> 4bcf218f c2 0x1cf218f
000004c4 <[^>]*> 4bdf310f c2 0x1df310f
000004c8 <[^>]*> 4ac4100e c2 0xc4100e
-000004cc <[^>]*> 4886208e 0x4886208e
+000004cc <[^>]*> 4886208e .word 0x4886208e
000004d0 <[^>]*> 4bcf218e c2 0x1cf218e
000004d4 <[^>]*> 4bdf310e c2 0x1df310e
000004d8 <[^>]*> 4ac41002 c2 0xc41002
-000004dc <[^>]*> 48862082 0x48862082
+000004dc <[^>]*> 48862082 .word 0x48862082
000004e0 <[^>]*> 4bcf2182 c2 0x1cf2182
000004e4 <[^>]*> 4bdf3102 c2 0x1df3102
000004e8 <[^>]*> 4ac41003 c2 0xc41003
-000004ec <[^>]*> 48862083 0x48862083
+000004ec <[^>]*> 48862083 .word 0x48862083
000004f0 <[^>]*> 4bcf2183 c2 0x1cf2183
000004f4 <[^>]*> 4bdf3103 c2 0x1df3103
000004f8 <[^>]*> 4ac4100a c2 0xc4100a
-000004fc <[^>]*> 4886208a 0x4886208a
+000004fc <[^>]*> 4886208a .word 0x4886208a
00000500 <[^>]*> 4bcf218a c2 0x1cf218a
00000504 <[^>]*> 4bdf310a c2 0x1df310a
00000508 <[^>]*> 4ac4100d c2 0xc4100d
-0000050c <[^>]*> 4886208d 0x4886208d
+0000050c <[^>]*> 4886208d .word 0x4886208d
00000510 <[^>]*> 4bcf218d c2 0x1cf218d
00000514 <[^>]*> 4bdf310d c2 0x1df310d
-00000518 <[^>]*> 48a41018 0x48a41018
-0000051c <[^>]*> 4984101f 0x4984101f
-00000520 <[^>]*> 49c4101f 0x49c4101f
+00000518 <[^>]*> 48a41018 .word 0x48a41018
+0000051c <[^>]*> 4984101f .word 0x4984101f
+00000520 <[^>]*> 49c4101f .word 0x49c4101f
00000524 <[^>]*> 4904101f bc2f \$cc1,000045a4 <[^>]*>
-00000528 <[^>]*> 4944101f 0x4944101f
-0000052c <[^>]*> 48c62090 0x48c62090
+00000528 <[^>]*> 4944101f .word 0x4944101f
+0000052c <[^>]*> 48c62090 .word 0x48c62090
00000530 <[^>]*> 4bce3110 c2 0x1ce3110
-00000534 <[^>]*> 48c62092 0x48c62092
+00000534 <[^>]*> 48c62092 .word 0x48c62092
00000538 <[^>]*> 4bce3112 c2 0x1ce3112
0000053c <[^>]*> 4bcd00a0 c2 0x1cd00a0
00000540 <[^>]*> 4a0000bf c2 0xbf
-00000544 <[^>]*> 480000bf 0x480000bf
+00000544 <[^>]*> 480000bf .word 0x480000bf
00000548 <[^>]*> 490000bf bc2f 00000848 <[^>]*>
0000054c <[^>]*> 4a00103e c2 0x103e
-00000550 <[^>]*> 4804103e 0x4804103e
-00000554 <[^>]*> 00c52046 0xc52046
-00000558 <[^>]*> 00252442 0x252442
-0000055c <[^>]*> 00c52056 0xc52056
-00000560 <[^>]*> 0025207e 0x25207e
-00000564 <[^>]*> 002520ba 0x2520ba
+00000550 <[^>]*> 4804103e .word 0x4804103e
+00000554 <[^>]*> 00c52046 .word 0xc52046
+00000558 <[^>]*> 00252442 .word 0x252442
+0000055c <[^>]*> 00c52056 .word 0xc52056
+00000560 <[^>]*> 0025207e .word 0x25207e
+00000564 <[^>]*> 002520ba .word 0x2520ba
00000568 <[^>]*> 4ca4200f prefx 0x4,a0\(a1\)
0000056c <[^>]*> 42000020 wait
00000570 <[^>]*> 42000020 wait
diff --git a/gas/testsuite/gas/mips/tls-o32.d b/gas/testsuite/gas/mips/tls-o32.d
index 0d2c183..a23e236 100644
--- a/gas/testsuite/gas/mips/tls-o32.d
+++ b/gas/testsuite/gas/mips/tls-o32.d
@@ -37,12 +37,12 @@ Disassembly of section .text:
50: 24630000 addiu v1,v1,0
50: R_MIPS_TLS_DTPREL_LO16 tlsvar_ld
54: 00621821 addu v1,v1,v0
- 58: 7c02283b 0x7c02283b
+ 58: 7c02283b .word 0x7c02283b
5c: 8f830000 lw v1,0\(gp\)
5c: R_MIPS_TLS_GOTTPREL tlsvar_ie
60: 00000000 nop
64: 00621821 addu v1,v1,v0
- 68: 7c02283b 0x7c02283b
+ 68: 7c02283b .word 0x7c02283b
6c: 3c030000 lui v1,0x0
6c: R_MIPS_TLS_TPREL_HI16 tlsvar_le
70: 34630000 ori v1,v1,0x0
diff --git a/opcodes/mips-dis.c b/opcodes/mips-dis.c
index faeebcc..1d9875f 100644
--- a/opcodes/mips-dis.c
+++ b/opcodes/mips-dis.c
@@ -2020,7 +2020,7 @@ print_insn_mips (bfd_vma memaddr,
/* Handle undefined instructions. */
info->insn_type = dis_noninsn;
- infprintf (is, "0x%x", word);
+ infprintf (is, ".word\t0x%x", word);
return INSNLEN;
}
@@ -2398,7 +2398,7 @@ print_insn_mips16 (bfd_vma memaddr, struct disassemble_info *info)
}
#undef GET_OP
- infprintf (is, "0x%x", first);
+ infprintf (is, ".short\t0x%x", first);
info->insn_type = dis_noninsn;
return 2;
@@ -2515,7 +2515,10 @@ print_insn_micromips (bfd_vma memaddr, struct disassemble_info *info)
}
}
- infprintf (is, "0x%x", insn);
+ if (length == 2)
+ infprintf (is, ".short\t0x%x", insn);
+ else
+ infprintf (is, ".word\t0x%x", insn);
info->insn_type = dis_noninsn;
return length;
generated by cgit v1.1 at 2024-09-17 22:45:52 +0000