* pj.h (pj_opc_info_t): Add union.

	* pj-dis.c (print_insn_pj): Adjust for pj_opc_info_t change.

	* config/tc-pj.c (little, big, parse_exp_save_ilp): Prototype.
	(c_to_r, ipush_code, fake_opcode, alias): Likewise.
	(fake_opcode): Adjust for pj_opc_int_t change.
	(md_begin): Likewise.
	(md_assemble): Likewise.
	(ipush_code): Correct parse_exp_save_ilp call.  Test pending_reloc
	instead of non-existent third arg of parse_exp_save_ilp.
	(md_parse_option): Correct "little" and "big" calls.

diff --git a/include/opcode/ChangeLog b/include/opcode/ChangeLog
index 79771d8..2fe2f99 100644 (file)
--- a/include/opcode/ChangeLog
+++ b/include/opcode/ChangeLog
@@ -1,3 +1,7 @@
+2002-12-13  Alan Modra  <amodra@bigpond.net.au>
+
+       * pj.h (pj_opc_info_t): Add union.
+
 2002-12-04  David Mosberger  <davidm@hpl.hp.com>
 
        * ia64.h: Fix copyright message.

diff --git a/include/opcode/pj.h b/include/opcode/pj.h
index b768f11..5779507 100644 (file)
--- a/include/opcode/pj.h
+++ b/include/opcode/pj.h
@@ -36,11 +36,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define UNS(x)    (!!((x) & (1<<3)))
 
                   
-typedef struct 
+typedef struct pj_opc_info_t
 {
   short opcode;
   short opcode_next;
   char len;
   unsigned char arg[2];
-  const char *name;
+  union {
+    const char *name;
+    void (*func) PARAMS ((struct pj_opc_info_t *, char *));
+  } u;
 } pj_opc_info_t;

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index a6ff9ab..2cca6e0 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,5 +1,6 @@
 2002-12-13  Alan Modra  <amodra@bigpond.net.au>
 
+       * pj-dis.c (print_insn_pj): Adjust for pj_opc_info_t change.
        * z8kgen.c: Include "libiberty.h".
        (opt, args, toks): Fix initializer warnings.
        (chewname): Make "name" a char **.  Return mnemonic trimmed of

diff --git a/opcodes/pj-dis.c b/opcodes/pj-dis.c
index b8b81a9..50d1750 100644 (file)
--- a/opcodes/pj-dis.c
+++ b/opcodes/pj-dis.c
@@ -62,7 +62,7 @@ print_insn_pj (addr, info)
       unsigned char byte_2;
       if ((status = info->read_memory_func (addr + 1, &byte_2, 1, info)))
        goto fail;
-      fprintf_fn (stream, "%s\t", pj_opc_info[opcode + byte_2].name);
+      fprintf_fn (stream, "%s\t", pj_opc_info[opcode + byte_2].u.name);
       return 2;
     }
   else
@@ -72,12 +72,12 @@ print_insn_pj (addr, info)
       const pj_opc_info_t *op = &pj_opc_info[opcode];
       int a;
       addr++;
-      fprintf_fn (stream, "%s", op->name);
+      fprintf_fn (stream, "%s", op->u.name);
 
       /* The tableswitch instruction is followed by the default
         address, low value, high value and the destinations.  */
 
-      if (strcmp (op->name, "tableswitch") == 0)
+      if (strcmp (op->u.name, "tableswitch") == 0)
        {
          int lowval;
          int highval;
@@ -116,7 +116,7 @@ print_insn_pj (addr, info)
         address, element count and pairs of values and
         addresses.  */
 
-      if (strcmp (op->name, "lookupswitch") == 0)
+      if (strcmp (op->u.name, "lookupswitch") == 0)
        {
          int count;
          int val;