* mips-opc.c (mula.s): Renamed from multa.s.

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 7b329cc0a61014d19c52f9db0c607eb94d0db1e7..67f183ed89db2b1b7764134bfb37ca4d5d387aab 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,9 @@
+start-sanitize-r5900
+Fri Feb 20 01:23:16 1998  Jeffrey A Law  (law@cygnus.com)
+
+        * mips-opc.c (mula.s): Renamed from multa.s.
+
+end-sanitize-r5900
 Thu Feb 19 16:51:13 1998  Doug Evans  <devans@canuck.cygnus.com>
 
        * m32r-opc.[ch]: Regenerate.

diff --git a/opcodes/mips-opc.c b/opcodes/mips-opc.c
index e8ed1d6fd47944cb998ea64f7d529841514167db..aa63a3bd5f056b5bdb7193265be66f6e721584d4 100644 (file)
--- a/opcodes/mips-opc.c
+++ b/opcodes/mips-opc.c
@@ -528,7 +528,6 @@ const struct mips_opcode mips_builtin_opcodes[] = {
   /* end-sanitize-vr5400 */
 {"mad",            "s,t",      0x70000000, 0xfc00ffff, RD_s|RD_t|WR_HI|WR_LO|RD_HI|RD_LO,      P3      },
 {"madu",    "s,t",     0x70000001, 0xfc00ffff, RD_s|RD_t|WR_HI|WR_LO|RD_HI|RD_LO,      P3      },
-{"addciu",  "t,r,j",   0x70000000, 0xfc000000, WR_t|RD_s,L1    },
 {"madd.d",  "D,R,S,T", 0x4c000021, 0xfc00003f, RD_R|RD_S|RD_T|WR_D|FP_D,       I4      },
 {"madd.s",  "D,R,S,T", 0x4c000020, 0xfc00003f, RD_R|RD_S|RD_T|WR_D|FP_S,       I4      },
 /* start-sanitize-r5900 */
@@ -552,7 +551,7 @@ const struct mips_opcode mips_builtin_opcodes[] = {
 {"max.s",   "D,S,T",    0x46000028, 0xffe0003f, WR_D|RD_S|RD_T|FP_S,    T5 },
 {"min.s",   "D,S,T",    0x46000030, 0xffe0003f, WR_D|RD_S|RD_T|FP_S,    T5 },
 {"msuba.s", "S,T",      0x4600001f, 0xffe007ff, RD_S|RD_T|FP_S,         T5 },
-{"multa.s", "S,T",      0x4600001a, 0xffe007ff, RD_S|RD_T|FP_S,         T5 },
+{"mult.s",  "S,T",      0x4600001a, 0xffe007ff, RD_S|RD_T|FP_S,         T5 },
 {"suba.s",  "S,T",      0x46000019, 0xffe007ff, RD_S|RD_T|FP_S,         T5 },
 {"di",      "",         0x42000039, 0xffffffff, WR_C0,          T5      },
 {"ei",      "",         0x42000038, 0xffffffff, WR_C0,          T5      },
@@ -676,7 +675,7 @@ const struct mips_opcode mips_builtin_opcodes[] = {
 {"mulhiu",  "d,s,t",   0x00000259, 0xfc0007ff, RD_s|RD_t|WR_HILO|WR_d, N5      },
 {"mul",     "d,s,t",   0x00000058, 0xfc0007ff, RD_s|RD_t|WR_HILO|WR_d, N5      },
   /* end-sanitize-vr5400 */
-{"mul",     "d,v,t",   0x70000002, 0xfc0007ff, WR_d|RD_s|RD_t|WR_HI|WR_LO,     P3      },
+{"mul",     "d,v,t",   0x70000002, 0xfc0007ff, WR_d|RD_s|RD_t|WR_HI|WR_LO,P3},
 {"mul",     "d,v,t",   0,    (int) M_MUL,      INSN_MACRO,     I1      },
 {"mul",     "d,v,I",   0,    (int) M_MUL_I,    INSN_MACRO,     I1      },
 {"mulo",    "d,v,t",   0,    (int) M_MULO,     INSN_MACRO,     I1      },
@@ -1114,6 +1113,11 @@ const struct mips_opcode mips_builtin_opcodes[] = {
 {"cop1",     "C",      0,    (int) M_COP1,     INSN_MACRO,     I1      },
 {"cop2",     "C",      0,    (int) M_COP2,     INSN_MACRO,     I1      },
 {"cop3",     "C",      0,    (int) M_COP3,     INSN_MACRO,     I1      },
+
+  /* Conflicts with the 4650's "mul" instruction.  Nobody's using the
+     4010 any more, so move this insn out of the way.  If the object
+     format gave us more info, we could do this right.  */
+{"addciu",  "t,r,j",   0x70000000, 0xfc000000, WR_t|RD_s,L1    },
 };
 
 #define MIPS_NUM_OPCODES \