summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Hsieh <andrewhsieh@google.com>2015-05-05 03:20:41 (GMT)
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-05-05 03:20:42 (GMT)
commit97a8de179d86d83e05cab161566aad0e7a3281cc (patch)
treebd24f23234a1f32d530ecf8ca97a33ef75e4cb3f
parent29e2f8467cd188e949e7271fd79e659a72ba8630 (diff)
parentdeabfb77006de9a9627925992139d545a669dbec (diff)
downloadtoolchain_binutils-97a8de179d86d83e05cab161566aad0e7a3281cc.zip
toolchain_binutils-97a8de179d86d83e05cab161566aad0e7a3281cc.tar.gz
toolchain_binutils-97a8de179d86d83e05cab161566aad0e7a3281cc.tar.bz2
Merge "MIPS: Update the encoding of the d16mule MXU instruction."
-rw-r--r--binutils-2.24/gas/testsuite/gas/mips/mxu.d16
-rw-r--r--binutils-2.24/gas/testsuite/gas/mips/mxu.s18
-rw-r--r--binutils-2.24/opcodes/mips-opc.c2
-rw-r--r--binutils-2.25/gas/testsuite/gas/mips/mxu.d16
-rw-r--r--binutils-2.25/gas/testsuite/gas/mips/mxu.s18
-rw-r--r--binutils-2.25/opcodes/mips-opc.c2
6 files changed, 36 insertions, 36 deletions
diff --git a/binutils-2.24/gas/testsuite/gas/mips/mxu.d b/binutils-2.24/gas/testsuite/gas/mips/mxu.d
index 99b34ba..8ad2c3c 100644
--- a/binutils-2.24/gas/testsuite/gas/mips/mxu.d
+++ b/binutils-2.24/gas/testsuite/gas/mips/mxu.d
@@ -190,14 +190,14 @@ Disassembly of section \.text:
[0-9a-f]+ <[^>]*> 7040c849 d16mulf xr1,xr2,xr3,LW
[0-9a-f]+ <[^>]*> 7080c849 d16mulf xr1,xr2,xr3,HW
[0-9a-f]+ <[^>]*> 70c0c849 d16mulf xr1,xr2,xr3,XW
-[0-9a-f]+ <[^>]*> 7100c849 d16mule xr1,xr2,xr3,WW
-[0-9a-f]+ <[^>]*> 7140c849 d16mule xr1,xr2,xr3,LW
-[0-9a-f]+ <[^>]*> 7180c849 d16mule xr1,xr2,xr3,HW
-[0-9a-f]+ <[^>]*> 71c0c849 d16mule xr1,xr2,xr3,XW
-[0-9a-f]+ <[^>]*> 7100c849 d16mule xr1,xr2,xr3,WW
-[0-9a-f]+ <[^>]*> 7140c849 d16mule xr1,xr2,xr3,LW
-[0-9a-f]+ <[^>]*> 7180c849 d16mule xr1,xr2,xr3,HW
-[0-9a-f]+ <[^>]*> 71c0c849 d16mule xr1,xr2,xr3,XW
+[0-9a-f]+ <[^>]*> 7110c849 d16mule xr1,xr2,xr3,xr4,WW
+[0-9a-f]+ <[^>]*> 7150c849 d16mule xr1,xr2,xr3,xr4,LW
+[0-9a-f]+ <[^>]*> 7190c849 d16mule xr1,xr2,xr3,xr4,HW
+[0-9a-f]+ <[^>]*> 71d0c849 d16mule xr1,xr2,xr3,xr4,XW
+[0-9a-f]+ <[^>]*> 7110c849 d16mule xr1,xr2,xr3,xr4,WW
+[0-9a-f]+ <[^>]*> 7150c849 d16mule xr1,xr2,xr3,xr4,LW
+[0-9a-f]+ <[^>]*> 7190c849 d16mule xr1,xr2,xr3,xr4,HW
+[0-9a-f]+ <[^>]*> 71d0c849 d16mule xr1,xr2,xr3,xr4,XW
[0-9a-f]+ <[^>]*> 7010c84d s16mad xr1,xr2,xr3,xr4,A,WW
[0-9a-f]+ <[^>]*> 7050c84d s16mad xr1,xr2,xr3,xr4,A,LW
[0-9a-f]+ <[^>]*> 7090c84d s16mad xr1,xr2,xr3,xr4,A,HW
diff --git a/binutils-2.24/gas/testsuite/gas/mips/mxu.s b/binutils-2.24/gas/testsuite/gas/mips/mxu.s
index fd06e61..3ae377b 100644
--- a/binutils-2.24/gas/testsuite/gas/mips/mxu.s
+++ b/binutils-2.24/gas/testsuite/gas/mips/mxu.s
@@ -138,15 +138,15 @@ test_mxu:
d16mulf xr1, xr2, xr3, 2
d16mulf xr1, xr2, xr3, 3
- d16mule xr1, xr2, xr3, WW
- d16mule xr1, xr2, xr3, LW
- d16mule xr1, xr2, xr3, HW
- d16mule xr1, xr2, xr3, XW
-
- d16mule xr1, xr2, xr3, 0
- d16mule xr1, xr2, xr3, 1
- d16mule xr1, xr2, xr3, 2
- d16mule xr1, xr2, xr3, 3
+ d16mule xr1, xr2, xr3, xr4, WW
+ d16mule xr1, xr2, xr3, xr4, LW
+ d16mule xr1, xr2, xr3, xr4, HW
+ d16mule xr1, xr2, xr3, xr4, XW
+
+ d16mule xr1, xr2, xr3, xr4, 0
+ d16mule xr1, xr2, xr3, xr4, 1
+ d16mule xr1, xr2, xr3, xr4, 2
+ d16mule xr1, xr2, xr3, xr4, 3
s16mad xr1, xr2, xr3, xr4,A,WW
s16mad xr1, xr2, xr3, xr4,A,LW
diff --git a/binutils-2.24/opcodes/mips-opc.c b/binutils-2.24/opcodes/mips-opc.c
index 74ebae2..fede291 100644
--- a/binutils-2.24/opcodes/mips-opc.c
+++ b/binutils-2.24/opcodes/mips-opc.c
@@ -3208,7 +3208,7 @@ const struct mips_opcode mips_builtin_opcodes[] =
/* MXU Extension. */
{"d16mul", "`=,`b,`c,`d,`o", 0x70000008, 0xff00003f, TRAP, 0, 0, MXU, 0},
{"d16mulf", "`=,`b,`c,`o", 0x70000009, 0xff3c003f, TRAP, 0, 0, MXU, 0},
-{"d16mule", "`=,`b,`c,`o", 0x71000009, 0xff3c003f, TRAP, 0, 0, MXU, 0},
+{"d16mule", "`=,`b,`c,`d,`o", 0x71000009, 0xff00003f, TRAP, 0, 0, MXU, 0},
{"d16mac", "`=,`b,`c,`d,`a,`o", 0x7000000a, 0xfc00003f, TRAP, 0, 0, MXU, 0},
{"d16macf", "`=,`b,`c,`d,`a,`o", 0x7000000b, 0xfc00003f, TRAP, 0, 0, MXU, 0},
{"d16madl", "`=,`b,`c,`d,`a,`o", 0x7000000c, 0xfc00003f, TRAP, 0, 0, MXU, 0},
diff --git a/binutils-2.25/gas/testsuite/gas/mips/mxu.d b/binutils-2.25/gas/testsuite/gas/mips/mxu.d
index 61990ff..26678da 100644
--- a/binutils-2.25/gas/testsuite/gas/mips/mxu.d
+++ b/binutils-2.25/gas/testsuite/gas/mips/mxu.d
@@ -190,14 +190,14 @@ Disassembly of section \.text:
[0-9a-f]+ <[^>]*> 7040c849 d16mulf xr1,xr2,xr3,LW
[0-9a-f]+ <[^>]*> 7080c849 d16mulf xr1,xr2,xr3,HW
[0-9a-f]+ <[^>]*> 70c0c849 d16mulf xr1,xr2,xr3,XW
-[0-9a-f]+ <[^>]*> 7100c849 d16mule xr1,xr2,xr3,WW
-[0-9a-f]+ <[^>]*> 7140c849 d16mule xr1,xr2,xr3,LW
-[0-9a-f]+ <[^>]*> 7180c849 d16mule xr1,xr2,xr3,HW
-[0-9a-f]+ <[^>]*> 71c0c849 d16mule xr1,xr2,xr3,XW
-[0-9a-f]+ <[^>]*> 7100c849 d16mule xr1,xr2,xr3,WW
-[0-9a-f]+ <[^>]*> 7140c849 d16mule xr1,xr2,xr3,LW
-[0-9a-f]+ <[^>]*> 7180c849 d16mule xr1,xr2,xr3,HW
-[0-9a-f]+ <[^>]*> 71c0c849 d16mule xr1,xr2,xr3,XW
+[0-9a-f]+ <[^>]*> 7110c849 d16mule xr1,xr2,xr3,xr4,WW
+[0-9a-f]+ <[^>]*> 7150c849 d16mule xr1,xr2,xr3,xr4,LW
+[0-9a-f]+ <[^>]*> 7190c849 d16mule xr1,xr2,xr3,xr4,HW
+[0-9a-f]+ <[^>]*> 71d0c849 d16mule xr1,xr2,xr3,xr4,XW
+[0-9a-f]+ <[^>]*> 7110c849 d16mule xr1,xr2,xr3,xr4,WW
+[0-9a-f]+ <[^>]*> 7150c849 d16mule xr1,xr2,xr3,xr4,LW
+[0-9a-f]+ <[^>]*> 7190c849 d16mule xr1,xr2,xr3,xr4,HW
+[0-9a-f]+ <[^>]*> 71d0c849 d16mule xr1,xr2,xr3,xr4,XW
[0-9a-f]+ <[^>]*> 7010c84d s16mad xr1,xr2,xr3,xr4,A,WW
[0-9a-f]+ <[^>]*> 7050c84d s16mad xr1,xr2,xr3,xr4,A,LW
[0-9a-f]+ <[^>]*> 7090c84d s16mad xr1,xr2,xr3,xr4,A,HW
diff --git a/binutils-2.25/gas/testsuite/gas/mips/mxu.s b/binutils-2.25/gas/testsuite/gas/mips/mxu.s
index 7650451..f9643d0 100644
--- a/binutils-2.25/gas/testsuite/gas/mips/mxu.s
+++ b/binutils-2.25/gas/testsuite/gas/mips/mxu.s
@@ -138,15 +138,15 @@ test_mxu:
d16mulf xr1, xr2, xr3, 2
d16mulf xr1, xr2, xr3, 3
- d16mule xr1, xr2, xr3, WW
- d16mule xr1, xr2, xr3, LW
- d16mule xr1, xr2, xr3, HW
- d16mule xr1, xr2, xr3, XW
-
- d16mule xr1, xr2, xr3, 0
- d16mule xr1, xr2, xr3, 1
- d16mule xr1, xr2, xr3, 2
- d16mule xr1, xr2, xr3, 3
+ d16mule xr1, xr2, xr3, xr4, WW
+ d16mule xr1, xr2, xr3, xr4, LW
+ d16mule xr1, xr2, xr3, xr4, HW
+ d16mule xr1, xr2, xr3, xr4, XW
+
+ d16mule xr1, xr2, xr3, xr4, 0
+ d16mule xr1, xr2, xr3, xr4, 1
+ d16mule xr1, xr2, xr3, xr4, 2
+ d16mule xr1, xr2, xr3, xr4, 3
s16mad xr1, xr2, xr3, xr4,A,WW
s16mad xr1, xr2, xr3, xr4,A,LW
diff --git a/binutils-2.25/opcodes/mips-opc.c b/binutils-2.25/opcodes/mips-opc.c
index 1871a85..8875f9b 100644
--- a/binutils-2.25/opcodes/mips-opc.c
+++ b/binutils-2.25/opcodes/mips-opc.c
@@ -3208,7 +3208,7 @@ const struct mips_opcode mips_builtin_opcodes[] =
/* MXU Extension. */
{"d16mul", "`=,`b,`c,`d,`o", 0x70000008, 0xff00003f, TRAP, 0, 0, MXU, 0 },
{"d16mulf", "`=,`b,`c,`o", 0x70000009, 0xff3c003f, TRAP, 0, 0, MXU, 0 },
-{"d16mule", "`=,`b,`c,`o", 0x71000009, 0xff3c003f, TRAP, 0, 0, MXU, 0 },
+{"d16mule", "`=,`b,`c,`d,`o", 0x71000009, 0xff00003f, TRAP, 0, 0, MXU, 0 },
{"d16mac", "`=,`b,`c,`d,`a,`o", 0x7000000a, 0xfc00003f, TRAP, 0, 0, MXU, 0 },
{"d16macf", "`=,`b,`c,`d,`a,`o", 0x7000000b, 0xfc00003f, TRAP, 0, 0, MXU, 0 },
{"d16madl", "`=,`b,`c,`d,`a,`o", 0x7000000c, 0xfc00003f, TRAP, 0, 0, MXU, 0 },