Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

since get_kerntext() is only used by the a.out code, move it there and 

make it private.
This commit is contained in:
cgd 1996-10-03 23:06:42 +00:00
parent ca2617f88a
commit 3e1fe814f0
3 changed files with 34 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
usr.sbin/kvm_mkdb/extern.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: extern.h,v 1.4 1996/09/30 18:26:59 thorpej Exp $ */
/* $NetBSD: extern.h,v 1.5 1996/10/03 23:06:42 cgd Exp $ */
/*-
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@ -49,7 +49,6 @@
void create_knlist __P((const char *, DB *));
void punt __P((void));
int testdb __P(());
u_long get_kerntext __P((const char *kfn));
#ifdef NLIST_AOUT
int create_knlist_aout __P((const char *, DB *));

32
usr.sbin/kvm_mkdb/nlist.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: nlist.c,v 1.14 1996/09/30 18:27:02 thorpej Exp $ */
/* $NetBSD: nlist.c,v 1.15 1996/10/03 23:06:43 cgd Exp $ */
/*-
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "from: @(#)nlist.c 8.1 (Berkeley) 6/6/93";
#else
static char *rcsid = "$NetBSD: nlist.c,v 1.14 1996/09/30 18:27:02 thorpej Exp $";
static char *rcsid = "$NetBSD: nlist.c,v 1.15 1996/10/03 23:06:43 cgd Exp $";
#endif
#endif /* not lint */
@ -88,31 +88,3 @@ create_knlist(name, db)
warnx("%s: file format not recognized", name);
punt();
}
/*
* XXX: Using this value from machine/param.h introduces a
* XXX: machine dependency on this program, so /usr can not
* XXX: be shared between (i.e.) several m68k machines.
* Instead of compiling in KERNTEXTOFF or KERNBASE, try to
* determine the text start address from a standard symbol.
* For backward compatibility, use the old compiled-in way
* when the standard symbol name is not found.
*/
#ifndef KERNTEXTOFF
#define KERNTEXTOFF KERNBASE
#endif
u_long
get_kerntext(name)
const char *name;
{
struct nlist nl[2];
bzero((caddr_t)nl, sizeof(nl));
nl[0].n_un.n_name = "_kernel_text";
if (nlist(name, nl) != 0)
return (KERNTEXTOFF);
return (nl[0].n_value);
}

34
usr.sbin/kvm_mkdb/nlist_aout.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: nlist_aout.c,v 1.2 1996/09/30 18:27:03 thorpej Exp $ */
/* $NetBSD: nlist_aout.c,v 1.3 1996/10/03 23:06:44 cgd Exp $ */
/*-
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "from: @(#)nlist.c 8.1 (Berkeley) 6/6/93";
#else
static char *rcsid = "$NetBSD: nlist_aout.c,v 1.2 1996/09/30 18:27:03 thorpej Exp $";
static char *rcsid = "$NetBSD: nlist_aout.c,v 1.3 1996/10/03 23:06:44 cgd Exp $";
#endif
#endif /* not lint */
@ -70,7 +70,8 @@ typedef struct nlist NLIST;
punt(); \
} while (0)
static void badread __P((int, char *));
static void badread __P((int, char *));
static u_long get_kerntext __P((const char *kfn));
static const char *kfile;
@ -222,4 +223,31 @@ badread(nr, p)
badfmt(p);
}
/*
* XXX: Using this value from machine/param.h introduces a
* XXX: machine dependency on this program, so /usr can not
* XXX: be shared between (i.e.) several m68k machines.
* Instead of compiling in KERNTEXTOFF or KERNBASE, try to
* determine the text start address from a standard symbol.
* For backward compatibility, use the old compiled-in way
* when the standard symbol name is not found.
*/
#ifndef KERNTEXTOFF
#define KERNTEXTOFF KERNBASE
#endif
static u_long
get_kerntext(name)
const char *name;
{
struct nlist nl[2];
bzero((caddr_t)nl, sizeof(nl));
nl[0].n_un.n_name = "_kernel_text";
if (nlist(name, nl) != 0)
return (KERNTEXTOFF);
return (nl[0].n_value);
}
#endif /* NLIST_AOUT */