From: "Jerry Quinn" <jquinn@nortelnetworks.com>
To: binutils@sourceware.cygnus.com
Subject: Patch: Add prefix to completers in hppa port
Date: Thu, 15 Jul 1999 11:31:00 -0000 [thread overview]
Message-ID: <15607.932063553.0@NO-ID-FOUND.mhonarc.org> (raw)
This patch adds a prefix 'c' to completer args. This will allow adding many
more completers required for pa2.0 syntax support without running out of
characters. The actual completer codes are remapped to be more intuitive in
the context of the remaining pa2.0 syntax completers.
ChangeLog entry:
Thu Jul 15 14:21:37 EDT 1999 Jerry Quinn <jquinn@nortelnetworks.com>
* include/opcode/hppa.h (pa_opcodes): Add 'c' prefix to completers.
* gas/config/tc-hppa.c (pa_ip): Add 'c' prefix to completers.
* opcodes/hppa-dis.c (print_insn_hppa): Add 'c' prefix to completers.
*** pa-prev/include/opcode/hppa.h Thu Jul 15 14:18:21 1999
--- gas-src/include/opcode/hppa.h Thu Jul 15 13:16:08 1999
***************
*** 71,78 ****
In the args field, the following characters are unused:
' "# %& *+- / :;< > @'
! ' LM U [\] '
! 'a d lm q {|}~'
Here are all the characters:
--- 71,78 ----
In the args field, the following characters are unused:
' "# %& *+- / :;< > @'
! ' C LM U YZ[\] '
! 'a d lm q {|} '
Here are all the characters:
***************
*** 88,96 ****
5 5 bit immediate at 15.
s 2 bit space specifier at 17.
S 3 bit space specifier at 18.
- c indexed load completer.
- C short load and store completer.
- Y Store Bytes Short completer
V 5 bit immediate value at 31
i 11 bit immediate value at 31
j 14 bit immediate value at 31
--- 88,93 ----
***************
*** 101,106 ****
--- 98,110 ----
W 17 bit branch displacement (PC relative)
z 17 bit branch displacement (just a number, not an address)
+ Completer operands all have 'c' as the prefix:
+
+ cx indexed load completer.
+ cm short load and store completer.
+ cs store bytes short completer.
+ cZ System Control Completer (to support LPA, LHA, etc.)
+
Condition operands all have '?' as the prefix:
?f Floating point compare conditions (encoded as 5 bits at 31)
***************
*** 140,146 ****
. 2 bit shift amount at 24:25
^ like b, but describes a control register
! sar (cr11) register
- Z System Control Completer (to support LPA, LHA, etc.)
D 26 bit immediate at 31 (to support the DIAG instruction)
$ 9 bit immediate at 28 (to support 'popbts')
--- 144,149 ----
***************
*** 190,196 ****
/* List of characters not to put a space after. Note that
"," is included, as the "spopN" operations use literal
commas in their completer sections. */
! static const char *const completer_chars = ",CcY<>?!@+&U~FfGHINnOoZMadu|/=0123%e$m}";
/* The order of the opcodes in this table is significant:
--- 193,199 ----
/* List of characters not to put a space after. Note that
"," is included, as the "spopN" operations use literal
commas in their completer sections. */
! static const char *const completer_chars = ",c<>?!@+&U~FfGHINnOoMadu|/=0123%e$m}";
/* The order of the opcodes in this table is significant:
***************
*** 244,276 ****
{ "ldwm", 0x4c000000, 0xfc000000, "j(b),x", pa10},
{ "stwm", 0x6c000000, 0xfc000000, "x,j(s,b)", pa10},
{ "stwm", 0x6c000000, 0xfc000000, "x,j(b)", pa10},
! { "ldwx", 0x0c000080, 0xfc001fc0, "cx(s,b),t", pa10},
! { "ldwx", 0x0c000080, 0xfc001fc0, "cx(b),t", pa10},
! { "ldhx", 0x0c000040, 0xfc001fc0, "cx(s,b),t", pa10},
! { "ldhx", 0x0c000040, 0xfc001fc0, "cx(b),t", pa10},
! { "ldbx", 0x0c000000, 0xfc001fc0, "cx(s,b),t", pa10},
! { "ldbx", 0x0c000000, 0xfc001fc0, "cx(b),t", pa10},
! { "ldwax", 0x0c000180, 0xfc00dfc0, "cx(b),t", pa10},
! { "ldcwx", 0x0c0001c0, 0xfc001fc0, "cx(s,b),t", pa10},
! { "ldcwx", 0x0c0001c0, 0xfc001fc0, "cx(b),t", pa10},
! { "ldws", 0x0c001080, 0xfc001fc0, "C5(s,b),t", pa10},
! { "ldws", 0x0c001080, 0xfc001fc0, "C5(b),t", pa10},
! { "ldhs", 0x0c001040, 0xfc001fc0, "C5(s,b),t", pa10},
! { "ldhs", 0x0c001040, 0xfc001fc0, "C5(b),t", pa10},
! { "ldbs", 0x0c001000, 0xfc001fc0, "C5(s,b),t", pa10},
! { "ldbs", 0x0c001000, 0xfc001fc0, "C5(b),t", pa10},
! { "ldwas", 0x0c001180, 0xfc00dfc0, "C5(b),t", pa10},
! { "ldcws", 0x0c0011c0, 0xfc001fc0, "C5(s,b),t", pa10},
! { "ldcws", 0x0c0011c0, 0xfc001fc0, "C5(b),t", pa10},
! { "stws", 0x0c001280, 0xfc001fc0, "Cx,V(s,b)", pa10},
! { "stws", 0x0c001280, 0xfc001fc0, "Cx,V(b)", pa10},
! { "sths", 0x0c001240, 0xfc001fc0, "Cx,V(s,b)", pa10},
! { "sths", 0x0c001240, 0xfc001fc0, "Cx,V(b)", pa10},
! { "stbs", 0x0c001200, 0xfc001fc0, "Cx,V(s,b)", pa10},
! { "stbs", 0x0c001200, 0xfc001fc0, "Cx,V(b)", pa10},
! { "stwas", 0x0c001380, 0xfc00dfc0, "Cx,V(b)", pa10},
! { "stbys", 0x0c001300, 0xfc001fc0, "Yx,V(s,b)", pa10},
! { "stbys", 0x0c001300, 0xfc001fc0, "Yx,V(b)", pa10},
/* Immediate instructions. */
{ "ldo", 0x34000000, 0xfc00c000, "j(b),x", pa10},
--- 247,279 ----
{ "ldwm", 0x4c000000, 0xfc000000, "j(b),x", pa10},
{ "stwm", 0x6c000000, 0xfc000000, "x,j(s,b)", pa10},
{ "stwm", 0x6c000000, 0xfc000000, "x,j(b)", pa10},
! { "ldwx", 0x0c000080, 0xfc001fc0, "cxx(s,b),t", pa10},
! { "ldwx", 0x0c000080, 0xfc001fc0, "cxx(b),t", pa10},
! { "ldhx", 0x0c000040, 0xfc001fc0, "cxx(s,b),t", pa10},
! { "ldhx", 0x0c000040, 0xfc001fc0, "cxx(b),t", pa10},
! { "ldbx", 0x0c000000, 0xfc001fc0, "cxx(s,b),t", pa10},
! { "ldbx", 0x0c000000, 0xfc001fc0, "cxx(b),t", pa10},
! { "ldwax", 0x0c000180, 0xfc00dfc0, "cxx(b),t", pa10},
! { "ldcwx", 0x0c0001c0, 0xfc001fc0, "cxx(s,b),t", pa10},
! { "ldcwx", 0x0c0001c0, 0xfc001fc0, "cxx(b),t", pa10},
! { "ldws", 0x0c001080, 0xfc001fc0, "cm5(s,b),t", pa10},
! { "ldws", 0x0c001080, 0xfc001fc0, "cm5(b),t", pa10},
! { "ldhs", 0x0c001040, 0xfc001fc0, "cm5(s,b),t", pa10},
! { "ldhs", 0x0c001040, 0xfc001fc0, "cm5(b),t", pa10},
! { "ldbs", 0x0c001000, 0xfc001fc0, "cm5(s,b),t", pa10},
! { "ldbs", 0x0c001000, 0xfc001fc0, "cm5(b),t", pa10},
! { "ldwas", 0x0c001180, 0xfc00dfc0, "cm5(b),t", pa10},
! { "ldcws", 0x0c0011c0, 0xfc001fc0, "cm5(s,b),t", pa10},
! { "ldcws", 0x0c0011c0, 0xfc001fc0, "cm5(b),t", pa10},
! { "stws", 0x0c001280, 0xfc001fc0, "cmx,V(s,b)", pa10},
! { "stws", 0x0c001280, 0xfc001fc0, "cmx,V(b)", pa10},
! { "sths", 0x0c001240, 0xfc001fc0, "cmx,V(s,b)", pa10},
! { "sths", 0x0c001240, 0xfc001fc0, "cmx,V(b)", pa10},
! { "stbs", 0x0c001200, 0xfc001fc0, "cmx,V(s,b)", pa10},
! { "stbs", 0x0c001200, 0xfc001fc0, "cmx,V(b)", pa10},
! { "stwas", 0x0c001380, 0xfc00dfc0, "cmx,V(b)", pa10},
! { "stbys", 0x0c001300, 0xfc001fc0, "csx,V(s,b)", pa10},
! { "stbys", 0x0c001300, 0xfc001fc0, "csx,V(b)", pa10},
/* Immediate instructions. */
{ "ldo", 0x34000000, 0xfc00c000, "j(b),x", pa10},
***************
*** 409,428 ****
{ "probew", 0x040011c0, 0xfc003fe0, "(b),x,t", pa10},
{ "probewi", 0x040031c0, 0xfc003fe0, "(s,b),R,t", pa10},
{ "probewi", 0x040031c0, 0xfc003fe0, "(b),R,t", pa10},
! { "lpa", 0x04001340, 0xfc003fc0, "Zx(s,b),t", pa10},
! { "lpa", 0x04001340, 0xfc003fc0, "Zx(b),t", pa10},
! { "lha", 0x04001300, 0xfc003fc0, "Zx(s,b),t", pa10},
! { "lha", 0x04001300, 0xfc003fc0, "Zx(b),t", pa10},
{ "lci", 0x04001300, 0xfc003fe0, "x(s,b),t", pa10},
{ "lci", 0x04001300, 0xfc003fe0, "x(b),t", pa10},
! { "pdtlb", 0x04001200, 0xfc003fdf, "Zx(s,b)", pa10},
! { "pdtlb", 0x04001200, 0xfc003fdf, "Zx(b)", pa10},
! { "pitlb", 0x04000200, 0xfc001fdf, "Zx(S,b)", pa10},
! { "pitlb", 0x04000200, 0xfc001fdf, "Zx(b)", pa10},
! { "pdtlbe", 0x04001240, 0xfc003fdf, "Zx(s,b)", pa10},
! { "pdtlbe", 0x04001240, 0xfc003fdf, "Zx(b)", pa10},
! { "pitlbe", 0x04000240, 0xfc001fdf, "Zx(S,b)", pa10},
! { "pitlbe", 0x04000240, 0xfc001fdf, "Zx(b)", pa10},
{ "idtlba", 0x04001040, 0xfc003fff, "x,(s,b)", pa10},
{ "idtlba", 0x04001040, 0xfc003fff, "x,(b)", pa10},
{ "iitlba", 0x04000040, 0xfc001fff, "x,(S,b)", pa10},
--- 412,431 ----
{ "probew", 0x040011c0, 0xfc003fe0, "(b),x,t", pa10},
{ "probewi", 0x040031c0, 0xfc003fe0, "(s,b),R,t", pa10},
{ "probewi", 0x040031c0, 0xfc003fe0, "(b),R,t", pa10},
! { "lpa", 0x04001340, 0xfc003fc0, "cZx(s,b),t", pa10},
! { "lpa", 0x04001340, 0xfc003fc0, "cZx(b),t", pa10},
! { "lha", 0x04001300, 0xfc003fc0, "cZx(s,b),t", pa10},
! { "lha", 0x04001300, 0xfc003fc0, "cZx(b),t", pa10},
{ "lci", 0x04001300, 0xfc003fe0, "x(s,b),t", pa10},
{ "lci", 0x04001300, 0xfc003fe0, "x(b),t", pa10},
! { "pdtlb", 0x04001200, 0xfc003fdf, "cZx(s,b)", pa10},
! { "pdtlb", 0x04001200, 0xfc003fdf, "cZx(b)", pa10},
! { "pitlb", 0x04000200, 0xfc001fdf, "cZx(S,b)", pa10},
! { "pitlb", 0x04000200, 0xfc001fdf, "cZx(b)", pa10},
! { "pdtlbe", 0x04001240, 0xfc003fdf, "cZx(s,b)", pa10},
! { "pdtlbe", 0x04001240, 0xfc003fdf, "cZx(b)", pa10},
! { "pitlbe", 0x04000240, 0xfc001fdf, "cZx(S,b)", pa10},
! { "pitlbe", 0x04000240, 0xfc001fdf, "cZx(b)", pa10},
{ "idtlba", 0x04001040, 0xfc003fff, "x,(s,b)", pa10},
{ "idtlba", 0x04001040, 0xfc003fff, "x,(b)", pa10},
{ "iitlba", 0x04000040, 0xfc001fff, "x,(S,b)", pa10},
***************
*** 431,446 ****
{ "idtlbp", 0x04001000, 0xfc003fff, "x,(b)", pa10},
{ "iitlbp", 0x04000000, 0xfc001fff, "x,(S,b)", pa10},
{ "iitlbp", 0x04000000, 0xfc001fff, "x,(b)", pa10},
! { "pdc", 0x04001380, 0xfc003fdf, "Zx(s,b)", pa10},
! { "pdc", 0x04001380, 0xfc003fdf, "Zx(b)", pa10},
! { "fdc", 0x04001280, 0xfc003fdf, "Zx(s,b)", pa10},
! { "fdc", 0x04001280, 0xfc003fdf, "Zx(b)", pa10},
! { "fic", 0x04000280, 0xfc001fdf, "Zx(S,b)", pa10},
! { "fic", 0x04000280, 0xfc001fdf, "Zx(b)", pa10},
! { "fdce", 0x040012c0, 0xfc003fdf, "Zx(s,b)", pa10},
! { "fdce", 0x040012c0, 0xfc003fdf, "Zx(b)", pa10},
! { "fice", 0x040002c0, 0xfc001fdf, "Zx(S,b)", pa10},
! { "fice", 0x040002c0, 0xfc001fdf, "Zx(b)", pa10},
{ "diag", 0x14000000, 0xfc000000, "D", pa10},
/* These may be specific to certain versions of the PA. Joel claimed
--- 434,449 ----
{ "idtlbp", 0x04001000, 0xfc003fff, "x,(b)", pa10},
{ "iitlbp", 0x04000000, 0xfc001fff, "x,(S,b)", pa10},
{ "iitlbp", 0x04000000, 0xfc001fff, "x,(b)", pa10},
! { "pdc", 0x04001380, 0xfc003fdf, "cZx(s,b)", pa10},
! { "pdc", 0x04001380, 0xfc003fdf, "cZx(b)", pa10},
! { "fdc", 0x04001280, 0xfc003fdf, "cZx(s,b)", pa10},
! { "fdc", 0x04001280, 0xfc003fdf, "cZx(b)", pa10},
! { "fic", 0x04000280, 0xfc001fdf, "cZx(S,b)", pa10},
! { "fic", 0x04000280, 0xfc001fdf, "cZx(b)", pa10},
! { "fdce", 0x040012c0, 0xfc003fdf, "cZx(s,b)", pa10},
! { "fdce", 0x040012c0, 0xfc003fdf, "cZx(b)", pa10},
! { "fice", 0x040002c0, 0xfc001fdf, "cZx(S,b)", pa10},
! { "fice", 0x040002c0, 0xfc001fdf, "cZx(b)", pa10},
{ "diag", 0x14000000, 0xfc000000, "D", pa10},
/* These may be specific to certain versions of the PA. Joel claimed
***************
*** 455,487 ****
/* gfw and gfr are not in the HP PA 1.1 manual, but they are in either
the Timex FPU or the Mustang ERS (not sure which) manual. */
! { "gfw", 0x04001680, 0xfc003fdf, "Zx(s,b)", pa11},
! { "gfw", 0x04001680, 0xfc003fdf, "Zx(b)", pa11},
! { "gfr", 0x04001a80, 0xfc003fdf, "Zx(s,b)", pa11},
! { "gfr", 0x04001a80, 0xfc003fdf, "Zx(b)", pa11},
/* Floating Point Coprocessor Instructions */
! { "fldwx", 0x24000000, 0xfc001f80, "cx(s,b),v", pa10},
! { "fldwx", 0x24000000, 0xfc001f80, "cx(b),v", pa10},
! { "flddx", 0x2c000000, 0xfc001fc0, "cx(s,b),y", pa10},
! { "flddx", 0x2c000000, 0xfc001fc0, "cx(b),y", pa10},
! { "fstwx", 0x24000200, 0xfc001f80, "cv,x(s,b)", pa10},
! { "fstwx", 0x24000200, 0xfc001f80, "cv,x(b)", pa10},
! { "fstdx", 0x2c000200, 0xfc001fc0, "cy,x(s,b)", pa10},
! { "fstdx", 0x2c000200, 0xfc001fc0, "cy,x(b)", pa10},
! { "fstqx", 0x3c000200, 0xfc001fc0, "cy,x(s,b)", pa10},
! { "fstqx", 0x3c000200, 0xfc001fc0, "cy,x(b)", pa10},
! { "fldws", 0x24001000, 0xfc001f80, "C5(s,b),v", pa10},
! { "fldws", 0x24001000, 0xfc001f80, "C5(b),v", pa10},
! { "fldds", 0x2c001000, 0xfc001fc0, "C5(s,b),y", pa10},
! { "fldds", 0x2c001000, 0xfc001fc0, "C5(b),y", pa10},
! { "fstws", 0x24001200, 0xfc001f80, "Cv,5(s,b)", pa10},
! { "fstws", 0x24001200, 0xfc001f80, "Cv,5(b)", pa10},
! { "fstds", 0x2c001200, 0xfc001fc0, "Cy,5(s,b)", pa10},
! { "fstds", 0x2c001200, 0xfc001fc0, "Cy,5(b)", pa10},
! { "fstqs", 0x3c001200, 0xfc001fc0, "Cy,5(s,b)", pa10},
! { "fstqs", 0x3c001200, 0xfc001fc0, "Cy,5(b)", pa10},
{ "fadd", 0x30000600, 0xfc00e7e0, "FE,X,v", pa10},
{ "fadd", 0x38000600, 0xfc00e720, "IJ,K,v", pa10},
{ "fsub", 0x30002600, 0xfc00e7e0, "FE,X,v", pa10},
--- 458,490 ----
/* gfw and gfr are not in the HP PA 1.1 manual, but they are in either
the Timex FPU or the Mustang ERS (not sure which) manual. */
! { "gfw", 0x04001680, 0xfc003fdf, "cZx(s,b)", pa11},
! { "gfw", 0x04001680, 0xfc003fdf, "cZx(b)", pa11},
! { "gfr", 0x04001a80, 0xfc003fdf, "cZx(s,b)", pa11},
! { "gfr", 0x04001a80, 0xfc003fdf, "cZx(b)", pa11},
/* Floating Point Coprocessor Instructions */
! { "fldwx", 0x24000000, 0xfc001f80, "cxx(s,b),v", pa10},
! { "fldwx", 0x24000000, 0xfc001f80, "cxx(b),v", pa10},
! { "flddx", 0x2c000000, 0xfc001fc0, "cxx(s,b),y", pa10},
! { "flddx", 0x2c000000, 0xfc001fc0, "cxx(b),y", pa10},
! { "fstwx", 0x24000200, 0xfc001f80, "cxv,x(s,b)", pa10},
! { "fstwx", 0x24000200, 0xfc001f80, "cxv,x(b)", pa10},
! { "fstdx", 0x2c000200, 0xfc001fc0, "cxy,x(s,b)", pa10},
! { "fstdx", 0x2c000200, 0xfc001fc0, "cxy,x(b)", pa10},
! { "fstqx", 0x3c000200, 0xfc001fc0, "cxy,x(s,b)", pa10},
! { "fstqx", 0x3c000200, 0xfc001fc0, "cxy,x(b)", pa10},
! { "fldws", 0x24001000, 0xfc001f80, "cm5(s,b),v", pa10},
! { "fldws", 0x24001000, 0xfc001f80, "cm5(b),v", pa10},
! { "fldds", 0x2c001000, 0xfc001fc0, "cm5(s,b),y", pa10},
! { "fldds", 0x2c001000, 0xfc001fc0, "cm5(b),y", pa10},
! { "fstws", 0x24001200, 0xfc001f80, "cmv,5(s,b)", pa10},
! { "fstws", 0x24001200, 0xfc001f80, "cmv,5(b)", pa10},
! { "fstds", 0x2c001200, 0xfc001fc0, "cmy,5(s,b)", pa10},
! { "fstds", 0x2c001200, 0xfc001fc0, "cmy,5(b)", pa10},
! { "fstqs", 0x3c001200, 0xfc001fc0, "cmy,5(s,b)", pa10},
! { "fstqs", 0x3c001200, 0xfc001fc0, "cmy,5(b)", pa10},
{ "fadd", 0x30000600, 0xfc00e7e0, "FE,X,v", pa10},
{ "fadd", 0x38000600, 0xfc00e720, "IJ,K,v", pa10},
{ "fsub", 0x30002600, 0xfc00e7e0, "FE,X,v", pa10},
***************
*** 530,551 ****
{ "spop2", 0x10000400, 0xfc000600, "f,1Nb", pa10},
{ "spop3", 0x10000600, 0xfc000600, "f,0Nx,b", pa10},
{ "copr", 0x30000000, 0xfc000000, "u,2N", pa10},
! { "cldwx", 0x24000000, 0xfc001e00, "ucx(s,b),t", pa10},
! { "cldwx", 0x24000000, 0xfc001e00, "ucx(b),t", pa10},
! { "clddx", 0x2c000000, 0xfc001e00, "ucx(s,b),t", pa10},
! { "clddx", 0x2c000000, 0xfc001e00, "ucx(b),t", pa10},
! { "cstwx", 0x24000200, 0xfc001e00, "uct,x(s,b)", pa10},
! { "cstwx", 0x24000200, 0xfc001e00, "uct,x(b)", pa10},
! { "cstdx", 0x2c000200, 0xfc001e00, "uct,x(s,b)", pa10},
! { "cstdx", 0x2c000200, 0xfc001e00, "uct,x(b)", pa10},
! { "cldws", 0x24001000, 0xfc001e00, "uC5(s,b),t", pa10},
! { "cldws", 0x24001000, 0xfc001e00, "uC5(b),t", pa10},
! { "cldds", 0x2c001000, 0xfc001e00, "uC5(s,b),t", pa10},
! { "cldds", 0x2c001000, 0xfc001e00, "uC5(b),t", pa10},
! { "cstws", 0x24001200, 0xfc001e00, "uCt,5(s,b)", pa10},
! { "cstws", 0x24001200, 0xfc001e00, "uCt,5(b)", pa10},
! { "cstds", 0x2c001200, 0xfc001e00, "uCt,5(s,b)", pa10},
! { "cstds", 0x2c001200, 0xfc001e00, "uCt,5(b)", pa10},
};
#define NUMOPCODES ((sizeof pa_opcodes)/(sizeof pa_opcodes[0]))
--- 533,554 ----
{ "spop2", 0x10000400, 0xfc000600, "f,1Nb", pa10},
{ "spop3", 0x10000600, 0xfc000600, "f,0Nx,b", pa10},
{ "copr", 0x30000000, 0xfc000000, "u,2N", pa10},
! { "cldwx", 0x24000000, 0xfc001e00, "ucxx(s,b),t", pa10},
! { "cldwx", 0x24000000, 0xfc001e00, "ucxx(b),t", pa10},
! { "clddx", 0x2c000000, 0xfc001e00, "ucxx(s,b),t", pa10},
! { "clddx", 0x2c000000, 0xfc001e00, "ucxx(b),t", pa10},
! { "cstwx", 0x24000200, 0xfc001e00, "ucxt,x(s,b)", pa10},
! { "cstwx", 0x24000200, 0xfc001e00, "ucxt,x(b)", pa10},
! { "cstdx", 0x2c000200, 0xfc001e00, "ucxt,x(s,b)", pa10},
! { "cstdx", 0x2c000200, 0xfc001e00, "ucxt,x(b)", pa10},
! { "cldws", 0x24001000, 0xfc001e00, "ucm5(s,b),t", pa10},
! { "cldws", 0x24001000, 0xfc001e00, "ucm5(b),t", pa10},
! { "cldds", 0x2c001000, 0xfc001e00, "ucm5(s,b),t", pa10},
! { "cldds", 0x2c001000, 0xfc001e00, "ucm5(b),t", pa10},
! { "cstws", 0x24001200, 0xfc001e00, "ucmt,5(s,b)", pa10},
! { "cstws", 0x24001200, 0xfc001e00, "ucmt,5(b)", pa10},
! { "cstds", 0x2c001200, 0xfc001e00, "ucmt,5(s,b)", pa10},
! { "cstds", 0x2c001200, 0xfc001e00, "ucmt,5(b)", pa10},
};
#define NUMOPCODES ((sizeof pa_opcodes)/(sizeof pa_opcodes[0]))
*** pa-prev/gas/config/tc-hppa.c Thu Jul 15 14:18:22 1999
--- gas-src/gas/config/tc-hppa.c Thu Jul 15 13:56:00 1999
***************
*** 1649,1740 ****
dis_assemble_3 (num, &num);
INSERT_FIELD_AND_CONTINUE (opcode, num, 13);
! /* Handle a completer for an indexing load or store. */
case 'c':
! {
! int uu = 0;
! int m = 0;
! int i = 0;
! while (*s == ',' && i < 2)
{
! s++;
! if (strncasecmp (s, "sm", 2) == 0)
{
uu = 1;
m = 1;
s++;
i++;
}
! else if (strncasecmp (s, "m", 1) == 0)
! m = 1;
! else if (strncasecmp (s, "s", 1) == 0)
! uu = 1;
! else
! as_bad (_("Invalid Indexed Load Completer."));
! s++;
! i++;
}
- if (i > 2)
- as_bad (_("Invalid Indexed Load Completer Syntax."));
- opcode |= m << 5;
- INSERT_FIELD_AND_CONTINUE (opcode, uu, 13);
- }
! /* Handle a short load/store completer. */
! case 'C':
! {
! int a = 0;
! int m = 0;
! if (*s == ',')
{
! s++;
! if (strncasecmp (s, "ma", 2) == 0)
{
a = 0;
m = 1;
}
! else if (strncasecmp (s, "mb", 2) == 0)
{
a = 1;
m = 1;
}
! else
! as_bad (_("Invalid Short Load/Store Completer."));
! s += 2;
}
! if (*args == 'C')
{
opcode |= m << 5;
INSERT_FIELD_AND_CONTINUE (opcode, a, 13);
}
- }
! /* Handle a stbys completer. */
! case 'Y':
! {
! int a = 0;
! int m = 0;
! int i = 0;
! while (*s == ',' && i < 2)
{
! s++;
! if (strncasecmp (s, "m", 1) == 0)
! m = 1;
! else if (strncasecmp (s, "b", 1) == 0)
! a = 0;
! else if (strncasecmp (s, "e", 1) == 0)
! a = 1;
! else
! as_bad (_("Invalid Store Bytes Short Completer"));
! s++;
! i++;
}
! if (i > 2)
! as_bad (_("Invalid Store Bytes Short Completer"));
! opcode |= m << 5;
! INSERT_FIELD_AND_CONTINUE (opcode, a, 13);
! }
/* Handle all conditions. */
--- 1649,1757 ----
dis_assemble_3 (num, &num);
INSERT_FIELD_AND_CONTINUE (opcode, num, 13);
! /* Handle all completers. */
case 'c':
! switch (*++args)
! {
!
! /* Handle a completer for an indexing load or store. */
! case 'x':
{
! int uu = 0;
! int m = 0;
! int i = 0;
! while (*s == ',' && i < 2)
! {
! s++;
! if (strncasecmp (s, "sm", 2) == 0)
{
uu = 1;
m = 1;
s++;
i++;
}
! else if (strncasecmp (s, "m", 1) == 0)
! m = 1;
! else if (strncasecmp (s, "s", 1) == 0)
! uu = 1;
! else
! as_bad (_("Invalid Indexed Load Completer."));
! s++;
! i++;
! }
! if (i > 2)
! as_bad (_("Invalid Indexed Load Completer Syntax."));
! opcode |= m << 5;
! INSERT_FIELD_AND_CONTINUE (opcode, uu, 13);
}
! /* Handle a short load/store completer. */
! case 'm':
{
! int a = 0;
! int m = 0;
! if (*s == ',')
! {
! s++;
! if (strncasecmp (s, "ma", 2) == 0)
{
a = 0;
m = 1;
}
! else if (strncasecmp (s, "mb", 2) == 0)
{
a = 1;
m = 1;
}
! else
! as_bad (_("Invalid Short Load/Store Completer."));
! s += 2;
! }
!
! opcode |= m << 5;
! INSERT_FIELD_AND_CONTINUE (opcode, a, 13);
}
! /* Handle a stbys completer. */
! case 's':
{
+ int a = 0;
+ int m = 0;
+ int i = 0;
+ while (*s == ',' && i < 2)
+ {
+ s++;
+ if (strncasecmp (s, "m", 1) == 0)
+ m = 1;
+ else if (strncasecmp (s, "b", 1) == 0)
+ a = 0;
+ else if (strncasecmp (s, "e", 1) == 0)
+ a = 1;
+ else
+ as_bad (_("Invalid Store Bytes Short Completer"));
+ s++;
+ i++;
+ }
+ if (i > 2)
+ as_bad (_("Invalid Store Bytes Short Completer"));
opcode |= m << 5;
INSERT_FIELD_AND_CONTINUE (opcode, a, 13);
}
! /* Handle a system control completer. */
! case 'Z':
! if (*s == ',' && (*(s + 1) == 'm' || *(s + 1) == 'M'))
{
! flag = 1;
! s += 2;
}
! else
! flag = 0;
!
! INSERT_FIELD_AND_CONTINUE (opcode, flag, 5);
!
! }
! break;
/* Handle all conditions. */
***************
*** 2216,2233 ****
break;
}
-
- /* Handle a system control completer. */
- case 'Z':
- if (*s == ',' && (*(s + 1) == 'm' || *(s + 1) == 'M'))
- {
- flag = 1;
- s += 2;
- }
- else
- flag = 0;
-
- INSERT_FIELD_AND_CONTINUE (opcode, flag, 5);
/* Handle a nullification completer for branch instructions. */
case 'n':
--- 2233,2238 ----
*** pa-prev/opcodes/hppa-dis.c Thu Jul 15 14:18:23 1999
--- gas-src/opcodes/hppa-dis.c Thu Jul 15 13:13:38 1999
***************
*** 326,332 ****
(*info->fprintf_func) (info->stream, "%s", opcode->name);
! if (!strchr ("*cfCY<?!@-+&U>~nHNZFIMadu|", opcode->args[0]))
(*info->fprintf_func) (info->stream, " ");
for (s = opcode->args; *s != '\0'; ++s)
{
--- 326,332 ----
(*info->fprintf_func) (info->stream, "%s", opcode->name);
! if (!strchr ("*cf<?!@-+&U>~nHNFIMadu|", opcode->args[0]))
(*info->fprintf_func) (info->stream, " ");
for (s = opcode->args; *s != '\0'; ++s)
{
***************
*** 418,434 ****
case 'S':
(*info->fprintf_func) (info->stream, "sr%d", extract_3 (insn));
break;
case 'c':
! (*info->fprintf_func) (info->stream, "%s ",
! index_compl_names[GET_COMPL (insn)]);
! break;
! case 'C':
! (*info->fprintf_func) (info->stream, "%s ",
! short_ldst_compl_names[GET_COMPL (insn)]);
! break;
! case 'Y':
! (*info->fprintf_func) (info->stream, "%s ",
! short_bytes_compl_names[GET_COMPL (insn)]);
break;
/* Handle conditions */
--- 418,447 ----
case 'S':
(*info->fprintf_func) (info->stream, "sr%d", extract_3 (insn));
break;
+
+ /* Handle completers */
case 'c':
! switch (*++s)
! {
! case 'x':
! (*info->fprintf_func) (info->stream, "%s ",
! index_compl_names[GET_COMPL (insn)]);
! break;
! case 'm':
! (*info->fprintf_func) (info->stream, "%s ",
! short_ldst_compl_names[GET_COMPL (insn)]);
! break;
! case 's':
! (*info->fprintf_func) (info->stream, "%s ",
! short_bytes_compl_names[GET_COMPL (insn)]);
! break;
! case 'Z':
! if (GET_FIELD (insn, 26, 26))
! (*info->fprintf_func) (info->stream, ",m ");
! else
! (*info->fprintf_func) (info->stream, " ");
! break;
! }
break;
/* Handle conditions */
***************
*** 604,615 ****
break;
case 'A':
fput_const (GET_FIELD (insn, 6, 18), info);
- break;
- case 'Z':
- if (GET_FIELD (insn, 26, 26))
- (*info->fprintf_func) (info->stream, ",m ");
- else
- (*info->fprintf_func) (info->stream, " ");
break;
case 'D':
fput_const (GET_FIELD (insn, 6, 31), info);
--- 617,622 ----
--
Jerry Quinn Tel: (514) 761-8737
jquinn@nortelnetworks.com Fax: (514) 761-8505
Speech Recognition Research
reply other threads:[~1999-07-15 11:31 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=15607.932063553.0@NO-ID-FOUND.mhonarc.org \
--to=jquinn@nortelnetworks.com \
--cc=binutils@sourceware.cygnus.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).