--- researchv9/sys/boot/stand/readfile.c 2018/04/24 17:21:59 1.1.1.1 +++ researchv9/sys/boot/stand/readfile.c 2018/04/24 17:31:02 1.1.1.2 @@ -1,8 +1,6 @@ /* * @(#)readfile.c 1.1 86/02/03 Copyright (c) 1985 by Sun Microsystems, Inc. */ - -#include "saio.h" #include /* @@ -48,10 +46,7 @@ readfile(io, print))() if (read(io, (char *)LOAD, (int)x.a_text) < x.a_text) goto shread; addr = (char *)(x.a_text + LOAD); - if (x.a_machtype == M_OLDSUN2) - segsiz = OLD_SEGSIZ; - else - segsiz = SEGSIZ; + segsiz = SEGSIZ; if (shared) while ((int)addr & (segsiz-1)) *addr++ = 0; @@ -67,10 +62,7 @@ readfile(io, print))() *addr++ = 0; if (print) printf(" bytes\n"); - if (x.a_machtype != M_OLDSUN2 && x.a_magic == ZMAGIC) - loadaddr = LOAD + sizeof (struct exec); - else - loadaddr = LOAD; + loadaddr = LOAD; return (int (*)()) (loadaddr); shread: