* Makefile.in (SFILES): Add nlmread.c.

	* Makefile.in (OBS):  Add nlmread.o.
	* Makefile.in (nlmread.o):  Add new target.
	* configure.in (i[34]86-*-netware):  New configuration.
	* nlmread.c, config/i386/{i386nw.mt, tm-i386nw.h}:  New files
	for NLM/NetWare support.

8 files changed, 354 insertions, 6 deletions

diff --git a/gdb/.Sanitize b/gdb/.Sanitize
index b06b7bf255c..efc2df98430 100644
--- a/gdb/.Sanitize
+++ b/gdb/.Sanitize
@@ -161,6 +161,7 @@ munch
 news-xdep.c
 nindy-share
 nindy-tdep.c
+nlmread.c
 ns32k-opcode.h
 ns32k-pinsn.c
 objfiles.c
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a654c976a6d..b061b2ebe6a 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+Mon Jul 19 21:29:14 1993  Fred Fish  (fnf@deneb.cygnus.com)
+
+	* Makefile.in (SFILES):  Add nlmread.c.
+	* Makefile.in (OBS):  Add nlmread.o.
+	* Makefile.in (nlmread.o):  Add new target.
+	* configure.in (i[34]86-*-netware):  New configuration.
+	* nlmread.c, config/i386/{i386nw.mt, tm-i386nw.h}:  New files
+	for NLM/NetWare support.
+
 Mon Jul 19 11:48:57 1993  Jim Kingdon  (kingdon@deneb.cygnus.com)
 
 	* symtab.h (enum minimal_symbol_type): Add mst_file_*.
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 353c4062ac2..c2c1eccc456 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -287,10 +287,10 @@ SFILES = blockframe.c breakpoint.c buildsym.c c-exp.y c-lang.c \
 	dbxread.c demangle.c dwarfread.c elfread.c environ.c eval.c expprint.c \
 	findvar.c gdbtypes.c infcmd.c inflow.c infrun.c language.c putenv.c \
 	m2-exp.y m2-lang.c m2-typeprint.c m2-valprint.c main.c maint.c \
-	mem-break.c minsyms.c mipsread.c objfiles.c parse.c printcmd.c \
-	remote.c source.c stabsread.c stack.c symfile.c symmisc.c symtab.c \
-	target.c typeprint.c utils.c valarith.c valops.c valprint.c values.c \
-	serial.c ser-unix.c
+	mem-break.c minsyms.c mipsread.c nlmread.c objfiles.c parse.c \
+	printcmd.c remote.c source.c stabsread.c stack.c symfile.c symmisc.c \
+	symtab.c target.c typeprint.c utils.c valarith.c valops.c valprint.c \
+	values.c serial.c ser-unix.c
 
 # Files that are not source code, but need to go into
 # gdb-$(VERSION).tar.Z.
@@ -397,7 +397,7 @@ TARFILES = $(SFILES) $(HFILES) $(NONSRC) $(ALLDEPFILES) $(ALLCONFIG) \
 	$(ALLPARAM) $(INFOFILES) $(POSSLIBS) $(REMOTE_EXAMPLES)
 
 
-OBS = version.o main.o blockframe.o breakpoint.o findvar.o stack.o \
+OBS =	version.o main.o blockframe.o breakpoint.o findvar.o stack.o \
 	source.o values.o eval.o valops.o valarith.o valprint.o printcmd.o \
 	symtab.o symfile.o symmisc.o infcmd.o infrun.o remote.o command.o \
 	utils.o expprint.o environ.o gdbtypes.o copying.o $(DEPFILES) \
@@ -405,7 +405,8 @@ OBS = version.o main.o blockframe.o breakpoint.o findvar.o stack.o \
 	objfiles.o minsyms.o maint.o demangle.o dbxread.o coffread.o elfread.o \
 	dwarfread.o mipsread.o stabsread.o core.o c-lang.o ch-lang.o m2-lang.o \
 	complaints.o typeprint.o c-typeprint.o ch-typeprint.o m2-typeprint.o \
-	c-valprint.o cp-valprint.o ch-valprint.o m2-valprint.o serial.o
+	c-valprint.o cp-valprint.o ch-valprint.o m2-valprint.o nlmread.o \
+	serial.o
 
 RAPP_OBS = rgdb.o rudp.o rserial.o serial.o udp.o $(XDEPFILES)
 
