Module Name: src
Committed By: matt
Date: Thu Mar 6 09:30:38 UTC 2014
Modified Files:
src/sys/kern: exec_elf.c
src/sys/sys: exec.h
Log Message:
add ep_entryoffset to exec_package so one can calculate the relocabase
of an ET_DYN image.
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/sys/kern/exec_elf.c
cvs rdiff -u -r1.144 -r1.145 src/sys/sys/exec.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/exec_elf.c
diff -u src/sys/kern/exec_elf.c:1.62 src/sys/kern/exec_elf.c:1.63
--- src/sys/kern/exec_elf.c:1.62 Thu Feb 27 09:58:05 2014
+++ src/sys/kern/exec_elf.c Thu Mar 6 09:30:37 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: exec_elf.c,v 1.62 2014/02/27 09:58:05 maxv Exp $ */
+/* $NetBSD: exec_elf.c,v 1.63 2014/03/06 09:30:37 matt Exp $ */
/*-
* Copyright (c) 1994, 2000, 2005 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: exec_elf.c,v 1.62 2014/02/27 09:58:05 maxv Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exec_elf.c,v 1.63 2014/03/06 09:30:37 matt Exp $");
#ifdef _KERNEL_OPT
#include "opt_pax.h"
@@ -162,6 +162,7 @@ elf_placedynexec(struct lwp *l, struct e
for (i = 0; i < eh->e_phnum; i++)
ph[i].p_vaddr += offset;
+ epp->ep_entryoffset = offset;
eh->e_entry += offset;
}
@@ -835,6 +836,7 @@ exec_elf_makecmds(struct lwp *l, struct
}
ap->arg_interp = epp->ep_vmcmds.evs_cmds[nused].ev_addr;
+ epp->ep_entryoffset = interp_offset;
epp->ep_entry = ap->arg_interp + interp_offset;
PNBUF_PUT(interp);
} else
Index: src/sys/sys/exec.h
diff -u src/sys/sys/exec.h:1.144 src/sys/sys/exec.h:1.145
--- src/sys/sys/exec.h:1.144 Fri Jan 3 20:52:47 2014
+++ src/sys/sys/exec.h Thu Mar 6 09:30:37 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: exec.h,v 1.144 2014/01/03 20:52:47 dsl Exp $ */
+/* $NetBSD: exec.h,v 1.145 2014/03/06 09:30:37 matt Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -200,6 +200,7 @@ struct exec_package {
vaddr_t ep_minsaddr; /* proc's min stack addr ("bottom") */
vsize_t ep_ssize; /* size of process's stack */
vaddr_t ep_entry; /* process's entry point */
+ vaddr_t ep_entryoffset; /* offset to entry point */
vaddr_t ep_vm_minaddr; /* bottom of process address space */
vaddr_t ep_vm_maxaddr; /* top of process address space */
u_int ep_flags; /* flags; see below. */
