This commit was manufactured by cvs2svn to create tagcarlton_dictionary-20021223-merge

'carlton_dictionary-20021223-merge'.

Sprout from drow-cplus-branch 2003-10-14 22:28:29 UTC cvs2svn 'This commit was manufactured by cvs2svn to create branch 'drow-cplus-'
Cherrypick from master 2002-12-23 11:53:12 UTC Alan Modra <modra@gmail.com> '	* bfdlink.h (struct bfd_link_info): Add "strip_discarded".':
    COPYING.NEWLIB
    ChangeLog
    Makefile.def
    Makefile.in
    Makefile.tpl
    config/ChangeLog
    config/mh-cygwin
    configure
    configure.in
    include/ChangeLog
    include/ansidecl.h
    include/bfdlink.h
    include/coff/ChangeLog
    include/coff/ecoff.h
    include/coff/xcoff.h
    include/elf/ChangeLog
    include/elf/dwarf2.h
    include/elf/internal.h
    include/elf/m68hc11.h
    include/elf/mmix.h
    include/elf/sh.h
    include/elf/xstormy16.h
    include/getopt.h
    include/libiberty.h
    include/opcode/ChangeLog
    include/opcode/arc.h
    include/opcode/cgen.h
    include/opcode/h8300.h
    include/opcode/hppa.h
    include/opcode/i860.h
    include/opcode/ia64.h
    include/opcode/m88k.h
    include/opcode/ns32k.h
    include/opcode/pj.h
    include/opcode/tic4x.h
    include/partition.h
    ltcf-c.sh
    ltcf-gcj.sh
    src-release
Delete:
    config/acx.m4
    config/gettext.m4
    config/mpw-mh-mpw
    config/mpw/ChangeLog
    config/mpw/MoveIfChange
    config/mpw/README
    config/mpw/forward-include
    config/mpw/g-mpw-make.sed
    config/mpw/mpw-touch
    config/mpw/mpw-true
    config/mpw/null-command
    config/mpw/open-brace
    config/mpw/tr-7to8-src
    config/mpw/true
    config/no-executables.m4
    config/progtest.m4
    include/elf/iq2000.h
    include/elf/msp430.h
    include/elf/ppc64.h
    include/elf/xtensa.h
    include/gdb/fileio.h
    include/opcode/msp430.h
    include/xtensa-config.h
    include/xtensa-isa-internal.h
    include/xtensa-isa.h

1 files changed, 13 insertions, 17 deletions

diff --git a/include/opcode/ns32k.h b/include/opcode/ns32k.h
index 6b3fc5ea1..68a0dbaa4 100644
--- a/include/opcode/ns32k.h
+++ b/include/opcode/ns32k.h
@@ -1,5 +1,5 @@
 /* ns32k-opcode.h -- Opcode table for National Semi 32k processor
-   Copyright 1987, 1991, 1994 Free Software Foundation, Inc.
+   Copyright 1987, 1991, 1994, 2002 Free Software Foundation, Inc.
 
 This file is part of GAS, the GNU Assembler.
 
@@ -37,7 +37,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307
    the opcode or the addition of data to the opcode.
    The operands in the source instruction are checked for inconsistent
    semantics.
- 
+
 	F : 32 bit float	general form
 	L : 64 bit float	    "
 	B : byte		    "
@@ -80,13 +80,13 @@ column	1 	instructions
 	6 	size in bytes of immediate
 */
 struct ns32k_opcode {
-  char *name;
+  const char *name;
   unsigned char opcode_id_size; /* not used by the assembler */
   unsigned char opcode_size;
   unsigned long opcode_seed;
-  char *operands;
+  const char *operands;
   unsigned char im_size;	/* not used by dissassembler */
-  char *default_args;		/* default to those args when none given */
+  const char *default_args;	/* default to those args when none given */
   char default_modec;		/* default to this addr-mode when ambigous
 				   ie when the argument of a general addr-mode
 				   is a plain constant */
@@ -103,20 +103,20 @@ struct ns32k_opcode {
 struct not_wot			/* ns32k opcode table: wot to do with this */
 				/* particular opcode */
 {
-  int obits;		/* number of opcode bits */
-  int ibits;		/* number of instruction bits */
-  ns32k_opcodeT	code;	/* op-code (may be > 8 bits!) */
-  char *args;		/* how to compile said opcode */
+  int obits;			/* number of opcode bits */
+  int ibits;			/* number of instruction bits */
+  ns32k_opcodeT code;		/* op-code (may be > 8 bits!) */
+  const char *args;		/* how to compile said opcode */
 };
 
 struct not			/* ns32k opcode text */
 {
-  char *            name;	/* opcode name: lowercase string  [key]  */
-  struct not_wot    detail;	/* rest of opcode table          [datum] */
+  const char *name;		/* opcode name: lowercase string  [key]  */
+  struct not_wot detail;	/* rest of opcode table          [datum] */
 };
 
 /* Instructions look like this:
-    
+
    basic instruction--1, 2, or 3 bytes
    index byte for operand A, if operand A is indexed--1 byte
    index byte for operand B, if operand B is indexed--1 byte
@@ -130,7 +130,7 @@ struct not			/* ns32k opcode text */
    The implied operands are associated with operands other than A and B.
 
    Each operand has a digit and a letter.
-   
+
    The digit gives the position in the assembly language.  The letter,
    one of the following, tells us what kind of operand it is.  */
 
@@ -482,10 +482,6 @@ static const struct ns32k_opcode ns32k_opcodes[]=
   { "scalbl",	14,24,  0x10fe, "1L2Z",		8,	"",	DEF_MODEC,DEF_MODEL	},
 };
 
-static const int numopcodes=sizeof(ns32k_opcodes)/sizeof(ns32k_opcodes[0]);
-
-static const struct ns32k_opcode *const endop = ns32k_opcodes+sizeof(ns32k_opcodes)/sizeof(ns32k_opcodes[0]);
-
 #define MAX_ARGS 4
 #define ARG_LEN 50