projects
/
platform
/
upstream
/
binutils.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
cfd4e87
)
Add in a JALRC alias and fix the NAL instruction.
author
Matthew Fortune
<matthew.fortune@imgtec.com>
Tue, 16 Dec 2014 13:33:56 +0000
(13:33 +0000)
committer
Matthew Fortune
<matthew.fortune@imgtec.com>
Fri, 19 Dec 2014 14:43:28 +0000
(14:43 +0000)
opcodes/
* mips-opc.c (mips_builtin_opcodes): Add JALRC alias for JIALC.
Remove the operand from NAL.
gas/testsuite/
* gas/mips/r6.s: Test JALRC and NAL
* gas/mips/r6-n32.d: Add expected output for JALRC and NAL.
* gas/mips/r6-n64.d: Likewise.
* gas/mips/r6.d: Likewise.
gas/testsuite/ChangeLog
patch
|
blob
|
history
gas/testsuite/gas/mips/r6-n32.d
patch
|
blob
|
history
gas/testsuite/gas/mips/r6-n64.d
patch
|
blob
|
history
gas/testsuite/gas/mips/r6.d
patch
|
blob
|
history
gas/testsuite/gas/mips/r6.s
patch
|
blob
|
history
opcodes/ChangeLog
patch
|
blob
|
history
opcodes/mips-opc.c
patch
|
blob
|
history
diff --git
a/gas/testsuite/ChangeLog
b/gas/testsuite/ChangeLog
index
2612cc3
..
28fc1f3
100644
(file)
--- a/
gas/testsuite/ChangeLog
+++ b/
gas/testsuite/ChangeLog
@@
-1,3
+1,10
@@
+2014-12-19 Matthew Fortune <matthew.fortune@imgtec.com>
+
+ * gas/mips/r6.s: Test JALRC and NAL
+ * gas/mips/r6-n32.d: Add expected output for JALRC and NAL.
+ * gas/mips/r6-n64.d: Likewise.
+ * gas/mips/r6.d: Likewise.
+
2014-11-30 Alan Modra <amodra@gmail.com>
* gas/ppc/a2.d: Update for mftb change.
2014-11-30 Alan Modra <amodra@gmail.com>
* gas/ppc/a2.d: Update for mftb change.
diff --git
a/gas/testsuite/gas/mips/r6-n32.d
b/gas/testsuite/gas/mips/r6-n32.d
index
4df4f31
..
d4e9859
100644
(file)
--- a/
gas/testsuite/gas/mips/r6-n32.d
+++ b/
gas/testsuite/gas/mips/r6-n32.d
@@
-490,4
+490,7
@@
Disassembly of section .text:
0+057c <[^>]*> ec8bffff lwpc a0,00100578 <[^>]*>
0+0580 <[^>]*> 00000000 nop
0+0584 <[^>]*> ec83ffff lapc a0,00100580 <[^>]*>
0+057c <[^>]*> ec8bffff lwpc a0,00100578 <[^>]*>
0+0580 <[^>]*> 00000000 nop
0+0584 <[^>]*> ec83ffff lapc a0,00100580 <[^>]*>
+0+0588 <[^>]*> f8040000 jalrc a0
+0+058c <[^>]*> 04100000 nal
+0+0590 <[^>]*> 00000000 nop
\.\.\.
\.\.\.
diff --git
a/gas/testsuite/gas/mips/r6-n64.d
b/gas/testsuite/gas/mips/r6-n64.d
index
d099988
..
e388e7a
100644
(file)
--- a/
gas/testsuite/gas/mips/r6-n64.d
+++ b/
gas/testsuite/gas/mips/r6-n64.d
@@
-746,4
+746,7
@@
Disassembly of section .text:
0+057c <[^>]*> ec8bffff lwpc a0,0000000000100578 <[^>]*>
0+0580 <[^>]*> 00000000 nop
0+0584 <[^>]*> ec83ffff lapc a0,0000000000100580 <[^>]*>
0+057c <[^>]*> ec8bffff lwpc a0,0000000000100578 <[^>]*>
0+0580 <[^>]*> 00000000 nop
0+0584 <[^>]*> ec83ffff lapc a0,0000000000100580 <[^>]*>
+0+0588 <[^>]*> f8040000 jalrc a0
+0+058c <[^>]*> 04100000 nal
+0+0590 <[^>]*> 00000000 nop
\.\.\.
\.\.\.
diff --git
a/gas/testsuite/gas/mips/r6.d
b/gas/testsuite/gas/mips/r6.d
index
0cfccb8
..
94ab611
100644
(file)
--- a/
gas/testsuite/gas/mips/r6.d
+++ b/
gas/testsuite/gas/mips/r6.d
@@
-489,4
+489,7
@@
Disassembly of section .text:
0+057c <[^>]*> ec8bffff lwpc a0,00100578 <[^>]*>
0+0580 <[^>]*> 00000000 nop
0+0584 <[^>]*> ec83ffff lapc a0,00100580 <[^>]*>
0+057c <[^>]*> ec8bffff lwpc a0,00100578 <[^>]*>
0+0580 <[^>]*> 00000000 nop
0+0584 <[^>]*> ec83ffff lapc a0,00100580 <[^>]*>
+0+0588 <[^>]*> f8040000 jalrc a0
+0+058c <[^>]*> 04100000 nal
+0+0590 <[^>]*> 00000000 nop
\.\.\.
\.\.\.
diff --git
a/gas/testsuite/gas/mips/r6.s
b/gas/testsuite/gas/mips/r6.s
index
73308ad
..
e4ee083
100644
(file)
--- a/
gas/testsuite/gas/mips/r6.s
+++ b/
gas/testsuite/gas/mips/r6.s
@@
-258,6
+258,9
@@
new: maddf.s $f0,$f1,$f2
nop
addiu $4, $pc, (262143 << 2)
nop
addiu $4, $pc, (262143 << 2)
+ jalrc $4
+ nal
+
# Force at least 8 (non-delay-slot) zero bytes, to make 'objdump' print ...
.align 2
.space 8
# Force at least 8 (non-delay-slot) zero bytes, to make 'objdump' print ...
.align 2
.space 8
diff --git
a/opcodes/ChangeLog
b/opcodes/ChangeLog
index
85e2f03
..
82e41aa
100644
(file)
--- a/
opcodes/ChangeLog
+++ b/
opcodes/ChangeLog
@@
-1,3
+1,8
@@
+2014-12-16 Matthew Fortune <matthew.fortune@imgtec.com>
+
+ * mips-opc.c (mips_builtin_opcodes): Add JALRC alias for
+ JIALC. Remove the operand from NAL.
+
2014-11-30 Alan Modra <amodra@gmail.com>
* ppc-opc.c (powerpc_opcodes): Make mftb* generate mfspr for
2014-11-30 Alan Modra <amodra@gmail.com>
* ppc-opc.c (powerpc_opcodes): Make mftb* generate mfspr for
diff --git
a/opcodes/mips-opc.c
b/opcodes/mips-opc.c
index
0e9f716
..
2c3bbad
100644
(file)
--- a/
opcodes/mips-opc.c
+++ b/
opcodes/mips-opc.c
@@
-429,7
+429,7
@@
const struct mips_opcode mips_builtin_opcodes[] =
{"move", "d,s", 0x00000025, 0xfc1f07ff, WR_1|RD_2, INSN2_ALIAS, I1, 0, 0 },/* or */
{"b", "p", 0x10000000, 0xffff0000, UBD, INSN2_ALIAS, I1, 0, 0 },/* beq 0,0 */
{"b", "p", 0x04010000, 0xffff0000, UBD, INSN2_ALIAS, I1, 0, 0 },/* bgez 0 */
{"move", "d,s", 0x00000025, 0xfc1f07ff, WR_1|RD_2, INSN2_ALIAS, I1, 0, 0 },/* or */
{"b", "p", 0x10000000, 0xffff0000, UBD, INSN2_ALIAS, I1, 0, 0 },/* beq 0,0 */
{"b", "p", 0x04010000, 0xffff0000, UBD, INSN2_ALIAS, I1, 0, 0 },/* bgez 0 */
-{"nal", "
p", 0x04100000, 0xffff0000
, WR_31|CBD, INSN2_ALIAS, I1, 0, 0 },/* bltzal 0 */
+{"nal", "
", 0x04100000, 0xffffffff
, WR_31|CBD, INSN2_ALIAS, I1, 0, 0 },/* bltzal 0 */
{"bal", "p", 0x04110000, 0xffff0000, WR_31|UBD, INSN2_ALIAS, I1, 0, 0 },/* bgezal 0*/
{"bc", "+'", 0xc8000000, 0xfc000000, NODS, 0, I37, 0, 0 },
{"balc", "+'", 0xe8000000, 0xfc000000, WR_31|NODS, 0, I37, 0, 0 },
{"bal", "p", 0x04110000, 0xffff0000, WR_31|UBD, INSN2_ALIAS, I1, 0, 0 },/* bgezal 0*/
{"bc", "+'", 0xc8000000, 0xfc000000, NODS, 0, I37, 0, 0 },
{"balc", "+'", 0xe8000000, 0xfc000000, WR_31|NODS, 0, I37, 0, 0 },
@@
-3247,6
+3247,7
@@
const struct mips_opcode mips_builtin_opcodes[] =
{"jic", "t,j", 0xd8000000, 0xffe00000, RD_1|NODS, 0, I37, 0, 0 },
{"bnezc", "-s,+\"", 0xf8000000, 0xfc000000, RD_1|NODS, FS, I37, 0, 0 },
{"jic", "t,j", 0xd8000000, 0xffe00000, RD_1|NODS, 0, I37, 0, 0 },
{"bnezc", "-s,+\"", 0xf8000000, 0xfc000000, RD_1|NODS, FS, I37, 0, 0 },
+{"jalrc", "t", 0xf8000000, 0xffe0ffff, RD_1|NODS, 0, I37, 0, 0 },
{"jialc", "t,j", 0xf8000000, 0xffe00000, RD_1|NODS, 0, I37, 0, 0 },
{"cmp.af.s", "D,S,T", 0x46800000, 0xffe0003f, WR_1|RD_2|RD_3|FP_S, 0, I37, 0, 0 },
{"jialc", "t,j", 0xf8000000, 0xffe00000, RD_1|NODS, 0, I37, 0, 0 },
{"cmp.af.s", "D,S,T", 0x46800000, 0xffe0003f, WR_1|RD_2|RD_3|FP_S, 0, I37, 0, 0 },