Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/usr.sbin support coff image file.
details: https://anonhg.NetBSD.org/src/rev/1304d2a566f8
branches: trunk
changeset: 476291:1304d2a566f8
user: itojun <itojun%NetBSD.org@localhost>
date: Sun Sep 12 16:08:13 1999 +0000
description:
support coff image file.
(this is part of NetBSD/sh3 patches)
diffstat:
usr.sbin/kvm_mkdb/Makefile | 6 +-
usr.sbin/kvm_mkdb/extern.h | 8 +-
usr.sbin/kvm_mkdb/nlist.c | 7 +-
usr.sbin/kvm_mkdb/nlist_coff.c | 346 +++++++++++++++++++++++++++++++++++++++
usr.sbin/mdsetimage/Makefile | 5 +-
usr.sbin/mdsetimage/exec_coff.c | 108 ++++++++++++
usr.sbin/mdsetimage/extern.h | 10 +-
usr.sbin/mdsetimage/mdsetimage.c | 7 +-
8 files changed, 486 insertions(+), 11 deletions(-)
diffs (truncated from 610 to 300 lines):
diff -r b26969bbc554 -r 1304d2a566f8 usr.sbin/kvm_mkdb/Makefile
--- a/usr.sbin/kvm_mkdb/Makefile Sun Sep 12 15:29:38 1999 +0000
+++ b/usr.sbin/kvm_mkdb/Makefile Sun Sep 12 16:08:13 1999 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 1996/09/30 18:26:58 thorpej Exp $
+# $NetBSD: Makefile,v 1.8 1999/09/12 16:08:15 itojun Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= kvm_mkdb
-SRCS= kvm_mkdb.c nlist.c nlist_aout.c nlist_ecoff.c nlist_elf32.c \
- nlist_elf64.c testdb.c
+SRCS= kvm_mkdb.c nlist.c nlist_aout.c nlist_coff.c nlist_ecoff.c \
+ nlist_elf32.c nlist_elf64.c testdb.c
MAN= kvm_mkdb.8
.include <bsd.prog.mk>
diff -r b26969bbc554 -r 1304d2a566f8 usr.sbin/kvm_mkdb/extern.h
--- a/usr.sbin/kvm_mkdb/extern.h Sun Sep 12 15:29:38 1999 +0000
+++ b/usr.sbin/kvm_mkdb/extern.h Sun Sep 12 16:08:13 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.9 1999/01/29 22:23:36 thorpej Exp $ */
+/* $NetBSD: extern.h,v 1.10 1999/09/12 16:08:15 itojun Exp $ */
/*-
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -50,6 +50,9 @@
# define NLIST_AOUT
# define NLIST_ELF32
# define NLIST_ELF64
+#elif defined(__sh3__)
+# define NLIST_COFF
+# define NLIST_ELF32
#else
# define NLIST_AOUT
/* #define NLIST_ECOFF */
@@ -64,6 +67,9 @@
#ifdef NLIST_AOUT
int create_knlist_aout __P((const char *, DB *));
#endif
+#ifdef NLIST_COFF
+int create_knlist_coff __P((const char *, DB *));
+#endif
#ifdef NLIST_ECOFF
int create_knlist_ecoff __P((const char *, DB *));
#endif
diff -r b26969bbc554 -r 1304d2a566f8 usr.sbin/kvm_mkdb/nlist.c
--- a/usr.sbin/kvm_mkdb/nlist.c Sun Sep 12 15:29:38 1999 +0000
+++ b/usr.sbin/kvm_mkdb/nlist.c Sun Sep 12 16:08:13 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: nlist.c,v 1.16 1997/10/17 10:15:14 lukem Exp $ */
+/* $NetBSD: nlist.c,v 1.17 1999/09/12 16:08:15 itojun Exp $ */
/*-
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "from: @(#)nlist.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: nlist.c,v 1.16 1997/10/17 10:15:14 lukem Exp $");
+__RCSID("$NetBSD: nlist.c,v 1.17 1999/09/12 16:08:15 itojun Exp $");
#endif
#endif /* not lint */
@@ -65,6 +65,9 @@
#ifdef NLIST_AOUT
{ create_knlist_aout },
#endif
+#ifdef NLIST_COFF
+ { create_knlist_coff },
+#endif
#ifdef NLIST_ECOFF
{ create_knlist_ecoff },
#endif
diff -r b26969bbc554 -r 1304d2a566f8 usr.sbin/kvm_mkdb/nlist_coff.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr.sbin/kvm_mkdb/nlist_coff.c Sun Sep 12 16:08:13 1999 +0000
@@ -0,0 +1,346 @@
+/* $NetBSD: nlist_coff.c,v 1.1 1999/09/12 16:08:15 itojun Exp $ */
+
+/*
+ * Copyright (c) 1996 Christopher G. Demetriou. 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 Christopher G. Demetriou
+ * for the NetBSD Project.
+ * 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/cdefs.h>
+#ifndef lint
+__RCSID("$NetBSD: nlist_coff.c,v 1.1 1999/09/12 16:08:15 itojun Exp $");
+#endif /* not lint */
+
+#include <sys/param.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+
+#include <a.out.h>
+#include <db.h>
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <kvm.h>
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "extern.h"
+
+#ifdef NLIST_COFF
+#include <machine/exec_coff.h>
+
+typedef struct nlist NLIST;
+#define _strx n_un.n_strx
+#define _name n_un.n_name
+
+#define badfmt(str) \
+ do { \
+ warnx("%s: %s: %s", kfile, str, strerror(EFTYPE)); \
+ punt(); \
+ } while (0)
+
+#define check(off, size) ((off < 0) || (off + size > mappedsize))
+#define BAD do { rv = -1; goto out; } while (0)
+#define BADUNMAP do { rv = -1; goto unmap; } while (0)
+
+static const char *kfile;
+
+int
+create_knlist_coff(name, db)
+ const char *name;
+ DB *db;
+{
+ struct coff_filehdr *filehdrp;
+ struct coff_aouthdr *aouthdrp;
+ struct stat st;
+ struct nlist nbuf;
+ DBT key, data;
+ char *mappedfile, *symname, *fsymname;
+ size_t mappedsize, symnamesize, fsymnamesize;
+ u_long symhdroff, extrstroff;
+ u_long symhdrsize, i, nesyms;
+ int fd, rv;
+ struct external_syment *syment;
+ u_long soff;
+ u_long val;
+ char snamebuf[16];
+
+ rv = -1;
+
+ /*
+ * Open and map the whole file. If we can't open/stat it,
+ * something bad is going on so we punt.
+ */
+ kfile = name;
+ if ((fd = open(name, O_RDONLY, 0)) < 0) {
+ warn("%s", kfile);
+ punt();
+ }
+ if (fstat(fd, &st) < 0) {
+ warn("%s", kfile);
+ punt();
+ }
+ if (st.st_size > SIZE_T_MAX)
+ BAD;
+
+ /*
+ * Map the file in its entirety.
+ */
+ mappedsize = st.st_size;
+ mappedfile = mmap(NULL, mappedsize, PROT_READ, MAP_FILE|MAP_PRIVATE,
+ fd, 0);
+ if (mappedfile == (char *)-1)
+ BAD;
+
+ /*
+ * Make sure we can access the executable's header
+ * directly, and make sure the recognize the executable
+ * as an COFF binary.
+ */
+ if (check(0, sizeof *filehdrp))
+ BADUNMAP;
+ filehdrp = (struct coff_filehdr *)&mappedfile[0];
+
+ if (COFF_BADMAG(filehdrp))
+ BADUNMAP;
+
+ /*
+ * We've recognized it as an COFF binary. From here
+ * on out, all errors are fatal.
+ */
+
+ aouthdrp = (struct coff_aouthdr *)
+ &mappedfile[sizeof(struct coff_filehdr)];
+
+ /*
+ * Find the symbol list and string table.
+ */
+ symhdroff = filehdrp->f_symptr;
+ symhdrsize = filehdrp->f_nsyms;
+ extrstroff = symhdroff + symhdrsize*COFF_ES_SYMENTSZ;
+
+#ifdef DEGBU
+ printf("sizeof syment = %d\n",sizeof(struct external_syment ));
+ printf("symhdroff = 0x%lx,symhdrsize=%ld,stroff = 0x%lx",
+ symhdroff,symhdrsize, extrstroff);
+#endif
+
+ if (symhdrsize == 0)
+ badfmt("stripped");
+
+ /*
+ * Set up the data item, pointing to a nlist structure.
+ * which we fill in for each symbol.
+ */
+ data.data = (u_char *)&nbuf;
+ data.size = sizeof(nbuf);
+
+ /*
+ * Create a buffer (to be expanded later, if necessary)
+ * to hold symbol names after we've added underscores
+ * to them.
+ */
+ symnamesize = 1024;
+ if ((symname = malloc(symnamesize)) == NULL) {
+ warn("malloc");
+ punt();
+ }
+
+ nesyms = filehdrp->f_nsyms;
+
+ /*
+ * Read each symbol and enter it into the database.
+ */
+ for (i = 0; i < nesyms; i++) {
+
+ /*
+ * Find symbol name, copy it (with added underscore) to
+ * temporary buffer, and prepare the database key for
+ * insertion.
+ */
+ syment = (struct external_syment *)&mappedfile[symhdroff +
+ COFF_ES_SYMENTSZ*i];
+
+ if(syment->e_sclass[0] != 2){
+ continue;
+ }
+
+ if(syment->e.e.e_zeroes[0]){
+ if( syment->e.e_name[COFF_ES_SYMNMLEN-1] ){
+ memcpy( snamebuf, syment->e.e_name,
+ COFF_ES_SYMNMLEN);
+ snamebuf[COFF_ES_SYMNMLEN] = '\0';
+ fsymname = snamebuf;
+ }
+ else{
+ fsymname = syment->e.e_name ;
+ }
+ fsymnamesize = strlen(fsymname) + 1;
+
+#ifdef DEBUG
+ printf("%s\n",fsymname );
+#endif
+ }
+ else{
+ memcpy(&soff, syment->e.e.e_offset, sizeof(long));
+ fsymname = &mappedfile[extrstroff+soff];
+ fsymnamesize = strlen(fsymname) + 1;
+
+#ifdef DEBUG
+ printf("*%s\n",fsymname );
+#endif
+ }
+
+ while (symnamesize < fsymnamesize + 1) {
+ symnamesize *= 2;
+ if ((symname = realloc(symname, symnamesize)) == NULL){
Home |
Main Index |
Thread Index |
Old Index