Add ECOFF support, do some slight restructuring to share the mmap between

the different object file format models

4 files changed, 128 insertions, 61 deletions

diff --git a/distrib/crunch/crunchide/Makefile b/distrib/crunch/crunchide/Makefile
index 08ab814ac82..7daf4f039ad 100644
--- a/distrib/crunch/crunchide/Makefile
+++ b/distrib/crunch/crunchide/Makefile
@@ -1,4 +1,4 @@
 PROG=   crunchide
-SRCS=crunchide.c elf_hide.c
+SRCS=	crunchide.c elf_hide.c ecoff_hide.c
 
 .include <bsd.prog.mk>
diff --git a/distrib/crunch/crunchide/crunchide.c b/distrib/crunch/crunchide/crunchide.c
index 86750241fee..bece34ce6ff 100644
--- a/distrib/crunch/crunchide/crunchide.c
+++ b/distrib/crunch/crunchide/crunchide.c
@@ -63,18 +63,35 @@
 #include <fcntl.h>
 #include <a.out.h>
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <sys/errno.h>
+#ifdef _NLIST_DO_ECOFF
+#include <sys/exec_ecoff.h>
+#endif
+#include <sys/mman.h>
+#include <sys/stat.h>
+
+/*
+ * The alpha and mips based ports define _NLIST_DO_AOUT although it doesn't
+ * fully support a.out.
+ */
+#if defined(_NLIST_DO_AOUT) && !(defined(__alpha__) || defined(__mips__))
+#define DO_AOUT
+#endif
 
 char *pname = "crunchide";
 
 void usage(void);
 
-void add_to_keep_list(char *symbol);
-void add_file_to_keep_list(char *filename);
-
-void hide_syms(char *filename);
+void add_to_keep_list(char *);
+void add_file_to_keep_list(char *);
 
+void hide_syms(char *);
+#ifdef _NLIST_DO_ECOFF
+void ecoff_hide(int, char *);
+#endif
+#ifdef _NLIST_DO_ELF
+void elf_hide(int, char *);
+#endif
 
 int main(argc, argv)
 int argc;
@@ -214,7 +231,7 @@ void hide_syms(char *filename)
     struct stat infstat;
     struct relocation_info *relp;
     struct nlist *symp;
-    char	buf[4];
+    char *buf;
 
     /*
      * Open the file and do some error checking.
@@ -237,44 +254,32 @@ void hide_syms(char *filename)
 	return;
     }
 
-	if((rc = read(inf, &buf, 4)) < 4) {
-		fprintf(stderr, "%s: read error: %s\n", filename,
-		rc == -1? strerror(errno) : "short read");
-		close(inf);
-		return;
-	}
-
-	lseek(inf, 0, SEEK_SET);
-
-	if (buf[0] == 0x7f &&
-		(buf[1] == 'E' || buf[1] == 'O') &&
-		buf[2] == 'L' &&
-		buf[3] == 'F')
-	{
-
-		printf("processing elf/olf file\n");
-		elf_hide(inf);
-		return;
-	}
-
-#if !defined(__mips__) || !defined(__OpenBSD__)
-    /*
-     * Read the entire file into memory.  XXX - Really, we only need to
-     * read the header and from TRELOFF to the end of the file.
-     */
+    if((buf = mmap(NULL, infstat.st_size, PROT_READ|PROT_WRITE,
+		   MAP_FILE|MAP_SHARED, inf, 0)) == (char *)-1) {
+        fprintf(stderr, "%s: cannot map\n", filename);
+        close(inf);
+        return;
+    }
 
-    if((aoutdata = (char *) calloc(1,infstat.st_size)) == NULL) {
-	fprintf(stderr, "%s: too big to read into memory\n", filename);
-	close(inf);
+#ifdef _NLIST_DO_ELF
+    if(buf[0] == 0x7f && (buf[1] == 'E' || buf[1] == 'O') &&
+       buf[2] == 'L' && buf[3] == 'F') {
+	printf("processing elf/olf file\n");
+	elf_hide(inf, buf);
 	return;
     }
+#endif /* _NLIST_DO_ELF */
 
-    if((rc = read(inf, aoutdata, infstat.st_size)) < infstat.st_size) {
-	fprintf(stderr, "%s: read error: %s\n", filename,
-		rc == -1? strerror(errno) : "short read");
-	close(inf);
+#ifdef _NLIST_DO_ECOFF
+    if(!ECOFF_BADMAG((struct ecoff_exechdr *)buf)) {
+        printf("processing ecoff file\n");
+	ecoff_hide(inf, buf);
 	return;
     }
+#endif /* _NLIST_DO_ECOFF */
+
+#ifdef DO_AOUT
+    aoutdata = buf;
 
     /*
      * Check the header and calculate offsets and sizes from it.
@@ -283,7 +288,8 @@ void hide_syms(char *filename)
     hdrp = (struct exec *) aoutdata;
 
     if(N_BADMAG(*hdrp)) {
-	fprintf(stderr, "%s: bad magic: not an a.out file\n", filename);
+	fprintf(stderr, "%s: bad magic: not an a.out, ecoff or elf  file\n",
+		filename);
 	close(inf);
 	return;
     }
@@ -325,21 +331,11 @@ void hide_syms(char *filename)
     for(relp = datarel; relp < datarel + ndatarel; relp++)
 	check_reloc(filename, relp);
 
-    /*
-     * Write the .o file back out to disk.  XXX - Really, we only need to
-     * write the symbol table entries back out.
-     */
-    lseek(inf, 0, SEEK_SET);
-    if((rc = write(inf, aoutdata, infstat.st_size)) < infstat.st_size) {
-	fprintf(stderr, "%s: write error: %s\n", filename,
-		rc == -1? strerror(errno) : "short write");
-    }
-
     close(inf);
-#endif
+#endif /* DO_AOUT */
 }
 
-#if !defined(__mips__) || !defined(__OpenBSD__)
+#ifdef DO_AOUT
 void check_reloc(char *filename, struct relocation_info *relp)
 {
     /* bail out if we zapped a symbol that is needed */
@@ -350,4 +346,4 @@ void check_reloc(char *filename, struct relocation_info *relp)
 	exit(1);
     }
 }
