From 1d85a6e03d6a67a4dd45721a1a21c1ac2db44507 Mon Sep 17 00:00:00 2001 From: downsj Date: Wed, 15 Jan 1997 04:54:45 +0000 Subject: [PATCH] Don't need this, /sys/compat/m68k4k works better. OpenBSD/hp300 is now 8k! --- sys/arch/hp300/hp300/machdep.c | 54 +--------------------------------- 1 file changed, 1 insertion(+), 53 deletions(-) diff --git a/sys/arch/hp300/hp300/machdep.c b/sys/arch/hp300/hp300/machdep.c index 0d8bd360f18..ad7f0c41c57 100644 --- a/sys/arch/hp300/hp300/machdep.c +++ b/sys/arch/hp300/hp300/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.9 1997/01/12 15:13:23 downsj Exp $ */ +/* $OpenBSD: machdep.c,v 1.10 1997/01/15 04:54:45 downsj Exp $ */ /* $NetBSD: machdep.c,v 1.77 1996/12/11 16:49:23 thorpej Exp $ */ /* @@ -1684,11 +1684,6 @@ cpu_exec_aout_makecmds(p, epp) midmag = mid << 16 | magic; switch (midmag) { -#if defined(COMPAT_M68K4K) - case (MID_M68K4K << 16) | ZMAGIC: - error = cpu_exec_aout_prep_m68k4k(p, epp); - break; -#endif #ifdef COMPAT_NOMID case (MID_ZERO << 16) | ZMAGIC: error = exec_aout_prep_oldzmagic(p, epp); @@ -1708,50 +1703,3 @@ cpu_exec_aout_makecmds(p, epp) return ENOEXEC; #endif } - -#if defined(COMPAT_M68K4K) -int -cpu_exec_aout_prep_m68k4k(p, epp) - struct proc *p; - struct exec_package *epp; -{ - struct exec *execp = epp->ep_hdr; - - epp->ep_taddr = 4096; - epp->ep_tsize = execp->a_text; - epp->ep_daddr = epp->ep_taddr + execp->a_text; - epp->ep_dsize = execp->a_data + execp->a_bss; - epp->ep_entry = execp->a_entry; - - /* - * check if vnode is in open for writing, because we want to - * demand-page out of it. if it is, don't do it, for various - * reasons - */ - if ((execp->a_text != 0 || execp->a_data != 0) && - epp->ep_vp->v_writecount != 0) { -#ifdef DIAGNOSTIC - if (epp->ep_vp->v_flag & VTEXT) - panic("exec: a VTEXT vnode has writecount != 0\n"); -#endif - return ETXTBSY; - } - epp->ep_vp->v_flag |= VTEXT; - - /* set up command for text segment */ - NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_pagedvn, execp->a_text, - epp->ep_taddr, epp->ep_vp, 0, VM_PROT_READ|VM_PROT_EXECUTE); - - /* set up command for data segment */ - NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_pagedvn, execp->a_data, - epp->ep_daddr, epp->ep_vp, execp->a_text, - VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE); - - /* set up command for bss segment */ - NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_zero, execp->a_bss, - epp->ep_daddr + execp->a_data, NULLVP, 0, - VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE); - - return exec_setup_stack(p, epp); -} -#endif /* COMPAT_M68K4K */ -- 2.20.1