diff options
Diffstat (limited to 'include/opcode')
| -rw-r--r-- | include/opcode/ChangeLog | 4 | ||||
| -rw-r--r-- | include/opcode/hppa.h | 319 |
2 files changed, 62 insertions, 261 deletions
diff --git a/include/opcode/ChangeLog b/include/opcode/ChangeLog index 0284dbd..e99160e 100644 --- a/include/opcode/ChangeLog +++ b/include/opcode/ChangeLog @@ -1,3 +1,7 @@ +Mon Jul 19 17:17:03 1993 Jim Kingdon (kingdon@deneb.cygnus.com) + + * hppa.h: Add rfir instruction. + Sun Jul 18 16:28:08 1993 Jim Kingdon (kingdon@rtl.cygnus.com) * mips.h: Split the actual table out into ../../opcodes/mips-opc.c. diff --git a/include/opcode/hppa.h b/include/opcode/hppa.h index e5cf611..5c6f708 100644 --- a/include/opcode/hppa.h +++ b/include/opcode/hppa.h @@ -59,23 +59,21 @@ struct pa_opcode Bit positions in this description follow HP usage of lsb = 31, "at" is lsb of field. -#ifndef OLD_TABLE In the args field, the following characters must match exactly: '+,() ' In the args field, the following characters are unused: - ' "#$% ' *- ./ 34 6789:; = @' - ' B E HIJKL N QR X [\] _' - ' e gh lm qr v yz{|} ' + ' "#$% *+- ./ 3 :; = @' + ' B L N [\] _' + ' e gh lm qr yz{|} ' Here are all the characters: ' !"#$%&'()*+-,./0123456789:;<=>?@' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_' 'abcdefghijklmnopqrstuvwxyz{|}~' -#endif /* OLD_TABLE */ Kinds of operands: x register field at 15. @@ -88,13 +86,8 @@ Kinds of operands: C short load and store completer. Y Store Bytes Short completer < non-negated compare/subtract conditions. -#ifndef OLD_TABLE a compare/subtract conditions d non-negated add conditions -#else - - compare/subtract conditions - + non-negated add conditions -#endif /* OLD_TABLE */ & logical instruction conditions U unit instruction conditions > shift/extract/deposit conditions. @@ -109,24 +102,13 @@ Kinds of operands: Also these: -#ifdef OLD_TABLE - B either s,b or b where - - s 2 bit space specifier at 17. - b register field at 10. -#endif /* OLD_TABLE */ - p 5 bit shift count at 26 (to support the SHD instruction) encoded as 31-p P 5 bit bit position at 26 T 5 bit field length at 31 (encoded as 32-T) A 13 bit immediate at 18 (to support the BREAK instruction) -#ifndef OLD_TABLE ^ like b, but describes a control register Z System Control Completer (to support LPA, LHA, etc.) -#else - Z System Control Completer (to support LDA, LHA, etc.) -#endif /* OLD_TABLE */ D 26 bit immediate at 31 (to support the DIAG instruction) f 3 bit Special Function Unit identifier at 25 @@ -141,26 +123,15 @@ Also these: and 5 bits at 31 u 3 bit coprocessor unit identifier at 25 F Source Floating Point Operand Format Completer encoded 2 bits at 20 + I Source Floating Point Operand Format Completer encoded 1 bits at 20 + (for 0xe format FP instructions) G Destination Floating Point Operand Format Completer encoded 2 bits at 18 M Floating-Point Compare Conditions (encoded as 5 bits at 31) -#ifdef GAS - ? negated or non-negated compare/subtract conditions - (used only by 'comb' and 'comib' pseudo-instructions) - ! negated or non-negated add conditions - (used only by 'addb' and 'addib' pseudo-instructions) -#else GDB ? negated compare/subtract conditions. ! non-negated add conditions. - @ negated add conditions. -#endif -#ifndef OLD_TABLE -No longer used: - B either s,b or b where - - s 2 bit space specifier at 17. - b register field at 10. -#else + s 2 bit space specifier at 17. + b register field at 10. r 5 bit immediate value at 31 (for the break instruction) (very similar to V above, except the value is unsigned instead of low_sign_ext) @@ -175,6 +146,8 @@ And these (PJH) for PA-89 F.P. registers and instructions: v a 't' operand type extended to handle L/R register halves. E a 'b' operand type extended to handle L/R register halves. X an 'x' operand type extended to handle L/R register halves. + J a 'b' operand type further extended to handle extra 1.1 registers + K a 'x' operand type further extended to handle extra 1.1 registers 4 a variation of the 'b' operand type for 'fmpyadd' and 'fmpysub' 6 a variation of the 'x' operand type for 'fmpyadd' and 'fmpysub' 7 a variation of the 't' operand type for 'fmpyadd' and 'fmpysub' @@ -182,8 +155,6 @@ And these (PJH) for PA-89 F.P. registers and instructions: 9 5 bit register field at 25 (used in 'fmpyadd' and 'fmpysub') H Floating Point Operand Format at 26 for 'fmpyadd' and 'fmpysub' (very similar to 'F') -#endif /* OLD_TABLE */ - */ /* The order of the opcodes in this table is significant: @@ -208,7 +179,7 @@ static const struct pa_opcode pa_opcodes[] = { "copy", 0x08000240, 0xffe0ffe0, "x,t"}, /* or r,0,t */ { "mtsar", 0x01601840, 0xffe0ffff, "x"}, /* mtctl r,cr11 */ -#ifndef OLD_TABLE +/* Loads and Stores for integer registers. */ { "ldw", 0x48000000, 0xfc000000, "j(s,b),x"}, { "ldw", 0x48000000, 0xfc000000, "j(b),x"}, { "ldh", 0x44000000, 0xfc000000, "j(s,b),x"}, @@ -231,21 +202,7 @@ static const struct pa_opcode pa_opcodes[] = { "ldhx", 0x0c000040, 0xfc001fc0, "cx(b),t"}, { "ldbx", 0x0c000000, 0xfc001fc0, "cx(s,b),t"}, { "ldbx", 0x0c000000, 0xfc001fc0, "cx(b),t"}, -#else -{ "ldw", 0x48000000, 0xfc000000, "j(B),x"}, -{ "ldh", 0x44000000, 0xfc000000, "j(B),x"}, -{ "ldb", 0x40000000, 0xfc000000, "j(B),x"}, -{ "stw", 0x68000000, 0xfc000000, "x,j(B)"}, -{ "sth", 0x64000000, 0xfc000000, "x,j(B)"}, -{ "stb", 0x60000000, 0xfc000000, "x,j(B)"}, -{ "ldwm", 0x4c000000, 0xfc000000, "j(B),x"}, -{ "stwm", 0x6c000000, 0xfc000000, "x,j(B)"}, -{ "ldwx", 0x0c000080, 0xfc001fc0, "cx(B),t"}, -{ "ldhx", 0x0c000040, 0xfc001fc0, "cx(B),t"}, -{ "ldbx", 0x0c000000, 0xfc001fc0, "cx(B),t"}, -#endif /* OLD_TABLE */ { "ldwax", 0x0c000180, 0xfc00dfc0, "cx(b),t"}, -#ifndef OLD_TABLE { "ldcwx", 0x0c0001c0, 0xfc001fc0, "cx(s,b),t"}, { "ldcwx", 0x0c0001c0, 0xfc001fc0, "cx(b),t"}, { "ldws", 0x0c001080, 0xfc001fc0, "C5(s,b),t"}, @@ -254,14 +211,7 @@ static const struct pa_opcode pa_opcodes[] = { "ldhs", 0x0c001040, 0xfc001fc0, "C5(b),t"}, { "ldbs", 0x0c001000, 0xfc001fc0, "C5(s,b),t"}, { "ldbs", 0x0c001000, 0xfc001fc0, "C5(b),t"}, -#else -{ "ldcwx", 0x0c0001c0, 0xfc001fc0, "cx(B),t"}, -{ "ldws", 0x0c001080, 0xfc001fc0, "C5(B),t"}, -{ "ldhs", 0x0c001040, 0xfc001fc0, "C5(B),t"}, -{ "ldbs", 0x0c001000, 0xfc001fc0, "C5(B),t"}, -#endif /* OLD_TABLE */ { "ldwas", 0x0c001180, 0xfc00dfc0, "C5(b),t"}, -#ifndef OLD_TABLE { "ldcws", 0x0c0011c0, 0xfc001fc0, "C5(s,b),t"}, { "ldcws", 0x0c0011c0, 0xfc001fc0, "C5(b),t"}, { "stws", 0x0c001280, 0xfc001fc0, "Cx,V(s,b)"}, @@ -270,29 +220,21 @@ static const struct pa_opcode pa_opcodes[] = { "sths", 0x0c001240, 0xfc001fc0, "Cx,V(b)"}, { "stbs", 0x0c001200, 0xfc001fc0, "Cx,V(s,b)"}, { "stbs", 0x0c001200, 0xfc001fc0, "Cx,V(b)"}, -#else -{ "ldcws", 0x0c0011c0, 0xfc001fc0, "C5(B),t"}, -{ "stws", 0x0c001280, 0xfc001fc0, "Cx,V(B)"}, -{ "sths", 0x0c001240, 0xfc001fc0, "Cx,V(B)"}, -{ "stbs", 0x0c001200, 0xfc001fc0, "Cx,V(B)"}, -#endif /* OLD_TABLE */ { "stwas", 0x0c001380, 0xfc00dfc0, "Cx,V(b)"}, -#ifndef OLD_TABLE { "stbys", 0x0c001300, 0xfc001fc0, "Yx,V(s,b)"}, { "stbys", 0x0c001300, 0xfc001fc0, "Yx,V(b)"}, -#else -{ "stbys", 0x0c001300, 0xfc001fc0, "Yx,V(B)"}, -#endif /* OLD_TABLE */ + +/* Immediate instructions. */ { "ldo", 0x34000000, 0xfc00c000, "j(b),x"}, { "ldil", 0x20000000, 0xfc000000, "k,b"}, { "addil", 0x28000000, 0xfc000000, "k,b"}, + +/* Branching instructions. */ { "bl", 0xe8000000, 0xfc00e000, "nW,b", NORMAL}, { "gate", 0xe8002000, 0xfc00e000, "nW,b", NORMAL}, { "blr", 0xe8004000, 0xfc00e001, "nx,b", NORMAL}, -#ifndef OLD_TABLE -{ "bv", 0xe800c000, 0xfc00e001, "n(b)", NORMAL}, -#endif /* OLD_TABLE */ { "bv", 0xe800c000, 0xfc00e001, "nx(b)", NORMAL}, +{ "bv", 0xe800c000, 0xfc00e001, "n(b)", NORMAL}, { "be", 0xe0000000, 0xfc000000, "nW(S,b)", NORMAL}, { "ble", 0xe4000000, 0xfc000000, "nW(S,b)", NORMAL}, { "movb", 0xc8000000, 0xfc000000, ">nx,b,w", CONDITIONAL}, @@ -301,27 +243,15 @@ static const struct pa_opcode pa_opcodes[] = { "combf", 0x88000000, 0xfc000000, "<nx,b,w", CONDITIONAL}, { "comibt", 0x84000000, 0xfc000000, "<n5,b,w", CONDITIONAL}, { "comibf", 0x8c000000, 0xfc000000, "<n5,b,w", CONDITIONAL}, -#ifndef OLD_TABLE { "addbt", 0xa0000000, 0xfc000000, "!nx,b,w", CONDITIONAL}, { "addbf", 0xa8000000, 0xfc000000, "!nx,b,w", CONDITIONAL}, { "addibt", 0xa4000000, 0xfc000000, "!n5,b,w", CONDITIONAL}, { "addibf", 0xac000000, 0xfc000000, "!n5,b,w", CONDITIONAL}, -#else -{ "addbt", 0xa0000000, 0xfc000000, "+nx,b,w", CONDITIONAL}, -{ "addbf", 0xa8000000, 0xfc000000, "+nx,b,w", CONDITIONAL}, -{ "addibt", 0xa4000000, 0xfc000000, "+n5,b,w", CONDITIONAL}, -{ "addibf", 0xac000000, 0xfc000000, "+n5,b,w", CONDITIONAL}, -#endif /* OLD_TABLE */ { "bvb", 0xc0000000, 0xffe00000, "~nx,w", CONDITIONAL}, -#ifndef OLD_TABLE -{ "bb", 0xc4000000, 0xfc000000, "~nx,b,w", CONDITIONAL}, /* maybe */ -#else -{ "bb", 0xc4000000, 0xfc000000, "~nx,Q,w", CONDITIONAL}, /* maybe */ -#endif /* OLD_TABLE */ +{ "bb", 0xc4000000, 0xfc000000, "~nx,Q,w", CONDITIONAL}, /* Computation Instructions */ -#ifndef OLD_TABLE { "add", 0x08000600, 0xfc000fe0, "dx,b,t", CONDITIONAL}, { "addl", 0x08000a00, 0xfc000fe0, "dx,b,t", CONDITIONAL}, { "addo", 0x08000e00, 0xfc000fe0, "dx,b,t", CONDITIONAL}, @@ -344,30 +274,6 @@ static const struct pa_opcode pa_opcodes[] = { "subto", 0x08000cc0, 0xfc000fe0, "ax,b,t", CONDITIONAL}, { "ds", 0x08000440, 0xfc000fe0, "ax,b,t", CONDITIONAL}, { "comclr", 0x08000880, 0xfc000fe0, "ax,b,t", CONDITIONAL}, -#else -{ "add", 0x08000600, 0xfc000fe0, "+x,b,t", CONDITIONAL}, -{ "addl", 0x08000a00, 0xfc000fe0, "+x,b,t", CONDITIONAL}, -{ "addo", 0x08000e00, 0xfc000fe0, "+x,b,t", CONDITIONAL}, -{ "addc", 0x08000700, 0xfc000fe0, "+x,b,t", CONDITIONAL}, -{ "addco", 0x08000f00, 0xfc000fe0, "+x,b,t", CONDITIONAL}, -{ "sh1add", 0x08000640, 0xfc000fe0, "+x,b,t", CONDITIONAL}, -{ "sh1addl", 0x08000a40, 0xfc000fe0, "+x,b,t", CONDITIONAL}, -{ "sh1addo", 0x08000e40, 0xfc000fe0, "+x,b,t", CONDITIONAL}, -{ "sh2add", 0x08000680, 0xfc000fe0, "+x,b,t", CONDITIONAL}, -{ "sh2addl", 0x08000a80, 0xfc000fe0, "+x,b,t", CONDITIONAL}, -{ "sh2addo", 0x08000e80, 0xfc000fe0, "+x,b,t", CONDITIONAL}, -{ "sh3add", 0x080006c0, 0xfc000fe0, "+x,b,t", CONDITIONAL}, -{ "sh3addl", 0x08000ac0, 0xfc000fe0, "+x,b,t", CONDITIONAL}, -{ "sh3addo", 0x08000ec0, 0xfc000fe0, "+x,b,t", CONDITIONAL}, -{ "sub", 0x08000400, 0xfc000fe0, "-x,b,t", CONDITIONAL}, -{ "subo", 0x08000c00, 0xfc000fe0, "-x,b,t", CONDITIONAL}, -{ "subb", 0x08000500, 0xfc000fe0, "-x,b,t", CONDITIONAL}, -{ "subbo", 0x08000d00, 0xfc000fe0, "-x,b,t", CONDITIONAL}, -{ "subt", 0x080004c0, 0xfc000fe0, "-x,b,t", CONDITIONAL}, -{ "subto", 0x08000cc0, 0xfc000fe0, "-x,b,t", CONDITIONAL}, -{ "ds", 0x08000440, 0xfc000fe0, "-x,b,t", CONDITIONAL}, -{ "comclr", 0x08000880, 0xfc000fe0, "-x,b,t", CONDITIONAL}, -#endif /* OLD_TABLE */ { "or", 0x08000240, 0xfc000fe0, "&x,b,t", CONDITIONAL}, { "xor", 0x08000280, 0xfc000fe0, "&x,b,t", CONDITIONAL}, { "and", 0x08000200, 0xfc000fe0, "&x,b,t", CONDITIONAL}, @@ -377,7 +283,6 @@ static const struct pa_opcode pa_opcodes[] = { "uaddcmt", 0x080009c0, 0xfc000fe0, "Ux,b,t", CONDITIONAL}, { "dcor", 0x08000b80, 0xfc1f0fe0, "Ub,t", CONDITIONAL}, { "idcor", 0x08000bc0, 0xfc1f0fe0, "Ub,t", CONDITIONAL}, -#ifndef OLD_TABLE { "addi", 0xb4000000, 0xfc000800, "di,b,x", CONDITIONAL}, { "addio", 0xb4000800, 0xfc000800, "di,b,x", CONDITIONAL}, { "addit", 0xb0000000, 0xfc000800, "di,b,x", CONDITIONAL}, @@ -385,15 +290,6 @@ static const struct pa_opcode pa_opcodes[] = { "subi", 0x94000000, 0xfc000800, "ai,b,x", CONDITIONAL}, { "subio", 0x94000800, 0xfc000800, "ai,b,x", CONDITIONAL}, { "comiclr", 0x90000000, 0xfc000800, "ai,b,x", CONDITIONAL}, -#else -{ "addi", 0xb4000000, 0xfc000800, "+i,b,x", CONDITIONAL}, -{ "addio", 0xb4000800, 0xfc000800, "+i,b,x", CONDITIONAL}, -{ "addit", 0xb0000000, 0xfc000800, "+i,b,x", CONDITIONAL}, -{ "addito", 0xb0000800, 0xfc000800, "+i,b,x", CONDITIONAL}, -{ "subi", 0x94000000, 0xfc000800, "-i,b,x", CONDITIONAL}, -{ "subio", 0x94000800, 0xfc000800, "-i,b,x", CONDITIONAL}, -{ "comiclr", 0x90000000, 0xfc000800, "-i,b,x", CONDITIONAL}, -#endif /* OLD_TABLE */ /* Extract and Deposit Instructions */ @@ -414,40 +310,19 @@ static const struct pa_opcode pa_opcodes[] = /* System Control Instructions */ -#ifndef OLD_TABLE { "break", 0x00000000, 0xfc001fe0, "V,A"}, -#else -{ "break", 0x00000000, 0xfc001fe0, "r,A"}, -#endif /* OLD_TABLE */ { "rfi", 0x00000c00, 0xffffffff, ""}, -#ifndef OLD_TABLE -{ "ssm", 0x00000d60, 0xffe0ffe0, "5,t"}, -{ "rsm", 0x00000e60, 0xffe0ffe0, "5,t"}, -#else +{ "rfir", 0x00000ca0, 0xffffffff, ""}, { "ssm", 0x00000d60, 0xffe0ffe0, "R,t"}, { "rsm", 0x00000e60, 0xffe0ffe0, "R,t"}, -#endif /* OLD_TABLE */ { "mtsm", 0x00001860, 0xffe0ffff, "x"}, -#ifndef OLD_TABLE { "ldsid", 0x000010a0, 0xfc1f3fe0, "(s,b),t"}, { "ldsid", 0x000010a0, 0xfc1f3fe0, "(b),t"}, -#else -{ "ldsid", 0x000010a0, 0xfc1f3fe0, "(B),t"}, -#endif /* OLD_TABLE */ { "mtsp", 0x00001820, 0xffe01fff, "x,S"}, -#ifndef OLD_TABLE { "mtctl", 0x00001840, 0xfc00ffff, "x,^"}, -#else -{ "mtctl", 0x00001840, 0xfc00ffff, "x,b"}, -#endif /* OLD_TABLE */ { "mfsp", 0x000004a0, 0xffff1fe0, "S,t"}, -#ifndef OLD_TABLE { "mfctl", 0x000008a0, 0xfc1fffe0, "^,t"}, -#else -{ "mfctl", 0x000008a0, 0xfc1fffe0, "b,t"}, -#endif /* OLD_TABLE */ { "sync", 0x00000400, 0xffffffff, ""}, -#ifndef OLD_TABLE { "prober", 0x04001180, 0xfc003fe0, "(s,b),x,t"}, { "prober", 0x04001180, 0xfc003fe0, "(b),x,t"}, { "proberi", 0x04003180, 0xfc003fe0, "(s,b),5,t"}, @@ -458,153 +333,88 @@ static const struct pa_opcode pa_opcodes[] = { "probewi", 0x040031c0, 0xfc003fe0, "(b),5,t"}, { "lpa", 0x04001340, 0xfc003fc0, "Zx(s,b),t"}, { "lpa", 0x04001340, 0xfc003fc0, "Zx(b),t"}, - { "lha", 0x04001300, 0xfc003fc0, "Zx(s,b),t"}, { "lha", 0x04001300, 0xfc003fc0, "Zx(b),t"}, - { "pdtlb", 0x04001200, 0xfc003fdf, "Zx(s,b)"}, { "pdtlb", 0x04001200, 0xfc003fdf, "Zx(b)"}, - { "pitlb", 0x04000200, 0xfc003fdf, "Zx(s,b)"}, { "pitlb", 0x04000200, 0xfc003fdf, "Zx(b)"}, - { "pdtlbe", 0x04001240, 0xfc003fdf, "Zx(s,b)"}, { "pdtlbe", 0x04001240, 0xfc003fdf, "Zx(b)"}, - { "pitlbe", 0x04000240, 0xfc003fdf, "Zx(s,b)"}, { "pitlbe", 0x04000240, 0xfc003fdf, "Zx(b)"}, - { "idtlba", 0x04001040, 0xfc003fff, "x,(s,b)"}, { "idtlba", 0x04001040, 0xfc003fff, "x,(b)"}, - { "iitlba", 0x04000040, 0xfc003fff, "x,(s,b)"}, { "iitlba", 0x04000040, 0xfc003fff, "x,(b)"}, - { "idtlbp", 0x04001000, 0xfc003fff, "x,(s,b)"}, { "idtlbp", 0x04001000, 0xfc003fff, "x,(b)"}, - { "iitlbp", 0x04000000, 0xfc003fff, "x,(s,b)"}, { "iitlbp", 0x04000000, 0xfc003fff, "x,(b)"}, - { "pdc", 0x04001380, 0xfc003fdf, "Zx(s,b)"}, { "pdc", 0x04001380, 0xfc003fdf, "Zx(b)"}, - { "fdc", 0x04001280, 0xfc003fdf, "Zx(s,b)"}, { "fdc", 0x04001280, 0xfc003fdf, "Zx(b)"}, - { "fic", 0x04000280, 0xfc003fdf, "Zx(s,b)"}, { "fic", 0x04000280, 0xfc003fdf, "Zx(b)"}, - { "fdce", 0x040012c0, 0xfc003fdf, "Zx(s,b)"}, { "fdce", 0x040012c0, 0xfc003fdf, "Zx(b)"}, - { "fice", 0x040002c0, 0xfc003fdf, "Zx(s,b)"}, { "fice", 0x040002c0, 0xfc003fdf, "Zx(b)"}, - -#else -{ "prober", 0x04001180, 0xfc003fe0, "(B),x,t"}, -{ "proberi", 0x04003180, 0xfc003fe0, "(B),5,t"}, -{ "probew", 0x040011c0, 0xfc003fe0, "(B),x,t"}, -{ "probewi", 0x040031c0, 0xfc003fe0, "(B),5,t"}, -{ "lpa", 0x04001340, 0xfc003fc0, "Zx(B),t"}, -{ "lha", 0x04001300, 0xfc003fc0, "Zx(B),t"}, -{ "pdtlb", 0x04001200, 0xfc003fdf, "Zx(B)"}, -{ "pitlb", 0x04000200, 0xfc003fdf, "Zx(B)"}, -{ "pdtlbe", 0x04001240, 0xfc003fdf, "Zx(B)"}, -{ "pitlbe", 0x04000240, 0xfc003fdf, "Zx(B)"}, -{ "idtlba", 0x04001040, 0xfc003fff, "x,(B)"}, -{ "iitlba", 0x04000040, 0xfc003fff, "x,(B)"}, -{ "idtlbp", 0x04001000, 0xfc003fff, "x,(B)"}, -{ "iitlbp", 0x04000000, 0xfc003fff, "x,(B)"}, -{ "pdc", 0x04001380, 0xfc003fdf, "Zx(B)"}, -{ "fdc", 0x04001280, 0xfc003fdf, "Zx(B)"}, -{ "fic", 0x04000280, 0xfc003fdf, "Zx(B)"}, -{ "fdce", 0x040012c0, 0xfc003fdf, "Zx(B)"}, -{ "fice", 0x040002c0, 0xfc003fdf, "Zx(B)"}, -#endif /* OLD_TABLE */ { "diag", 0x14000000, 0xfc000000, "D"}, /* Floating Point Coprocessor Instructions */ - -#ifndef OLD_TABLE -{ "fldwx", 0x24000000, 0xfc001fc0, "cx(s,b),t"}, -{ "fldwx", 0x24000000, 0xfc001fc0, "cx(b),t"}, -#else -{ "fldwx", 0x24000000, 0xfc001f80, "cx(B),v"}, /* PJH: v used to be t */ - /* and 0xfc001f80 used to be 0xfc001fc0 */ -{ "flddx", 0x2c000000, 0xfc001fc0, "cx(B),t"}, -{ "fstwx", 0x24000200, 0xfc001fc0, "cv,x(B)"}, /* PJH: v used to be t */ -{ "fstdx", 0x2c000200, 0xfc001fc0, "ct,x(B)"}, -{ "fldws", 0x24001000, 0xfc001fc0, "C5(B),v"}, /* PJH: v used to be t */ -{ "fldds", 0x2c001000, 0xfc001fc0, "C5(B),t"}, -{ "fstws", 0x24001200, 0xfc001fc0, "Cv,5(B)"}, /* PJH: v used to be t */ -{ "fstds", 0x2c001200, 0xfc001fc0, "Ct,5(B)"}, -{ "fadd", 0x30000600, 0xfc00e7e0, "FE,X,v"}, /* PJH: operands were "Fb,x,t" */ -{ "fsub", 0x30002600, 0xfc00e7e0, "FE,X,v"}, /* PJH: operands were "Fb,x,t" */ -{ "fmpy", 0x30004600, 0xfc00e7e0, "FE,X,v"}, /* PJH: operands were "Fb,x,t" */ -{ "fdiv", 0x30006600, 0xfc00e7e0, "FE,X,v"}, /* PJH: operands were "Fb,x,t" */ -{ "fsqrt", 0x30008000, 0xfc1fe7e0, "FE,v"}, /* PJH: operands were "Fb,t" */ -{ "fabs", 0x30006000, 0xfc1fe7e0, "FE,v"}, /* PJH: operands were "Fb,t" */ -{ "frem", 0x30008600, 0xfc00e7e0, "FE,X,v"}, /* PJH: operands were "Fb,x,t" */ -{ "frnd", 0x3000a000, 0xfc1fe7e0, "FE,v"}, /* PJH: operands were "Fb,t" */ -{ "fcpy", 0x30004000, 0xfc1fe7e0, "FE,v"}, /* PJH: operands were "Fb,t" */ -{ "fcnvff", 0x30000200, 0xfc1f87e0, "FGE,v"}, /* PJH: operands were "FGb,t" */ -{ "fcnvxf", 0x30008200, 0xfc1f87e0, "FGE,v"}, /* PJH: operands were "FGb,t" */ -{ "fcnvfx", 0x30010200, 0xfc1f87e0, "FGE,v"}, /* PJH: operands were "FGb,t" */ -{ "fcnvfxt", 0x30018200, 0xfc1f87e0, "FGE,v"}, /* PJH: operands were "FGb,t" */ -{ "fcmp", 0x30000400, 0xfc00e7e0, "FME,X"}, /* PJH: operands were "FMb,x" */ -{ "ftest", 0x30002420, 0xffffffff, ""}, -#endif /* OLD_TABLE */ - -#ifndef OLD_TABLE + +{ "fldwx", 0x24000000, 0xfc001f80, "cx(s,b),v"}, +{ "fldwx", 0x24000000, 0xfc001f80, "cx(b),v"}, { "flddx", 0x2c000000, 0xfc001fc0, "cx(s,b),t"}, { "flddx", 0x2c000000, 0xfc001fc0, "cx(b),t"}, -#else -/* PA-89 only instructions */ -#endif /* OLD_TABLE */ - -#ifndef OLD_TABLE -{ "fstwx", 0x24000200, 0xfc001fc0, "ct,x(s,b)"}, -{ "fstwx", 0x24000200, 0xfc001fc0, "ct,x(b)"}, -#else -{ "xmpyu", 0x38004700, 0xfc00e720, "FE,X,v"}, -{ "fmpyadd", 0x18000000, 0xfc000000, "H4,6,7,9,8"}, -{ "fmpysub", 0x98000000, 0xfc000000, "H4,6,7,9,8"}, -#endif /* OLD_TABLE */ - -#ifndef OLD_TABLE +{ "fstwx", 0x24000200, 0xfc001fc0, "cv,x(s,b)"}, +{ "fstwx", 0x24000200, 0xfc001fc0, "cv,x(b)"}, { "fstdx", 0x2c000200, 0xfc001fc0, "ct,x(s,b)"}, { "fstdx", 0x2c000200, 0xfc001fc0, "ct,x(b)"}, - -{ "fldws", 0x24001000, 0xfc001fc0, "C5(s,b),t"}, -{ "fldws", 0x24001000, 0xfc001fc0, "C5(b),t"}, - +{ "fldws", 0x24001000, 0xfc001f80, "C5(s,b),v"}, +{ "fldws", 0x24001000, 0xfc001f80, "C5(b),v"}, { "fldds", 0x2c001000, 0xfc001fc0, "C5(s,b),t"}, { "fldds", 0x2c001000, 0xfc001fc0, "C5(b),t"}, - -{ "fstws", 0x24001200, 0xfc001fc0, "Ct,5(s,b)"}, -{ "fstws", 0x24001200, 0xfc001fc0, "Ct,5(b)"}, - +{ "fstws", 0x24001200, 0xfc001f80, "Cv,5(s,b)"}, +{ "fstws", 0x24001200, 0xfc001f80, "Ct,5(b)"}, { "fstds", 0x2c001200, 0xfc001fc0, "Ct,5(s,b)"}, { "fstds", 0x2c001200, 0xfc001fc0, "Ct,5(b)"}, - -{ "fadd", 0x30000600, 0xfc00e7e0, "Fb,x,t"}, -{ "fsub", 0x30002600, 0xfc00e7e0, "Fb,x,t"}, -{ "fmpy", 0x30004600, 0xfc00e7e0, "Fb,x,t"}, -{ "fdiv", 0x30006600, 0xfc00e7e0, "Fb,x,t"}, -{ "fsqrt", 0x30008000, 0xfc1fe7e0, "Fb,t"}, -{ "fabs", 0x30006000, 0xfc1fe7e0, "Fb,t"}, -{ "frem", 0x30008600, 0xfc00e7e0, "Fb,x,t"}, -{ "frnd", 0x3000a000, 0xfc1fe7e0, "Fb,t"}, -{ "fcpy", 0x30004000, 0xfc1fe7e0, "Fb,t"}, -{ "fcnvff", 0x30000200, 0xfc1f87e0, "FGb,t"}, -{ "fcnvxf", 0x30008200, 0xfc1f87e0, "FGb,t"}, -{ "fcnvfx", 0x30010200, 0xfc1f87e0, "FGb,t"}, -{ "fcnvfxt", 0x30018200, 0xfc1f87e0, "FGb,t"}, -{ "fcmp", 0x30000400, 0xfc00e7e0, "FMb,x"}, +{ "fadd", 0x30000600, 0xfc00e7e0, "FE,X,v"}, +{ "fadd", 0x38000600, 0xfc00e720, "IJ,K,v"}, +{ "fsub", 0x30002600, 0xfc00e7e0, "FE,X,v"}, +{ "fsub", 0x38002600, 0xfc00e720, "IJ,K,v"}, +{ "fmpy", 0x30004600, 0xfc00e7e0, "FE,X,v"}, +{ "fmpy", 0x38004600, 0xfc00e720, "IJ,K,v"}, +{ "fdiv", 0x30006600, 0xfc00e7e0, "FE,X,v"}, +{ "fdiv", 0x38006600, 0xfc00e720, "IJ,K,v"}, +{ "fsqrt", 0x30008000, 0xfc1fe7e0, "FE,v"}, +{ "fsqrt", 0x38008000, 0xfc1fe720, "FJ,v"}, +{ "fabs", 0x30006000, 0xfc1fe7e0, "FE,v"}, +{ "fabs", 0x38006000, 0xfc1fe720, "FJ,v"}, +{ "frem", 0x30008600, 0xfc00e7e0, "FE,X,v"}, +{ "frem", 0x38008600, 0xfc00e720, "FJ,K,v"}, +{ "frnd", 0x3000a000, 0xfc1fe7e0, "FE,v"}, +{ "frnd", 0x3800a000, 0xfc1fe720, "FJ,v"}, +{ "fcpy", 0x30004000, 0xfc1fe7e0, "FE,v"}, +{ "fcpy", 0x38004000, 0xfc1fe720, "FJ,v"}, +{ "fcnvff", 0x30000200, 0xfc1f87e0, "FGE,v"}, +{ "fcnvff", 0x38000200, 0xfc1f8720, "FGJ,v"}, +{ "fcnvxf", 0x30008200, 0xfc1f87e0, "FGE,v"}, +{ "fcnvxf", 0x38008200, 0xfc1f8720, "FGJ,v"}, +{ "fcnvfx", 0x30010200, 0xfc1f87e0, "FGE,v"}, +{ "fcnvfx", 0x38010200, 0xfc1f8720, "FGJ,v"}, +{ "fcnvfxt", 0x30018200, 0xfc1f87e0, "FGE,v"}, +{ "fcnvfxt", 0x38018200, 0xfc1f8720, "FGJ,v"}, +{ "fcmp", 0x30000400, 0xfc00e7e0, "FME,X"}, +{ "fcmp", 0x38000400, 0xfc00e720, "IMJ,K"}, +{ "xmpyu", 0x38004700, 0xfc00e720, "FE,X,v"}, +{ "fmpyadd", 0x18000000, 0xfc000000, "H4,6,7,9,8"}, +{ "fmpysub", 0x98000000, 0xfc000000, "H4,6,7,9,8"}, { "ftest", 0x30002420, 0xffffffff, ""}, -#endif /* OLD_TABLE */ + /* Assist Instructions */ { "spop0", 0x10000000, 0xfc000600, ",f,On", NORMAL}, @@ -612,7 +422,6 @@ static const struct pa_opcode pa_opcodes[] = { "spop2", 0x10000400, 0xfc000600, ",f,1nb", NORMAL}, { "spop3", 0x10000600, 0xfc000600, ",f,0nx,b", NORMAL}, { "copr", 0x30000000, 0xfc000000, ",u,2n", NORMAL}, -#ifndef OLD_TABLE { "cldwx", 0x24000000, 0xfc001e00, ",u,Zx(s,b),t"}, { "cldwx", 0x24000000, 0xfc001e00, ",u,Zx(b),t"}, { "clddx", 0x2c000000, 0xfc001e00, ",u,Zx(s,b),t"}, @@ -629,20 +438,9 @@ static const struct pa_opcode pa_opcodes[] = { "cstws", 0x24001200, 0xfc001e00, ",u,Zt,5(b)"}, { "cstds", 0x2c001200, 0xfc001e00, ",u,Zt,5(s,b)"}, { "cstds", 0x2c001200, 0xfc001e00, ",u,Zt,5(b)"}, -#else -{ "cldwx", 0x24000000, 0xfc001e00, ",u,Zx(B),t"}, -{ "clddx", 0x2c000000, 0xfc001e00, ",u,Zx(B),t"}, -{ "cstwx", 0x24000200, 0xfc001e00, ",u,Zt,x(B)"}, -{ "cstdx", 0x2c000200, 0xfc001e00, ",u,Zt,x(B)"}, -{ "cldws", 0x24001000, 0xfc001e00, ",u,Z5(B),t"}, -{ "cldds", 0x2c001000, 0xfc001e00, ",u,Z5(B),t"}, -{ "cstws", 0x24001200, 0xfc001e00, ",u,Zt,5(B)"}, -{ "cstds", 0x2c001200, 0xfc001e00, ",u,Zt,5(B)"}, -#endif /* OLD_TABLE */ }; #define NUMOPCODES ((sizeof pa_opcodes)/(sizeof pa_opcodes[0])) -#ifndef OLD_TABLE /* SKV 12/18/92. Added some denotations for various operands. */ @@ -653,4 +451,3 @@ static const struct pa_opcode pa_opcodes[] = #define PA_DISP17 'W' #define N_HPPA_OPERAND_FORMATS 5 -#endif /* OLD_TABLE */ |