summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Sandiford <rsandifo@nildram.co.uk>2013-06-26 07:04:56 +0000
committerRichard Sandiford <rsandifo@nildram.co.uk>2013-06-26 07:04:56 +0000
commit5360ea8ab62d8b77537412a628ab74bf46ba5eb4 (patch)
treef85c42052008e51c2d469f9be2dec9b8d9a10625
parent25ce54b4b3c16cebac9745712146ed5f50c9e32d (diff)
downloadbinutils-redhat-5360ea8ab62d8b77537412a628ab74bf46ba5eb4.tar.gz
include/opcode/
* mips.h: Fix comment for "1": it is now STYPE rather than SHAMT. Use "source" rather than "destination" for microMIPS "G". gas/ * config/tc-mips.c (validate_mips_insn): Use STYPE rather than SHAMT.
-rw-r--r--gas/ChangeLog4
-rw-r--r--gas/config/tc-mips.c2
-rw-r--r--include/opcode/ChangeLog5
-rw-r--r--include/opcode/mips.h8
4 files changed, 14 insertions, 5 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 6e244133f7..ac69efe754 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2013-06-26 Richard Sandiford <rdsandiford@googlemail.com>
+
+ * config/tc-mips.c (validate_mips_insn): Use STYPE rather than SHAMT.
+
2013-06-25 Maciej W. Rozycki <macro@codesourcery.com>
* config/tc-mips.c (mips_set_options): Add insn32 member.
diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index 595ab74c99..d2b1f6376f 100644
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -10975,7 +10975,7 @@ validate_mips_insn (const struct mips_opcode *opc)
case '%': USE_BITS (OP_MASK_VECALIGN, OP_SH_VECALIGN); break;
case '[': break;
case ']': break;
- case '1': USE_BITS (OP_MASK_SHAMT, OP_SH_SHAMT); break;
+ case '1': USE_BITS (OP_MASK_STYPE, OP_SH_STYPE); break;
case '2': USE_BITS (OP_MASK_BP, OP_SH_BP); break;
case '3': USE_BITS (OP_MASK_SA3, OP_SH_SA3); break;
case '4': USE_BITS (OP_MASK_SA4, OP_SH_SA4); break;
diff --git a/include/opcode/ChangeLog b/include/opcode/ChangeLog
index 9aa75d9021..b927a2c344 100644
--- a/include/opcode/ChangeLog
+++ b/include/opcode/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-26 Richard Sandiford <rdsandiford@googlemail.com>
+
+ * mips.h: Fix comment for "1": it is now STYPE rather than SHAMT.
+ Use "source" rather than "destination" for microMIPS "G".
+
2013-06-25 Maciej W. Rozycki <macro@codesourcery.com>
* mips.h: Add M_JRADDIUSP, M_JRC and M_MOVEP anonymous enum
diff --git a/include/opcode/mips.h b/include/opcode/mips.h
index ec9b6ba190..68cd9b6d7c 100644
--- a/include/opcode/mips.h
+++ b/include/opcode/mips.h
@@ -377,7 +377,7 @@ struct mips_opcode
Each of these characters corresponds to a mask field defined above.
- "1" 5 bit sync type (OP_*_SHAMT)
+ "1" 5 bit sync type (OP_*_STYPE)
"<" 5 bit shift amount (OP_*_SHAMT)
">" shift amount between 32 and 63, stored after subtracting 32 (OP_*_SHAMT)
"a" 26 bit target address (OP_*_TARGET)
@@ -1742,7 +1742,7 @@ extern const int bfd_mips16_num_opcodes;
others too).
"." 10-bit signed offset/number (MICROMIPSOP_*_OFFSET10)
- "1" 5-bit sync type (MICROMIPSOP_*_SHAMT)
+ "1" 5-bit sync type (MICROMIPSOP_*_STYPE)
"<" 5-bit shift amount (MICROMIPSOP_*_SHAMT)
">" shift amount between 32 and 63, stored after subtracting 32
(MICROMIPSOP_*_SHAMT)
@@ -1814,9 +1814,9 @@ extern const int bfd_mips16_num_opcodes;
Coprocessor instructions:
"E" 5-bit target register (MICROMIPSOP_*_RT)
- "G" 5-bit destination register (MICROMIPSOP_*_RS)
+ "G" 5-bit source register (MICROMIPSOP_*_RS)
"H" 3-bit sel field for (D)MTC* and (D)MFC* (MICROMIPSOP_*_SEL)
- "+D" combined destination register ("G") and sel ("H") for CP0 ops,
+ "+D" combined source register ("G") and sel ("H") for CP0 ops,
for pretty-printing in disassembly only
Macro instructions: