* mips-dis.c: Change '%' to '#' to avoid conflict with vr5400

        support.
        * vu0.h: Likewise.

2 files changed, 56 insertions, 48 deletions

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index dd887ed..f58f21b 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,11 @@
+start-sanitize-r5900
+Fri Mar 20 09:01:31 1998  Jeffrey A Law  (law@cygnus.com)
+
+        * mips-dis.c: Change '%' to '#' to avoid conflict with vr5400
+        support.
+        * vu0.h: Likewise.
+
+end-sanitize-r5900
 Thu Mar 19 15:46:53 1998  Nick Clifton  <nickc@cygnus.com>
 
 	These patches are courtesy of Jonathan Walton and Tony Thompson
diff --git a/opcodes/vu0.h b/opcodes/vu0.h
index 1ef8ae0..d294062 100644
--- a/opcodes/vu0.h
+++ b/opcodes/vu0.h
@@ -29,17 +29,17 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  *
 {"vadd",   "&3K,2K,1K",	0x4a000028, 0xfe00003f,	0, 		T5},
 {"vaddi",  "&3K,2K,J",	0x4a000022, 0xfe1f003f,	0, 		T5},
 {"vaddq",  "&3K,2K,Q",	0x4a000020, 0xfe1f003f,	0, 		T5},
-{"vaddw",  "&3K,2K,1%w",	0x4a000003, 0xfe00003f,	0, 		T5},
-{"vaddx",  "&3K,2K,1%x",	0x4a000000, 0xfe00003f,	0, 		T5},
-{"vaddy",  "&3K,2K,1%y",	0x4a000001, 0xfe00003f,	0, 		T5},
-{"vaddz",  "&3K,2K,1%z",	0x4a000002, 0xfe00003f,	0, 		T5},
+{"vaddw",  "&3K,2K,1#w",	0x4a000003, 0xfe00003f,	0, 		T5},
+{"vaddx",  "&3K,2K,1#x",	0x4a000000, 0xfe00003f,	0, 		T5},
+{"vaddy",  "&3K,2K,1#y",	0x4a000001, 0xfe00003f,	0, 		T5},
+{"vaddz",  "&3K,2K,1#z",	0x4a000002, 0xfe00003f,	0, 		T5},
 {"vadda",  "&UK,1K,2K",	0x4a0002bc, 0xfe0007ff,	0, 		T5},
 {"vaddai", "&UK,2K,J",	0x4a00023e, 0xfe1f07ff,	0, 		T5},
 {"vaddaq", "&UK,2K,Q",	0x4a00023c, 0xfe1f07ff,	0, 		T5},
-{"vaddaw", "&UK,2K,1%w",	0x4a00003f, 0xfe0007ff,	0, 		T5},
-{"vaddax", "&UK,2K,1%x",	0x4a00003c, 0xfe0007ff,	0, 		T5},
-{"vadday", "&UK,2K,1%y",	0x4a00003d, 0xfe0007ff,	0, 		T5},
-{"vaddaz", "&UK,2K,1%z",	0x4a00003e, 0xfe0007ff,	0, 		T5},
+{"vaddaw", "&UK,2K,1#w",	0x4a00003f, 0xfe0007ff,	0, 		T5},
+{"vaddax", "&UK,2K,1#x",	0x4a00003c, 0xfe0007ff,	0, 		T5},
+{"vadday", "&UK,2K,1#y",	0x4a00003d, 0xfe0007ff,	0, 		T5},
+{"vaddaz", "&UK,2K,1#z",	0x4a00003e, 0xfe0007ff,	0, 		T5},
 {"vcallms","p",		0x4a000038, 0xffe0003f,	0, 		T5},
 {"vcallmsr", "9",		0x4a009839, 0xffffffff,	0, 		T5},
 {"vclip","2",		0x4be001ff, 0xffff07ff,	0, 		T5},
@@ -70,61 +70,61 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  *
 {"vmadd", "&3K,2K,1K",	0x4a000029, 0xfe00003f,	0, 		T5},
 {"vmaddi", "&3K,2K,J",	0x4a000023, 0xfe1f003f,	0, 		T5},
 {"vmaddq", "&3K,2K,Q",	0x4a000021, 0xfe1f003f,	0, 		T5},
