This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
[PATCH v2] NIOS2: Test suite changes
This patch deletes four files which are not used by nios2.exp. The rol
test seem to be a copy of the MIPS test suite. The mov test uses
instructions not defined for Nios II.
Instead of a file enumeration the run_dump_tests function is used to run
the dump tests in nios2.exp.
The instruction values are checked. This ensures that the assembler
generates something the processor can understand.
I do not have commit access. If someone approves this patch, please
commit it also.
2013-03-10 Sebastian Huber <sebastian.huber@embedded-brains.de>
* gas/nios2/nios2.exp: Use run_dump_tests.
* gas/nios2/mov.d: Delete file.
* gas/nios2/mov.s: Likewise.
* gas/nios2/rol.d: Likewise.
* gas/nios2/rol.s: Likewise.
* gas/nios2/add.d: Check instruction values.
* gas/nios2/align_fill.d: Likewise.
* gas/nios2/and.d: Likewise.
* gas/nios2/branch.d: Likewise.
* gas/nios2/bret.d: Likewise.
* gas/nios2/cache.d: Likewise.
* gas/nios2/call.d: Likewise.
* gas/nios2/call26.d: Likewise.
* gas/nios2/cmp.d: Likewise.
* gas/nios2/comments.d: Likewise.
* gas/nios2/complex.d: Likewise.
* gas/nios2/ctl.d: Likewise.
* gas/nios2/custom.d: Likewise.
* gas/nios2/etbt.d: Likewise.
* gas/nios2/flushda.d: Likewise.
* gas/nios2/jmp.d: Likewise.
* gas/nios2/ldb.d: Likewise.
* gas/nios2/ldh.d: Likewise.
* gas/nios2/ldw.d: Likewise.
* gas/nios2/lineseparator.d: Likewise.
* gas/nios2/movi.d: Likewise.
* gas/nios2/movia.d: Likewise.
* gas/nios2/mul.d: Likewise.
* gas/nios2/nor.d: Likewise.
* gas/nios2/or.d: Likewise.
* gas/nios2/registers.d: Likewise.
* gas/nios2/ret.d: Likewise.
* gas/nios2/rotate.d: Likewise.
* gas/nios2/stb.d: Likewise.
* gas/nios2/sth.d: Likewise.
* gas/nios2/stw.d: Likewise.
* gas/nios2/sub.d: Likewise.
* gas/nios2/sync.d: Likewise.
* gas/nios2/trap.d: Likewise.
* gas/nios2/tret.d: Likewise.
* gas/nios2/xor.d: Likewise.
---
gas/testsuite/gas/nios2/add.d | 18 +--
gas/testsuite/gas/nios2/align_fill.d | 30 ++---
gas/testsuite/gas/nios2/and.d | 20 +--
gas/testsuite/gas/nios2/branch.d | 16 +--
gas/testsuite/gas/nios2/bret.d | 4 +-
gas/testsuite/gas/nios2/cache.d | 18 +--
gas/testsuite/gas/nios2/call.d | 8 +-
gas/testsuite/gas/nios2/call26.d | 128 +++++++++----------
gas/testsuite/gas/nios2/cmp.d | 30 ++---
gas/testsuite/gas/nios2/comments.d | 38 +++---
gas/testsuite/gas/nios2/complex.d | 8 +-
gas/testsuite/gas/nios2/ctl.d | 26 ++--
gas/testsuite/gas/nios2/custom.d | 12 +-
gas/testsuite/gas/nios2/etbt.d | 6 +-
gas/testsuite/gas/nios2/flushda.d | 4 +-
gas/testsuite/gas/nios2/jmp.d | 4 +-
gas/testsuite/gas/nios2/ldb.d | 206 +++++++++++++++----------------
gas/testsuite/gas/nios2/ldh.d | 206 +++++++++++++++----------------
gas/testsuite/gas/nios2/ldw.d | 206 +++++++++++++++----------------
gas/testsuite/gas/nios2/lineseparator.d | 6 +-
gas/testsuite/gas/nios2/mov.d | 11 --
gas/testsuite/gas/nios2/mov.s | 5 -
gas/testsuite/gas/nios2/movi.d | 14 +--
gas/testsuite/gas/nios2/movia.d | 14 +--
gas/testsuite/gas/nios2/mul.d | 22 ++--
gas/testsuite/gas/nios2/nios2.exp | 57 +--------
gas/testsuite/gas/nios2/nor.d | 4 +-
gas/testsuite/gas/nios2/or.d | 8 +-
gas/testsuite/gas/nios2/registers.d | 88 ++++++-------
gas/testsuite/gas/nios2/ret.d | 4 +-
gas/testsuite/gas/nios2/rol.d | 40 ------
gas/testsuite/gas/nios2/rol.s | 15 ---
gas/testsuite/gas/nios2/rotate.d | 20 +--
gas/testsuite/gas/nios2/stb.d | 206 +++++++++++++++----------------
gas/testsuite/gas/nios2/sth.d | 206 +++++++++++++++----------------
gas/testsuite/gas/nios2/stw.d | 206 +++++++++++++++----------------
gas/testsuite/gas/nios2/sub.d | 4 +-
gas/testsuite/gas/nios2/sync.d | 4 +-
gas/testsuite/gas/nios2/trap.d | 4 +-
gas/testsuite/gas/nios2/tret.d | 4 +-
gas/testsuite/gas/nios2/xor.d | 8 +-
41 files changed, 907 insertions(+), 1031 deletions(-)
delete mode 100644 gas/testsuite/gas/nios2/mov.d
delete mode 100644 gas/testsuite/gas/nios2/mov.s
delete mode 100644 gas/testsuite/gas/nios2/rol.d
delete mode 100644 gas/testsuite/gas/nios2/rol.s
diff --git a/gas/testsuite/gas/nios2/add.d b/gas/testsuite/gas/nios2/add.d
index ba3d27f..3eb685a 100644
--- a/gas/testsuite/gas/nios2/add.d
+++ b/gas/testsuite/gas/nios2/add.d
@@ -1,4 +1,4 @@
-#objdump: -dr --prefix-addresses
+#objdump: -dr --prefix-addresses --show-raw-insn
#name: NIOS2 add
# Test the add instruction
@@ -6,11 +6,11 @@
.*: +file format elf32-littlenios2
Disassembly of section .text:
-0+0000 <[^>]*> add r4,r4,r4
-0+0004 <[^>]*> addi r4,r4,32767
-0+0008 <[^>]*> addi r4,r4,-32768
-0+000c <[^>]*> addi r4,r4,0
-0+0010 <[^>]*> addi r4,r4,-1
-0+0014 <[^>]*> addi r4,r4,-1
-0+0018 <[^>]*> addi r4,r4,13398
-0+001c <[^>]*> nop
+0+0000 <[^>]*> 2109883a add r4,r4,r4
+0+0004 <[^>]*> 211fffc4 addi r4,r4,32767
+0+0008 <[^>]*> 21200004 addi r4,r4,-32768
+0+000c <[^>]*> 21000004 addi r4,r4,0
+0+0010 <[^>]*> 213fffc4 addi r4,r4,-1
+0+0014 <[^>]*> 213fffc4 addi r4,r4,-1
+0+0018 <[^>]*> 210d1584 addi r4,r4,13398
+0+001c <[^>]*> 0001883a nop
diff --git a/gas/testsuite/gas/nios2/align_fill.d b/gas/testsuite/gas/nios2/align_fill.d
index 90a9e5f..ecee94d 100644
--- a/gas/testsuite/gas/nios2/align_fill.d
+++ b/gas/testsuite/gas/nios2/align_fill.d
@@ -1,4 +1,4 @@
-#objdump: -dr --prefix-addresses
+#objdump: -dr --prefix-addresses --show-raw-insn
#name: NIOS2 align_fill
# Test the and macro.
@@ -6,18 +6,18 @@
.*: +file format elf32-littlenios2
Disassembly of section .text:
-0+0000 <[^>]*> addi sp,sp,-8
-0+0004 <[^>]*> stw fp,4\(sp\)
-0+0008 <[^>]*> mov fp,sp
-0+000c <[^>]*> mov r3,zero
-0+0010 <[^>]*> nop
-0+0014 <[^>]*> nop
-0+0018 <[^>]*> nop
-0+001c <[^>]*> nop
-0+0020 <[^>]*> addi r3,r3,1
-0+0024 <[^>]*> cmplti r2,r3,100
-0+0028 <[^>]*> bne r2,zero,0+0020 <[^>*]*>
-0+002c <[^>]*> ldw fp,4\(sp\)
-0+0030 <[^>]*> addi sp,sp,8
-0+0034 <[^>]*> ret
+0+0000 <[^>]*> defffe04 addi sp,sp,-8
+0+0004 <[^>]*> df000115 stw fp,4\(sp\)
+0+0008 <[^>]*> d839883a mov fp,sp
+0+000c <[^>]*> 0007883a mov r3,zero
+0+0010 <[^>]*> 0001883a nop
+0+0014 <[^>]*> 0001883a nop
+0+0018 <[^>]*> 0001883a nop
+0+001c <[^>]*> 0001883a nop
+0+0020 <[^>]*> 18c00044 addi r3,r3,1
+0+0024 <[^>]*> 18801910 cmplti r2,r3,100
+0+0028 <[^>]*> 103ffd1e bne r2,zero,00000020 <[^>]*>
+0+002c <[^>]*> df000117 ldw fp,4\(sp\)
+0+0030 <[^>]*> dec00204 addi sp,sp,8
+0+0034 <[^>]*> f800283a ret
...
diff --git a/gas/testsuite/gas/nios2/and.d b/gas/testsuite/gas/nios2/and.d
index 350ca69..8ae122c 100644
--- a/gas/testsuite/gas/nios2/and.d
+++ b/gas/testsuite/gas/nios2/and.d
@@ -1,4 +1,4 @@
-#objdump: -dr --prefix-addresses
+#objdump: -dr --prefix-addresses --show-raw-insn
#name: NIOS2 and
# Test the and macro.
@@ -6,12 +6,12 @@
.*: +file format elf32-littlenios2
Disassembly of section .text:
-0+0000 <[^>]*> and r4,r4,r4
-0+0004 <[^>]*> andi r4,r4,32767
-0+0008 <[^>]*> andi r4,r4,32768
-0+000c <[^>]*> andi r4,r4,65535
-0+0010 <[^>]*> andi r4,r4,0
-0+0014 <[^>]*> andhi r4,r4,32767
-0+0018 <[^>]*> andhi r4,r4,32768
-0+001c <[^>]*> andhi r4,r4,65535
-0+0020 <[^>]*> andhi r4,r4,0
+0+0000 <[^>]*> 2108703a and r4,r4,r4
+0+0004 <[^>]*> 211fffcc andi r4,r4,32767
+0+0008 <[^>]*> 2120000c andi r4,r4,32768
+0+000c <[^>]*> 213fffcc andi r4,r4,65535
+0+0010 <[^>]*> 2100000c andi r4,r4,0
+0+0014 <[^>]*> 211fffec andhi r4,r4,32767
+0+0018 <[^>]*> 2120002c andhi r4,r4,32768
+0+001c <[^>]*> 213fffec andhi r4,r4,65535
+0+0020 <[^>]*> 2100002c andhi r4,r4,0
diff --git a/gas/testsuite/gas/nios2/branch.d b/gas/testsuite/gas/nios2/branch.d
index 08d20f3..4d9dac6 100644
--- a/gas/testsuite/gas/nios2/branch.d
+++ b/gas/testsuite/gas/nios2/branch.d
@@ -1,21 +1,21 @@
-#objdump: -dr --prefix-addresses
+#objdump: -dr --prefix-addresses --show-raw-insn
#name: NIOS2 branch
# Test the branch instructions.
dump.o: file format elf32-littlenios2
Disassembly of section .text:
-0+0000 <[^>]*> beq r4,r5,00000004 <text_label\+0x4>
+0+0000 <[^>]*> 21400026 beq r4,r5,00000004 <[^>]*>
[ ]*0: R_NIOS2_PCREL16 text_label
-0+0004 <[^>]*> bge r4,r5,00000008 <text_label\+0x8>
+0+0004 <[^>]*> 2140000e bge r4,r5,00000008 <[^>]*>
[ ]*4: R_NIOS2_PCREL16 text_label
-0+0008 <[^>]*> bgeu r4,r5,0000000c <text_label\+0xc>
+0+0008 <[^>]*> 2140002e bgeu r4,r5,0000000c <[^>]*>
[ ]*8: R_NIOS2_PCREL16 text_label
-0+000c <[^>]*> blt r4,r5,00000010 <text_label\+0x10>
+0+000c <[^>]*> 21400016 blt r4,r5,00000010 <[^>]*>
[ ]*c: R_NIOS2_PCREL16 text_label
-0+0010 <[^>]*> bltu r4,r5,00000014 <text_label\+0x14>
+0+0010 <[^>]*> 21400036 bltu r4,r5,00000014 <[^>]*>
[ ]*10: R_NIOS2_PCREL16 text_label
-0+0014 <[^>]*> bne r4,r5,00000018 <text_label\+0x18>
+0+0014 <[^>]*> 2140001e bne r4,r5,00000018 <[^>]*>
[ ]*14: R_NIOS2_PCREL16 text_label
-0+0018 <[^>]*> br 0000001c <text_label\+0x1c>
+0+0018 <[^>]*> 00000006 br 0000001c <[^>]*>
[ ]*18: R_NIOS2_PCREL16 external_label
diff --git a/gas/testsuite/gas/nios2/bret.d b/gas/testsuite/gas/nios2/bret.d
index a12530b..80462fd 100644
--- a/gas/testsuite/gas/nios2/bret.d
+++ b/gas/testsuite/gas/nios2/bret.d
@@ -1,8 +1,8 @@
-#objdump: -dr --prefix-addresses
+#objdump: -dr --prefix-addresses --show-raw-insn
#name: NIOS2 bret
.*: +file format elf32-littlenios2
Disassembly of section .text:
-0+0000 <[^>]*> bret
+0+0000 <[^>]*> f000483a bret
diff --git a/gas/testsuite/gas/nios2/cache.d b/gas/testsuite/gas/nios2/cache.d
index 7c278d8..061ceb6 100644
--- a/gas/testsuite/gas/nios2/cache.d
+++ b/gas/testsuite/gas/nios2/cache.d
@@ -1,17 +1,17 @@
-#objdump: -dr --prefix-addresses
+#objdump: -dr --prefix-addresses --show-raw-insn
#name: NIOS2 cache
.*: +file format elf32-littlenios2
Disassembly of section .text:
-0+0000 <[^>]*> flushd -32768\(r6\)
-0+0004 <[^>]*> flushd 32767\(r6\)
-0+0008 <[^>]*> flushd 0\(r6\)
-0+000c <[^>]*> flushd -1\(r6\)
-0+0010 <[^>]*> flushd 0\(r6\)
+0+0000 <[^>]*> 3020003b flushd -32768\(r6\)
+0+0004 <[^>]*> 301ffffb flushd 32767\(r6\)
+0+0008 <[^>]*> 3000003b flushd 0\(r6\)
+0+000c <[^>]*> 303ffffb flushd -1\(r6\)
+0+0010 <[^>]*> 3000003b flushd 0\(r6\)
[ ]*10: R_NIOS2_S16 .text
-0+0014 <[^>]*> flushd 0\(r6\)
+0+0014 <[^>]*> 3000003b flushd 0\(r6\)
[ ]*14: R_NIOS2_S16 external
-0+0018 <[^>]*> flushi r2
-0+001c <[^>]*> flushp
+0+0018 <[^>]*> 1000603a flushi r2
+0+001c <[^>]*> 0000203a flushp
diff --git a/gas/testsuite/gas/nios2/call.d b/gas/testsuite/gas/nios2/call.d
index cfa6aec..44ce885 100644
--- a/gas/testsuite/gas/nios2/call.d
+++ b/gas/testsuite/gas/nios2/call.d
@@ -1,11 +1,11 @@
-# objdump: -dr --prefix-addresses
+# objdump: -dr --prefix-addresses --show-raw-insn
#name: NIOS2 call
.*: +file format elf32-littlenios2
Disassembly of section .text:
-0+0000 <[^>]*> call 00000000 <foo>
+0+0000 <[^>]*> 00000000 call 00000000 <[^>]*>
[ ]*0: R_NIOS2_CALL26 .text\+0xc
-0+0004 <[^>]*> callr r10
-0+0008 <[^>]*> call 00000000 <foo>
+0+0004 <[^>]*> 503ee83a callr r10
+0+0008 <[^>]*> 00000000 call 00000000 <[^>]*>
[ ]*8: R_NIOS2_CALL26 external
diff --git a/gas/testsuite/gas/nios2/call26.d b/gas/testsuite/gas/nios2/call26.d
index 63364ef..30376e7 100644
--- a/gas/testsuite/gas/nios2/call26.d
+++ b/gas/testsuite/gas/nios2/call26.d
@@ -1,4 +1,4 @@
-#objdump: -dr --prefix-addresses
+#objdump: -dr --prefix-addresses --show-raw-insn
#name: NIOS2 nios2-reloc-r-nios2-call26
# Test the branch instructions.
@@ -8,69 +8,69 @@ Disassembly of section .text:
[ ]*\.\.\.
[ ]*0: R_NIOS2_CALL26 .text\+0x100
[ ]*4: R_NIOS2_CALL26 globalfunc
-0+0008 <[^>]*> nop
-0+000c <[^>]*> nop
-0+0010 <[^>]*> nop
-0+0014 <[^>]*> nop
-0+0018 <[^>]*> nop
-0+001c <[^>]*> nop
-0+0020 <[^>]*> nop
-0+0024 <[^>]*> nop
-0+0028 <[^>]*> nop
-0+002c <[^>]*> nop
-0+0030 <[^>]*> nop
-0+0034 <[^>]*> nop
-0+0038 <[^>]*> nop
-0+003c <[^>]*> nop
-0+0040 <[^>]*> nop
-0+0044 <[^>]*> nop
-0+0048 <[^>]*> nop
-0+004c <[^>]*> nop
-0+0050 <[^>]*> nop
-0+0054 <[^>]*> nop
-0+0058 <[^>]*> nop
-0+005c <[^>]*> nop
-0+0060 <[^>]*> nop
-0+0064 <[^>]*> nop
-0+0068 <[^>]*> nop
-0+006c <[^>]*> nop
-0+0070 <[^>]*> nop
-0+0074 <[^>]*> nop
-0+0078 <[^>]*> nop
-0+007c <[^>]*> nop
-0+0080 <[^>]*> nop
-0+0084 <[^>]*> nop
-0+0088 <[^>]*> nop
-0+008c <[^>]*> nop
-0+0090 <[^>]*> nop
-0+0094 <[^>]*> nop
-0+0098 <[^>]*> nop
-0+009c <[^>]*> nop
-0+00a0 <[^>]*> nop
-0+00a4 <[^>]*> nop
-0+00a8 <[^>]*> nop
-0+00ac <[^>]*> nop
-0+00b0 <[^>]*> nop
-0+00b4 <[^>]*> nop
-0+00b8 <[^>]*> nop
-0+00bc <[^>]*> nop
-0+00c0 <[^>]*> nop
-0+00c4 <[^>]*> nop
-0+00c8 <[^>]*> nop
-0+00cc <[^>]*> nop
-0+00d0 <[^>]*> nop
-0+00d4 <[^>]*> nop
-0+00d8 <[^>]*> nop
-0+00dc <[^>]*> nop
-0+00e0 <[^>]*> nop
-0+00e4 <[^>]*> nop
-0+00e8 <[^>]*> nop
-0+00ec <[^>]*> nop
-0+00f0 <[^>]*> nop
-0+00f4 <[^>]*> nop
-0+00f8 <[^>]*> nop
-0+00fc <[^>]*> nop
-0+0100 <[^>]*> nop
+0+0008 <[^>]*> 0001883a nop
+0+000c <[^>]*> 0001883a nop
+0+0010 <[^>]*> 0001883a nop
+0+0014 <[^>]*> 0001883a nop
+0+0018 <[^>]*> 0001883a nop
+0+001c <[^>]*> 0001883a nop
+0+0020 <[^>]*> 0001883a nop
+0+0024 <[^>]*> 0001883a nop
+0+0028 <[^>]*> 0001883a nop
+0+002c <[^>]*> 0001883a nop
+0+0030 <[^>]*> 0001883a nop
+0+0034 <[^>]*> 0001883a nop
+0+0038 <[^>]*> 0001883a nop
+0+003c <[^>]*> 0001883a nop
+0+0040 <[^>]*> 0001883a nop
+0+0044 <[^>]*> 0001883a nop
+0+0048 <[^>]*> 0001883a nop
+0+004c <[^>]*> 0001883a nop
+0+0050 <[^>]*> 0001883a nop
+0+0054 <[^>]*> 0001883a nop
+0+0058 <[^>]*> 0001883a nop
+0+005c <[^>]*> 0001883a nop
+0+0060 <[^>]*> 0001883a nop
+0+0064 <[^>]*> 0001883a nop
+0+0068 <[^>]*> 0001883a nop
+0+006c <[^>]*> 0001883a nop
+0+0070 <[^>]*> 0001883a nop
+0+0074 <[^>]*> 0001883a nop
+0+0078 <[^>]*> 0001883a nop
+0+007c <[^>]*> 0001883a nop
+0+0080 <[^>]*> 0001883a nop
+0+0084 <[^>]*> 0001883a nop
+0+0088 <[^>]*> 0001883a nop
+0+008c <[^>]*> 0001883a nop
+0+0090 <[^>]*> 0001883a nop
+0+0094 <[^>]*> 0001883a nop
+0+0098 <[^>]*> 0001883a nop
+0+009c <[^>]*> 0001883a nop
+0+00a0 <[^>]*> 0001883a nop
+0+00a4 <[^>]*> 0001883a nop
+0+00a8 <[^>]*> 0001883a nop
+0+00ac <[^>]*> 0001883a nop
+0+00b0 <[^>]*> 0001883a nop
+0+00b4 <[^>]*> 0001883a nop
+0+00b8 <[^>]*> 0001883a nop
+0+00bc <[^>]*> 0001883a nop
+0+00c0 <[^>]*> 0001883a nop
+0+00c4 <[^>]*> 0001883a nop
+0+00c8 <[^>]*> 0001883a nop
+0+00cc <[^>]*> 0001883a nop
+0+00d0 <[^>]*> 0001883a nop
+0+00d4 <[^>]*> 0001883a nop
+0+00d8 <[^>]*> 0001883a nop
+0+00dc <[^>]*> 0001883a nop
+0+00e0 <[^>]*> 0001883a nop
+0+00e4 <[^>]*> 0001883a nop
+0+00e8 <[^>]*> 0001883a nop
+0+00ec <[^>]*> 0001883a nop
+0+00f0 <[^>]*> 0001883a nop
+0+00f4 <[^>]*> 0001883a nop
+0+00f8 <[^>]*> 0001883a nop
+0+00fc <[^>]*> 0001883a nop
+0+0100 <[^>]*> 0001883a nop
...
diff --git a/gas/testsuite/gas/nios2/cmp.d b/gas/testsuite/gas/nios2/cmp.d
index 43d9d68..bb588eb 100644
--- a/gas/testsuite/gas/nios2/cmp.d
+++ b/gas/testsuite/gas/nios2/cmp.d
@@ -1,24 +1,24 @@
-#objdump: -dr --prefix-addresses
+#objdump: -dr --prefix-addresses --show-raw-insn
#name: NIOS2 cmp
.*: +file format elf32-littlenios2
Disassembly of section .text:
-0+0000 <[^>]*> cmpeq r11,r2,r3
-0+0004 <[^>]*> cmpge r11,r2,r3
-0+0008 <[^>]*> cmpgeu r11,r2,r3
-0+000c <[^>]*> cmplt r11,r2,r3
-0+0010 <[^>]*> cmpltu r11,r2,r3
-0+0014 <[^>]*> cmpne r11,r2,r3
-0+0018 <[^>]*> cmpgei r11,r2,0
+0+0000 <[^>]*> 10d7003a cmpeq r11,r2,r3
+0+0004 <[^>]*> 10d6403a cmpge r11,r2,r3
+0+0008 <[^>]*> 10d7403a cmpgeu r11,r2,r3
+0+000c <[^>]*> 10d6803a cmplt r11,r2,r3
+0+0010 <[^>]*> 10d7803a cmpltu r11,r2,r3
+0+0014 <[^>]*> 10d6c03a cmpne r11,r2,r3
+0+0018 <[^>]*> 12c00008 cmpgei r11,r2,0
[ ]*18: R_NIOS2_S16 value
-0+001c <[^>]*> cmpgeui r11,r2,0
+0+001c <[^>]*> 12c00028 cmpgeui r11,r2,0
[ ]*1c: R_NIOS2_U16 value\+0x200
-0+0020 <[^>]*> cmplti r11,r2,0
+0+0020 <[^>]*> 12c00010 cmplti r11,r2,0
[ ]*20: R_NIOS2_S16 value
-0+0024 <[^>]*> cmpltui r11,r2,0
+0+0024 <[^>]*> 12c00030 cmpltui r11,r2,0
[ ]*24: R_NIOS2_U16 value\+0x200
-0+0028 <[^>]*> cmpgei r11,r2,32767
-0+002c <[^>]*> cmpgeui r11,r2,32768
-0+0030 <[^>]*> cmplti r11,r2,-32768
-0+0034 <[^>]*> cmpltui r11,r2,65535
+0+0028 <[^>]*> 12dfffc8 cmpgei r11,r2,32767
+0+002c <[^>]*> 12e00028 cmpgeui r11,r2,32768
+0+0030 <[^>]*> 12e00010 cmplti r11,r2,-32768
+0+0034 <[^>]*> 12fffff0 cmpltui r11,r2,65535
diff --git a/gas/testsuite/gas/nios2/comments.d b/gas/testsuite/gas/nios2/comments.d
index 890dcc2..a116d87 100644
--- a/gas/testsuite/gas/nios2/comments.d
+++ b/gas/testsuite/gas/nios2/comments.d
@@ -1,4 +1,4 @@
-#objdump: -dr --prefix-addresses
+#objdump: -dr --prefix-addresses --show-raw-insn
#name: NIOS2 comments
# Test the add instruction
@@ -6,21 +6,21 @@
.*: +file format elf32-littlenios2
Disassembly of section .text:
-0+0000 <[^>]*> br 0000001c <start>
-0+0004 <[^>]*> br 00000008 <abort>
-0+0008 <[^>]*> movui r3,0
-0+000c <[^>]*> movui r2,1
-0+0010 <[^>]*> movui r3,0
-0+0014 <[^>]*> movui r2,0
-0+0018 <[^>]*> br 00000044 <exit>
-0+001c <[^>]*> addi r2,r2,-4
-0+0020 <[^>]*> movui r11,1
-0+0024 <[^>]*> movui r5,0
-0+0028 <[^>]*> movui r6,0
-0+002c <[^>]*> br 00000030 <ldst>
-0+0030 <[^>]*> movui r2,61452
-0+0034 <[^>]*> movui r20,64206
-0+0038 <[^>]*> stw r20,0\(r2\)
-0+003c <[^>]*> ldw r21,0\(r2\)
-0+0040 <[^>]*> br 00000010 <end>
-0+0044 <[^>]*> br 00000044 <exit>
+0+0000 <[^>]*> 00000606 br 0000001c <start>
+0+0004 <[^>]*> 00000006 br 00000008 <abort>
+0+0008 <[^>]*> 00c00014 movui r3,0
+0+000c <[^>]*> 00800054 movui r2,1
+0+0010 <[^>]*> 00c00014 movui r3,0
+0+0014 <[^>]*> 00800014 movui r2,0
+0+0018 <[^>]*> 00000a06 br 00000044 <exit>
+0+001c <[^>]*> 10bfff04 addi r2,r2,-4
+0+0020 <[^>]*> 02c00054 movui r11,1
+0+0024 <[^>]*> 01400014 movui r5,0
+0+0028 <[^>]*> 01800014 movui r6,0
+0+002c <[^>]*> 00000006 br 00000030 <ldst>
+0+0030 <[^>]*> 00bc0314 movui r2,61452
+0+0034 <[^>]*> 053eb394 movui r20,64206
+0+0038 <[^>]*> 15000015 stw r20,0\(r2\)
+0+003c <[^>]*> 15400017 ldw r21,0\(r2\)
+0+0040 <[^>]*> 003ff306 br 00000010 <end>
+0+0044 <[^>]*> 003fff06 br 00000044 <exit>
diff --git a/gas/testsuite/gas/nios2/complex.d b/gas/testsuite/gas/nios2/complex.d
index f32115b..81224d8 100644
--- a/gas/testsuite/gas/nios2/complex.d
+++ b/gas/testsuite/gas/nios2/complex.d
@@ -1,4 +1,4 @@
-#objdump: -dr --prefix-addresses
+#objdump: -dr --prefix-addresses --show-raw-insn
#name: NIOS2 complex
# Test complex expression parsing
@@ -6,7 +6,7 @@
.*: +file format elf32-littlenios2
Disassembly of section .text:
-0+0000 <[^>]*> ldw r2,-1\(r3\)
-0+0004 <[^>]*> ldw r2,1\(r3\)
-0+0008 <[^>]*> ldw r2,0\(r3\)
+0+0000 <[^>]*> 18bfffd7 ldw r2,-1\(r3\)
+0+0004 <[^>]*> 18800057 ldw r2,1\(r3\)
+0+0008 <[^>]*> 18800017 ldw r2,0\(r3\)
8: R_NIOS2_S16 stack_top-0x1
diff --git a/gas/testsuite/gas/nios2/ctl.d b/gas/testsuite/gas/nios2/ctl.d
index f698ce6..ce7450a 100644
--- a/gas/testsuite/gas/nios2/ctl.d
+++ b/gas/testsuite/gas/nios2/ctl.d
@@ -1,4 +1,4 @@
-#objdump: -dr --prefix-addresses
+#objdump: -dr --prefix-addresses --show-raw-insn
#name: NIOS2 ctl
# Test the ctl instructions
@@ -6,15 +6,15 @@
.*: +file format elf32-littlenios2
Disassembly of section .text:
-0+0000 <[^>]*> rdctl r8,ctl31
-0+0004 <[^>]*> rdctl r8,ctl30
-0+0008 <[^>]*> rdctl r8,ctl29
-0+000c <[^>]*> rdctl r8,status
-0+0010 <[^>]*> rdctl r8,bstatus
-0+0014 <[^>]*> rdctl r8,estatus
-0+0018 <[^>]*> wrctl ctl31,r8
-0+001c <[^>]*> wrctl ctl30,r8
-0+0020 <[^>]*> wrctl ctl29,r8
-0+0024 <[^>]*> wrctl status,r8
-0+0028 <[^>]*> wrctl bstatus,r8
-0+002c <[^>]*> wrctl estatus,r8
+0+0000 <[^>]*> 001137fa rdctl r8,ctl31
+0+0004 <[^>]*> 001137ba rdctl r8,ctl30
+0+0008 <[^>]*> 0011377a rdctl r8,ctl29
+0+000c <[^>]*> 0011303a rdctl r8,status
+0+0010 <[^>]*> 001130ba rdctl r8,bstatus
+0+0014 <[^>]*> 0011307a rdctl r8,estatus
+0+0018 <[^>]*> 400177fa wrctl ctl31,r8
+0+001c <[^>]*> 400177ba wrctl ctl30,r8
+0+0020 <[^>]*> 4001777a wrctl ctl29,r8
+0+0024 <[^>]*> 4001703a wrctl status,r8
+0+0028 <[^>]*> 400170ba wrctl bstatus,r8
+0+002c <[^>]*> 4001707a wrctl estatus,r8
diff --git a/gas/testsuite/gas/nios2/custom.d b/gas/testsuite/gas/nios2/custom.d
index c1e17be..c7f7a1c 100644
--- a/gas/testsuite/gas/nios2/custom.d
+++ b/gas/testsuite/gas/nios2/custom.d
@@ -1,4 +1,4 @@
-#objdump: -dr --prefix-addresses
+#objdump: -dr --prefix-addresses --show-raw-insn
#name: NIOS2 custom
# Test the custom instruction
@@ -6,8 +6,8 @@
.*: +file format elf32-littlenios2
Disassembly of section .text:
-0+0000 <[^>]*> custom 0,r11,r2,r3
-0+0004 <[^>]*> custom 255,r11,r2,r3
-0+0008 <[^>]*> custom 150,c1,r2,r3
-0+000c <[^>]*> custom 24,c1,c2,r3
-0+0010 <[^>]*> custom 56,c1,c2,c3
+0+0000 <[^>]*> 10d7c032 custom 0,r11,r2,r3
+0+0004 <[^>]*> 10d7fff2 custom 255,r11,r2,r3
+0+0008 <[^>]*> 10c3a5b2 custom 150,c1,r2,r3
+0+000c <[^>]*> 10c28632 custom 24,c1,c2,r3
+0+0010 <[^>]*> 10c20e32 custom 56,c1,c2,c3
diff --git a/gas/testsuite/gas/nios2/etbt.d b/gas/testsuite/gas/nios2/etbt.d
index 58b8e32..f43eb9c 100644
--- a/gas/testsuite/gas/nios2/etbt.d
+++ b/gas/testsuite/gas/nios2/etbt.d
@@ -1,4 +1,4 @@
-#objdump: -dr --prefix-addresses
+#objdump: -dr --prefix-addresses --show-raw-insn
#name: NIOS2 etbt
# Test the et, bt registers
@@ -6,5 +6,5 @@
.*: +file format elf32-littlenios2
Disassembly of section .text:
-0+0000 <[^>]*> add et,bt,r6
-0+0004 <[^>]*> add et,bt,r6
+0+0000 <[^>]*> c9b1883a add et,bt,r6
+0+0004 <[^>]*> c9b1883a add et,bt,r6
diff --git a/gas/testsuite/gas/nios2/flushda.d b/gas/testsuite/gas/nios2/flushda.d
index f3b5e3e..3af1850 100644
--- a/gas/testsuite/gas/nios2/flushda.d
+++ b/gas/testsuite/gas/nios2/flushda.d
@@ -1,4 +1,4 @@
-#objdump: -dr --prefix-addresses
+#objdump: -dr --prefix-addresses --show-raw-insn
#name: NIOS2 flushda
# Test the jmp instruction.
@@ -6,5 +6,5 @@
.*: +file format elf32-littlenios2
Disassembly of section .text:
-0+0000 <[^>]*> flushda 12\(r2\)
+0+0000 <[^>]*> 1000031b flushda 12\(r2\)
diff --git a/gas/testsuite/gas/nios2/jmp.d b/gas/testsuite/gas/nios2/jmp.d
index b8727b3..8a8309d 100644
--- a/gas/testsuite/gas/nios2/jmp.d
+++ b/gas/testsuite/gas/nios2/jmp.d
@@ -1,4 +1,4 @@
-#objdump: -dr --prefix-addresses
+#objdump: -dr --prefix-addresses --show-raw-insn
#name: NIOS2 jmp
# Test the jmp instruction.
@@ -6,5 +6,5 @@
.*: +file format elf32-littlenios2
Disassembly of section .text:
-0+0000 <[^>]*> jmp bt
+0+0000 <[^>]*> c800683a jmp bt
diff --git a/gas/testsuite/gas/nios2/ldb.d b/gas/testsuite/gas/nios2/ldb.d
index 5a417b8..25ad6b4 100644
--- a/gas/testsuite/gas/nios2/ldb.d
+++ b/gas/testsuite/gas/nios2/ldb.d
@@ -1,4 +1,4 @@
-#objdump: -dr --prefix-addresses
+#objdump: -dr --prefix-addresses --show-raw-insn
#name: NIOS2 ldb
# Test the ld instruction
@@ -6,191 +6,191 @@
.*: +file format elf32-littlenios2
Disassembly of section .text:
-0+0000 <[^>]*> ldb r4,0\(zero\)
-0+0004 <[^>]*> ldb r4,4\(zero\)
-0+0008 <[^>]*> ldb r4,32764\(zero\)
-0+000c <[^>]*> ldb r4,-32768\(zero\)
-0+0010 <[^>]*> ldb r4,0\(r5\)
-0+0014 <[^>]*> ldb r4,4\(r5\)
-0+0018 <[^>]*> ldb r4,32764\(r5\)
-0+001c <[^>]*> ldb r4,-32768\(r5\)
-0+0020 <[^>]*> ldb r4,0\(zero\)
+0+0000 <[^>]*> 01000007 ldb r4,0\(zero\)
+0+0004 <[^>]*> 01000107 ldb r4,4\(zero\)
+0+0008 <[^>]*> 011fff07 ldb r4,32764\(zero\)
+0+000c <[^>]*> 01200007 ldb r4,-32768\(zero\)
+0+0010 <[^>]*> 29000007 ldb r4,0\(r5\)
+0+0014 <[^>]*> 29000107 ldb r4,4\(r5\)
+0+0018 <[^>]*> 291fff07 ldb r4,32764\(r5\)
+0+001c <[^>]*> 29200007 ldb r4,-32768\(r5\)
+0+0020 <[^>]*> 01000007 ldb r4,0\(zero\)
[ ]*20: R_NIOS2_S16 .data
-0+0024 <[^>]*> ldb r4,0\(zero\)
+0+0024 <[^>]*> 01000007 ldb r4,0\(zero\)
[ ]*24: R_NIOS2_S16 big_external_data_label
-0+0028 <[^>]*> ldb r4,0\(zero\)
+0+0028 <[^>]*> 01000007 ldb r4,0\(zero\)
[ ]*28: R_NIOS2_S16 small_external_data_label
-0+002c <[^>]*> ldb r4,0\(zero\)
+0+002c <[^>]*> 01000007 ldb r4,0\(zero\)
[ ]*2c: R_NIOS2_S16 big_external_common
-0+0030 <[^>]*> ldb r4,0\(zero\)
+0+0030 <[^>]*> 01000007 ldb r4,0\(zero\)
[ ]*30: R_NIOS2_S16 small_external_common
-0+0034 <[^>]*> ldb r4,0\(zero\)
+0+0034 <[^>]*> 01000007 ldb r4,0\(zero\)
[ ]*34: R_NIOS2_S16 .bss
-0+0038 <[^>]*> ldb r4,0\(zero\)
+0+0038 <[^>]*> 01000007 ldb r4,0\(zero\)
[ ]*38: R_NIOS2_S16 .bss\+0x4000
-0+003c <[^>]*> ldb r4,0\(zero\)
+0+003c <[^>]*> 01000007 ldb r4,0\(zero\)
[ ]*3c: R_NIOS2_S16 .data\+0x4
-0+0040 <[^>]*> ldb r4,0\(zero\)
+0+0040 <[^>]*> 01000007 ldb r4,0\(zero\)
[ ]*40: R_NIOS2_S16 big_external_data_label\+0x4
-0+0044 <[^>]*> ldb r4,0\(zero\)
+0+0044 <[^>]*> 01000007 ldb r4,0\(zero\)
[ ]*44: R_NIOS2_S16 small_external_data_label\+0x4
-0+0048 <[^>]*> ldb r4,0\(zero\)
+0+0048 <[^>]*> 01000007 ldb r4,0\(zero\)
[ ]*48: R_NIOS2_S16 big_external_common\+0x4
-0+004c <[^>]*> ldb r4,0\(zero\)
+0+004c <[^>]*> 01000007 ldb r4,0\(zero\)
[ ]*4c: R_NIOS2_S16 small_external_common\+0x4
-0+0050 <[^>]*> ldb r4,0\(zero\)
+0+0050 <[^>]*> 01000007 ldb r4,0\(zero\)
[ ]*50: R_NIOS2_S16 .bss\+0x4
-0+0054 <[^>]*> ldb r4,0\(zero\)
+0+0054 <[^>]*> 01000007 ldb r4,0\(zero\)
[ ]*54: R_NIOS2_S16 .bss\+0x4004
-0+0058 <[^>]*> ldb r4,0\(zero\)
+0+0058 <[^>]*> 01000007 ldb r4,0\(zero\)
[ ]*58: R_NIOS2_S16 .data-0x8000
-0+005c <[^>]*> ldb r4,0\(zero\)
+0+005c <[^>]*> 01000007 ldb r4,0\(zero\)
[ ]*5c: R_NIOS2_S16 big_external_data_label-0x8000
-0+0060 <[^>]*> ldb r4,0\(zero\)
+0+0060 <[^>]*> 01000007 ldb r4,0\(zero\)
[ ]*60: R_NIOS2_S16 small_external_data_label-0x8000
-0+0064 <[^>]*> ldb r4,0\(zero\)
+0+0064 <[^>]*> 01000007 ldb r4,0\(zero\)
[ ]*64: R_NIOS2_S16 big_external_common-0x8000
-0+0068 <[^>]*> ldb r4,0\(zero\)
+0+0068 <[^>]*> 01000007 ldb r4,0\(zero\)
[ ]*68: R_NIOS2_S16 small_external_common-0x8000
-0+006c <[^>]*> ldb r4,0\(zero\)
+0+006c <[^>]*> 01000007 ldb r4,0\(zero\)
[ ]*6c: R_NIOS2_S16 .bss-0x8000
-0+0070 <[^>]*> ldb r4,0\(zero\)
+0+0070 <[^>]*> 01000007 ldb r4,0\(zero\)
[ ]*70: R_NIOS2_S16 .bss-0x4000
-0+0074 <[^>]*> ldb r4,0\(zero\)
+0+0074 <[^>]*> 01000007 ldb r4,0\(zero\)
[ ]*74: R_NIOS2_S16 .data\+0x10000
-0+0078 <[^>]*> ldb r4,0\(r5\)
+0+0078 <[^>]*> 29000007 ldb r4,0\(r5\)
[ ]*78: R_NIOS2_S16 .data
-0+007c <[^>]*> ldb r4,0\(r5\)
+0+007c <[^>]*> 29000007 ldb r4,0\(r5\)
[ ]*7c: R_NIOS2_S16 big_external_data_label
-0+0080 <[^>]*> ldb r4,0\(r5\)
+0+0080 <[^>]*> 29000007 ldb r4,0\(r5\)
[ ]*80: R_NIOS2_S16 small_external_data_label
-0+0084 <[^>]*> ldb r4,0\(r5\)
+0+0084 <[^>]*> 29000007 ldb r4,0\(r5\)
[ ]*84: R_NIOS2_S16 big_external_common
-0+0088 <[^>]*> ldb r4,0\(r5\)
+0+0088 <[^>]*> 29000007 ldb r4,0\(r5\)
[ ]*88: R_NIOS2_S16 small_external_common
-0+008c <[^>]*> ldb r4,0\(r5\)
+0+008c <[^>]*> 29000007 ldb r4,0\(r5\)
[ ]*8c: R_NIOS2_S16 .bss
-0+0090 <[^>]*> ldb r4,0\(r5\)
+0+0090 <[^>]*> 29000007 ldb r4,0\(r5\)
[ ]*90: R_NIOS2_S16 .bss\+0x4000
-0+0094 <[^>]*> ldb r4,0\(r5\)
+0+0094 <[^>]*> 29000007 ldb r4,0\(r5\)
[ ]*94: R_NIOS2_S16 .data\+0x4
-0+0098 <[^>]*> ldb r4,0\(r5\)
+0+0098 <[^>]*> 29000007 ldb r4,0\(r5\)
[ ]*98: R_NIOS2_S16 big_external_data_label\+0x4
-0+009c <[^>]*> ldb r4,0\(r5\)
+0+009c <[^>]*> 29000007 ldb r4,0\(r5\)
[ ]*9c: R_NIOS2_S16 small_external_data_label\+0x4
-0+00a0 <[^>]*> ldb r4,0\(r5\)
+0+00a0 <[^>]*> 29000007 ldb r4,0\(r5\)
[ ]*a0: R_NIOS2_S16 big_external_common\+0x4
-0+00a4 <[^>]*> ldb r4,0\(r5\)
+0+00a4 <[^>]*> 29000007 ldb r4,0\(r5\)
[ ]*a4: R_NIOS2_S16 small_external_common\+0x4
-0+00a8 <[^>]*> ldb r4,0\(r5\)
+0+00a8 <[^>]*> 29000007 ldb r4,0\(r5\)
[ ]*a8: R_NIOS2_S16 .bss\+0x4
-0+00ac <[^>]*> ldb r4,0\(r5\)
+0+00ac <[^>]*> 29000007 ldb r4,0\(r5\)
[ ]*ac: R_NIOS2_S16 .bss\+0x4004
-0+00b0 <[^>]*> ldb r4,0\(r5\)
+0+00b0 <[^>]*> 29000007 ldb r4,0\(r5\)
[ ]*b0: R_NIOS2_S16 .data-0x8000
-0+00b4 <[^>]*> ldb r4,0\(r5\)
+0+00b4 <[^>]*> 29000007 ldb r4,0\(r5\)
[ ]*b4: R_NIOS2_S16 big_external_data_label-0x8000
-0+00b8 <[^>]*> ldb r4,0\(r5\)
+0+00b8 <[^>]*> 29000007 ldb r4,0\(r5\)
[ ]*b8: R_NIOS2_S16 small_external_data_label-0x8000
-0+00bc <[^>]*> ldb r4,0\(r5\)
+0+00bc <[^>]*> 29000007 ldb r4,0\(r5\)
[ ]*bc: R_NIOS2_S16 big_external_common-0x8000
-0+00c0 <[^>]*> ldb r4,0\(r5\)
+0+00c0 <[^>]*> 29000007 ldb r4,0\(r5\)
[ ]*c0: R_NIOS2_S16 small_external_common-0x8000
-0+00c4 <[^>]*> ldb r4,0\(r5\)
+0+00c4 <[^>]*> 29000007 ldb r4,0\(r5\)
[ ]*c4: R_NIOS2_S16 .bss-0x8000
-0+00c8 <[^>]*> ldb r4,0\(r5\)
+0+00c8 <[^>]*> 29000007 ldb r4,0\(r5\)
[ ]*c8: R_NIOS2_S16 .bss-0x4000
-0+00cc <[^>]*> ldbio r4,0\(zero\)
-0+00d0 <[^>]*> ldbio r4,4\(zero\)
-0+00d4 <[^>]*> ldbio r4,32764\(zero\)
-0+00d8 <[^>]*> ldbio r4,-32768\(zero\)
-0+00dc <[^>]*> ldbio r4,0\(r5\)
-0+00e0 <[^>]*> ldbio r4,4\(r5\)
-0+00e4 <[^>]*> ldbio r4,32764\(r5\)
-0+00e8 <[^>]*> ldbio r4,-32768\(r5\)
-0+00ec <[^>]*> ldbio r4,0\(zero\)
+0+00cc <[^>]*> 01000027 ldbio r4,0\(zero\)
+0+00d0 <[^>]*> 01000127 ldbio r4,4\(zero\)
+0+00d4 <[^>]*> 011fff27 ldbio r4,32764\(zero\)
+0+00d8 <[^>]*> 01200027 ldbio r4,-32768\(zero\)
+0+00dc <[^>]*> 29000027 ldbio r4,0\(r5\)
+0+00e0 <[^>]*> 29000127 ldbio r4,4\(r5\)
+0+00e4 <[^>]*> 291fff27 ldbio r4,32764\(r5\)
+0+00e8 <[^>]*> 29200027 ldbio r4,-32768\(r5\)
+0+00ec <[^>]*> 01000027 ldbio r4,0\(zero\)
[ ]*ec: R_NIOS2_S16 .data
-0+00f0 <[^>]*> ldbio r4,0\(zero\)
+0+00f0 <[^>]*> 01000027 ldbio r4,0\(zero\)
[ ]*f0: R_NIOS2_S16 big_external_data_label
-0+00f4 <[^>]*> ldbio r4,0\(zero\)
+0+00f4 <[^>]*> 01000027 ldbio r4,0\(zero\)
[ ]*f4: R_NIOS2_S16 small_external_data_label
-0+00f8 <[^>]*> ldbio r4,0\(zero\)
+0+00f8 <[^>]*> 01000027 ldbio r4,0\(zero\)
[ ]*f8: R_NIOS2_S16 big_external_common
-0+00fc <[^>]*> ldbio r4,0\(zero\)
+0+00fc <[^>]*> 01000027 ldbio r4,0\(zero\)
[ ]*fc: R_NIOS2_S16 small_external_common
-0+0100 <[^>]*> ldbio r4,0\(zero\)
+0+0100 <[^>]*> 01000027 ldbio r4,0\(zero\)
[ ]*100: R_NIOS2_S16 .bss
-0+0104 <[^>]*> ldbio r4,0\(zero\)
+0+0104 <[^>]*> 01000027 ldbio r4,0\(zero\)
[ ]*104: R_NIOS2_S16 .bss\+0x4000
-0+0108 <[^>]*> ldbio r4,0\(zero\)
+0+0108 <[^>]*> 01000027 ldbio r4,0\(zero\)
[ ]*108: R_NIOS2_S16 .data\+0x4
-0+010c <[^>]*> ldbio r4,0\(zero\)
+0+010c <[^>]*> 01000027 ldbio r4,0\(zero\)
[ ]*10c: R_NIOS2_S16 big_external_data_label\+0x4
-0+0110 <[^>]*> ldbio r4,0\(zero\)
+0+0110 <[^>]*> 01000027 ldbio r4,0\(zero\)
[ ]*110: R_NIOS2_S16 small_external_data_label\+0x4
-0+0114 <[^>]*> ldbio r4,0\(zero\)
+0+0114 <[^>]*> 01000027 ldbio r4,0\(zero\)
[ ]*114: R_NIOS2_S16 big_external_common\+0x4
-0+0118 <[^>]*> ldbio r4,0\(zero\)
+0+0118 <[^>]*> 01000027 ldbio r4,0\(zero\)
[ ]*118: R_NIOS2_S16 small_external_common\+0x4
-0+011c <[^>]*> ldbio r4,0\(zero\)
+0+011c <[^>]*> 01000027 ldbio r4,0\(zero\)
[ ]*11c: R_NIOS2_S16 .bss\+0x4
-0+0120 <[^>]*> ldbio r4,0\(zero\)
+0+0120 <[^>]*> 01000027 ldbio r4,0\(zero\)
[ ]*120: R_NIOS2_S16 .bss\+0x4004
-0+0124 <[^>]*> ldbio r4,0\(zero\)
+0+0124 <[^>]*> 01000027 ldbio r4,0\(zero\)
[ ]*124: R_NIOS2_S16 .data-0x8000
-0+0128 <[^>]*> ldbio r4,0\(zero\)
+0+0128 <[^>]*> 01000027 ldbio r4,0\(zero\)
[ ]*128: R_NIOS2_S16 big_external_data_label-0x8000
-0+012c <[^>]*> ldbio r4,0\(zero\)
+0+012c <[^>]*> 01000027 ldbio r4,0\(zero\)
[ ]*12c: R_NIOS2_S16 small_external_data_label-0x8000
-0+0130 <[^>]*> ldbio r4,0\(zero\)
+0+0130 <[^>]*> 01000027 ldbio r4,0\(zero\)
[ ]*130: R_NIOS2_S16 big_external_common-0x8000
-0+0134 <[^>]*> ldbio r4,0\(zero\)
+0+0134 <[^>]*> 01000027 ldbio r4,0\(zero\)
[ ]*134: R_NIOS2_S16 small_external_common-0x8000
-0+0138 <[^>]*> ldbio r4,0\(zero\)
+0+0138 <[^>]*> 01000027 ldbio r4,0\(zero\)
[ ]*138: R_NIOS2_S16 .bss-0x8000
-0+013c <[^>]*> ldbio r4,0\(zero\)
+0+013c <[^>]*> 01000027 ldbio r4,0\(zero\)
[ ]*13c: R_NIOS2_S16 .bss-0x4000
-0+0140 <[^>]*> ldbio r4,0\(zero\)
+0+0140 <[^>]*> 01000027 ldbio r4,0\(zero\)
[ ]*140: R_NIOS2_S16 .data\+0x10000
-0+0144 <[^>]*> ldbio r4,0\(r5\)
+0+0144 <[^>]*> 29000027 ldbio r4,0\(r5\)
[ ]*144: R_NIOS2_S16 .data
-0+0148 <[^>]*> ldbio r4,0\(r5\)
+0+0148 <[^>]*> 29000027 ldbio r4,0\(r5\)
[ ]*148: R_NIOS2_S16 big_external_data_label
-0+014c <[^>]*> ldbio r4,0\(r5\)
+0+014c <[^>]*> 29000027 ldbio r4,0\(r5\)
[ ]*14c: R_NIOS2_S16 small_external_data_label
-0+0150 <[^>]*> ldbio r4,0\(r5\)
+0+0150 <[^>]*> 29000027 ldbio r4,0\(r5\)
[ ]*150: R_NIOS2_S16 big_external_common
-0+0154 <[^>]*> ldbio r4,0\(r5\)
+0+0154 <[^>]*> 29000027 ldbio r4,0\(r5\)
[ ]*154: R_NIOS2_S16 small_external_common
-0+0158 <[^>]*> ldbio r4,0\(r5\)
+0+0158 <[^>]*> 29000027 ldbio r4,0\(r5\)
[ ]*158: R_NIOS2_S16 .bss
-0+015c <[^>]*> ldbio r4,0\(r5\)
+0+015c <[^>]*> 29000027 ldbio r4,0\(r5\)
[ ]*15c: R_NIOS2_S16 .bss\+0x4000
-0+0160 <[^>]*> ldbio r4,0\(r5\)
+0+0160 <[^>]*> 29000027 ldbio r4,0\(r5\)
[ ]*160: R_NIOS2_S16 .data\+0x4
-0+0164 <[^>]*> ldbio r4,0\(r5\)
+0+0164 <[^>]*> 29000027 ldbio r4,0\(r5\)
[ ]*164: R_NIOS2_S16 big_external_data_label\+0x4
-0+0168 <[^>]*> ldbio r4,0\(r5\)
+0+0168 <[^>]*> 29000027 ldbio r4,0\(r5\)
[ ]*168: R_NIOS2_S16 small_external_data_label\+0x4
-0+016c <[^>]*> ldbio r4,0\(r5\)
+0+016c <[^>]*> 29000027 ldbio r4,0\(r5\)
[ ]*16c: R_NIOS2_S16 big_external_common\+0x4
-0+0170 <[^>]*> ldbio r4,0\(r5\)
+0+0170 <[^>]*> 29000027 ldbio r4,0\(r5\)
[ ]*170: R_NIOS2_S16 small_external_common\+0x4
-0+0174 <[^>]*> ldbio r4,0\(r5\)
+0+0174 <[^>]*> 29000027 ldbio r4,0\(r5\)
[ ]*174: R_NIOS2_S16 .bss\+0x4
-0+0178 <[^>]*> ldbio r4,0\(r5\)
+0+0178 <[^>]*> 29000027 ldbio r4,0\(r5\)
[ ]*178: R_NIOS2_S16 .bss\+0x4004
-0+017c <[^>]*> ldbio r4,0\(r5\)
+0+017c <[^>]*> 29000027 ldbio r4,0\(r5\)
[ ]*17c: R_NIOS2_S16 .data-0x8000
-0+0180 <[^>]*> ldbio r4,0\(r5\)
+0+0180 <[^>]*> 29000027 ldbio r4,0\(r5\)
[ ]*180: R_NIOS2_S16 big_external_data_label-0x8000
-0+0184 <[^>]*> ldbio r4,0\(r5\)
+0+0184 <[^>]*> 29000027 ldbio r4,0\(r5\)
[ ]*184: R_NIOS2_S16 small_external_data_label-0x8000
-0+0188 <[^>]*> ldbio r4,0\(r5\)
+0+0188 <[^>]*> 29000027 ldbio r4,0\(r5\)
[ ]*188: R_NIOS2_S16 big_external_common-0x8000
-0+018c <[^>]*> ldbio r4,0\(r5\)
+0+018c <[^>]*> 29000027 ldbio r4,0\(r5\)
[ ]*18c: R_NIOS2_S16 small_external_common-0x8000
-0+0190 <[^>]*> ldbio r4,0\(r5\)
+0+0190 <[^>]*> 29000027 ldbio r4,0\(r5\)
[ ]*190: R_NIOS2_S16 .bss-0x8000
-0+0194 <[^>]*> ldbio r4,0\(r5\)
+0+0194 <[^>]*> 29000027 ldbio r4,0\(r5\)
[ ]*194: R_NIOS2_S16 .bss-0x4000
diff --git a/gas/testsuite/gas/nios2/ldh.d b/gas/testsuite/gas/nios2/ldh.d
index f030eef..190d5a6 100644
--- a/gas/testsuite/gas/nios2/ldh.d
+++ b/gas/testsuite/gas/nios2/ldh.d
@@ -1,4 +1,4 @@
-#objdump: -dr --prefix-addresses
+#objdump: -dr --prefix-addresses --show-raw-insn
#name: NIOS2 ldh
# Test the ld instruction
@@ -6,191 +6,191 @@
.*: +file format elf32-littlenios2
Disassembly of section .text:
-0+0000 <[^>]*> ldh r4,0\(zero\)
-0+0004 <[^>]*> ldh r4,4\(zero\)
-0+0008 <[^>]*> ldh r4,32764\(zero\)
-0+000c <[^>]*> ldh r4,-32768\(zero\)
-0+0010 <[^>]*> ldh r4,0\(r5\)
-0+0014 <[^>]*> ldh r4,4\(r5\)
-0+0018 <[^>]*> ldh r4,32764\(r5\)
-0+001c <[^>]*> ldh r4,-32768\(r5\)
-0+0020 <[^>]*> ldh r4,0\(zero\)
+0+0000 <[^>]*> 0100000f ldh r4,0\(zero\)
+0+0004 <[^>]*> 0100010f ldh r4,4\(zero\)
+0+0008 <[^>]*> 011fff0f ldh r4,32764\(zero\)
+0+000c <[^>]*> 0120000f ldh r4,-32768\(zero\)
+0+0010 <[^>]*> 2900000f ldh r4,0\(r5\)
+0+0014 <[^>]*> 2900010f ldh r4,4\(r5\)
+0+0018 <[^>]*> 291fff0f ldh r4,32764\(r5\)
+0+001c <[^>]*> 2920000f ldh r4,-32768\(r5\)
+0+0020 <[^>]*> 0100000f ldh r4,0\(zero\)
[ ]*20: R_NIOS2_S16 .data
-0+0024 <[^>]*> ldh r4,0\(zero\)
+0+0024 <[^>]*> 0100000f ldh r4,0\(zero\)
[ ]*24: R_NIOS2_S16 big_external_data_label
-0+0028 <[^>]*> ldh r4,0\(zero\)
+0+0028 <[^>]*> 0100000f ldh r4,0\(zero\)
[ ]*28: R_NIOS2_S16 small_external_data_label
-0+002c <[^>]*> ldh r4,0\(zero\)
+0+002c <[^>]*> 0100000f ldh r4,0\(zero\)
[ ]*2c: R_NIOS2_S16 big_external_common
-0+0030 <[^>]*> ldh r4,0\(zero\)
+0+0030 <[^>]*> 0100000f ldh r4,0\(zero\)
[ ]*30: R_NIOS2_S16 small_external_common
-0+0034 <[^>]*> ldh r4,0\(zero\)
+0+0034 <[^>]*> 0100000f ldh r4,0\(zero\)
[ ]*34: R_NIOS2_S16 .bss
-0+0038 <[^>]*> ldh r4,0\(zero\)
+0+0038 <[^>]*> 0100000f ldh r4,0\(zero\)
[ ]*38: R_NIOS2_S16 .bss\+0x4000
-0+003c <[^>]*> ldh r4,0\(zero\)
+0+003c <[^>]*> 0100000f ldh r4,0\(zero\)
[ ]*3c: R_NIOS2_S16 .data\+0x4
-0+0040 <[^>]*> ldh r4,0\(zero\)
+0+0040 <[^>]*> 0100000f ldh r4,0\(zero\)
[ ]*40: R_NIOS2_S16 big_external_data_label\+0x4
-0+0044 <[^>]*> ldh r4,0\(zero\)
+0+0044 <[^>]*> 0100000f ldh r4,0\(zero\)
[ ]*44: R_NIOS2_S16 small_external_data_label\+0x4
-0+0048 <[^>]*> ldh r4,0\(zero\)
+0+0048 <[^>]*> 0100000f ldh r4,0\(zero\)
[ ]*48: R_NIOS2_S16 big_external_common\+0x4
-0+004c <[^>]*> ldh r4,0\(zero\)
+0+004c <[^>]*> 0100000f ldh r4,0\(zero\)
[ ]*4c: R_NIOS2_S16 small_external_common\+0x4
-0+0050 <[^>]*> ldh r4,0\(zero\)
+0+0050 <[^>]*> 0100000f ldh r4,0\(zero\)
[ ]*50: R_NIOS2_S16 .bss\+0x4
-0+0054 <[^>]*> ldh r4,0\(zero\)
+0+0054 <[^>]*> 0100000f ldh r4,0\(zero\)
[ ]*54: R_NIOS2_S16 .bss\+0x4004
-0+0058 <[^>]*> ldh r4,0\(zero\)
+0+0058 <[^>]*> 0100000f ldh r4,0\(zero\)
[ ]*58: R_NIOS2_S16 .data-0x8000
-0+005c <[^>]*> ldh r4,0\(zero\)
+0+005c <[^>]*> 0100000f ldh r4,0\(zero\)
[ ]*5c: R_NIOS2_S16 big_external_data_label-0x8000
-0+0060 <[^>]*> ldh r4,0\(zero\)
+0+0060 <[^>]*> 0100000f ldh r4,0\(zero\)
[ ]*60: R_NIOS2_S16 small_external_data_label-0x8000
-0+0064 <[^>]*> ldh r4,0\(zero\)
+0+0064 <[^>]*> 0100000f ldh r4,0\(zero\)
[ ]*64: R_NIOS2_S16 big_external_common-0x8000
-0+0068 <[^>]*> ldh r4,0\(zero\)
+0+0068 <[^>]*> 0100000f ldh r4,0\(zero\)
[ ]*68: R_NIOS2_S16 small_external_common-0x8000
-0+006c <[^>]*> ldh r4,0\(zero\)
+0+006c <[^>]*> 0100000f ldh r4,0\(zero\)
[ ]*6c: R_NIOS2_S16 .bss-0x8000
-0+0070 <[^>]*> ldh r4,0\(zero\)
+0+0070 <[^>]*> 0100000f ldh r4,0\(zero\)
[ ]*70: R_NIOS2_S16 .bss-0x4000
-0+0074 <[^>]*> ldh r4,0\(zero\)
+0+0074 <[^>]*> 0100000f ldh r4,0\(zero\)
[ ]*74: R_NIOS2_S16 .data\+0x10000
-0+0078 <[^>]*> ldh r4,0\(r5\)
+0+0078 <[^>]*> 2900000f ldh r4,0\(r5\)
[ ]*78: R_NIOS2_S16 .data
-0+007c <[^>]*> ldh r4,0\(r5\)
+0+007c <[^>]*> 2900000f ldh r4,0\(r5\)
[ ]*7c: R_NIOS2_S16 big_external_data_label
-0+0080 <[^>]*> ldh r4,0\(r5\)
+0+0080 <[^>]*> 2900000f ldh r4,0\(r5\)
[ ]*80: R_NIOS2_S16 small_external_data_label
-0+0084 <[^>]*> ldh r4,0\(r5\)
+0+0084 <[^>]*> 2900000f ldh r4,0\(r5\)
[ ]*84: R_NIOS2_S16 big_external_common
-0+0088 <[^>]*> ldh r4,0\(r5\)
+0+0088 <[^>]*> 2900000f ldh r4,0\(r5\)
[ ]*88: R_NIOS2_S16 small_external_common
-0+008c <[^>]*> ldh r4,0\(r5\)
+0+008c <[^>]*> 2900000f ldh r4,0\(r5\)
[ ]*8c: R_NIOS2_S16 .bss
-0+0090 <[^>]*> ldh r4,0\(r5\)
+0+0090 <[^>]*> 2900000f ldh r4,0\(r5\)
[ ]*90: R_NIOS2_S16 .bss\+0x4000
-0+0094 <[^>]*> ldh r4,0\(r5\)
+0+0094 <[^>]*> 2900000f ldh r4,0\(r5\)
[ ]*94: R_NIOS2_S16 .data\+0x4
-0+0098 <[^>]*> ldh r4,0\(r5\)
+0+0098 <[^>]*> 2900000f ldh r4,0\(r5\)
[ ]*98: R_NIOS2_S16 big_external_data_label\+0x4
-0+009c <[^>]*> ldh r4,0\(r5\)
+0+009c <[^>]*> 2900000f ldh r4,0\(r5\)
[ ]*9c: R_NIOS2_S16 small_external_data_label\+0x4
-0+00a0 <[^>]*> ldh r4,0\(r5\)
+0+00a0 <[^>]*> 2900000f ldh r4,0\(r5\)
[ ]*a0: R_NIOS2_S16 big_external_common\+0x4
-0+00a4 <[^>]*> ldh r4,0\(r5\)
+0+00a4 <[^>]*> 2900000f ldh r4,0\(r5\)
[ ]*a4: R_NIOS2_S16 small_external_common\+0x4
-0+00a8 <[^>]*> ldh r4,0\(r5\)
+0+00a8 <[^>]*> 2900000f ldh r4,0\(r5\)
[ ]*a8: R_NIOS2_S16 .bss\+0x4
-0+00ac <[^>]*> ldh r4,0\(r5\)
+0+00ac <[^>]*> 2900000f ldh r4,0\(r5\)
[ ]*ac: R_NIOS2_S16 .bss\+0x4004
-0+00b0 <[^>]*> ldh r4,0\(r5\)
+0+00b0 <[^>]*> 2900000f ldh r4,0\(r5\)
[ ]*b0: R_NIOS2_S16 .data-0x8000
-0+00b4 <[^>]*> ldh r4,0\(r5\)
+0+00b4 <[^>]*> 2900000f ldh r4,0\(r5\)
[ ]*b4: R_NIOS2_S16 big_external_data_label-0x8000
-0+00b8 <[^>]*> ldh r4,0\(r5\)
+0+00b8 <[^>]*> 2900000f ldh r4,0\(r5\)
[ ]*b8: R_NIOS2_S16 small_external_data_label-0x8000
-0+00bc <[^>]*> ldh r4,0\(r5\)
+0+00bc <[^>]*> 2900000f ldh r4,0\(r5\)
[ ]*bc: R_NIOS2_S16 big_external_common-0x8000
-0+00c0 <[^>]*> ldh r4,0\(r5\)
+0+00c0 <[^>]*> 2900000f ldh r4,0\(r5\)
[ ]*c0: R_NIOS2_S16 small_external_common-0x8000
-0+00c4 <[^>]*> ldh r4,0\(r5\)
+0+00c4 <[^>]*> 2900000f ldh r4,0\(r5\)
[ ]*c4: R_NIOS2_S16 .bss-0x8000
-0+00c8 <[^>]*> ldh r4,0\(r5\)
+0+00c8 <[^>]*> 2900000f ldh r4,0\(r5\)
[ ]*c8: R_NIOS2_S16 .bss-0x4000
-0+00cc <[^>]*> ldhio r4,0\(zero\)
-0+00d0 <[^>]*> ldhio r4,4\(zero\)
-0+00d4 <[^>]*> ldhio r4,32764\(zero\)
-0+00d8 <[^>]*> ldhio r4,-32768\(zero\)
-0+00dc <[^>]*> ldhio r4,0\(r5\)
-0+00e0 <[^>]*> ldhio r4,4\(r5\)
-0+00e4 <[^>]*> ldhio r4,32764\(r5\)
-0+00e8 <[^>]*> ldhio r4,-32768\(r5\)
-0+00ec <[^>]*> ldhio r4,0\(zero\)
+0+00cc <[^>]*> 0100002f ldhio r4,0\(zero\)
+0+00d0 <[^>]*> 0100012f ldhio r4,4\(zero\)
+0+00d4 <[^>]*> 011fff2f ldhio r4,32764\(zero\)
+0+00d8 <[^>]*> 0120002f ldhio r4,-32768\(zero\)
+0+00dc <[^>]*> 2900002f ldhio r4,0\(r5\)
+0+00e0 <[^>]*> 2900012f ldhio r4,4\(r5\)
+0+00e4 <[^>]*> 291fff2f ldhio r4,32764\(r5\)
+0+00e8 <[^>]*> 2920002f ldhio r4,-32768\(r5\)
+0+00ec <[^>]*> 0100002f ldhio r4,0\(zero\)
[ ]*ec: R_NIOS2_S16 .data
-0+00f0 <[^>]*> ldhio r4,0\(zero\)
+0+00f0 <[^>]*> 0100002f ldhio r4,0\(zero\)
[ ]*f0: R_NIOS2_S16 big_external_data_label
-0+00f4 <[^>]*> ldhio r4,0\(zero\)
+0+00f4 <[^>]*> 0100002f ldhio r4,0\(zero\)
[ ]*f4: R_NIOS2_S16 small_external_data_label
-0+00f8 <[^>]*> ldhio r4,0\(zero\)
+0+00f8 <[^>]*> 0100002f ldhio r4,0\(zero\)
[ ]*f8: R_NIOS2_S16 big_external_common
-0+00fc <[^>]*> ldhio r4,0\(zero\)
+0+00fc <[^>]*> 0100002f ldhio r4,0\(zero\)
[ ]*fc: R_NIOS2_S16 small_external_common
-0+0100 <[^>]*> ldhio r4,0\(zero\)
+0+0100 <[^>]*> 0100002f ldhio r4,0\(zero\)
[ ]*100: R_NIOS2_S16 .bss
-0+0104 <[^>]*> ldhio r4,0\(zero\)
+0+0104 <[^>]*> 0100002f ldhio r4,0\(zero\)
[ ]*104: R_NIOS2_S16 .bss\+0x4000
-0+0108 <[^>]*> ldhio r4,0\(zero\)
+0+0108 <[^>]*> 0100002f ldhio r4,0\(zero\)
[ ]*108: R_NIOS2_S16 .data\+0x4
-0+010c <[^>]*> ldhio r4,0\(zero\)
+0+010c <[^>]*> 0100002f ldhio r4,0\(zero\)
[ ]*10c: R_NIOS2_S16 big_external_data_label\+0x4
-0+0110 <[^>]*> ldhio r4,0\(zero\)
+0+0110 <[^>]*> 0100002f ldhio r4,0\(zero\)
[ ]*110: R_NIOS2_S16 small_external_data_label\+0x4
-0+0114 <[^>]*> ldhio r4,0\(zero\)
+0+0114 <[^>]*> 0100002f ldhio r4,0\(zero\)
[ ]*114: R_NIOS2_S16 big_external_common\+0x4
-0+0118 <[^>]*> ldhio r4,0\(zero\)
+0+0118 <[^>]*> 0100002f ldhio r4,0\(zero\)
[ ]*118: R_NIOS2_S16 small_external_common\+0x4
-0+011c <[^>]*> ldhio r4,0\(zero\)
+0+011c <[^>]*> 0100002f ldhio r4,0\(zero\)
[ ]*11c: R_NIOS2_S16 .bss\+0x4
-0+0120 <[^>]*> ldhio r4,0\(zero\)
+0+0120 <[^>]*> 0100002f ldhio r4,0\(zero\)
[ ]*120: R_NIOS2_S16 .bss\+0x4004
-0+0124 <[^>]*> ldhio r4,0\(zero\)
+0+0124 <[^>]*> 0100002f ldhio r4,0\(zero\)
[ ]*124: R_NIOS2_S16 .data-0x8000
-0+0128 <[^>]*> ldhio r4,0\(zero\)
+0+0128 <[^>]*> 0100002f ldhio r4,0\(zero\)
[ ]*128: R_NIOS2_S16 big_external_data_label-0x8000
-0+012c <[^>]*> ldhio r4,0\(zero\)
+0+012c <[^>]*> 0100002f ldhio r4,0\(zero\)
[ ]*12c: R_NIOS2_S16 small_external_data_label-0x8000
-0+0130 <[^>]*> ldhio r4,0\(zero\)
+0+0130 <[^>]*> 0100002f ldhio r4,0\(zero\)
[ ]*130: R_NIOS2_S16 big_external_common-0x8000
-0+0134 <[^>]*> ldhio r4,0\(zero\)
+0+0134 <[^>]*> 0100002f ldhio r4,0\(zero\)
[ ]*134: R_NIOS2_S16 small_external_common-0x8000
-0+0138 <[^>]*> ldhio r4,0\(zero\)
+0+0138 <[^>]*> 0100002f ldhio r4,0\(zero\)
[ ]*138: R_NIOS2_S16 .bss-0x8000
-0+013c <[^>]*> ldhio r4,0\(zero\)
+0+013c <[^>]*> 0100002f ldhio r4,0\(zero\)
[ ]*13c: R_NIOS2_S16 .bss-0x4000
-0+0140 <[^>]*> ldhio r4,0\(zero\)
+0+0140 <[^>]*> 0100002f ldhio r4,0\(zero\)
[ ]*140: R_NIOS2_S16 .data\+0x10000
-0+0144 <[^>]*> ldhio r4,0\(r5\)
+0+0144 <[^>]*> 2900002f ldhio r4,0\(r5\)
[ ]*144: R_NIOS2_S16 .data
-0+0148 <[^>]*> ldhio r4,0\(r5\)
+0+0148 <[^>]*> 2900002f ldhio r4,0\(r5\)
[ ]*148: R_NIOS2_S16 big_external_data_label
-0+014c <[^>]*> ldhio r4,0\(r5\)
+0+014c <[^>]*> 2900002f ldhio r4,0\(r5\)
[ ]*14c: R_NIOS2_S16 small_external_data_label
-0+0150 <[^>]*> ldhio r4,0\(r5\)
+0+0150 <[^>]*> 2900002f ldhio r4,0\(r5\)
[ ]*150: R_NIOS2_S16 big_external_common
-0+0154 <[^>]*> ldhio r4,0\(r5\)
+0+0154 <[^>]*> 2900002f ldhio r4,0\(r5\)
[ ]*154: R_NIOS2_S16 small_external_common
-0+0158 <[^>]*> ldhio r4,0\(r5\)
+0+0158 <[^>]*> 2900002f ldhio r4,0\(r5\)
[ ]*158: R_NIOS2_S16 .bss
-0+015c <[^>]*> ldhio r4,0\(r5\)
+0+015c <[^>]*> 2900002f ldhio r4,0\(r5\)
[ ]*15c: R_NIOS2_S16 .bss\+0x4000
-0+0160 <[^>]*> ldhio r4,0\(r5\)
+0+0160 <[^>]*> 2900002f ldhio r4,0\(r5\)
[ ]*160: R_NIOS2_S16 .data\+0x4
-0+0164 <[^>]*> ldhio r4,0\(r5\)
+0+0164 <[^>]*> 2900002f ldhio r4,0\(r5\)
[ ]*164: R_NIOS2_S16 big_external_data_label\+0x4
-0+0168 <[^>]*> ldhio r4,0\(r5\)
+0+0168 <[^>]*> 2900002f ldhio r4,0\(r5\)
[ ]*168: R_NIOS2_S16 small_external_data_label\+0x4
-0+016c <[^>]*> ldhio r4,0\(r5\)
+0+016c <[^>]*> 2900002f ldhio r4,0\(r5\)
[ ]*16c: R_NIOS2_S16 big_external_common\+0x4
-0+0170 <[^>]*> ldhio r4,0\(r5\)
+0+0170 <[^>]*> 2900002f ldhio r4,0\(r5\)
[ ]*170: R_NIOS2_S16 small_external_common\+0x4
-0+0174 <[^>]*> ldhio r4,0\(r5\)
+0+0174 <[^>]*> 2900002f ldhio r4,0\(r5\)
[ ]*174: R_NIOS2_S16 .bss\+0x4
-0+0178 <[^>]*> ldhio r4,0\(r5\)
+0+0178 <[^>]*> 2900002f ldhio r4,0\(r5\)
[ ]*178: R_NIOS2_S16 .bss\+0x4004
-0+017c <[^>]*> ldhio r4,0\(r5\)
+0+017c <[^>]*> 2900002f ldhio r4,0\(r5\)
[ ]*17c: R_NIOS2_S16 .data-0x8000
-0+0180 <[^>]*> ldhio r4,0\(r5\)
+0+0180 <[^>]*> 2900002f ldhio r4,0\(r5\)
[ ]*180: R_NIOS2_S16 big_external_data_label-0x8000
-0+0184 <[^>]*> ldhio r4,0\(r5\)
+0+0184 <[^>]*> 2900002f ldhio r4,0\(r5\)
[ ]*184: R_NIOS2_S16 small_external_data_label-0x8000
-0+0188 <[^>]*> ldhio r4,0\(r5\)
+0+0188 <[^>]*> 2900002f ldhio r4,0\(r5\)
[ ]*188: R_NIOS2_S16 big_external_common-0x8000
-0+018c <[^>]*> ldhio r4,0\(r5\)
+0+018c <[^>]*> 2900002f ldhio r4,0\(r5\)
[ ]*18c: R_NIOS2_S16 small_external_common-0x8000
-0+0190 <[^>]*> ldhio r4,0\(r5\)
+0+0190 <[^>]*> 2900002f ldhio r4,0\(r5\)
[ ]*190: R_NIOS2_S16 .bss-0x8000
-0+0194 <[^>]*> ldhio r4,0\(r5\)
+0+0194 <[^>]*> 2900002f ldhio r4,0\(r5\)
[ ]*194: R_NIOS2_S16 .bss-0x4000
diff --git a/gas/testsuite/gas/nios2/ldw.d b/gas/testsuite/gas/nios2/ldw.d
index dc2571e..8b86019 100644
--- a/gas/testsuite/gas/nios2/ldw.d
+++ b/gas/testsuite/gas/nios2/ldw.d
@@ -1,4 +1,4 @@
-#objdump: -dr --prefix-addresses
+#objdump: -dr --prefix-addresses --show-raw-insn
#name: NIOS2 ldw
# Test the ld instruction
@@ -6,191 +6,191 @@
.*: +file format elf32-littlenios2
Disassembly of section .text:
-0+0000 <[^>]*> ldw r4,0\(zero\)
-0+0004 <[^>]*> ldw r4,4\(zero\)
-0+0008 <[^>]*> ldw r4,32764\(zero\)
-0+000c <[^>]*> ldw r4,-32768\(zero\)
-0+0010 <[^>]*> ldw r4,0\(r5\)
-0+0014 <[^>]*> ldw r4,4\(r5\)
-0+0018 <[^>]*> ldw r4,32764\(r5\)
-0+001c <[^>]*> ldw r4,-32768\(r5\)
-0+0020 <[^>]*> ldw r4,0\(zero\)
+0+0000 <[^>]*> 01000017 ldw r4,0\(zero\)
+0+0004 <[^>]*> 01000117 ldw r4,4\(zero\)
+0+0008 <[^>]*> 011fff17 ldw r4,32764\(zero\)
+0+000c <[^>]*> 01200017 ldw r4,-32768\(zero\)
+0+0010 <[^>]*> 29000017 ldw r4,0\(r5\)
+0+0014 <[^>]*> 29000117 ldw r4,4\(r5\)
+0+0018 <[^>]*> 291fff17 ldw r4,32764\(r5\)
+0+001c <[^>]*> 29200017 ldw r4,-32768\(r5\)
+0+0020 <[^>]*> 01000017 ldw r4,0\(zero\)
[ ]*20: R_NIOS2_S16 .data
-0+0024 <[^>]*> ldw r4,0\(zero\)
+0+0024 <[^>]*> 01000017 ldw r4,0\(zero\)
[ ]*24: R_NIOS2_S16 big_external_data_label
-0+0028 <[^>]*> ldw r4,0\(zero\)
+0+0028 <[^>]*> 01000017 ldw r4,0\(zero\)
[ ]*28: R_NIOS2_S16 small_external_data_label
-0+002c <[^>]*> ldw r4,0\(zero\)
+0+002c <[^>]*> 01000017 ldw r4,0\(zero\)
[ ]*2c: R_NIOS2_S16 big_external_common
-0+0030 <[^>]*> ldw r4,0\(zero\)
+0+0030 <[^>]*> 01000017 ldw r4,0\(zero\)
[ ]*30: R_NIOS2_S16 small_external_common
-0+0034 <[^>]*> ldw r4,0\(zero\)
+0+0034 <[^>]*> 01000017 ldw r4,0\(zero\)
[ ]*34: R_NIOS2_S16 .bss
-0+0038 <[^>]*> ldw r4,0\(zero\)
+0+0038 <[^>]*> 01000017 ldw r4,0\(zero\)
[ ]*38: R_NIOS2_S16 .bss\+0x4000
-0+003c <[^>]*> ldw r4,0\(zero\)
+0+003c <[^>]*> 01000017 ldw r4,0\(zero\)
[ ]*3c: R_NIOS2_S16 .data\+0x4
-0+0040 <[^>]*> ldw r4,0\(zero\)
+0+0040 <[^>]*> 01000017 ldw r4,0\(zero\)
[ ]*40: R_NIOS2_S16 big_external_data_label\+0x4
-0+0044 <[^>]*> ldw r4,0\(zero\)
+0+0044 <[^>]*> 01000017 ldw r4,0\(zero\)
[ ]*44: R_NIOS2_S16 small_external_data_label\+0x4
-0+0048 <[^>]*> ldw r4,0\(zero\)
+0+0048 <[^>]*> 01000017 ldw r4,0\(zero\)
[ ]*48: R_NIOS2_S16 big_external_common\+0x4
-0+004c <[^>]*> ldw r4,0\(zero\)
+0+004c <[^>]*> 01000017 ldw r4,0\(zero\)
[ ]*4c: R_NIOS2_S16 small_external_common\+0x4
-0+0050 <[^>]*> ldw r4,0\(zero\)
+0+0050 <[^>]*> 01000017 ldw r4,0\(zero\)
[ ]*50: R_NIOS2_S16 .bss\+0x4
-0+0054 <[^>]*> ldw r4,0\(zero\)
+0+0054 <[^>]*> 01000017 ldw r4,0\(zero\)
[ ]*54: R_NIOS2_S16 .bss\+0x4004
-0+0058 <[^>]*> ldw r4,0\(zero\)
+0+0058 <[^>]*> 01000017 ldw r4,0\(zero\)
[ ]*58: R_NIOS2_S16 .data-0x8000
-0+005c <[^>]*> ldw r4,0\(zero\)
+0+005c <[^>]*> 01000017 ldw r4,0\(zero\)
[ ]*5c: R_NIOS2_S16 big_external_data_label-0x8000
-0+0060 <[^>]*> ldw r4,0\(zero\)
+0+0060 <[^>]*> 01000017 ldw r4,0\(zero\)
[ ]*60: R_NIOS2_S16 small_external_data_label-0x8000
-0+0064 <[^>]*> ldw r4,0\(zero\)
+0+0064 <[^>]*> 01000017 ldw r4,0\(zero\)
[ ]*64: R_NIOS2_S16 big_external_common-0x8000
-0+0068 <[^>]*> ldw r4,0\(zero\)
+0+0068 <[^>]*> 01000017 ldw r4,0\(zero\)
[ ]*68: R_NIOS2_S16 small_external_common-0x8000
-0+006c <[^>]*> ldw r4,0\(zero\)
+0+006c <[^>]*> 01000017 ldw r4,0\(zero\)
[ ]*6c: R_NIOS2_S16 .bss-0x8000
-0+0070 <[^>]*> ldw r4,0\(zero\)
+0+0070 <[^>]*> 01000017 ldw r4,0\(zero\)
[ ]*70: R_NIOS2_S16 .bss-0x4000
-0+0074 <[^>]*> ldw r4,0\(zero\)
+0+0074 <[^>]*> 01000017 ldw r4,0\(zero\)
[ ]*74: R_NIOS2_S16 .data\+0x10000
-0+0078 <[^>]*> ldw r4,0\(r5\)
+0+0078 <[^>]*> 29000017 ldw r4,0\(r5\)
[ ]*78: R_NIOS2_S16 .data
-0+007c <[^>]*> ldw r4,0\(r5\)
+0+007c <[^>]*> 29000017 ldw r4,0\(r5\)
[ ]*7c: R_NIOS2_S16 big_external_data_label
-0+0080 <[^>]*> ldw r4,0\(r5\)
+0+0080 <[^>]*> 29000017 ldw r4,0\(r5\)
[ ]*80: R_NIOS2_S16 small_external_data_label
-0+0084 <[^>]*> ldw r4,0\(r5\)
+0+0084 <[^>]*> 29000017 ldw r4,0\(r5\)
[ ]*84: R_NIOS2_S16 big_external_common
-0+0088 <[^>]*> ldw r4,0\(r5\)
+0+0088 <[^>]*> 29000017 ldw r4,0\(r5\)
[ ]*88: R_NIOS2_S16 small_external_common
-0+008c <[^>]*> ldw r4,0\(r5\)
+0+008c <[^>]*> 29000017 ldw r4,0\(r5\)
[ ]*8c: R_NIOS2_S16 .bss
-0+0090 <[^>]*> ldw r4,0\(r5\)
+0+0090 <[^>]*> 29000017 ldw r4,0\(r5\)
[ ]*90: R_NIOS2_S16 .bss\+0x4000
-0+0094 <[^>]*> ldw r4,0\(r5\)
+0+0094 <[^>]*> 29000017 ldw r4,0\(r5\)
[ ]*94: R_NIOS2_S16 .data\+0x4
-0+0098 <[^>]*> ldw r4,0\(r5\)
+0+0098 <[^>]*> 29000017 ldw r4,0\(r5\)
[ ]*98: R_NIOS2_S16 big_external_data_label\+0x4
-0+009c <[^>]*> ldw r4,0\(r5\)
+0+009c <[^>]*> 29000017 ldw r4,0\(r5\)
[ ]*9c: R_NIOS2_S16 small_external_data_label\+0x4
-0+00a0 <[^>]*> ldw r4,0\(r5\)
+0+00a0 <[^>]*> 29000017 ldw r4,0\(r5\)
[ ]*a0: R_NIOS2_S16 big_external_common\+0x4
-0+00a4 <[^>]*> ldw r4,0\(r5\)
+0+00a4 <[^>]*> 29000017 ldw r4,0\(r5\)
[ ]*a4: R_NIOS2_S16 small_external_common\+0x4
-0+00a8 <[^>]*> ldw r4,0\(r5\)
+0+00a8 <[^>]*> 29000017 ldw r4,0\(r5\)
[ ]*a8: R_NIOS2_S16 .bss\+0x4
-0+00ac <[^>]*> ldw r4,0\(r5\)
+0+00ac <[^>]*> 29000017 ldw r4,0\(r5\)
[ ]*ac: R_NIOS2_S16 .bss\+0x4004
-0+00b0 <[^>]*> ldw r4,0\(r5\)
+0+00b0 <[^>]*> 29000017 ldw r4,0\(r5\)
[ ]*b0: R_NIOS2_S16 .data-0x8000
-0+00b4 <[^>]*> ldw r4,0\(r5\)
+0+00b4 <[^>]*> 29000017 ldw r4,0\(r5\)
[ ]*b4: R_NIOS2_S16 big_external_data_label-0x8000
-0+00b8 <[^>]*> ldw r4,0\(r5\)
+0+00b8 <[^>]*> 29000017 ldw r4,0\(r5\)
[ ]*b8: R_NIOS2_S16 small_external_data_label-0x8000
-0+00bc <[^>]*> ldw r4,0\(r5\)
+0+00bc <[^>]*> 29000017 ldw r4,0\(r5\)
[ ]*bc: R_NIOS2_S16 big_external_common-0x8000
-0+00c0 <[^>]*> ldw r4,0\(r5\)
+0+00c0 <[^>]*> 29000017 ldw r4,0\(r5\)
[ ]*c0: R_NIOS2_S16 small_external_common-0x8000
-0+00c4 <[^>]*> ldw r4,0\(r5\)
+0+00c4 <[^>]*> 29000017 ldw r4,0\(r5\)
[ ]*c4: R_NIOS2_S16 .bss-0x8000
-0+00c8 <[^>]*> ldw r4,0\(r5\)
+0+00c8 <[^>]*> 29000017 ldw r4,0\(r5\)
[ ]*c8: R_NIOS2_S16 .bss-0x4000
-0+00cc <[^>]*> ldwio r4,0\(zero\)
-0+00d0 <[^>]*> ldwio r4,4\(zero\)
-0+00d4 <[^>]*> ldwio r4,32764\(zero\)
-0+00d8 <[^>]*> ldwio r4,-32768\(zero\)
-0+00dc <[^>]*> ldwio r4,0\(r5\)
-0+00e0 <[^>]*> ldwio r4,4\(r5\)
-0+00e4 <[^>]*> ldwio r4,32764\(r5\)
-0+00e8 <[^>]*> ldwio r4,-32768\(r5\)
-0+00ec <[^>]*> ldwio r4,0\(zero\)
+0+00cc <[^>]*> 01000037 ldwio r4,0\(zero\)
+0+00d0 <[^>]*> 01000137 ldwio r4,4\(zero\)
+0+00d4 <[^>]*> 011fff37 ldwio r4,32764\(zero\)
+0+00d8 <[^>]*> 01200037 ldwio r4,-32768\(zero\)
+0+00dc <[^>]*> 29000037 ldwio r4,0\(r5\)
+0+00e0 <[^>]*> 29000137 ldwio r4,4\(r5\)
+0+00e4 <[^>]*> 291fff37 ldwio r4,32764\(r5\)
+0+00e8 <[^>]*> 29200037 ldwio r4,-32768\(r5\)
+0+00ec <[^>]*> 01000037 ldwio r4,0\(zero\)
[ ]*ec: R_NIOS2_S16 .data
-0+00f0 <[^>]*> ldwio r4,0\(zero\)
+0+00f0 <[^>]*> 01000037 ldwio r4,0\(zero\)
[ ]*f0: R_NIOS2_S16 big_external_data_label
-0+00f4 <[^>]*> ldwio r4,0\(zero\)
+0+00f4 <[^>]*> 01000037 ldwio r4,0\(zero\)
[ ]*f4: R_NIOS2_S16 small_external_data_label
-0+00f8 <[^>]*> ldwio r4,0\(zero\)
+0+00f8 <[^>]*> 01000037 ldwio r4,0\(zero\)
[ ]*f8: R_NIOS2_S16 big_external_common
-0+00fc <[^>]*> ldwio r4,0\(zero\)
+0+00fc <[^>]*> 01000037 ldwio r4,0\(zero\)
[ ]*fc: R_NIOS2_S16 small_external_common
-0+0100 <[^>]*> ldwio r4,0\(zero\)
+0+0100 <[^>]*> 01000037 ldwio r4,0\(zero\)
[ ]*100: R_NIOS2_S16 .bss
-0+0104 <[^>]*> ldwio r4,0\(zero\)
+0+0104 <[^>]*> 01000037 ldwio r4,0\(zero\)
[ ]*104: R_NIOS2_S16 .bss\+0x4000
-0+0108 <[^>]*> ldwio r4,0\(zero\)
+0+0108 <[^>]*> 01000037 ldwio r4,0\(zero\)
[ ]*108: R_NIOS2_S16 .data\+0x4
-0+010c <[^>]*> ldwio r4,0\(zero\)
+0+010c <[^>]*> 01000037 ldwio r4,0\(zero\)
[ ]*10c: R_NIOS2_S16 big_external_data_label\+0x4
-0+0110 <[^>]*> ldwio r4,0\(zero\)
+0+0110 <[^>]*> 01000037 ldwio r4,0\(zero\)
[ ]*110: R_NIOS2_S16 small_external_data_label\+0x4
-0+0114 <[^>]*> ldwio r4,0\(zero\)
+0+0114 <[^>]*> 01000037 ldwio r4,0\(zero\)
[ ]*114: R_NIOS2_S16 big_external_common\+0x4
-0+0118 <[^>]*> ldwio r4,0\(zero\)
+0+0118 <[^>]*> 01000037 ldwio r4,0\(zero\)
[ ]*118: R_NIOS2_S16 small_external_common\+0x4
-0+011c <[^>]*> ldwio r4,0\(zero\)
+0+011c <[^>]*> 01000037 ldwio r4,0\(zero\)
[ ]*11c: R_NIOS2_S16 .bss\+0x4
-0+0120 <[^>]*> ldwio r4,0\(zero\)
+0+0120 <[^>]*> 01000037 ldwio r4,0\(zero\)
[ ]*120: R_NIOS2_S16 .bss\+0x4004
-0+0124 <[^>]*> ldwio r4,0\(zero\)
+0+0124 <[^>]*> 01000037 ldwio r4,0\(zero\)
[ ]*124: R_NIOS2_S16 .data-0x8000
-0+0128 <[^>]*> ldwio r4,0\(zero\)
+0+0128 <[^>]*> 01000037 ldwio r4,0\(zero\)
[ ]*128: R_NIOS2_S16 big_external_data_label-0x8000
-0+012c <[^>]*> ldwio r4,0\(zero\)
+0+012c <[^>]*> 01000037 ldwio r4,0\(zero\)
[ ]*12c: R_NIOS2_S16 small_external_data_label-0x8000
-0+0130 <[^>]*> ldwio r4,0\(zero\)
+0+0130 <[^>]*> 01000037 ldwio r4,0\(zero\)
[ ]*130: R_NIOS2_S16 big_external_common-0x8000
-0+0134 <[^>]*> ldwio r4,0\(zero\)
+0+0134 <[^>]*> 01000037 ldwio r4,0\(zero\)
[ ]*134: R_NIOS2_S16 small_external_common-0x8000
-0+0138 <[^>]*> ldwio r4,0\(zero\)
+0+0138 <[^>]*> 01000037 ldwio r4,0\(zero\)
[ ]*138: R_NIOS2_S16 .bss-0x8000
-0+013c <[^>]*> ldwio r4,0\(zero\)
+0+013c <[^>]*> 01000037 ldwio r4,0\(zero\)
[ ]*13c: R_NIOS2_S16 .bss-0x4000
-0+0140 <[^>]*> ldwio r4,0\(zero\)
+0+0140 <[^>]*> 01000037 ldwio r4,0\(zero\)
[ ]*140: R_NIOS2_S16 .data\+0x10000
-0+0144 <[^>]*> ldwio r4,0\(r5\)
+0+0144 <[^>]*> 29000037 ldwio r4,0\(r5\)
[ ]*144: R_NIOS2_S16 .data
-0+0148 <[^>]*> ldwio r4,0\(r5\)
+0+0148 <[^>]*> 29000037 ldwio r4,0\(r5\)
[ ]*148: R_NIOS2_S16 big_external_data_label
-0+014c <[^>]*> ldwio r4,0\(r5\)
+0+014c <[^>]*> 29000037 ldwio r4,0\(r5\)
[ ]*14c: R_NIOS2_S16 small_external_data_label
-0+0150 <[^>]*> ldwio r4,0\(r5\)
+0+0150 <[^>]*> 29000037 ldwio r4,0\(r5\)
[ ]*150: R_NIOS2_S16 big_external_common
-0+0154 <[^>]*> ldwio r4,0\(r5\)
+0+0154 <[^>]*> 29000037 ldwio r4,0\(r5\)
[ ]*154: R_NIOS2_S16 small_external_common
-0+0158 <[^>]*> ldwio r4,0\(r5\)
+0+0158 <[^>]*> 29000037 ldwio r4,0\(r5\)
[ ]*158: R_NIOS2_S16 .bss
-0+015c <[^>]*> ldwio r4,0\(r5\)
+0+015c <[^>]*> 29000037 ldwio r4,0\(r5\)
[ ]*15c: R_NIOS2_S16 .bss\+0x4000
-0+0160 <[^>]*> ldwio r4,0\(r5\)
+0+0160 <[^>]*> 29000037 ldwio r4,0\(r5\)
[ ]*160: R_NIOS2_S16 .data\+0x4
-0+0164 <[^>]*> ldwio r4,0\(r5\)
+0+0164 <[^>]*> 29000037 ldwio r4,0\(r5\)
[ ]*164: R_NIOS2_S16 big_external_data_label\+0x4
-0+0168 <[^>]*> ldwio r4,0\(r5\)
+0+0168 <[^>]*> 29000037 ldwio r4,0\(r5\)
[ ]*168: R_NIOS2_S16 small_external_data_label\+0x4
-0+016c <[^>]*> ldwio r4,0\(r5\)
+0+016c <[^>]*> 29000037 ldwio r4,0\(r5\)
[ ]*16c: R_NIOS2_S16 big_external_common\+0x4
-0+0170 <[^>]*> ldwio r4,0\(r5\)
+0+0170 <[^>]*> 29000037 ldwio r4,0\(r5\)
[ ]*170: R_NIOS2_S16 small_external_common\+0x4
-0+0174 <[^>]*> ldwio r4,0\(r5\)
+0+0174 <[^>]*> 29000037 ldwio r4,0\(r5\)
[ ]*174: R_NIOS2_S16 .bss\+0x4
-0+0178 <[^>]*> ldwio r4,0\(r5\)
+0+0178 <[^>]*> 29000037 ldwio r4,0\(r5\)
[ ]*178: R_NIOS2_S16 .bss\+0x4004
-0+017c <[^>]*> ldwio r4,0\(r5\)
+0+017c <[^>]*> 29000037 ldwio r4,0\(r5\)
[ ]*17c: R_NIOS2_S16 .data-0x8000
-0+0180 <[^>]*> ldwio r4,0\(r5\)
+0+0180 <[^>]*> 29000037 ldwio r4,0\(r5\)
[ ]*180: R_NIOS2_S16 big_external_data_label-0x8000
-0+0184 <[^>]*> ldwio r4,0\(r5\)
+0+0184 <[^>]*> 29000037 ldwio r4,0\(r5\)
[ ]*184: R_NIOS2_S16 small_external_data_label-0x8000
-0+0188 <[^>]*> ldwio r4,0\(r5\)
+0+0188 <[^>]*> 29000037 ldwio r4,0\(r5\)
[ ]*188: R_NIOS2_S16 big_external_common-0x8000
-0+018c <[^>]*> ldwio r4,0\(r5\)
+0+018c <[^>]*> 29000037 ldwio r4,0\(r5\)
[ ]*18c: R_NIOS2_S16 small_external_common-0x8000
-0+0190 <[^>]*> ldwio r4,0\(r5\)
+0+0190 <[^>]*> 29000037 ldwio r4,0\(r5\)
[ ]*190: R_NIOS2_S16 .bss-0x8000
-0+0194 <[^>]*> ldwio r4,0\(r5\)
+0+0194 <[^>]*> 29000037 ldwio r4,0\(r5\)
[ ]*194: R_NIOS2_S16 .bss-0x4000
diff --git a/gas/testsuite/gas/nios2/lineseparator.d b/gas/testsuite/gas/nios2/lineseparator.d
index 09c66ea..41ce204 100644
--- a/gas/testsuite/gas/nios2/lineseparator.d
+++ b/gas/testsuite/gas/nios2/lineseparator.d
@@ -1,4 +1,4 @@
-#objdump: -dr --prefix-addresses
+#objdump: -dr --prefix-addresses --show-raw-insn
#name: NIOS2 lineseparator
# Test the add instruction
@@ -6,5 +6,5 @@
.*: +file format elf32-littlenios2
Disassembly of section .text:
-0x0+0000 mov r5,r4
-0x0+0004 mov r4,r5
+0x0+0000 200b883a mov r5,r4
+0x0+0004 2809883a mov r4,r5
diff --git a/gas/testsuite/gas/nios2/mov.d b/gas/testsuite/gas/nios2/mov.d
deleted file mode 100644
index 13bf6db..0000000
--- a/gas/testsuite/gas/nios2/mov.d
+++ /dev/null
@@ -1,11 +0,0 @@
-#objdump: -dr --prefix-addresses
-#name: NIOS2 mov
-
-# Test the mov instruction
-
-.*: +file format elf32-littlenios2
-
-Disassembly of section .text:
-0+0000 <[^>]*> movz \$4,\$5,\$6
-0+0004 <[^>]*> movnz \$4,\$5,\$6
-
diff --git a/gas/testsuite/gas/nios2/mov.s b/gas/testsuite/gas/nios2/mov.s
deleted file mode 100644
index a66aaeb..0000000
--- a/gas/testsuite/gas/nios2/mov.s
+++ /dev/null
@@ -1,5 +0,0 @@
-# Source file used to test the movz and movnz instructions
-
-foo:
- movz $4,$5,$6
- movnz $4,$5,$6
diff --git a/gas/testsuite/gas/nios2/movi.d b/gas/testsuite/gas/nios2/movi.d
index 9e35c7b..e306017 100644
--- a/gas/testsuite/gas/nios2/movi.d
+++ b/gas/testsuite/gas/nios2/movi.d
@@ -1,13 +1,13 @@
-#objdump: -dr --prefix-addresses
+#objdump: -dr --prefix-addresses --show-raw-insn
#name: NIOS2 movi
# Test implicit conversion of movi/movhi etc
.*: file format elf32-littlenios2
Disassembly of section .text:
-0+0000 <[^>]*> movi r2,32
-0+0004 <[^>]*> movhi r2,8192
-0+0008 <[^>]*> movhi r2,65535
-0+000c <[^>]*> orhi r2,r5,65535
-0+0010 <[^>]*> xorhi r2,r10,65535
-0+0014 <[^>]*> andhi r2,r15,65535
+0+0000 <[^>]*> 00800804 movi r2,32
+0+0004 <[^>]*> 00880034 movhi r2,8192
+0+0008 <[^>]*> 00bffff4 movhi r2,65535
+0+000c <[^>]*> 28bffff4 orhi r2,r5,65535
+0+0010 <[^>]*> 50bffffc xorhi r2,r10,65535
+0+0014 <[^>]*> 78bfffec andhi r2,r15,65535
diff --git a/gas/testsuite/gas/nios2/movia.d b/gas/testsuite/gas/nios2/movia.d
index c255ace..3903f18 100644
--- a/gas/testsuite/gas/nios2/movia.d
+++ b/gas/testsuite/gas/nios2/movia.d
@@ -1,4 +1,4 @@
-#objdump: -dr --prefix-addresses
+#objdump: -dr --prefix-addresses --show-raw-insn
#name: NIOS2 movia
# Test the movia instruction
@@ -6,13 +6,13 @@
.*: +file format elf32-littlenios2
Disassembly of section .text:
-0+0000 <[^>]*> movhi r2,32897
-0+0004 <[^>]*> addi r2,r2,-32640
-0+0008 <[^>]*> movhi r3,0
+0+0000 <[^>]*> 00a02074 movhi r2,32897
+0+0004 <[^>]*> 10a02004 addi r2,r2,-32640
+0+0008 <[^>]*> 00c00034 movhi r3,0
8: R_NIOS2_HIADJ16 sym-0x80000000
-0+000c <[^>]*> addi r3,r3,0
+0+000c <[^>]*> 18c00004 addi r3,r3,0
c: R_NIOS2_LO16 sym-0x80000000
-0+0010 <[^>]*> movhi r4,0
+0+0010 <[^>]*> 01000034 movhi r4,0
10: R_NIOS2_HIADJ16 sym-0x7fffffff
-0+0014 <[^>]*> addi r4,r4,0
+0+0014 <[^>]*> 21000004 addi r4,r4,0
14: R_NIOS2_LO16 sym-0x7fffffff
diff --git a/gas/testsuite/gas/nios2/mul.d b/gas/testsuite/gas/nios2/mul.d
index 79e86d1..84577b1 100644
--- a/gas/testsuite/gas/nios2/mul.d
+++ b/gas/testsuite/gas/nios2/mul.d
@@ -1,4 +1,4 @@
-#objdump: -dr --prefix-addresses
+#objdump: -dr --prefix-addresses --show-raw-insn
#name: NIOS2 mul
# Test the mul macro.
@@ -6,14 +6,14 @@
.*: +file format elf32-littlenios2
Disassembly of section .text:
-0+0000 <[^>]*> mul r4,r5,r6
-0+0004 <[^>]*> muli r4,r5,0
-0+0008 <[^>]*> muli r4,r5,1
-0+000c <[^>]*> muli r4,r5,-32768
-0+0010 <[^>]*> muli r4,r5,32767
-0+0014 <[^>]*> muli r4,r5,0
+0+0000 <[^>]*> 2989383a mul r4,r5,r6
+0+0004 <[^>]*> 29000024 muli r4,r5,0
+0+0008 <[^>]*> 29000064 muli r4,r5,1
+0+000c <[^>]*> 29200024 muli r4,r5,-32768
+0+0010 <[^>]*> 291fffe4 muli r4,r5,32767
+0+0014 <[^>]*> 29000024 muli r4,r5,0
[ ]*14: R_NIOS2_S16 undefined_symbol
-0+0018 <[^>]*> muli r4,r5,16448
-0+001c <[^>]*> mulxss r4,r5,r6
-0+0020 <[^>]*> mulxsu r4,r5,r6
-0+0024 <[^>]*> mulxuu r4,r5,r6
+0+0018 <[^>]*> 29101024 muli r4,r5,16448
+0+001c <[^>]*> 2988f83a mulxss r4,r5,r6
+0+0020 <[^>]*> 2988b83a mulxsu r4,r5,r6
+0+0024 <[^>]*> 2988383a mulxuu r4,r5,r6
diff --git a/gas/testsuite/gas/nios2/nios2.exp b/gas/testsuite/gas/nios2/nios2.exp
index af22bf8..d8180c3 100644
--- a/gas/testsuite/gas/nios2/nios2.exp
+++ b/gas/testsuite/gas/nios2/nios2.exp
@@ -19,61 +19,8 @@
# Some generic Nios II tests
#
-if { [istarget nios2-*-*] } then {
-
- run_dump_test "add"
- run_dump_test "and"
- run_dump_test "align_fill"
- run_dump_test "align_text"
-
- run_dump_test "branch"
-
- run_dump_test "break"
- run_dump_test "bret"
- run_dump_test "cache"
-
- run_dump_test "call"
- run_dump_test "call26"
-
- run_dump_test "cmp"
-
- run_dump_test "jmp"
- run_dump_test "ldw"
- run_dump_test "ldh"
- run_dump_test "ldb"
-
- run_dump_test "flushda"
-
- run_dump_test "mul"
-
- run_dump_test "nor"
- run_dump_test "or"
-
- run_dump_test "ctl"
- run_dump_test "ret"
- run_dump_test "rotate"
- run_dump_test "registers"
- run_dump_test "rdprs"
- run_dump_test "wrprs"
-
- run_dump_test "stw"
- run_dump_test "sth"
- run_dump_test "stb"
-
- run_dump_test "sub"
- run_dump_test "sync"
- run_dump_test "trap"
- run_dump_test "tret"
-
- run_dump_test "custom"
- run_dump_test "xor"
- run_dump_test "movia"
-
- run_dump_test "complex"
- run_dump_test "comments"
- run_dump_test "etbt"
- run_dump_test "lineseparator"
- run_dump_test "movi"
+if { [istarget nios2-*-*] } {
+ run_dump_tests [lsort [glob -nocomplain $srcdir/$subdir/*.d]]
run_list_test "illegal" ""
run_list_test "warn_nobreak" ""
diff --git a/gas/testsuite/gas/nios2/nor.d b/gas/testsuite/gas/nios2/nor.d
index fab8e69..d38553c 100644
--- a/gas/testsuite/gas/nios2/nor.d
+++ b/gas/testsuite/gas/nios2/nor.d
@@ -1,4 +1,4 @@
-#objdump: -dr --prefix-addresses
+#objdump: -dr --prefix-addresses --show-raw-insn
#name: NIOS2 nor
# Test the nor instruction
@@ -6,4 +6,4 @@
.*: +file format elf32-littlenios2
Disassembly of section .text:
-0+0000 <[^>]*> nor r6,r8,r10
+0+0000 <[^>]*> 428c303a nor r6,r8,r10
diff --git a/gas/testsuite/gas/nios2/or.d b/gas/testsuite/gas/nios2/or.d
index e5035bc..e796a30 100644
--- a/gas/testsuite/gas/nios2/or.d
+++ b/gas/testsuite/gas/nios2/or.d
@@ -1,4 +1,4 @@
-#objdump: -dr --prefix-addresses
+#objdump: -dr --prefix-addresses --show-raw-insn
#name: NIOS2 or
# Test the nor instruction
@@ -6,6 +6,6 @@
.*: +file format elf32-littlenios2
Disassembly of section .text:
-0+0000 <[^>]*> or r6,r8,r10
-0+0004 <[^>]*> orhi r6,r7,65535
-0+0008 <[^>]*> ori r6,r7,65535
+0+0000 <[^>]*> 428cb03a or r6,r8,r10
+0+0004 <[^>]*> 39bffff4 orhi r6,r7,65535
+0+0008 <[^>]*> 39bfffd4 ori r6,r7,65535
diff --git a/gas/testsuite/gas/nios2/registers.d b/gas/testsuite/gas/nios2/registers.d
index f92bda1..2083ba7 100644
--- a/gas/testsuite/gas/nios2/registers.d
+++ b/gas/testsuite/gas/nios2/registers.d
@@ -1,4 +1,4 @@
-#objdump: -dr --prefix-addresses
+#objdump: -dr --prefix-addresses --show-raw-insn
#name: NIOS2 registers
# Test the register names
@@ -6,46 +6,46 @@
.*: +file format elf32-littlenios2
Disassembly of section .text:
-0+0000 <[^>]*> movi zero,123
-0+0004 <[^>]*> movi at,123
-0+0008 <[^>]*> movi r2,123
-0+000c <[^>]*> movi r3,123
-0+0010 <[^>]*> movi r4,123
-0+0014 <[^>]*> movi r5,123
-0+0018 <[^>]*> movi r6,123
-0+001c <[^>]*> movi r7,123
-0+0020 <[^>]*> movi r8,123
-0+0024 <[^>]*> movi r9,123
-0+0028 <[^>]*> movi r10,123
-0+002c <[^>]*> movi r11,123
-0+0030 <[^>]*> movi r12,123
-0+0034 <[^>]*> movi r13,123
-0+0038 <[^>]*> movi r14,123
-0+003c <[^>]*> movi r15,123
-0+0040 <[^>]*> movi r16,123
-0+0044 <[^>]*> movi r17,123
-0+0048 <[^>]*> movi r18,123
-0+004c <[^>]*> movi r19,123
-0+0050 <[^>]*> movi r20,123
-0+0054 <[^>]*> movi r21,123
-0+0058 <[^>]*> movi r22,123
-0+005c <[^>]*> movi r23,123
-0+0060 <[^>]*> movi et,123
-0+0064 <[^>]*> movi bt,123
-0+0068 <[^>]*> movi gp,123
-0+006c <[^>]*> movi sp,123
-0+0070 <[^>]*> movi fp,123
-0+0074 <[^>]*> movi ea,123
-0+0078 <[^>]*> movi ba,123
-0+007c <[^>]*> movi ra,123
-0+0080 <[^>]*> movi zero,123
-0+0084 <[^>]*> movi at,123
-0+0088 <[^>]*> movi et,123
-0+008c <[^>]*> movi bt,123
-0+0090 <[^>]*> movi gp,123
-0+0094 <[^>]*> movi sp,123
-0+0098 <[^>]*> movi fp,123
-0+009c <[^>]*> movi ea,123
-0+00a0 <[^>]*> movi ba,123
-0+00a4 <[^>]*> movi ba,123
-0+00a8 <[^>]*> movi ra,123
+0+0000 <[^>]*> 00001ec4 movi zero,123
+0+0004 <[^>]*> 00401ec4 movi at,123
+0+0008 <[^>]*> 00801ec4 movi r2,123
+0+000c <[^>]*> 00c01ec4 movi r3,123
+0+0010 <[^>]*> 01001ec4 movi r4,123
+0+0014 <[^>]*> 01401ec4 movi r5,123
+0+0018 <[^>]*> 01801ec4 movi r6,123
+0+001c <[^>]*> 01c01ec4 movi r7,123
+0+0020 <[^>]*> 02001ec4 movi r8,123
+0+0024 <[^>]*> 02401ec4 movi r9,123
+0+0028 <[^>]*> 02801ec4 movi r10,123
+0+002c <[^>]*> 02c01ec4 movi r11,123
+0+0030 <[^>]*> 03001ec4 movi r12,123
+0+0034 <[^>]*> 03401ec4 movi r13,123
+0+0038 <[^>]*> 03801ec4 movi r14,123
+0+003c <[^>]*> 03c01ec4 movi r15,123
+0+0040 <[^>]*> 04001ec4 movi r16,123
+0+0044 <[^>]*> 04401ec4 movi r17,123
+0+0048 <[^>]*> 04801ec4 movi r18,123
+0+004c <[^>]*> 04c01ec4 movi r19,123
+0+0050 <[^>]*> 05001ec4 movi r20,123
+0+0054 <[^>]*> 05401ec4 movi r21,123
+0+0058 <[^>]*> 05801ec4 movi r22,123
+0+005c <[^>]*> 05c01ec4 movi r23,123
+0+0060 <[^>]*> 06001ec4 movi et,123
+0+0064 <[^>]*> 06401ec4 movi bt,123
+0+0068 <[^>]*> 06801ec4 movi gp,123
+0+006c <[^>]*> 06c01ec4 movi sp,123
+0+0070 <[^>]*> 07001ec4 movi fp,123
+0+0074 <[^>]*> 07401ec4 movi ea,123
+0+0078 <[^>]*> 07801ec4 movi ba,123
+0+007c <[^>]*> 07c01ec4 movi ra,123
+0+0080 <[^>]*> 00001ec4 movi zero,123
+0+0084 <[^>]*> 00401ec4 movi at,123
+0+0088 <[^>]*> 06001ec4 movi et,123
+0+008c <[^>]*> 06401ec4 movi bt,123
+0+0090 <[^>]*> 06801ec4 movi gp,123
+0+0094 <[^>]*> 06c01ec4 movi sp,123
+0+0098 <[^>]*> 07001ec4 movi fp,123
+0+009c <[^>]*> 07401ec4 movi ea,123
+0+00a0 <[^>]*> 07801ec4 movi ba,123
+0+00a4 <[^>]*> 07801ec4 movi ba,123
+0+00a8 <[^>]*> 07c01ec4 movi ra,123
diff --git a/gas/testsuite/gas/nios2/ret.d b/gas/testsuite/gas/nios2/ret.d
index b071931..fe924e1 100644
--- a/gas/testsuite/gas/nios2/ret.d
+++ b/gas/testsuite/gas/nios2/ret.d
@@ -1,8 +1,8 @@
-#objdump: -dr --prefix-addresses
+#objdump: -dr --prefix-addresses --show-raw-insn
#name: NIOS2 ret
.*: +file format elf32-littlenios2
Disassembly of section .text:
-0+0000 <[^>]*> ret
+0+0000 <[^>]*> f800283a ret
diff --git a/gas/testsuite/gas/nios2/rol.d b/gas/testsuite/gas/nios2/rol.d
deleted file mode 100644
index 2128dd5..0000000
--- a/gas/testsuite/gas/nios2/rol.d
+++ /dev/null
@@ -1,40 +0,0 @@
-#objdump: -dr --prefix-addresses -mmips:3000
-#as: -march=r3000 -mtune=r3000
-#name: MIPS R3000 rol
-
-# Test the rol and ror macros.
-
-.*: +file format .*mips.*
-
-Disassembly of section .text:
-0+0000 <[^>]*> negu at,a1
-0+0004 <[^>]*> srlv at,a0,at
-0+0008 <[^>]*> sllv a0,a0,a1
-0+000c <[^>]*> or a0,a0,at
-0+0010 <[^>]*> negu at,a2
-0+0014 <[^>]*> srlv at,a1,at
-0+0018 <[^>]*> sllv a0,a1,a2
-0+001c <[^>]*> or a0,a0,at
-0+0020 <[^>]*> sll at,a0,0x1
-0+0024 <[^>]*> srl a0,a0,0x1f
-0+0028 <[^>]*> or a0,a0,at
-0+002c <[^>]*> sll at,a1,0x1
-0+0030 <[^>]*> srl a0,a1,0x1f
-0+0034 <[^>]*> or a0,a0,at
-0+0038 <[^>]*> srl a0,a1,0x0
-0+003c <[^>]*> negu at,a1
-0+0040 <[^>]*> sllv at,a0,at
-0+0044 <[^>]*> srlv a0,a0,a1
-0+0048 <[^>]*> or a0,a0,at
-0+004c <[^>]*> negu at,a2
-0+0050 <[^>]*> sllv at,a1,at
-0+0054 <[^>]*> srlv a0,a1,a2
-0+0058 <[^>]*> or a0,a0,at
-0+005c <[^>]*> srl at,a0,0x1
-0+0060 <[^>]*> sll a0,a0,0x1f
-0+0064 <[^>]*> or a0,a0,at
-0+0068 <[^>]*> srl at,a1,0x1
-0+006c <[^>]*> sll a0,a1,0x1f
-0+0070 <[^>]*> or a0,a0,at
-0+0074 <[^>]*> srl a0,a1,0x0
- ...
diff --git a/gas/testsuite/gas/nios2/rol.s b/gas/testsuite/gas/nios2/rol.s
deleted file mode 100644
index 988d702..0000000
--- a/gas/testsuite/gas/nios2/rol.s
+++ /dev/null
@@ -1,15 +0,0 @@
-# Source file used to test the rol and ror macros.
-
-foo:
- rol $4,$5
- rol $4,$5,$6
- rol $4,1
- rol $4,$5,1
- rol $4,$5,0
-
- ror $4,$5
- ror $4,$5,$6
- ror $4,1
- ror $4,$5,1
- ror $4,$5,0
- .space 8
diff --git a/gas/testsuite/gas/nios2/rotate.d b/gas/testsuite/gas/nios2/rotate.d
index 0f54f43..72338da 100644
--- a/gas/testsuite/gas/nios2/rotate.d
+++ b/gas/testsuite/gas/nios2/rotate.d
@@ -1,4 +1,4 @@
-#objdump: -dr --prefix-addresses
+#objdump: -dr --prefix-addresses --show-raw-insn
#name: NIOS2 rotate
# Test the and macro.
@@ -6,12 +6,12 @@
.*: +file format elf32-littlenios2
Disassembly of section .text:
-0+0000 <[^>]*> rol r4,r4,r4
-0+0004 <[^>]*> roli r4,r4,31
-0+0008 <[^>]*> ror r4,r4,r4
-0+000c <[^>]*> sll r4,r4,r4
-0+0010 <[^>]*> slli r4,r4,24
-0+0014 <[^>]*> sra r4,r4,r4
-0+0018 <[^>]*> srai r4,r4,10
-0+001c <[^>]*> srl r4,r4,r4
-0+0020 <[^>]*> srli r4,r4,5
+0+0000 <[^>]*> 2108183a rol r4,r4,r4
+0+0004 <[^>]*> 200817fa roli r4,r4,31
+0+0008 <[^>]*> 2108583a ror r4,r4,r4
+0+000c <[^>]*> 2108983a sll r4,r4,r4
+0+0010 <[^>]*> 2008963a slli r4,r4,24
+0+0014 <[^>]*> 2109d83a sra r4,r4,r4
+0+0018 <[^>]*> 2009d2ba srai r4,r4,10
+0+001c <[^>]*> 2108d83a srl r4,r4,r4
+0+0020 <[^>]*> 2008d17a srli r4,r4,5
diff --git a/gas/testsuite/gas/nios2/stb.d b/gas/testsuite/gas/nios2/stb.d
index e3b4818..c8b4ba5 100644
--- a/gas/testsuite/gas/nios2/stb.d
+++ b/gas/testsuite/gas/nios2/stb.d
@@ -1,4 +1,4 @@
-#objdump: -dr --prefix-addresses
+#objdump: -dr --prefix-addresses --show-raw-insn
#name: NIOS2 stb
# Test the ld instruction
@@ -6,191 +6,191 @@
.*: +file format elf32-littlenios2
Disassembly of section .text:
-0+0000 <[^>]*> stb r4,0\(zero\)
-0+0004 <[^>]*> stb r4,4\(zero\)
-0+0008 <[^>]*> stb r4,32764\(zero\)
-0+000c <[^>]*> stb r4,-32768\(zero\)
-0+0010 <[^>]*> stb r4,0\(r5\)
-0+0014 <[^>]*> stb r4,4\(r5\)
-0+0018 <[^>]*> stb r4,32764\(r5\)
-0+001c <[^>]*> stb r4,-32768\(r5\)
-0+0020 <[^>]*> stb r4,0\(zero\)
+0+0000 <[^>]*> 01000005 stb r4,0\(zero\)
+0+0004 <[^>]*> 01000105 stb r4,4\(zero\)
+0+0008 <[^>]*> 011fff05 stb r4,32764\(zero\)
+0+000c <[^>]*> 01200005 stb r4,-32768\(zero\)
+0+0010 <[^>]*> 29000005 stb r4,0\(r5\)
+0+0014 <[^>]*> 29000105 stb r4,4\(r5\)
+0+0018 <[^>]*> 291fff05 stb r4,32764\(r5\)
+0+001c <[^>]*> 29200005 stb r4,-32768\(r5\)
+0+0020 <[^>]*> 01000005 stb r4,0\(zero\)
[ ]*20: R_NIOS2_S16 .data
-0+0024 <[^>]*> stb r4,0\(zero\)
+0+0024 <[^>]*> 01000005 stb r4,0\(zero\)
[ ]*24: R_NIOS2_S16 big_external_data_label
-0+0028 <[^>]*> stb r4,0\(zero\)
+0+0028 <[^>]*> 01000005 stb r4,0\(zero\)
[ ]*28: R_NIOS2_S16 small_external_data_label
-0+002c <[^>]*> stb r4,0\(zero\)
+0+002c <[^>]*> 01000005 stb r4,0\(zero\)
[ ]*2c: R_NIOS2_S16 big_external_common
-0+0030 <[^>]*> stb r4,0\(zero\)
+0+0030 <[^>]*> 01000005 stb r4,0\(zero\)
[ ]*30: R_NIOS2_S16 small_external_common
-0+0034 <[^>]*> stb r4,0\(zero\)
+0+0034 <[^>]*> 01000005 stb r4,0\(zero\)
[ ]*34: R_NIOS2_S16 .bss
-0+0038 <[^>]*> stb r4,0\(zero\)
+0+0038 <[^>]*> 01000005 stb r4,0\(zero\)
[ ]*38: R_NIOS2_S16 .bss\+0x4000
-0+003c <[^>]*> stb r4,0\(zero\)
+0+003c <[^>]*> 01000005 stb r4,0\(zero\)
[ ]*3c: R_NIOS2_S16 .data\+0x4
-0+0040 <[^>]*> stb r4,0\(zero\)
+0+0040 <[^>]*> 01000005 stb r4,0\(zero\)
[ ]*40: R_NIOS2_S16 big_external_data_label\+0x4
-0+0044 <[^>]*> stb r4,0\(zero\)
+0+0044 <[^>]*> 01000005 stb r4,0\(zero\)
[ ]*44: R_NIOS2_S16 small_external_data_label\+0x4
-0+0048 <[^>]*> stb r4,0\(zero\)
+0+0048 <[^>]*> 01000005 stb r4,0\(zero\)
[ ]*48: R_NIOS2_S16 big_external_common\+0x4
-0+004c <[^>]*> stb r4,0\(zero\)
+0+004c <[^>]*> 01000005 stb r4,0\(zero\)
[ ]*4c: R_NIOS2_S16 small_external_common\+0x4
-0+0050 <[^>]*> stb r4,0\(zero\)
+0+0050 <[^>]*> 01000005 stb r4,0\(zero\)
[ ]*50: R_NIOS2_S16 .bss\+0x4
-0+0054 <[^>]*> stb r4,0\(zero\)
+0+0054 <[^>]*> 01000005 stb r4,0\(zero\)
[ ]*54: R_NIOS2_S16 .bss\+0x4004
-0+0058 <[^>]*> stb r4,0\(zero\)
+0+0058 <[^>]*> 01000005 stb r4,0\(zero\)
[ ]*58: R_NIOS2_S16 .data-0x8000
-0+005c <[^>]*> stb r4,0\(zero\)
+0+005c <[^>]*> 01000005 stb r4,0\(zero\)
[ ]*5c: R_NIOS2_S16 big_external_data_label-0x8000
-0+0060 <[^>]*> stb r4,0\(zero\)
+0+0060 <[^>]*> 01000005 stb r4,0\(zero\)
[ ]*60: R_NIOS2_S16 small_external_data_label-0x8000
-0+0064 <[^>]*> stb r4,0\(zero\)
+0+0064 <[^>]*> 01000005 stb r4,0\(zero\)
[ ]*64: R_NIOS2_S16 big_external_common-0x8000
-0+0068 <[^>]*> stb r4,0\(zero\)
+0+0068 <[^>]*> 01000005 stb r4,0\(zero\)
[ ]*68: R_NIOS2_S16 small_external_common-0x8000
-0+006c <[^>]*> stb r4,0\(zero\)
+0+006c <[^>]*> 01000005 stb r4,0\(zero\)
[ ]*6c: R_NIOS2_S16 .bss-0x8000
-0+0070 <[^>]*> stb r4,0\(zero\)
+0+0070 <[^>]*> 01000005 stb r4,0\(zero\)
[ ]*70: R_NIOS2_S16 .bss-0x4000
-0+0074 <[^>]*> stb r4,0\(zero\)
+0+0074 <[^>]*> 01000005 stb r4,0\(zero\)
[ ]*74: R_NIOS2_S16 .data\+0x10000
-0+0078 <[^>]*> stb r4,0\(r5\)
+0+0078 <[^>]*> 29000005 stb r4,0\(r5\)
[ ]*78: R_NIOS2_S16 .data
-0+007c <[^>]*> stb r4,0\(r5\)
+0+007c <[^>]*> 29000005 stb r4,0\(r5\)
[ ]*7c: R_NIOS2_S16 big_external_data_label
-0+0080 <[^>]*> stb r4,0\(r5\)
+0+0080 <[^>]*> 29000005 stb r4,0\(r5\)
[ ]*80: R_NIOS2_S16 small_external_data_label
-0+0084 <[^>]*> stb r4,0\(r5\)
+0+0084 <[^>]*> 29000005 stb r4,0\(r5\)
[ ]*84: R_NIOS2_S16 big_external_common
-0+0088 <[^>]*> stb r4,0\(r5\)
+0+0088 <[^>]*> 29000005 stb r4,0\(r5\)
[ ]*88: R_NIOS2_S16 small_external_common
-0+008c <[^>]*> stb r4,0\(r5\)
+0+008c <[^>]*> 29000005 stb r4,0\(r5\)
[ ]*8c: R_NIOS2_S16 .bss
-0+0090 <[^>]*> stb r4,0\(r5\)
+0+0090 <[^>]*> 29000005 stb r4,0\(r5\)
[ ]*90: R_NIOS2_S16 .bss\+0x4000
-0+0094 <[^>]*> stb r4,0\(r5\)
+0+0094 <[^>]*> 29000005 stb r4,0\(r5\)
[ ]*94: R_NIOS2_S16 .data\+0x4
-0+0098 <[^>]*> stb r4,0\(r5\)
+0+0098 <[^>]*> 29000005 stb r4,0\(r5\)
[ ]*98: R_NIOS2_S16 big_external_data_label\+0x4
-0+009c <[^>]*> stb r4,0\(r5\)
+0+009c <[^>]*> 29000005 stb r4,0\(r5\)
[ ]*9c: R_NIOS2_S16 small_external_data_label\+0x4
-0+00a0 <[^>]*> stb r4,0\(r5\)
+0+00a0 <[^>]*> 29000005 stb r4,0\(r5\)
[ ]*a0: R_NIOS2_S16 big_external_common\+0x4
-0+00a4 <[^>]*> stb r4,0\(r5\)
+0+00a4 <[^>]*> 29000005 stb r4,0\(r5\)
[ ]*a4: R_NIOS2_S16 small_external_common\+0x4
-0+00a8 <[^>]*> stb r4,0\(r5\)
+0+00a8 <[^>]*> 29000005 stb r4,0\(r5\)
[ ]*a8: R_NIOS2_S16 .bss\+0x4
-0+00ac <[^>]*> stb r4,0\(r5\)
+0+00ac <[^>]*> 29000005 stb r4,0\(r5\)
[ ]*ac: R_NIOS2_S16 .bss\+0x4004
-0+00b0 <[^>]*> stb r4,0\(r5\)
+0+00b0 <[^>]*> 29000005 stb r4,0\(r5\)
[ ]*b0: R_NIOS2_S16 .data-0x8000
-0+00b4 <[^>]*> stb r4,0\(r5\)
+0+00b4 <[^>]*> 29000005 stb r4,0\(r5\)
[ ]*b4: R_NIOS2_S16 big_external_data_label-0x8000
-0+00b8 <[^>]*> stb r4,0\(r5\)
+0+00b8 <[^>]*> 29000005 stb r4,0\(r5\)
[ ]*b8: R_NIOS2_S16 small_external_data_label-0x8000
-0+00bc <[^>]*> stb r4,0\(r5\)
+0+00bc <[^>]*> 29000005 stb r4,0\(r5\)
[ ]*bc: R_NIOS2_S16 big_external_common-0x8000
-0+00c0 <[^>]*> stb r4,0\(r5\)
+0+00c0 <[^>]*> 29000005 stb r4,0\(r5\)
[ ]*c0: R_NIOS2_S16 small_external_common-0x8000
-0+00c4 <[^>]*> stb r4,0\(r5\)
+0+00c4 <[^>]*> 29000005 stb r4,0\(r5\)
[ ]*c4: R_NIOS2_S16 .bss-0x8000
-0+00c8 <[^>]*> stb r4,0\(r5\)
+0+00c8 <[^>]*> 29000005 stb r4,0\(r5\)
[ ]*c8: R_NIOS2_S16 .bss-0x4000
-0+00cc <[^>]*> stbio r4,0\(zero\)
-0+00d0 <[^>]*> stbio r4,4\(zero\)
-0+00d4 <[^>]*> stbio r4,32764\(zero\)
-0+00d8 <[^>]*> stbio r4,-32768\(zero\)
-0+00dc <[^>]*> stbio r4,0\(r5\)
-0+00e0 <[^>]*> stbio r4,4\(r5\)
-0+00e4 <[^>]*> stbio r4,32764\(r5\)
-0+00e8 <[^>]*> stbio r4,-32768\(r5\)
-0+00ec <[^>]*> stbio r4,0\(zero\)
+0+00cc <[^>]*> 01000025 stbio r4,0\(zero\)
+0+00d0 <[^>]*> 01000125 stbio r4,4\(zero\)
+0+00d4 <[^>]*> 011fff25 stbio r4,32764\(zero\)
+0+00d8 <[^>]*> 01200025 stbio r4,-32768\(zero\)
+0+00dc <[^>]*> 29000025 stbio r4,0\(r5\)
+0+00e0 <[^>]*> 29000125 stbio r4,4\(r5\)
+0+00e4 <[^>]*> 291fff25 stbio r4,32764\(r5\)
+0+00e8 <[^>]*> 29200025 stbio r4,-32768\(r5\)
+0+00ec <[^>]*> 01000025 stbio r4,0\(zero\)
[ ]*ec: R_NIOS2_S16 .data
-0+00f0 <[^>]*> stbio r4,0\(zero\)
+0+00f0 <[^>]*> 01000025 stbio r4,0\(zero\)
[ ]*f0: R_NIOS2_S16 big_external_data_label
-0+00f4 <[^>]*> stbio r4,0\(zero\)
+0+00f4 <[^>]*> 01000025 stbio r4,0\(zero\)
[ ]*f4: R_NIOS2_S16 small_external_data_label
-0+00f8 <[^>]*> stbio r4,0\(zero\)
+0+00f8 <[^>]*> 01000025 stbio r4,0\(zero\)
[ ]*f8: R_NIOS2_S16 big_external_common
-0+00fc <[^>]*> stbio r4,0\(zero\)
+0+00fc <[^>]*> 01000025 stbio r4,0\(zero\)
[ ]*fc: R_NIOS2_S16 small_external_common
-0+0100 <[^>]*> stbio r4,0\(zero\)
+0+0100 <[^>]*> 01000025 stbio r4,0\(zero\)
[ ]*100: R_NIOS2_S16 .bss
-0+0104 <[^>]*> stbio r4,0\(zero\)
+0+0104 <[^>]*> 01000025 stbio r4,0\(zero\)
[ ]*104: R_NIOS2_S16 .bss\+0x4000
-0+0108 <[^>]*> stbio r4,0\(zero\)
+0+0108 <[^>]*> 01000025 stbio r4,0\(zero\)
[ ]*108: R_NIOS2_S16 .data\+0x4
-0+010c <[^>]*> stbio r4,0\(zero\)
+0+010c <[^>]*> 01000025 stbio r4,0\(zero\)
[ ]*10c: R_NIOS2_S16 big_external_data_label\+0x4
-0+0110 <[^>]*> stbio r4,0\(zero\)
+0+0110 <[^>]*> 01000025 stbio r4,0\(zero\)
[ ]*110: R_NIOS2_S16 small_external_data_label\+0x4
-0+0114 <[^>]*> stbio r4,0\(zero\)
+0+0114 <[^>]*> 01000025 stbio r4,0\(zero\)
[ ]*114: R_NIOS2_S16 big_external_common\+0x4
-0+0118 <[^>]*> stbio r4,0\(zero\)
+0+0118 <[^>]*> 01000025 stbio r4,0\(zero\)
[ ]*118: R_NIOS2_S16 small_external_common\+0x4
-0+011c <[^>]*> stbio r4,0\(zero\)
+0+011c <[^>]*> 01000025 stbio r4,0\(zero\)
[ ]*11c: R_NIOS2_S16 .bss\+0x4
-0+0120 <[^>]*> stbio r4,0\(zero\)
+0+0120 <[^>]*> 01000025 stbio r4,0\(zero\)
[ ]*120: R_NIOS2_S16 .bss\+0x4004
-0+0124 <[^>]*> stbio r4,0\(zero\)
+0+0124 <[^>]*> 01000025 stbio r4,0\(zero\)
[ ]*124: R_NIOS2_S16 .data-0x8000
-0+0128 <[^>]*> stbio r4,0\(zero\)
+0+0128 <[^>]*> 01000025 stbio r4,0\(zero\)
[ ]*128: R_NIOS2_S16 big_external_data_label-0x8000
-0+012c <[^>]*> stbio r4,0\(zero\)
+0+012c <[^>]*> 01000025 stbio r4,0\(zero\)
[ ]*12c: R_NIOS2_S16 small_external_data_label-0x8000
-0+0130 <[^>]*> stbio r4,0\(zero\)
+0+0130 <[^>]*> 01000025 stbio r4,0\(zero\)
[ ]*130: R_NIOS2_S16 big_external_common-0x8000
-0+0134 <[^>]*> stbio r4,0\(zero\)
+0+0134 <[^>]*> 01000025 stbio r4,0\(zero\)
[ ]*134: R_NIOS2_S16 small_external_common-0x8000
-0+0138 <[^>]*> stbio r4,0\(zero\)
+0+0138 <[^>]*> 01000025 stbio r4,0\(zero\)
[ ]*138: R_NIOS2_S16 .bss-0x8000
-0+013c <[^>]*> stbio r4,0\(zero\)
+0+013c <[^>]*> 01000025 stbio r4,0\(zero\)
[ ]*13c: R_NIOS2_S16 .bss-0x4000
-0+0140 <[^>]*> stbio r4,0\(zero\)
+0+0140 <[^>]*> 01000025 stbio r4,0\(zero\)
[ ]*140: R_NIOS2_S16 .data\+0x10000
-0+0144 <[^>]*> stbio r4,0\(r5\)
+0+0144 <[^>]*> 29000025 stbio r4,0\(r5\)
[ ]*144: R_NIOS2_S16 .data
-0+0148 <[^>]*> stbio r4,0\(r5\)
+0+0148 <[^>]*> 29000025 stbio r4,0\(r5\)
[ ]*148: R_NIOS2_S16 big_external_data_label
-0+014c <[^>]*> stbio r4,0\(r5\)
+0+014c <[^>]*> 29000025 stbio r4,0\(r5\)
[ ]*14c: R_NIOS2_S16 small_external_data_label
-0+0150 <[^>]*> stbio r4,0\(r5\)
+0+0150 <[^>]*> 29000025 stbio r4,0\(r5\)
[ ]*150: R_NIOS2_S16 big_external_common
-0+0154 <[^>]*> stbio r4,0\(r5\)
+0+0154 <[^>]*> 29000025 stbio r4,0\(r5\)
[ ]*154: R_NIOS2_S16 small_external_common
-0+0158 <[^>]*> stbio r4,0\(r5\)
+0+0158 <[^>]*> 29000025 stbio r4,0\(r5\)
[ ]*158: R_NIOS2_S16 .bss
-0+015c <[^>]*> stbio r4,0\(r5\)
+0+015c <[^>]*> 29000025 stbio r4,0\(r5\)
[ ]*15c: R_NIOS2_S16 .bss\+0x4000
-0+0160 <[^>]*> stbio r4,0\(r5\)
+0+0160 <[^>]*> 29000025 stbio r4,0\(r5\)
[ ]*160: R_NIOS2_S16 .data\+0x4
-0+0164 <[^>]*> stbio r4,0\(r5\)
+0+0164 <[^>]*> 29000025 stbio r4,0\(r5\)
[ ]*164: R_NIOS2_S16 big_external_data_label\+0x4
-0+0168 <[^>]*> stbio r4,0\(r5\)
+0+0168 <[^>]*> 29000025 stbio r4,0\(r5\)
[ ]*168: R_NIOS2_S16 small_external_data_label\+0x4
-0+016c <[^>]*> stbio r4,0\(r5\)
+0+016c <[^>]*> 29000025 stbio r4,0\(r5\)
[ ]*16c: R_NIOS2_S16 big_external_common\+0x4
-0+0170 <[^>]*> stbio r4,0\(r5\)
+0+0170 <[^>]*> 29000025 stbio r4,0\(r5\)
[ ]*170: R_NIOS2_S16 small_external_common\+0x4
-0+0174 <[^>]*> stbio r4,0\(r5\)
+0+0174 <[^>]*> 29000025 stbio r4,0\(r5\)
[ ]*174: R_NIOS2_S16 .bss\+0x4
-0+0178 <[^>]*> stbio r4,0\(r5\)
+0+0178 <[^>]*> 29000025 stbio r4,0\(r5\)
[ ]*178: R_NIOS2_S16 .bss\+0x4004
-0+017c <[^>]*> stbio r4,0\(r5\)
+0+017c <[^>]*> 29000025 stbio r4,0\(r5\)
[ ]*17c: R_NIOS2_S16 .data-0x8000
-0+0180 <[^>]*> stbio r4,0\(r5\)
+0+0180 <[^>]*> 29000025 stbio r4,0\(r5\)
[ ]*180: R_NIOS2_S16 big_external_data_label-0x8000
-0+0184 <[^>]*> stbio r4,0\(r5\)
+0+0184 <[^>]*> 29000025 stbio r4,0\(r5\)
[ ]*184: R_NIOS2_S16 small_external_data_label-0x8000
-0+0188 <[^>]*> stbio r4,0\(r5\)
+0+0188 <[^>]*> 29000025 stbio r4,0\(r5\)
[ ]*188: R_NIOS2_S16 big_external_common-0x8000
-0+018c <[^>]*> stbio r4,0\(r5\)
+0+018c <[^>]*> 29000025 stbio r4,0\(r5\)
[ ]*18c: R_NIOS2_S16 small_external_common-0x8000
-0+0190 <[^>]*> stbio r4,0\(r5\)
+0+0190 <[^>]*> 29000025 stbio r4,0\(r5\)
[ ]*190: R_NIOS2_S16 .bss-0x8000
-0+0194 <[^>]*> stbio r4,0\(r5\)
+0+0194 <[^>]*> 29000025 stbio r4,0\(r5\)
[ ]*194: R_NIOS2_S16 .bss-0x4000
diff --git a/gas/testsuite/gas/nios2/sth.d b/gas/testsuite/gas/nios2/sth.d
index 76d58d4..2625f6d 100644
--- a/gas/testsuite/gas/nios2/sth.d
+++ b/gas/testsuite/gas/nios2/sth.d
@@ -1,4 +1,4 @@
-#objdump: -dr --prefix-addresses
+#objdump: -dr --prefix-addresses --show-raw-insn
#name: NIOS2 sth
# Test the ld instruction
@@ -6,191 +6,191 @@
.*: +file format elf32-littlenios2
Disassembly of section .text:
-0+0000 <[^>]*> sth r4,0\(zero\)
-0+0004 <[^>]*> sth r4,4\(zero\)
-0+0008 <[^>]*> sth r4,32764\(zero\)
-0+000c <[^>]*> sth r4,-32768\(zero\)
-0+0010 <[^>]*> sth r4,0\(r5\)
-0+0014 <[^>]*> sth r4,4\(r5\)
-0+0018 <[^>]*> sth r4,32764\(r5\)
-0+001c <[^>]*> sth r4,-32768\(r5\)
-0+0020 <[^>]*> sth r4,0\(zero\)
+0+0000 <[^>]*> 0100000d sth r4,0\(zero\)
+0+0004 <[^>]*> 0100010d sth r4,4\(zero\)
+0+0008 <[^>]*> 011fff0d sth r4,32764\(zero\)
+0+000c <[^>]*> 0120000d sth r4,-32768\(zero\)
+0+0010 <[^>]*> 2900000d sth r4,0\(r5\)
+0+0014 <[^>]*> 2900010d sth r4,4\(r5\)
+0+0018 <[^>]*> 291fff0d sth r4,32764\(r5\)
+0+001c <[^>]*> 2920000d sth r4,-32768\(r5\)
+0+0020 <[^>]*> 0100000d sth r4,0\(zero\)
[ ]*20: R_NIOS2_S16 .data
-0+0024 <[^>]*> sth r4,0\(zero\)
+0+0024 <[^>]*> 0100000d sth r4,0\(zero\)
[ ]*24: R_NIOS2_S16 big_external_data_label
-0+0028 <[^>]*> sth r4,0\(zero\)
+0+0028 <[^>]*> 0100000d sth r4,0\(zero\)
[ ]*28: R_NIOS2_S16 small_external_data_label
-0+002c <[^>]*> sth r4,0\(zero\)
+0+002c <[^>]*> 0100000d sth r4,0\(zero\)
[ ]*2c: R_NIOS2_S16 big_external_common
-0+0030 <[^>]*> sth r4,0\(zero\)
+0+0030 <[^>]*> 0100000d sth r4,0\(zero\)
[ ]*30: R_NIOS2_S16 small_external_common
-0+0034 <[^>]*> sth r4,0\(zero\)
+0+0034 <[^>]*> 0100000d sth r4,0\(zero\)
[ ]*34: R_NIOS2_S16 .bss
-0+0038 <[^>]*> sth r4,0\(zero\)
+0+0038 <[^>]*> 0100000d sth r4,0\(zero\)
[ ]*38: R_NIOS2_S16 .bss\+0x4000
-0+003c <[^>]*> sth r4,0\(zero\)
+0+003c <[^>]*> 0100000d sth r4,0\(zero\)
[ ]*3c: R_NIOS2_S16 .data\+0x4
-0+0040 <[^>]*> sth r4,0\(zero\)
+0+0040 <[^>]*> 0100000d sth r4,0\(zero\)
[ ]*40: R_NIOS2_S16 big_external_data_label\+0x4
-0+0044 <[^>]*> sth r4,0\(zero\)
+0+0044 <[^>]*> 0100000d sth r4,0\(zero\)
[ ]*44: R_NIOS2_S16 small_external_data_label\+0x4
-0+0048 <[^>]*> sth r4,0\(zero\)
+0+0048 <[^>]*> 0100000d sth r4,0\(zero\)
[ ]*48: R_NIOS2_S16 big_external_common\+0x4
-0+004c <[^>]*> sth r4,0\(zero\)
+0+004c <[^>]*> 0100000d sth r4,0\(zero\)
[ ]*4c: R_NIOS2_S16 small_external_common\+0x4
-0+0050 <[^>]*> sth r4,0\(zero\)
+0+0050 <[^>]*> 0100000d sth r4,0\(zero\)
[ ]*50: R_NIOS2_S16 .bss\+0x4
-0+0054 <[^>]*> sth r4,0\(zero\)
+0+0054 <[^>]*> 0100000d sth r4,0\(zero\)
[ ]*54: R_NIOS2_S16 .bss\+0x4004
-0+0058 <[^>]*> sth r4,0\(zero\)
+0+0058 <[^>]*> 0100000d sth r4,0\(zero\)
[ ]*58: R_NIOS2_S16 .data-0x8000
-0+005c <[^>]*> sth r4,0\(zero\)
+0+005c <[^>]*> 0100000d sth r4,0\(zero\)
[ ]*5c: R_NIOS2_S16 big_external_data_label-0x8000
-0+0060 <[^>]*> sth r4,0\(zero\)
+0+0060 <[^>]*> 0100000d sth r4,0\(zero\)
[ ]*60: R_NIOS2_S16 small_external_data_label-0x8000
-0+0064 <[^>]*> sth r4,0\(zero\)
+0+0064 <[^>]*> 0100000d sth r4,0\(zero\)
[ ]*64: R_NIOS2_S16 big_external_common-0x8000
-0+0068 <[^>]*> sth r4,0\(zero\)
+0+0068 <[^>]*> 0100000d sth r4,0\(zero\)
[ ]*68: R_NIOS2_S16 small_external_common-0x8000
-0+006c <[^>]*> sth r4,0\(zero\)
+0+006c <[^>]*> 0100000d sth r4,0\(zero\)
[ ]*6c: R_NIOS2_S16 .bss-0x8000
-0+0070 <[^>]*> sth r4,0\(zero\)
+0+0070 <[^>]*> 0100000d sth r4,0\(zero\)
[ ]*70: R_NIOS2_S16 .bss-0x4000
-0+0074 <[^>]*> sth r4,0\(zero\)
+0+0074 <[^>]*> 0100000d sth r4,0\(zero\)
[ ]*74: R_NIOS2_S16 .data\+0x10000
-0+0078 <[^>]*> sth r4,0\(r5\)
+0+0078 <[^>]*> 2900000d sth r4,0\(r5\)
[ ]*78: R_NIOS2_S16 .data
-0+007c <[^>]*> sth r4,0\(r5\)
+0+007c <[^>]*> 2900000d sth r4,0\(r5\)
[ ]*7c: R_NIOS2_S16 big_external_data_label
-0+0080 <[^>]*> sth r4,0\(r5\)
+0+0080 <[^>]*> 2900000d sth r4,0\(r5\)
[ ]*80: R_NIOS2_S16 small_external_data_label
-0+0084 <[^>]*> sth r4,0\(r5\)
+0+0084 <[^>]*> 2900000d sth r4,0\(r5\)
[ ]*84: R_NIOS2_S16 big_external_common
-0+0088 <[^>]*> sth r4,0\(r5\)
+0+0088 <[^>]*> 2900000d sth r4,0\(r5\)
[ ]*88: R_NIOS2_S16 small_external_common
-0+008c <[^>]*> sth r4,0\(r5\)
+0+008c <[^>]*> 2900000d sth r4,0\(r5\)
[ ]*8c: R_NIOS2_S16 .bss
-0+0090 <[^>]*> sth r4,0\(r5\)
+0+0090 <[^>]*> 2900000d sth r4,0\(r5\)
[ ]*90: R_NIOS2_S16 .bss\+0x4000
-0+0094 <[^>]*> sth r4,0\(r5\)
+0+0094 <[^>]*> 2900000d sth r4,0\(r5\)
[ ]*94: R_NIOS2_S16 .data\+0x4
-0+0098 <[^>]*> sth r4,0\(r5\)
+0+0098 <[^>]*> 2900000d sth r4,0\(r5\)
[ ]*98: R_NIOS2_S16 big_external_data_label\+0x4
-0+009c <[^>]*> sth r4,0\(r5\)
+0+009c <[^>]*> 2900000d sth r4,0\(r5\)
[ ]*9c: R_NIOS2_S16 small_external_data_label\+0x4
-0+00a0 <[^>]*> sth r4,0\(r5\)
+0+00a0 <[^>]*> 2900000d sth r4,0\(r5\)
[ ]*a0: R_NIOS2_S16 big_external_common\+0x4
-0+00a4 <[^>]*> sth r4,0\(r5\)
+0+00a4 <[^>]*> 2900000d sth r4,0\(r5\)
[ ]*a4: R_NIOS2_S16 small_external_common\+0x4
-0+00a8 <[^>]*> sth r4,0\(r5\)
+0+00a8 <[^>]*> 2900000d sth r4,0\(r5\)
[ ]*a8: R_NIOS2_S16 .bss\+0x4
-0+00ac <[^>]*> sth r4,0\(r5\)
+0+00ac <[^>]*> 2900000d sth r4,0\(r5\)
[ ]*ac: R_NIOS2_S16 .bss\+0x4004
-0+00b0 <[^>]*> sth r4,0\(r5\)
+0+00b0 <[^>]*> 2900000d sth r4,0\(r5\)
[ ]*b0: R_NIOS2_S16 .data-0x8000
-0+00b4 <[^>]*> sth r4,0\(r5\)
+0+00b4 <[^>]*> 2900000d sth r4,0\(r5\)
[ ]*b4: R_NIOS2_S16 big_external_data_label-0x8000
-0+00b8 <[^>]*> sth r4,0\(r5\)
+0+00b8 <[^>]*> 2900000d sth r4,0\(r5\)
[ ]*b8: R_NIOS2_S16 small_external_data_label-0x8000
-0+00bc <[^>]*> sth r4,0\(r5\)
+0+00bc <[^>]*> 2900000d sth r4,0\(r5\)
[ ]*bc: R_NIOS2_S16 big_external_common-0x8000
-0+00c0 <[^>]*> sth r4,0\(r5\)
+0+00c0 <[^>]*> 2900000d sth r4,0\(r5\)
[ ]*c0: R_NIOS2_S16 small_external_common-0x8000
-0+00c4 <[^>]*> sth r4,0\(r5\)
+0+00c4 <[^>]*> 2900000d sth r4,0\(r5\)
[ ]*c4: R_NIOS2_S16 .bss-0x8000
-0+00c8 <[^>]*> sth r4,0\(r5\)
+0+00c8 <[^>]*> 2900000d sth r4,0\(r5\)
[ ]*c8: R_NIOS2_S16 .bss-0x4000
-0+00cc <[^>]*> sthio r4,0\(zero\)
-0+00d0 <[^>]*> sthio r4,4\(zero\)
-0+00d4 <[^>]*> sthio r4,32764\(zero\)
-0+00d8 <[^>]*> sthio r4,-32768\(zero\)
-0+00dc <[^>]*> sthio r4,0\(r5\)
-0+00e0 <[^>]*> sthio r4,4\(r5\)
-0+00e4 <[^>]*> sthio r4,32764\(r5\)
-0+00e8 <[^>]*> sthio r4,-32768\(r5\)
-0+00ec <[^>]*> sthio r4,0\(zero\)
+0+00cc <[^>]*> 0100002d sthio r4,0\(zero\)
+0+00d0 <[^>]*> 0100012d sthio r4,4\(zero\)
+0+00d4 <[^>]*> 011fff2d sthio r4,32764\(zero\)
+0+00d8 <[^>]*> 0120002d sthio r4,-32768\(zero\)
+0+00dc <[^>]*> 2900002d sthio r4,0\(r5\)
+0+00e0 <[^>]*> 2900012d sthio r4,4\(r5\)
+0+00e4 <[^>]*> 291fff2d sthio r4,32764\(r5\)
+0+00e8 <[^>]*> 2920002d sthio r4,-32768\(r5\)
+0+00ec <[^>]*> 0100002d sthio r4,0\(zero\)
[ ]*ec: R_NIOS2_S16 .data
-0+00f0 <[^>]*> sthio r4,0\(zero\)
+0+00f0 <[^>]*> 0100002d sthio r4,0\(zero\)
[ ]*f0: R_NIOS2_S16 big_external_data_label
-0+00f4 <[^>]*> sthio r4,0\(zero\)
+0+00f4 <[^>]*> 0100002d sthio r4,0\(zero\)
[ ]*f4: R_NIOS2_S16 small_external_data_label
-0+00f8 <[^>]*> sthio r4,0\(zero\)
+0+00f8 <[^>]*> 0100002d sthio r4,0\(zero\)
[ ]*f8: R_NIOS2_S16 big_external_common
-0+00fc <[^>]*> sthio r4,0\(zero\)
+0+00fc <[^>]*> 0100002d sthio r4,0\(zero\)
[ ]*fc: R_NIOS2_S16 small_external_common
-0+0100 <[^>]*> sthio r4,0\(zero\)
+0+0100 <[^>]*> 0100002d sthio r4,0\(zero\)
[ ]*100: R_NIOS2_S16 .bss
-0+0104 <[^>]*> sthio r4,0\(zero\)
+0+0104 <[^>]*> 0100002d sthio r4,0\(zero\)
[ ]*104: R_NIOS2_S16 .bss\+0x4000
-0+0108 <[^>]*> sthio r4,0\(zero\)
+0+0108 <[^>]*> 0100002d sthio r4,0\(zero\)
[ ]*108: R_NIOS2_S16 .data\+0x4
-0+010c <[^>]*> sthio r4,0\(zero\)
+0+010c <[^>]*> 0100002d sthio r4,0\(zero\)
[ ]*10c: R_NIOS2_S16 big_external_data_label\+0x4
-0+0110 <[^>]*> sthio r4,0\(zero\)
+0+0110 <[^>]*> 0100002d sthio r4,0\(zero\)
[ ]*110: R_NIOS2_S16 small_external_data_label\+0x4
-0+0114 <[^>]*> sthio r4,0\(zero\)
+0+0114 <[^>]*> 0100002d sthio r4,0\(zero\)
[ ]*114: R_NIOS2_S16 big_external_common\+0x4
-0+0118 <[^>]*> sthio r4,0\(zero\)
+0+0118 <[^>]*> 0100002d sthio r4,0\(zero\)
[ ]*118: R_NIOS2_S16 small_external_common\+0x4
-0+011c <[^>]*> sthio r4,0\(zero\)
+0+011c <[^>]*> 0100002d sthio r4,0\(zero\)
[ ]*11c: R_NIOS2_S16 .bss\+0x4
-0+0120 <[^>]*> sthio r4,0\(zero\)
+0+0120 <[^>]*> 0100002d sthio r4,0\(zero\)
[ ]*120: R_NIOS2_S16 .bss\+0x4004
-0+0124 <[^>]*> sthio r4,0\(zero\)
+0+0124 <[^>]*> 0100002d sthio r4,0\(zero\)
[ ]*124: R_NIOS2_S16 .data-0x8000
-0+0128 <[^>]*> sthio r4,0\(zero\)
+0+0128 <[^>]*> 0100002d sthio r4,0\(zero\)
[ ]*128: R_NIOS2_S16 big_external_data_label-0x8000
-0+012c <[^>]*> sthio r4,0\(zero\)
+0+012c <[^>]*> 0100002d sthio r4,0\(zero\)
[ ]*12c: R_NIOS2_S16 small_external_data_label-0x8000
-0+0130 <[^>]*> sthio r4,0\(zero\)
+0+0130 <[^>]*> 0100002d sthio r4,0\(zero\)
[ ]*130: R_NIOS2_S16 big_external_common-0x8000
-0+0134 <[^>]*> sthio r4,0\(zero\)
+0+0134 <[^>]*> 0100002d sthio r4,0\(zero\)
[ ]*134: R_NIOS2_S16 small_external_common-0x8000
-0+0138 <[^>]*> sthio r4,0\(zero\)
+0+0138 <[^>]*> 0100002d sthio r4,0\(zero\)
[ ]*138: R_NIOS2_S16 .bss-0x8000
-0+013c <[^>]*> sthio r4,0\(zero\)
+0+013c <[^>]*> 0100002d sthio r4,0\(zero\)
[ ]*13c: R_NIOS2_S16 .bss-0x4000
-0+0140 <[^>]*> sthio r4,0\(zero\)
+0+0140 <[^>]*> 0100002d sthio r4,0\(zero\)
[ ]*140: R_NIOS2_S16 .data\+0x10000
-0+0144 <[^>]*> sthio r4,0\(r5\)
+0+0144 <[^>]*> 2900002d sthio r4,0\(r5\)
[ ]*144: R_NIOS2_S16 .data
-0+0148 <[^>]*> sthio r4,0\(r5\)
+0+0148 <[^>]*> 2900002d sthio r4,0\(r5\)
[ ]*148: R_NIOS2_S16 big_external_data_label
-0+014c <[^>]*> sthio r4,0\(r5\)
+0+014c <[^>]*> 2900002d sthio r4,0\(r5\)
[ ]*14c: R_NIOS2_S16 small_external_data_label
-0+0150 <[^>]*> sthio r4,0\(r5\)
+0+0150 <[^>]*> 2900002d sthio r4,0\(r5\)
[ ]*150: R_NIOS2_S16 big_external_common
-0+0154 <[^>]*> sthio r4,0\(r5\)
+0+0154 <[^>]*> 2900002d sthio r4,0\(r5\)
[ ]*154: R_NIOS2_S16 small_external_common
-0+0158 <[^>]*> sthio r4,0\(r5\)
+0+0158 <[^>]*> 2900002d sthio r4,0\(r5\)
[ ]*158: R_NIOS2_S16 .bss
-0+015c <[^>]*> sthio r4,0\(r5\)
+0+015c <[^>]*> 2900002d sthio r4,0\(r5\)
[ ]*15c: R_NIOS2_S16 .bss\+0x4000
-0+0160 <[^>]*> sthio r4,0\(r5\)
+0+0160 <[^>]*> 2900002d sthio r4,0\(r5\)
[ ]*160: R_NIOS2_S16 .data\+0x4
-0+0164 <[^>]*> sthio r4,0\(r5\)
+0+0164 <[^>]*> 2900002d sthio r4,0\(r5\)
[ ]*164: R_NIOS2_S16 big_external_data_label\+0x4
-0+0168 <[^>]*> sthio r4,0\(r5\)
+0+0168 <[^>]*> 2900002d sthio r4,0\(r5\)
[ ]*168: R_NIOS2_S16 small_external_data_label\+0x4
-0+016c <[^>]*> sthio r4,0\(r5\)
+0+016c <[^>]*> 2900002d sthio r4,0\(r5\)
[ ]*16c: R_NIOS2_S16 big_external_common\+0x4
-0+0170 <[^>]*> sthio r4,0\(r5\)
+0+0170 <[^>]*> 2900002d sthio r4,0\(r5\)
[ ]*170: R_NIOS2_S16 small_external_common\+0x4
-0+0174 <[^>]*> sthio r4,0\(r5\)
+0+0174 <[^>]*> 2900002d sthio r4,0\(r5\)
[ ]*174: R_NIOS2_S16 .bss\+0x4
-0+0178 <[^>]*> sthio r4,0\(r5\)
+0+0178 <[^>]*> 2900002d sthio r4,0\(r5\)
[ ]*178: R_NIOS2_S16 .bss\+0x4004
-0+017c <[^>]*> sthio r4,0\(r5\)
+0+017c <[^>]*> 2900002d sthio r4,0\(r5\)
[ ]*17c: R_NIOS2_S16 .data-0x8000
-0+0180 <[^>]*> sthio r4,0\(r5\)
+0+0180 <[^>]*> 2900002d sthio r4,0\(r5\)
[ ]*180: R_NIOS2_S16 big_external_data_label-0x8000
-0+0184 <[^>]*> sthio r4,0\(r5\)
+0+0184 <[^>]*> 2900002d sthio r4,0\(r5\)
[ ]*184: R_NIOS2_S16 small_external_data_label-0x8000
-0+0188 <[^>]*> sthio r4,0\(r5\)
+0+0188 <[^>]*> 2900002d sthio r4,0\(r5\)
[ ]*188: R_NIOS2_S16 big_external_common-0x8000
-0+018c <[^>]*> sthio r4,0\(r5\)
+0+018c <[^>]*> 2900002d sthio r4,0\(r5\)
[ ]*18c: R_NIOS2_S16 small_external_common-0x8000
-0+0190 <[^>]*> sthio r4,0\(r5\)
+0+0190 <[^>]*> 2900002d sthio r4,0\(r5\)
[ ]*190: R_NIOS2_S16 .bss-0x8000
-0+0194 <[^>]*> sthio r4,0\(r5\)
+0+0194 <[^>]*> 2900002d sthio r4,0\(r5\)
[ ]*194: R_NIOS2_S16 .bss-0x4000
diff --git a/gas/testsuite/gas/nios2/stw.d b/gas/testsuite/gas/nios2/stw.d
index 6dcf4e5..6253d7d 100644
--- a/gas/testsuite/gas/nios2/stw.d
+++ b/gas/testsuite/gas/nios2/stw.d
@@ -1,4 +1,4 @@
-#objdump: -dr --prefix-addresses
+#objdump: -dr --prefix-addresses --show-raw-insn
#name: NIOS2 stw
# Test the ld instruction
@@ -6,191 +6,191 @@
.*: +file format elf32-littlenios2
Disassembly of section .text:
-0+0000 <[^>]*> stw r4,0\(zero\)
-0+0004 <[^>]*> stw r4,4\(zero\)
-0+0008 <[^>]*> stw r4,32764\(zero\)
-0+000c <[^>]*> stw r4,-32768\(zero\)
-0+0010 <[^>]*> stw r4,0\(r5\)
-0+0014 <[^>]*> stw r4,4\(r5\)
-0+0018 <[^>]*> stw r4,32764\(r5\)
-0+001c <[^>]*> stw r4,-32768\(r5\)
-0+0020 <[^>]*> stw r4,0\(zero\)
+0+0000 <[^>]*> 01000015 stw r4,0\(zero\)
+0+0004 <[^>]*> 01000115 stw r4,4\(zero\)
+0+0008 <[^>]*> 011fff15 stw r4,32764\(zero\)
+0+000c <[^>]*> 01200015 stw r4,-32768\(zero\)
+0+0010 <[^>]*> 29000015 stw r4,0\(r5\)
+0+0014 <[^>]*> 29000115 stw r4,4\(r5\)
+0+0018 <[^>]*> 291fff15 stw r4,32764\(r5\)
+0+001c <[^>]*> 29200015 stw r4,-32768\(r5\)
+0+0020 <[^>]*> 01000015 stw r4,0\(zero\)
[ ]*20: R_NIOS2_S16 .data
-0+0024 <[^>]*> stw r4,0\(zero\)
+0+0024 <[^>]*> 01000015 stw r4,0\(zero\)
[ ]*24: R_NIOS2_S16 big_external_data_label
-0+0028 <[^>]*> stw r4,0\(zero\)
+0+0028 <[^>]*> 01000015 stw r4,0\(zero\)
[ ]*28: R_NIOS2_S16 small_external_data_label
-0+002c <[^>]*> stw r4,0\(zero\)
+0+002c <[^>]*> 01000015 stw r4,0\(zero\)
[ ]*2c: R_NIOS2_S16 big_external_common
-0+0030 <[^>]*> stw r4,0\(zero\)
+0+0030 <[^>]*> 01000015 stw r4,0\(zero\)
[ ]*30: R_NIOS2_S16 small_external_common
-0+0034 <[^>]*> stw r4,0\(zero\)
+0+0034 <[^>]*> 01000015 stw r4,0\(zero\)
[ ]*34: R_NIOS2_S16 .bss
-0+0038 <[^>]*> stw r4,0\(zero\)
+0+0038 <[^>]*> 01000015 stw r4,0\(zero\)
[ ]*38: R_NIOS2_S16 .bss\+0x4000
-0+003c <[^>]*> stw r4,0\(zero\)
+0+003c <[^>]*> 01000015 stw r4,0\(zero\)
[ ]*3c: R_NIOS2_S16 .data\+0x4
-0+0040 <[^>]*> stw r4,0\(zero\)
+0+0040 <[^>]*> 01000015 stw r4,0\(zero\)
[ ]*40: R_NIOS2_S16 big_external_data_label\+0x4
-0+0044 <[^>]*> stw r4,0\(zero\)
+0+0044 <[^>]*> 01000015 stw r4,0\(zero\)
[ ]*44: R_NIOS2_S16 small_external_data_label\+0x4
-0+0048 <[^>]*> stw r4,0\(zero\)
+0+0048 <[^>]*> 01000015 stw r4,0\(zero\)
[ ]*48: R_NIOS2_S16 big_external_common\+0x4
-0+004c <[^>]*> stw r4,0\(zero\)
+0+004c <[^>]*> 01000015 stw r4,0\(zero\)
[ ]*4c: R_NIOS2_S16 small_external_common\+0x4
-0+0050 <[^>]*> stw r4,0\(zero\)
+0+0050 <[^>]*> 01000015 stw r4,0\(zero\)
[ ]*50: R_NIOS2_S16 .bss\+0x4
-0+0054 <[^>]*> stw r4,0\(zero\)
+0+0054 <[^>]*> 01000015 stw r4,0\(zero\)
[ ]*54: R_NIOS2_S16 .bss\+0x4004
-0+0058 <[^>]*> stw r4,0\(zero\)
+0+0058 <[^>]*> 01000015 stw r4,0\(zero\)
[ ]*58: R_NIOS2_S16 .data-0x8000
-0+005c <[^>]*> stw r4,0\(zero\)
+0+005c <[^>]*> 01000015 stw r4,0\(zero\)
[ ]*5c: R_NIOS2_S16 big_external_data_label-0x8000
-0+0060 <[^>]*> stw r4,0\(zero\)
+0+0060 <[^>]*> 01000015 stw r4,0\(zero\)
[ ]*60: R_NIOS2_S16 small_external_data_label-0x8000
-0+0064 <[^>]*> stw r4,0\(zero\)
+0+0064 <[^>]*> 01000015 stw r4,0\(zero\)
[ ]*64: R_NIOS2_S16 big_external_common-0x8000
-0+0068 <[^>]*> stw r4,0\(zero\)
+0+0068 <[^>]*> 01000015 stw r4,0\(zero\)
[ ]*68: R_NIOS2_S16 small_external_common-0x8000
-0+006c <[^>]*> stw r4,0\(zero\)
+0+006c <[^>]*> 01000015 stw r4,0\(zero\)
[ ]*6c: R_NIOS2_S16 .bss-0x8000
-0+0070 <[^>]*> stw r4,0\(zero\)
+0+0070 <[^>]*> 01000015 stw r4,0\(zero\)
[ ]*70: R_NIOS2_S16 .bss-0x4000
-0+0074 <[^>]*> stw r4,0\(zero\)
+0+0074 <[^>]*> 01000015 stw r4,0\(zero\)
[ ]*74: R_NIOS2_S16 .data\+0x10000
-0+0078 <[^>]*> stw r4,0\(r5\)
+0+0078 <[^>]*> 29000015 stw r4,0\(r5\)
[ ]*78: R_NIOS2_S16 .data
-0+007c <[^>]*> stw r4,0\(r5\)
+0+007c <[^>]*> 29000015 stw r4,0\(r5\)
[ ]*7c: R_NIOS2_S16 big_external_data_label
-0+0080 <[^>]*> stw r4,0\(r5\)
+0+0080 <[^>]*> 29000015 stw r4,0\(r5\)
[ ]*80: R_NIOS2_S16 small_external_data_label
-0+0084 <[^>]*> stw r4,0\(r5\)
+0+0084 <[^>]*> 29000015 stw r4,0\(r5\)
[ ]*84: R_NIOS2_S16 big_external_common
-0+0088 <[^>]*> stw r4,0\(r5\)
+0+0088 <[^>]*> 29000015 stw r4,0\(r5\)
[ ]*88: R_NIOS2_S16 small_external_common
-0+008c <[^>]*> stw r4,0\(r5\)
+0+008c <[^>]*> 29000015 stw r4,0\(r5\)
[ ]*8c: R_NIOS2_S16 .bss
-0+0090 <[^>]*> stw r4,0\(r5\)
+0+0090 <[^>]*> 29000015 stw r4,0\(r5\)
[ ]*90: R_NIOS2_S16 .bss\+0x4000
-0+0094 <[^>]*> stw r4,0\(r5\)
+0+0094 <[^>]*> 29000015 stw r4,0\(r5\)
[ ]*94: R_NIOS2_S16 .data\+0x4
-0+0098 <[^>]*> stw r4,0\(r5\)
+0+0098 <[^>]*> 29000015 stw r4,0\(r5\)
[ ]*98: R_NIOS2_S16 big_external_data_label\+0x4
-0+009c <[^>]*> stw r4,0\(r5\)
+0+009c <[^>]*> 29000015 stw r4,0\(r5\)
[ ]*9c: R_NIOS2_S16 small_external_data_label\+0x4
-0+00a0 <[^>]*> stw r4,0\(r5\)
+0+00a0 <[^>]*> 29000015 stw r4,0\(r5\)
[ ]*a0: R_NIOS2_S16 big_external_common\+0x4
-0+00a4 <[^>]*> stw r4,0\(r5\)
+0+00a4 <[^>]*> 29000015 stw r4,0\(r5\)
[ ]*a4: R_NIOS2_S16 small_external_common\+0x4
-0+00a8 <[^>]*> stw r4,0\(r5\)
+0+00a8 <[^>]*> 29000015 stw r4,0\(r5\)
[ ]*a8: R_NIOS2_S16 .bss\+0x4
-0+00ac <[^>]*> stw r4,0\(r5\)
+0+00ac <[^>]*> 29000015 stw r4,0\(r5\)
[ ]*ac: R_NIOS2_S16 .bss\+0x4004
-0+00b0 <[^>]*> stw r4,0\(r5\)
+0+00b0 <[^>]*> 29000015 stw r4,0\(r5\)
[ ]*b0: R_NIOS2_S16 .data-0x8000
-0+00b4 <[^>]*> stw r4,0\(r5\)
+0+00b4 <[^>]*> 29000015 stw r4,0\(r5\)
[ ]*b4: R_NIOS2_S16 big_external_data_label-0x8000
-0+00b8 <[^>]*> stw r4,0\(r5\)
+0+00b8 <[^>]*> 29000015 stw r4,0\(r5\)
[ ]*b8: R_NIOS2_S16 small_external_data_label-0x8000
-0+00bc <[^>]*> stw r4,0\(r5\)
+0+00bc <[^>]*> 29000015 stw r4,0\(r5\)
[ ]*bc: R_NIOS2_S16 big_external_common-0x8000
-0+00c0 <[^>]*> stw r4,0\(r5\)
+0+00c0 <[^>]*> 29000015 stw r4,0\(r5\)
[ ]*c0: R_NIOS2_S16 small_external_common-0x8000
-0+00c4 <[^>]*> stw r4,0\(r5\)
+0+00c4 <[^>]*> 29000015 stw r4,0\(r5\)
[ ]*c4: R_NIOS2_S16 .bss-0x8000
-0+00c8 <[^>]*> stw r4,0\(r5\)
+0+00c8 <[^>]*> 29000015 stw r4,0\(r5\)
[ ]*c8: R_NIOS2_S16 .bss-0x4000
-0+00cc <[^>]*> stwio r4,0\(zero\)
-0+00d0 <[^>]*> stwio r4,4\(zero\)
-0+00d4 <[^>]*> stwio r4,32764\(zero\)
-0+00d8 <[^>]*> stwio r4,-32768\(zero\)
-0+00dc <[^>]*> stwio r4,0\(r5\)
-0+00e0 <[^>]*> stwio r4,4\(r5\)
-0+00e4 <[^>]*> stwio r4,32764\(r5\)
-0+00e8 <[^>]*> stwio r4,-32768\(r5\)
-0+00ec <[^>]*> stwio r4,0\(zero\)
+0+00cc <[^>]*> 01000035 stwio r4,0\(zero\)
+0+00d0 <[^>]*> 01000135 stwio r4,4\(zero\)
+0+00d4 <[^>]*> 011fff35 stwio r4,32764\(zero\)
+0+00d8 <[^>]*> 01200035 stwio r4,-32768\(zero\)
+0+00dc <[^>]*> 29000035 stwio r4,0\(r5\)
+0+00e0 <[^>]*> 29000135 stwio r4,4\(r5\)
+0+00e4 <[^>]*> 291fff35 stwio r4,32764\(r5\)
+0+00e8 <[^>]*> 29200035 stwio r4,-32768\(r5\)
+0+00ec <[^>]*> 01000035 stwio r4,0\(zero\)
[ ]*ec: R_NIOS2_S16 .data
-0+00f0 <[^>]*> stwio r4,0\(zero\)
+0+00f0 <[^>]*> 01000035 stwio r4,0\(zero\)
[ ]*f0: R_NIOS2_S16 big_external_data_label
-0+00f4 <[^>]*> stwio r4,0\(zero\)
+0+00f4 <[^>]*> 01000035 stwio r4,0\(zero\)
[ ]*f4: R_NIOS2_S16 small_external_data_label
-0+00f8 <[^>]*> stwio r4,0\(zero\)
+0+00f8 <[^>]*> 01000035 stwio r4,0\(zero\)
[ ]*f8: R_NIOS2_S16 big_external_common
-0+00fc <[^>]*> stwio r4,0\(zero\)
+0+00fc <[^>]*> 01000035 stwio r4,0\(zero\)
[ ]*fc: R_NIOS2_S16 small_external_common
-0+0100 <[^>]*> stwio r4,0\(zero\)
+0+0100 <[^>]*> 01000035 stwio r4,0\(zero\)
[ ]*100: R_NIOS2_S16 .bss
-0+0104 <[^>]*> stwio r4,0\(zero\)
+0+0104 <[^>]*> 01000035 stwio r4,0\(zero\)
[ ]*104: R_NIOS2_S16 .bss\+0x4000
-0+0108 <[^>]*> stwio r4,0\(zero\)
+0+0108 <[^>]*> 01000035 stwio r4,0\(zero\)
[ ]*108: R_NIOS2_S16 .data\+0x4
-0+010c <[^>]*> stwio r4,0\(zero\)
+0+010c <[^>]*> 01000035 stwio r4,0\(zero\)
[ ]*10c: R_NIOS2_S16 big_external_data_label\+0x4
-0+0110 <[^>]*> stwio r4,0\(zero\)
+0+0110 <[^>]*> 01000035 stwio r4,0\(zero\)
[ ]*110: R_NIOS2_S16 small_external_data_label\+0x4
-0+0114 <[^>]*> stwio r4,0\(zero\)
+0+0114 <[^>]*> 01000035 stwio r4,0\(zero\)
[ ]*114: R_NIOS2_S16 big_external_common\+0x4
-0+0118 <[^>]*> stwio r4,0\(zero\)
+0+0118 <[^>]*> 01000035 stwio r4,0\(zero\)
[ ]*118: R_NIOS2_S16 small_external_common\+0x4
-0+011c <[^>]*> stwio r4,0\(zero\)
+0+011c <[^>]*> 01000035 stwio r4,0\(zero\)
[ ]*11c: R_NIOS2_S16 .bss\+0x4
-0+0120 <[^>]*> stwio r4,0\(zero\)
+0+0120 <[^>]*> 01000035 stwio r4,0\(zero\)
[ ]*120: R_NIOS2_S16 .bss\+0x4004
-0+0124 <[^>]*> stwio r4,0\(zero\)
+0+0124 <[^>]*> 01000035 stwio r4,0\(zero\)
[ ]*124: R_NIOS2_S16 .data-0x8000
-0+0128 <[^>]*> stwio r4,0\(zero\)
+0+0128 <[^>]*> 01000035 stwio r4,0\(zero\)
[ ]*128: R_NIOS2_S16 big_external_data_label-0x8000
-0+012c <[^>]*> stwio r4,0\(zero\)
+0+012c <[^>]*> 01000035 stwio r4,0\(zero\)
[ ]*12c: R_NIOS2_S16 small_external_data_label-0x8000
-0+0130 <[^>]*> stwio r4,0\(zero\)
+0+0130 <[^>]*> 01000035 stwio r4,0\(zero\)
[ ]*130: R_NIOS2_S16 big_external_common-0x8000
-0+0134 <[^>]*> stwio r4,0\(zero\)
+0+0134 <[^>]*> 01000035 stwio r4,0\(zero\)
[ ]*134: R_NIOS2_S16 small_external_common-0x8000
-0+0138 <[^>]*> stwio r4,0\(zero\)
+0+0138 <[^>]*> 01000035 stwio r4,0\(zero\)
[ ]*138: R_NIOS2_S16 .bss-0x8000
-0+013c <[^>]*> stwio r4,0\(zero\)
+0+013c <[^>]*> 01000035 stwio r4,0\(zero\)
[ ]*13c: R_NIOS2_S16 .bss-0x4000
-0+0140 <[^>]*> stwio r4,0\(zero\)
+0+0140 <[^>]*> 01000035 stwio r4,0\(zero\)
[ ]*140: R_NIOS2_S16 .data\+0x10000
-0+0144 <[^>]*> stwio r4,0\(r5\)
+0+0144 <[^>]*> 29000035 stwio r4,0\(r5\)
[ ]*144: R_NIOS2_S16 .data
-0+0148 <[^>]*> stwio r4,0\(r5\)
+0+0148 <[^>]*> 29000035 stwio r4,0\(r5\)
[ ]*148: R_NIOS2_S16 big_external_data_label
-0+014c <[^>]*> stwio r4,0\(r5\)
+0+014c <[^>]*> 29000035 stwio r4,0\(r5\)
[ ]*14c: R_NIOS2_S16 small_external_data_label
-0+0150 <[^>]*> stwio r4,0\(r5\)
+0+0150 <[^>]*> 29000035 stwio r4,0\(r5\)
[ ]*150: R_NIOS2_S16 big_external_common
-0+0154 <[^>]*> stwio r4,0\(r5\)
+0+0154 <[^>]*> 29000035 stwio r4,0\(r5\)
[ ]*154: R_NIOS2_S16 small_external_common
-0+0158 <[^>]*> stwio r4,0\(r5\)
+0+0158 <[^>]*> 29000035 stwio r4,0\(r5\)
[ ]*158: R_NIOS2_S16 .bss
-0+015c <[^>]*> stwio r4,0\(r5\)
+0+015c <[^>]*> 29000035 stwio r4,0\(r5\)
[ ]*15c: R_NIOS2_S16 .bss\+0x4000
-0+0160 <[^>]*> stwio r4,0\(r5\)
+0+0160 <[^>]*> 29000035 stwio r4,0\(r5\)
[ ]*160: R_NIOS2_S16 .data\+0x4
-0+0164 <[^>]*> stwio r4,0\(r5\)
+0+0164 <[^>]*> 29000035 stwio r4,0\(r5\)
[ ]*164: R_NIOS2_S16 big_external_data_label\+0x4
-0+0168 <[^>]*> stwio r4,0\(r5\)
+0+0168 <[^>]*> 29000035 stwio r4,0\(r5\)
[ ]*168: R_NIOS2_S16 small_external_data_label\+0x4
-0+016c <[^>]*> stwio r4,0\(r5\)
+0+016c <[^>]*> 29000035 stwio r4,0\(r5\)
[ ]*16c: R_NIOS2_S16 big_external_common\+0x4
-0+0170 <[^>]*> stwio r4,0\(r5\)
+0+0170 <[^>]*> 29000035 stwio r4,0\(r5\)
[ ]*170: R_NIOS2_S16 small_external_common\+0x4
-0+0174 <[^>]*> stwio r4,0\(r5\)
+0+0174 <[^>]*> 29000035 stwio r4,0\(r5\)
[ ]*174: R_NIOS2_S16 .bss\+0x4
-0+0178 <[^>]*> stwio r4,0\(r5\)
+0+0178 <[^>]*> 29000035 stwio r4,0\(r5\)
[ ]*178: R_NIOS2_S16 .bss\+0x4004
-0+017c <[^>]*> stwio r4,0\(r5\)
+0+017c <[^>]*> 29000035 stwio r4,0\(r5\)
[ ]*17c: R_NIOS2_S16 .data-0x8000
-0+0180 <[^>]*> stwio r4,0\(r5\)
+0+0180 <[^>]*> 29000035 stwio r4,0\(r5\)
[ ]*180: R_NIOS2_S16 big_external_data_label-0x8000
-0+0184 <[^>]*> stwio r4,0\(r5\)
+0+0184 <[^>]*> 29000035 stwio r4,0\(r5\)
[ ]*184: R_NIOS2_S16 small_external_data_label-0x8000
-0+0188 <[^>]*> stwio r4,0\(r5\)
+0+0188 <[^>]*> 29000035 stwio r4,0\(r5\)
[ ]*188: R_NIOS2_S16 big_external_common-0x8000
-0+018c <[^>]*> stwio r4,0\(r5\)
+0+018c <[^>]*> 29000035 stwio r4,0\(r5\)
[ ]*18c: R_NIOS2_S16 small_external_common-0x8000
-0+0190 <[^>]*> stwio r4,0\(r5\)
+0+0190 <[^>]*> 29000035 stwio r4,0\(r5\)
[ ]*190: R_NIOS2_S16 .bss-0x8000
-0+0194 <[^>]*> stwio r4,0\(r5\)
+0+0194 <[^>]*> 29000035 stwio r4,0\(r5\)
[ ]*194: R_NIOS2_S16 .bss-0x4000
diff --git a/gas/testsuite/gas/nios2/sub.d b/gas/testsuite/gas/nios2/sub.d
index 69b0285..9ff2b7d 100644
--- a/gas/testsuite/gas/nios2/sub.d
+++ b/gas/testsuite/gas/nios2/sub.d
@@ -1,4 +1,4 @@
-#objdump: -dr --prefix-addresses
+#objdump: -dr --prefix-addresses --show-raw-insn
#name: NIOS2 sub
# Test the add instruction
@@ -6,5 +6,5 @@
.*: +file format elf32-littlenios2
Disassembly of section .text:
-0+0000 <[^>]*> sub r4,r4,r4
+0+0000 <[^>]*> 2109c83a sub r4,r4,r4
diff --git a/gas/testsuite/gas/nios2/sync.d b/gas/testsuite/gas/nios2/sync.d
index f0949e2..a039c0d 100644
--- a/gas/testsuite/gas/nios2/sync.d
+++ b/gas/testsuite/gas/nios2/sync.d
@@ -1,8 +1,8 @@
-#objdump: -dr --prefix-addresses
+#objdump: -dr --prefix-addresses --show-raw-insn
#name: NIOS2 sync
.*: +file format elf32-littlenios2
Disassembly of section \.text:
-0+0000 <foo> sync
+0+0000 <[^>]*> 0001b03a sync
diff --git a/gas/testsuite/gas/nios2/trap.d b/gas/testsuite/gas/nios2/trap.d
index 003ff69..d9d07f1 100644
--- a/gas/testsuite/gas/nios2/trap.d
+++ b/gas/testsuite/gas/nios2/trap.d
@@ -1,7 +1,7 @@
-#objdump: -dr --prefix-addresses
+#objdump: -dr --prefix-addresses --show-raw-insn
#name: NIOS2 trap
.*: +file format elf32-littlenios2
Disassembly of section .text:
-0+0000 <[^>]*> trap
+0+0000 <[^>]*> 003b683a trap
diff --git a/gas/testsuite/gas/nios2/tret.d b/gas/testsuite/gas/nios2/tret.d
index 48e2b51..c6fc003 100644
--- a/gas/testsuite/gas/nios2/tret.d
+++ b/gas/testsuite/gas/nios2/tret.d
@@ -1,8 +1,8 @@
-#objdump: -dr --prefix-addresses
+#objdump: -dr --prefix-addresses --show-raw-insn
#name: NIOS2 tret
.*: +file format elf32-littlenios2
Disassembly of section .text:
-0+0000 <[^>]*> eret
+0+0000 <[^>]*> e800083a eret
diff --git a/gas/testsuite/gas/nios2/xor.d b/gas/testsuite/gas/nios2/xor.d
index de137dc..a7d609e 100644
--- a/gas/testsuite/gas/nios2/xor.d
+++ b/gas/testsuite/gas/nios2/xor.d
@@ -1,4 +1,4 @@
-#objdump: -dr --prefix-addresses
+#objdump: -dr --prefix-addresses --show-raw-insn
#name: NIOS2 xor
# Test the nor instruction
@@ -6,6 +6,6 @@
.*: +file format elf32-littlenios2
Disassembly of section .text:
-0+0000 <[^>]*> xor r6,r8,r10
-0+0004 <[^>]*> xorhi r6,r7,65535
-0+0008 <[^>]*> xori r6,r7,65535
+0+0000 <[^>]*> 428cf03a xor r6,r8,r10
+0+0004 <[^>]*> 39bffffc xorhi r6,r7,65535
+0+0008 <[^>]*> 39bfffdc xori r6,r7,65535
--
1.7.10.4