Date: Fri, 19 Jul 2002 20:40:45 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 14495 for review Message-ID: <200207200340.g6K3ejWl010499@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14495 Change 14495 by peter@peter_daintree on 2002/07/19 20:40:19 IFC @14492 (with -i this time) Affected files ... .. //depot/projects/ia64/sys/ia64/ia32/ia32.h#2 integrate .. //depot/projects/ia64/sys/ia64/ia32/ia32_misc.c#5 integrate .. //depot/projects/ia64/sys/ia64/ia32/ia32_sysvec.c#4 integrate .. //depot/projects/ia64/sys/ia64/ia32/ia32_util.h#3 integrate .. //depot/projects/ia64/sys/kern/imgact_elf32.c#2 integrate .. //depot/projects/ia64/sys/kern/imgact_elf64.c#2 integrate .. //depot/projects/ia64/sys/kern/imgact_elfN.c#3 integrate Differences ... ==== //depot/projects/ia64/sys/ia64/ia32/ia32.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/ia64/ia32/ia32.h,v 1.1 2002/07/20 02:56:10 peter Exp $ */ #ifndef _IA64_IA32_IA32_H_ ==== //depot/projects/ia64/sys/ia64/ia32/ia32_misc.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/ia64/ia32/ia32_misc.c,v 1.1 2002/07/20 02:56:10 peter Exp $ */ #include <sys/param.h> @@ -76,7 +76,7 @@ #include <ia64/ia32/ia32.h> #include <ia64/ia32/ia32_proto.h> -static const char ia32_emul_path[] = "/compat/ilp32"; +static const char ia32_emul_path[] = "/compat/ia32"; /* * [ taken from the linux emulator ] * Search an alternate path before passing pathname arguments on @@ -89,20 +89,20 @@ int ia32_emul_find(td, sgp, prefix, path, pbuf, cflag) struct thread *td; - caddr_t *sgp; /* Pointer to stackgap memory */ + caddr_t *sgp; /* Pointer to stackgap memory */ const char *prefix; char *path; char **pbuf; int cflag; { - int error; - size_t len, sz; - char *buf, *cp, *ptr; + int error; + size_t len, sz; + char *buf, *cp, *ptr; struct ucred *ucred; - struct nameidata nd; - struct nameidata ndroot; - struct vattr vat; - struct vattr vatroot; + struct nameidata nd; + struct nameidata ndroot; + struct vattr vat; + struct vattr vatroot; buf = (char *) malloc(MAXPATHLEN, M_TEMP, M_WAITOK); *pbuf = path; ==== //depot/projects/ia64/sys/ia64/ia32/ia32_sysvec.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/ia64/ia32/ia32_sysvec.c,v 1.1 2002/07/20 02:56:10 peter Exp $ */ #define __ELF_WORD_SIZE 32 @@ -89,19 +89,19 @@ static int ia32_szsigcode = sizeof(ia32_sigcode) & ~3; struct sysentvec ia32_freebsd_sysvec = { - SYS_MAXSYSCALL, - ia32_sysent, - 0, - 0, - 0, - 0, - 0, - 0, - elf32_freebsd_fixup, - sendsig, - ia32_sigcode, - &ia32_szsigcode, - 0, + SYS_MAXSYSCALL, + ia32_sysent, + 0, + 0, + 0, + 0, + 0, + 0, + elf32_freebsd_fixup, + sendsig, + ia32_sigcode, + &ia32_szsigcode, + 0, "FreeBSD ELF", elf32_coredump, NULL, @@ -171,7 +171,7 @@ vectp = (u_int32_t *) (destp - (imgp->argc + imgp->envc + 2 + imgp->auxarg_size) * sizeof(u_int32_t)); - } else + } else /* * The '+ 2' is for the null pointers at the end of each of * the arg and env vector sets @@ -288,7 +288,7 @@ &gdt, PAGE_SIZE, 0, VM_PROT_ALL, VM_PROT_ALL, 0); ldt = gdt + 4096; - + desc.sd_lolimit = 8*NLDT-1; desc.sd_lobase = ldt & 0xffffff; desc.sd_type = SDT_SYSLDT; @@ -312,7 +312,7 @@ copyout(&desc, (caddr_t) ldt + 8*LUCODE_SEL, sizeof(desc)); desc.sd_type = SDT_MEMRWA; copyout(&desc, (caddr_t) ldt + 8*LUDATA_SEL, sizeof(desc)); - + codeseg = 0 /* base */ + (((IA32_USRSTACK >> 12) - 1) << 32) /* limit */ + ((long)SDT_MEMERA << 52) ==== //depot/projects/ia64/sys/ia64/ia32/ia32_util.h#3 (text+ko) ==== @@ -6,7 +6,7 @@ * 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 + * notice, this list of conditions and the following disclaimer * in this position and unchanged. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/ia64/ia32/ia32_util.h,v 1.1 2002/07/20 02:56:10 peter Exp $ */ #include <vm/vm.h> ==== //depot/projects/ia64/sys/kern/imgact_elf32.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/kern/imgact_elf32.c,v 1.1 2002/07/20 02:56:11 peter Exp $ */ /* ==== //depot/projects/ia64/sys/kern/imgact_elf64.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/kern/imgact_elf64.c,v 1.1 2002/07/20 02:56:11 peter Exp $ */ /* ==== //depot/projects/ia64/sys/kern/imgact_elfN.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/imgact_elf.c,v 1.110 2002/03/19 21:24:05 alfred Exp $ + * $FreeBSD: src/sys/kern/imgact_elfN.c,v 1.1 2002/07/20 02:56:11 peter Exp $ */ #include <sys/param.h> To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200207200340.g6K3ejWl010499>