-{"vmaddw", "&3K,2K,1%w",	0x4a00000b, 0xfe00003f,	0, 		T5},
-{"vmaddx", "&3K,2K,1%x",	0x4a000008, 0xfe00003f,	0, 		T5},
-{"vmaddy", "&3K,2K,1%y",	0x4a000009, 0xfe00003f,	0, 		T5},
-{"vmaddz", "&3K,2K,1%z",	0x4a00000a, 0xfe00003f,	0, 		T5},
+{"vmaddw", "&3K,2K,1#w",	0x4a00000b, 0xfe00003f,	0, 		T5},
+{"vmaddx", "&3K,2K,1#x",	0x4a000008, 0xfe00003f,	0, 		T5},
+{"vmaddy", "&3K,2K,1#y",	0x4a000009, 0xfe00003f,	0, 		T5},
+{"vmaddz", "&3K,2K,1#z",	0x4a00000a, 0xfe00003f,	0, 		T5},
 {"vmadda", "&UK,2K,1K",	0x4a0002bd, 0xfe0007ff,	0, 		T5},
 {"vmaddai", "&UK,2K,J",	0x4a00023f, 0xfe1f07ff,	0, 		T5},
 {"vmaddaq", "&UK,2K,Q",	0x4a00023d, 0xfe1f07ff,	0, 		T5},
-{"vmaddaw", "&UK,2K,1%w",	0x4a0000bf, 0xfe0007ff,	0, 		T5},
-{"vmaddax", "&UK,2K,1%x",	0x4a0000bc, 0xfe0007ff,	0, 		T5},
-{"vmadday", "&UK,2K,1%y",	0x4a0000bd, 0xfe0007ff,	0, 		T5},
-{"vmaddaz", "&UK,2K,1%z",	0x4a0000be, 0xfe0007ff,	0, 		T5},
+{"vmaddaw", "&UK,2K,1#w",	0x4a0000bf, 0xfe0007ff,	0, 		T5},
+{"vmaddax", "&UK,2K,1#x",	0x4a0000bc, 0xfe0007ff,	0, 		T5},
+{"vmadday", "&UK,2K,1#y",	0x4a0000bd, 0xfe0007ff,	0, 		T5},
+{"vmaddaz", "&UK,2K,1#z",	0x4a0000be, 0xfe0007ff,	0, 		T5},
 {"vmax",    "&3K,2K,1K",	0x4a00002b, 0xfe00003f,	0, 		T5},
 {"vmaxi",   "&3K,2K,J",	0x4a00001b, 0xfe1f003f,	0, 		T5},
-{"vmaxw",   "&3K,2K,1%w",	0x4a000013, 0xfe00003f,	0, 		T5},
-{"vmaxx",   "&3K,2K,1%x",	0x4a000010, 0xfe00003f,	0, 		T5},
-{"vmaxy",   "&3K,2K,1%y",	0x4a000011, 0xfe00003f,	0, 		T5},
-{"vmaxz",   "&3K,2K,1%z",	0x4a000012, 0xfe00003f,	0, 		T5},
+{"vmaxw",   "&3K,2K,1#w",	0x4a000013, 0xfe00003f,	0, 		T5},
+{"vmaxx",   "&3K,2K,1#x",	0x4a000010, 0xfe00003f,	0, 		T5},
+{"vmaxy",   "&3K,2K,1#y",	0x4a000011, 0xfe00003f,	0, 		T5},
+{"vmaxz",   "&3K,2K,1#z",	0x4a000012, 0xfe00003f,	0, 		T5},
 {"vmfir",   "&1K,5",	0x4a0003fd, 0xfe0007ff,	0, 		T5},
 {"vmini",   "&3K,2K,1K",	0x4a00002f, 0xfe00003f,	0, 		T5},
 {"vminii",  "&3K,2K,J",	0x4a00001f, 0xfe1f003f,	0, 		T5},
-{"vminiw",  "&3K,2K,1%w",	0x4a000017, 0xfe00003f,	0, 		T5},
-{"vminix",  "&3K,2K,1%x",	0x4a000014, 0xfe00003f,	0, 		T5},
-{"vminiy",  "&3K,2K,1%y",	0x4a000015, 0xfe00003f,	0, 		T5},
-{"vminiz",  "&3K,2K,1%z",	0x4a000016, 0xfe00003f,	0, 		T5},
+{"vminiw",  "&3K,2K,1#w",	0x4a000017, 0xfe00003f,	0, 		T5},
+{"vminix",  "&3K,2K,1#x",	0x4a000014, 0xfe00003f,	0, 		T5},
+{"vminiy",  "&3K,2K,1#y",	0x4a000015, 0xfe00003f,	0, 		T5},
+{"vminiz",  "&3K,2K,1#z",	0x4a000016, 0xfe00003f,	0, 		T5},
 {"vmove",   "&1K,2K",	0x4a00033c, 0xfe0007ff,	0, 		T5},
 {"vmr32",   "&1K,2K",	0x4a00033d, 0xfe0007ff,	0, 		T5},
 {"vmsub",   "&3K,2K,1K",	0x4a00002d, 0xfe00003f,	0, 		T5},
 {"vmsubi",  "&3K,2K,J",	0x4a000027, 0xfe1f003f,	0, 		T5},
 {"vmsubq",  "&3K,2K,Q",	0x4a000025, 0xfe1f003f,	0, 		T5},