-#endif
+#endif /* DO_AOUT */
diff --git a/distrib/crunch/crunchide/ecoff_hide.c b/distrib/crunch/crunchide/ecoff_hide.c
new file mode 100644
index 00000000000..37ba7a442bc
--- /dev/null
+++ b/distrib/crunch/crunchide/ecoff_hide.c
@@ -0,0 +1,67 @@
+/*	$OpenBSD: ecoff_hide.c,v 1.1 1997/05/06 17:08:29 niklas Exp $	*/
+
+/*-
+ * Copyright (c) 1997 Niklas Hallqvist.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by Niklas Hallqvist.
+ * 4. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/types.h>
+#include <sys/exec.h>
+#ifdef _NLIST_DO_ECOFF
+#include <sys/exec_ecoff.h>
+#include <string.h>
+
+/* Do we have these symbols in any include file?  */
+#define scText		1
+#define scData		2
+#define scBss		3
+#define scSData		13
+#define scSBss		14
+#define scRData		15
+
+#define stNil		0
+
+extern int in_keep_list (char *);
+
+void
+ecoff_hide (int fd, char *p)
+{
+  struct ecoff_exechdr *ehdr = (struct ecoff_exechdr *)p;
+  struct ecoff_symhdr *shdr = (struct ecoff_symhdr *)(p + ehdr->f.f_symptr);
+  u_int ecnt = shdr->esymMax;
+  struct ecoff_extsym *esym = (struct ecoff_extsym *)(p + shdr->cbExtOffset);
+  char *estr = p + shdr->cbSsExtOffset;
+  int i;
+
+  for (i = 0; i < ecnt; i++, esym++)
+    if ((esym->es_class == scText || esym->es_class == scData
+	 || esym->es_class == scBss || esym->es_class == scSData
+	 || esym->es_class == scSBss || esym->es_class == scRData)
+	&& !in_keep_list(estr + esym->es_strindex))
+      esym->es_type = stNil;
+}
+#endif /* _NLIST_DO_ECOFF */
diff --git a/distrib/crunch/crunchide/elf_hide.c b/distrib/crunch/crunchide/elf_hide.c
index 415601a1f46..b23e31f5fe3 100644
--- a/distrib/crunch/crunchide/elf_hide.c
+++ b/distrib/crunch/crunchide/elf_hide.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: elf_hide.c,v 1.2 1997/04/04 21:52:42 mickey Exp $ */
+/*	$OpenBSD: elf_hide.c,v 1.3 1997/05/06 17:08:29 niklas Exp $ */
 
 /*
  * Copyright (c) 1997 Dale Rahn. All rights reserved.
@@ -36,7 +36,11 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <assert.h>
+#include <sys/exec.h>
+#ifdef _NLIST_DO_ELF
 #include <sys/exec_elf.h>
 
 void load_strtab(Elf32_Ehdr *pehdr, char *pexe);
@@ -60,7 +64,9 @@ typedef int Symmap;
 void renum_reloc_syms(Elf32_Ehdr *ehdr, Symmap *symmap, int symtabsecnum);
 
 char * pexe;
-elf_hide(int pfile)
+
+void
+elf_hide(int pfile, char *p)
 {
 	int i;
 
@@ -69,10 +75,7 @@ elf_hide(int pfile)
 	Elf32_Phdr *pphdr;
 	struct stat sb;
 
-	fstat(pfile, &sb);
-	pexe = mmap(0, sb.st_size, PROT_READ|PROT_WRITE, 
-		MAP_FILE | MAP_SHARED, pfile, 0);
-
+	pexe = p;
 	pehdr = (Elf32_Ehdr *)pexe;
 
 #ifdef DEBUG
@@ -278,8 +281,8 @@ dump_strtab()
 	index = 0;
 	pstr = strtab;
 	while (index < strtabsize) {
-		printf("string %x: \"%s\"\n",i, pstr);
-		pnstr = (char *) ((int)strchr(pstr, '\0') + 1);
+		printf("string %x: \"%s\"\n", i, pstr);
+		pnstr = pstr + strlen(pstr) + 1;
 		index = pnstr - strtab;
 		pstr = pnstr;
 		i++;
@@ -443,3 +446,4 @@ renum_reloc_syms(Elf32_Ehdr *ehdr, Symmap *symmap, int symtabsecnum)
 	}
 	
 }
+#endif /* _NLIST_DO_ELF */