@@ -1131,6 +1132,9 @@ nindy.o: nindy-share/nindy.c $(wait_h) nindy-share/block_io.h \
 	nindy-share/env.h nindy-share/ttycntl.h
 	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/nindy-share/nindy.c
 
+nlmread.o: nlmread.c $(bfd_h) buildsym.h complaints.h $(defs_h) \
+	gdb-stabs.h objfiles.h symfile.h $(symtab_h)
+
 ttybreak.o: nindy-share/ttybreak.c nindy-share/ttycntl.h 
 	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/nindy-share/ttybreak.c
 
diff --git a/gdb/config/i386/.Sanitize b/gdb/config/i386/.Sanitize
index 426d4ce7fa0..ae46d2eb334 100644
--- a/gdb/config/i386/.Sanitize
+++ b/gdb/config/i386/.Sanitize
@@ -30,6 +30,7 @@ i386bsd.mt
 i386lynx.mh
 i386lynx.mt
 i386mach.mh
+i386nw.mt
 i386sco.mh
 i386sco4.mh
 i386sol2.mh
@@ -60,6 +61,7 @@ symmetry.mt
 tm-i386aix.h
 tm-i386bsd.h
 tm-i386lynx.h
+tm-i386nw.h
 tm-i386v.h
 tm-i386v4.h
 tm-linux.h
diff --git a/gdb/config/i386/i386nw.mt b/gdb/config/i386/i386nw.mt
new file mode 100644
index 00000000000..fa30f080913
--- /dev/null
+++ b/gdb/config/i386/i386nw.mt
@@ -0,0 +1,3 @@
+# Target: Intel 386 running NetWare
+TDEPFILES= i386-tdep.o i386-pinsn.o
+TM_FILE= tm-i386nw.h
diff --git a/gdb/config/i386/tm-i386nw.h b/gdb/config/i386/tm-i386nw.h
new file mode 100644
index 00000000000..8cab4169337
--- /dev/null
+++ b/gdb/config/i386/tm-i386nw.h
@@ -0,0 +1,27 @@
+/* Macro definitions for i386 running under Univel NetWare.
+   Copyright 1993 Free Software Foundation, Inc.
+
+This file is part of GDB.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+
+/* Override number of expected traps from sysv. */
+#define START_INFERIOR_TRAPS_EXPECTED 2
+
+/* FIXME:  tm-i386v.h seems to be used in a lot of target config files as a
+   generic i386 target config file.  The parts that are truely generic should
+   be extracted out and placed in a tm-i386.h file that all the others,
+   including tm-i386v.h, includes as needed. */
+#include "i386/tm-i386v.h"
diff --git a/gdb/configure.in b/gdb/configure.in
index 1486df82f0f..795dff06293 100644
--- a/gdb/configure.in
+++ b/gdb/configure.in
@@ -187,6 +187,7 @@ i[34]86-*-sco*)		gdb_target=i386v ;;
 i[34]86-*-sysv*)	gdb_target=i386v ;;
 i[34]86-*-linux*)	gdb_target=linux ;;
 i[34]86-*-isc*)		gdb_target=i386v ;;
+i[34]86-*-netware*)	gdb_target=i386nw ;;
 
 i960-*-bout)		gdb_target=vxworks960 ;;
 i960-*-coff)		gdb_target=nindy960 ;;