-{"vmsubw",  "&3K,2K,1%w",	0x4a00000f, 0xfe00003f,	0, 		T5},
-{"vmsubx",  "&3K,2K,1%x",	0x4a00000c, 0xfe00003f,	0, 		T5},
-{"vmsuby",  "&3K,2K,1%y",	0x4a00000d, 0xfe00003f,	0, 		T5},
-{"vmsubz",  "&3K,2K,1%z",	0x4a00000e, 0xfe00003f,	0, 		T5},
+{"vmsubw",  "&3K,2K,1#w",	0x4a00000f, 0xfe00003f,	0, 		T5},
+{"vmsubx",  "&3K,2K,1#x",	0x4a00000c, 0xfe00003f,	0, 		T5},
+{"vmsuby",  "&3K,2K,1#y",	0x4a00000d, 0xfe00003f,	0, 		T5},
+{"vmsubz",  "&3K,2K,1#z",	0x4a00000e, 0xfe00003f,	0, 		T5},
 {"vmsuba",  "&UK,1K,2K",	0x4a0002fd, 0xfe0007ff,	0, 		T5},
 {"vmsubai", "&UK,2K,J",	0x4a00027f, 0xfe1f07ff,	0, 		T5},
 {"vmsubaq", "&UK,2K,Q",	0x4a00027d, 0xfe1f07ff,	0, 		T5},
-{"vmsubaw", "&UK,2K,1%w",	0x4a0000ff, 0xfe0007ff,	0, 		T5},
-{"vmsubax", "&UK,2K,1%x",	0x4a0000fc, 0xfe0007ff,	0, 		T5},
-{"vmsubay", "&UK,2K,1%y",	0x4a0000fd, 0xfe0007ff,	0, 		T5},
-{"vmsubaz", "&UK,2K,1%z",	0x4a0000fe, 0xfe0007ff,	0, 		T5},
+{"vmsubaw", "&UK,2K,1#w",	0x4a0000ff, 0xfe0007ff,	0, 		T5},
+{"vmsubax", "&UK,2K,1#x",	0x4a0000fc, 0xfe0007ff,	0, 		T5},
+{"vmsubay", "&UK,2K,1#y",	0x4a0000fd, 0xfe0007ff,	0, 		T5},
+{"vmsubaz", "&UK,2K,1#z",	0x4a0000fe, 0xfe0007ff,	0, 		T5},
 {"vmtir",   "&4,2K",	0x4a0003fc, 0xfe0007ff,	0, 		T5},
 {"vmul",    "&3K,2K,1K",	0x4a00002a, 0xfe00003f,	0, 		T5},
 {"vmuli",   "&3K,2K,J",	0x4a00001e, 0xfe1f003f,	0, 		T5},
 {"vmulq",   "&3K,2K,Q",	0x4a00001c, 0xfe1f003f,	0, 		T5},
-{"vmulw",   "&3K,2K,1%w",	0x4a00001b, 0xfe00003f,	0, 		T5},
-{"vmulx",   "&3K,2K,1%x",	0x4a000018, 0xfe00003f,	0, 		T5},
-{"vmuly",   "&3K,2K,1%y",	0x4a000019, 0xfe00003f,	0, 		T5},
-{"vmulz",   "&3K,2K,1%z",	0x4a00001a, 0xfe00003f,	0, 		T5},
+{"vmulw",   "&3K,2K,1#w",	0x4a00001b, 0xfe00003f,	0, 		T5},
+{"vmulx",   "&3K,2K,1#x",	0x4a000018, 0xfe00003f,	0, 		T5},
+{"vmuly",   "&3K,2K,1#y",	0x4a000019, 0xfe00003f,	0, 		T5},
+{"vmulz",   "&3K,2K,1#z",	0x4a00001a, 0xfe00003f,	0, 		T5},
 {"vmula",   "&UK,2K,1K",	0x4a0002be, 0xfe0007ff,	0, 		T5},
 {"vmulai",  "&UK,2K,J",	0x4a0001fe, 0xfe1f07ff,	0, 		T5},
 {"vmulaq",  "&UK,2K,Q",	0x4a0001fc, 0xfe1f07ff,	0, 		T5},
