[src/trunk]: src/sys/compat/netbsd32 adapt to execsw[] changes

[jdolecek <jdolecek%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3c61848efda7
branches:  trunk
changeset: 499720:3c61848efda7
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Mon Nov 27 17:25:24 2000 +0000

description:
adapt to execsw[] changes

diffstat:

 sys/compat/netbsd32/netbsd32_exec.c |  14 ++++----------
 sys/compat/netbsd32/netbsd32_exec.h |   8 +++++++-
 2 files changed, 11 insertions(+), 11 deletions(-)

diffs (85 lines):

diff -r 7ba37dd5bda3 -r 3c61848efda7 sys/compat/netbsd32/netbsd32_exec.c
--- a/sys/compat/netbsd32/netbsd32_exec.c       Mon Nov 27 17:21:22 2000 +0000
+++ b/sys/compat/netbsd32/netbsd32_exec.c       Mon Nov 27 17:25:24 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netbsd32_exec.c,v 1.23 2000/11/21 00:37:54 jdolecek Exp $      */
+/*     $NetBSD: netbsd32_exec.c,v 1.24 2000/11/27 17:25:25 jdolecek Exp $      */
 /*     from: NetBSD: exec_aout.c,v 1.15 1996/09/26 23:34:46 cgd Exp */
 
 /*
@@ -61,10 +61,6 @@
 #ifdef SYSCALL_DEBUG
 extern const char * const netbsd32_syscallnames[];
 #endif
-void *netbsd32_copyargs __P((struct exec_package *, struct ps_strings *,
-       void *, void *));
-void *netbsd32_elf32_copyargs __P((struct exec_package *, struct ps_strings *,
-       void *, void *));
 int netbsd32_copyinargs __P((struct exec_package *, struct ps_strings *, 
                             void *, size_t, const void *, const void *));
 
@@ -99,9 +95,9 @@
 ELFNAME2(netbsd32,probe)(p, epp, eh, itp, pos)
        struct proc *p;
        struct exec_package *epp;
-       Elf_Ehdr *eh;
+       void *eh;
        char *itp;
-       Elf_Addr *pos;
+       vaddr_t *pos;
 {
        int error;
        size_t i;
@@ -119,7 +115,6 @@
                        return error;
                free((void *)bp, M_TEMP);
        }
-       epp->ep_emul = &ELFNAMEEND(emul_netbsd32);
        epp->ep_flags |= EXEC_32;
        *pos = ELFDEFNNAME(NO_ADDR);
        return 0;
@@ -177,7 +172,6 @@
 
        if (error == 0) {
                /* set up our emulation information */
-               epp->ep_emul = &emul_netbsd32;
                epp->ep_flags |= EXEC_32;
        } else
                kill_vmcmds(&epp->ep_vmcmds);
@@ -347,7 +341,7 @@
        if (copyout(&argc, cpp++, sizeof(argc)))
                return NULL;
 
-       dp = (u_long) (cpp + argc + envc + 2 + pack->ep_emul->e_arglen);
+       dp = (u_long) (cpp + argc + envc + 2 + pack->ep_esch->es_arglen);
        sp = argp;
 
        /* XXX don't copy them out, remap them! */
diff -r 7ba37dd5bda3 -r 3c61848efda7 sys/compat/netbsd32/netbsd32_exec.h
--- a/sys/compat/netbsd32/netbsd32_exec.h       Mon Nov 27 17:21:22 2000 +0000
+++ b/sys/compat/netbsd32/netbsd32_exec.h       Mon Nov 27 17:25:24 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netbsd32_exec.h,v 1.5 2000/11/21 00:37:54 jdolecek Exp $       */
+/*     $NetBSD: netbsd32_exec.h,v 1.6 2000/11/27 17:25:24 jdolecek Exp $       */
 
 /*
  * Copyright (c) 1998 Matthew R. Green
@@ -50,12 +50,18 @@
        netbsd32_u_long a_drsize;       /* data relocation size */
 };
 
+extern const struct emul emul_netbsd32;
+
 #ifdef EXEC_AOUT
 int exec_netbsd32_makecmds __P((struct proc *, struct exec_package *));
+void *netbsd32_copyargs __P((struct exec_package *, struct ps_strings *,
+       void *, void *));
 #endif
 #ifdef EXEC_ELF32
 int netbsd32_elf32_probe __P((struct proc *, struct exec_package *, void *,
     char *, vaddr_t *));
+void *netbsd32_elf32_copyargs __P((struct exec_package *, struct ps_strings *,
+       void *, void *));
 #endif /* EXEC_ELF32 */
 
 #endif /* !_NETBSD32_EXEC_H_ */