diff --git a/gdb/nlmread.c b/gdb/nlmread.c
new file mode 100644
index 00000000000..54e91aa8171
--- /dev/null
+++ b/gdb/nlmread.c
@@ -0,0 +1,301 @@
+/* Read NLM (NetWare Loadable Module) format executable files for GDB.
+   Copyright 1993 Free Software Foundation, Inc.
+   Written by Fred Fish at Cygnus Support (fnf@cygnus.com).
+
+This file is part of GDB.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+
+#include "defs.h"
+#include "bfd.h"
+#include "symtab.h"
+#include "symfile.h"
+#include "objfiles.h"
+#include "gdb-stabs.h"
+
+static void
+nlm_new_init PARAMS ((struct objfile *));
+
+static void
+nlm_symfile_init PARAMS ((struct objfile *));
+
+static void
+nlm_symfile_read PARAMS ((struct objfile *, struct section_offsets *, int));
+
+static void
+nlm_symfile_finish PARAMS ((struct objfile *));
+
+static void
+nlm_symtab_read PARAMS ((bfd *,  CORE_ADDR, struct objfile *));
+
+static struct section_offsets *
+nlm_symfile_offsets PARAMS ((struct objfile *, CORE_ADDR));
+
+static void
+record_minimal_symbol PARAMS ((char *, CORE_ADDR, enum minimal_symbol_type,
+			       struct objfile *));
+
+
+/* Initialize anything that needs initializing when a completely new symbol
+   file is specified (not just adding some symbols from another file, e.g. a
+   shared library).
+
+   We reinitialize buildsym, since gdb will be able to read stabs from an NLM
+   file at some point in the near future.  */
+
+static void
+nlm_new_init (ignore)
+     struct objfile *ignore;
+{
+  stabsread_new_init ();
+  buildsym_new_init ();
+}
+
+
+/* NLM specific initialization routine for reading symbols.
+
+   It is passed a pointer to a struct sym_fns which contains, among other
+   things, the BFD for the file whose symbols are being read, and a slot for
+   a pointer to "private data" which we can fill with goodies.
+
+   For now at least, we have nothing in particular to do, so this function is
+   just a stub. */
+
+static void
+nlm_symfile_init (ignore)
+     struct objfile *ignore;
+{
+}
+
+static void
+record_minimal_symbol (name, address, ms_type, objfile)
+     char *name;
+     CORE_ADDR address;
+     enum minimal_symbol_type ms_type;
+     struct objfile *objfile;
+{
+  name = obsavestring (name, strlen (name), &objfile -> symbol_obstack);
+  prim_record_minimal_symbol (name, address, ms_type);
+}
+
+
+/*
+
+LOCAL FUNCTION
+
+	nlm_symtab_read -- read the symbol table of an NLM file
+
+SYNOPSIS
+
+	void nlm_symtab_read (bfd *abfd, CORE_ADDR addr,
+			      struct objfile *objfile)
+
+DESCRIPTION
+
+	Given an open bfd, a base address to relocate symbols to, and a
+	flag that specifies whether or not this bfd is for an executable
+	or not (may be shared library for example), add all the global
+	function and data symbols to the minimal symbol table.
+*/
+
+static void
+nlm_symtab_read (abfd, addr, objfile)
+     bfd *abfd;
+     CORE_ADDR addr;
+     struct objfile *objfile;
+{
+  unsigned int storage_needed;
+  asymbol *sym;
+  asymbol **symbol_table;
+  unsigned int number_of_symbols;
+  unsigned int i;
+  int index;
+  struct cleanup *back_to;
+  CORE_ADDR symaddr;
+  enum minimal_symbol_type ms_type;
+  
+  storage_needed = get_symtab_upper_bound (abfd);
+  if (storage_needed > 0)
+    {
+      symbol_table = (asymbol **) xmalloc (storage_needed);
+      back_to = make_cleanup (free, symbol_table);
+      number_of_symbols = bfd_canonicalize_symtab (abfd, symbol_table); 
+  
+      for (i = 0; i < number_of_symbols; i++)
+	{
+	  sym = symbol_table[i];
+	  if (sym -> flags & BSF_GLOBAL)
+	    {
+	      /* Bfd symbols are section relative. */
+	      symaddr = sym -> value + sym -> section -> vma;
+	      /* Relocate all non-absolute symbols by base address.  */
+	      if (sym -> section != &bfd_abs_section)
+		{
+		  symaddr += addr;
+		}
+
+	      /* For non-absolute symbols, use the type of the section
+		 they are relative to, to intuit text/data.  Bfd provides
+		 no way of figuring this out for absolute symbols. */
+	      if (sym -> section -> flags & SEC_CODE)
+		{
+		  ms_type = mst_text;
+		}
+	      else if (sym -> section -> flags & SEC_DATA)
+		{
+		  ms_type = mst_data;
+		}
+	      else
+		{
+		  ms_type = mst_unknown;
+		}
+	      record_minimal_symbol ((char *) sym -> name, symaddr, ms_type,
+				     objfile);
+	    }
+	}
+      do_cleanups (back_to);
+    }
+}
+
+
+/* Scan and build partial symbols for a symbol file.
+   We have been initialized by a call to nlm_symfile_init, which 
+   currently does nothing.
+
+   SECTION_OFFSETS is a set of offsets to apply to relocate the symbols
+   in each section.  We simplify it down to a single offset for all
+   symbols.  FIXME.
+
+   MAINLINE is true if we are reading the main symbol
+   table (as opposed to a shared lib or dynamically loaded file).
+
+   This function only does the minimum work necessary for letting the
+   user "name" things symbolically; it does not read the entire symtab.
+   Instead, it reads the external and static symbols and puts them in partial
+   symbol tables.  When more extensive information is requested of a
+   file, the corresponding partial symbol table is mutated into a full
+   fledged symbol table by going back and reading the symbols
+   for real.
+
+   Note that NLM files have two sets of information that is potentially
+   useful for building gdb's minimal symbol table.  The first is a list
+   of the publically exported symbols, and is currently used to build
+   bfd's canonical symbol table.  The second is an optional native debugging
+   format which contains additional symbols (and possibly duplicates of
+   the publically exported symbols).  The optional native debugging format
+   is not currently used. */
+
+static void
+nlm_symfile_read (objfile, section_offsets, mainline)
+     struct objfile *objfile;
+     struct section_offsets *section_offsets;
+     int mainline;
+{
+  bfd *abfd = objfile -> obfd;
+  struct cleanup *back_to;
+  CORE_ADDR offset;
+
+  init_minimal_symbol_collection ();
+  back_to = make_cleanup (discard_minimal_symbols, 0);
+
+  /* FIXME, should take a section_offsets param, not just an offset.  */
+
+  offset = ANOFFSET (section_offsets, 0);
+
+  /* Process the NLM export records, which become the bfd's canonical symbol
+     table. */
+
+  nlm_symtab_read (abfd, offset, objfile);
+
+  /* FIXME:  We could locate and read the optional native debugging format
+     here and add the symbols to the minimal symbol table. */
+
+  if (!have_partial_symbols ())
+    {
+      wrap_here ("");
+      printf_filtered ("(no debugging symbols found)...");
+      wrap_here ("");
+    }
+
+  /* Install any minimal symbols that have been collected as the current
+     minimal symbols for this objfile. */
+
+  install_minimal_symbols (objfile);
+
+  do_cleanups (back_to);
+}
+
+
+/* Perform any local cleanups required when we are done with a particular
+   objfile.  I.E, we are in the process of discarding all symbol information
+   for an objfile, freeing up all memory held for it, and unlinking the
+   objfile struct from the global list of known objfiles. */
+
+static void
+nlm_symfile_finish (objfile)
+     struct objfile *objfile;
+{
+  if (objfile -> sym_private != NULL)
+    {
+      mfree (objfile -> md, objfile -> sym_private);
+    }
+}
+
+/* NLM specific parsing routine for section offsets.
+   FIXME:  This may or may not be necessary.  All the symbol readers seem
+   to have similar code.  See if it can be generalized and moved elsewhere. */
+
+static
+struct section_offsets *
+nlm_symfile_offsets (objfile, addr)
+     struct objfile *objfile;
+     CORE_ADDR addr;
+{
+  struct section_offsets *section_offsets;
+  int i;
+ 
+  section_offsets = (struct section_offsets *)
+    obstack_alloc (&objfile -> psymbol_obstack,
+		   sizeof (struct section_offsets) +
+		   sizeof (section_offsets->offsets) * (SECT_OFF_MAX-1));
+
+  for (i = 0; i < SECT_OFF_MAX; i++)
+    {
+      ANOFFSET (section_offsets, i) = addr;
+    }
+  
+  return (section_offsets);
+}
+
+
+/*  Register that we are able to handle NLM file format. */
+
+static struct sym_fns nlm_sym_fns =
+{
+  "nlm",		/* sym_name: name or name prefix of BFD target type */
+  3,			/* sym_namelen: number of significant sym_name chars */
+  nlm_new_init,		/* sym_new_init: init anything gbl to entire symtab */
+  nlm_symfile_init,	/* sym_init: read initial info, setup for sym_read() */
+  nlm_symfile_read,	/* sym_read: read a symbol file into symtab */
+  nlm_symfile_finish,	/* sym_finish: finished with file, cleanup */
+  nlm_symfile_offsets,	/* sym_offsets:  Translate ext. to int. relocation */
+  NULL			/* next: pointer to next struct sym_fns */
+};
+
+void
+_initialize_nlmread ()
+{
+  add_symtab_fns (&nlm_sym_fns);
+}