-{"vmulaw",  "&UK,2K,1%w",	0x4a0001bf, 0xfe0007ff,	0, 		T5},
-{"vmulax",  "&UK,2K,1%x",	0x4a0001bc, 0xfe0007ff,	0, 		T5},
-{"vmulay",  "&UK,2K,1%y",	0x4a0001bd, 0xfe0007ff,	0, 		T5},
-{"vmulaz",  "&UK,2K,1%z",	0x4a0001be, 0xfe0007ff,	0, 		T5},
+{"vmulaw",  "&UK,2K,1#w",	0x4a0001bf, 0xfe0007ff,	0, 		T5},
+{"vmulax",  "&UK,2K,1#x",	0x4a0001bc, 0xfe0007ff,	0, 		T5},
+{"vmulay",  "&UK,2K,1#y",	0x4a0001bd, 0xfe0007ff,	0, 		T5},
+{"vmulaz",  "&UK,2K,1#z",	0x4a0001be, 0xfe0007ff,	0, 		T5},
 {"vnop","",		0x4a0002ff, 0xffffffff,	0, 		T5},
 {"vopmula.xyz", "U,2,1", 0x4bc002fe, 0xffe007ff,	0, 	T5},
 {"vopmsub.xyz", "3,2,1", 0x4bc0002e, 0xffe0003f,	0, 	T5},
@@ -139,15 +139,15 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  *
 {"vsub",  "&3K,2K,1K",	0x4a00002c, 0xfe00003f,	0, 		T5},
 {"vsubi", "&3K,2K,J",	0x4a000026, 0xfe1f003f,	0, 		T5},
 {"vsubq", "&3K,2K,Q",	0x4a000024, 0xfe1f003f,	0, 		T5},
-{"vsubw", "&3K,2K,1%w",	0x4a000007, 0xfe00003f,	0, 		T5},
-{"vsubx", "&3K,2K,1%x",	0x4a000004, 0xfe00003f,	0, 		T5},
-{"vsuby", "&3K,2K,1%y",	0x4a000005, 0xfe00003f,	0, 		T5},
-{"vsubz", "&3K,2K,1%z",	0x4a000006, 0xfe00003f,	0, 		T5},
+{"vsubw", "&3K,2K,1#w",	0x4a000007, 0xfe00003f,	0, 		T5},
+{"vsubx", "&3K,2K,1#x",	0x4a000004, 0xfe00003f,	0, 		T5},
+{"vsuby", "&3K,2K,1#y",	0x4a000005, 0xfe00003f,	0, 		T5},
+{"vsubz", "&3K,2K,1#z",	0x4a000006, 0xfe00003f,	0, 		T5},
 {"vsuba", "&UK,2K,1K",	0x4a0002fc, 0xfe0007ff,	0, 		T5},
 {"vsubai", "&UK,2K,J",	0x4a00027e, 0xfe1f07ff,	0, 		T5},
 {"vsubaq", "&UK,2K,Q",	0x4a00027c, 0xfe1f07ff,	0, 		T5},
-{"vsubaw", "&UK,2K,1%w",	0x4a00007f, 0xfe0007ff,	0, 		T5},
-{"vsubax", "&UK,2K,1%x",	0x4a00007c, 0xfe0007ff,	0, 		T5},
-{"vsubay", "&UK,2K,1%y",	0x4a00007d, 0xfe0007ff,	0, 		T5},
-{"vsubaz", "&UK,2K,1%z",	0x4a00007e, 0xfe0007ff,	0, 		T5},
+{"vsubaw", "&UK,2K,1#w",	0x4a00007f, 0xfe0007ff,	0, 		T5},
+{"vsubax", "&UK,2K,1#x",	0x4a00007c, 0xfe0007ff,	0, 		T5},
+{"vsubay", "&UK,2K,1#y",	0x4a00007d, 0xfe0007ff,	0, 		T5},
+{"vsubaz", "&UK,2K,1#z",	0x4a00007e, 0xfe0007ff,	0, 		T5},
 {"vwaitq","",		0x4a0003bf, 0xffffffff,	0, 		T5},