diff options
| author | cinap_lenrek <cinap_lenrek@felloff.net> | 2020-01-26 19:01:36 +0100 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@felloff.net> | 2020-01-26 19:01:36 +0100 |
| commit | 8d51e7fa1a1dbcbde513c2b756d504c879598907 (patch) | |
| tree | 4cd1a3aaab346ac990bc9058e8cc4928258be6ae /sys | |
| parent | 60bb408acca3b48b17f9158132849b894ad9f234 (diff) | |
kernel: implement portable userinit() and simplify process creation
replace machine specific userinit() by a portable
implemntation that uses kproc() to create the first
process. the initcode text is mapped using kmap(),
so there is no need for machine specific tmpmap()
functions.
initcode stack preparation should be done in init0()
where the stack is mapped and can be accessed directly.
replacing the machine specific userinit() allows some
big simplifications as sysrfork() and kproc() are now
the only callers of newproc() and we can avoid initializing
fields that we know are being initialized by these
callers.
rename autogenerated init.h and reboot.h headers.
the initcode[] and rebootcode[] blobs are now in *.i
files and hex generation was moved to portmkfile. the
machine specific mkfile only needs to specify how to
build rebootcode.out and initcode.out.
Diffstat (limited to 'sys')
53 files changed, 342 insertions, 1804 deletions
diff --git a/sys/src/9/bcm/init9.s b/sys/src/9/bcm/init9.s deleted file mode 100644 index 751ad84fc..000000000 --- a/sys/src/9/bcm/init9.s +++ /dev/null @@ -1 +0,0 @@ -#include "../omap/init9.s" diff --git a/sys/src/9/bcm/main.c b/sys/src/9/bcm/main.c index 4099d67f2..ba289ad08 100644 --- a/sys/src/9/bcm/main.c +++ b/sys/src/9/bcm/main.c @@ -6,10 +6,9 @@ #include "fns.h" #include "io.h" -#include "init.h" #include <pool.h> -#include "reboot.h" +#include "rebootcode.i" /* Firmware compatibility */ #define Minfirmrev 326770 @@ -131,19 +130,6 @@ init0(void) { char buf[2*KNAMELEN], **sp; - up->nerrlab = 0; - coherence(); - spllo(); - - /* - * These are o.k. because rootinit is null. - * Then early kproc's will have a root and dot. - */ - up->slash = namec("#/", Atodir, 0, 0); - pathclose(up->slash->path); - up->slash->path = newpath("/"); - up->dot = cclone(up->slash); - chandevinit(); if(!waserror()){ @@ -166,74 +152,7 @@ init0(void) sp = (char**)(USTKTOP - sizeof(Tos) - 8 - sizeof(sp[0])*4); sp[3] = sp[2] = sp[1] = nil; strcpy(sp[0] = (char*)&sp[4], "boot"); - touser((uintptr)sp); - assert(0); /* shouldn't have returned */ -} - -/* - * create the first process - */ -void -userinit(void) -{ - Proc *p; - Segment *s; - KMap *k; - Page *pg; - - /* no processes yet */ - up = nil; - - p = newproc(); - p->pgrp = newpgrp(); - p->egrp = smalloc(sizeof(Egrp)); - p->egrp->ref = 1; - p->fgrp = dupfgrp(nil); - p->rgrp = newrgrp(); - p->procmode = 0640; - - kstrdup(&eve, ""); - kstrdup(&p->text, "*init*"); - kstrdup(&p->user, eve); - - /* - * Kernel Stack - */ - p->sched.pc = (uintptr)init0; - p->sched.sp = (uintptr)p->kstack+KSTACK-sizeof(up->s.args)-sizeof(uintptr); - p->sched.sp = STACKALIGN(p->sched.sp); - - /* - * User Stack - * - * Technically, newpage can't be called here because it - * should only be called when in a user context as it may - * try to sleep if there are no pages available, but that - * shouldn't be the case here. - */ - s = newseg(SG_STACK, USTKTOP-USTKSIZE, USTKSIZE/BY2PG); - s->flushme++; - p->seg[SSEG] = s; - pg = newpage(1, 0, USTKTOP-BY2PG); - segpage(s, pg); - k = kmap(pg); - memset((void*)VA(k), 0, BY2PG); - kunmap(k); - - /* - * Text - */ - s = newseg(SG_TEXT, UTZERO, 1); - p->seg[TSEG] = s; - pg = newpage(1, 0, UTZERO); - pg->txtflush = ~0; - segpage(s, pg); - k = kmap(s->map[0]->pages[0]); - memmove((void*)VA(k), initcode, sizeof initcode); - kunmap(k); - - ready(p); } void diff --git a/sys/src/9/bcm/mkfile b/sys/src/9/bcm/mkfile index eb7cad035..495dd659f 100644 --- a/sys/src/9/bcm/mkfile +++ b/sys/src/9/bcm/mkfile @@ -39,6 +39,7 @@ PORT=\ taslock.$O\ tod.$O\ xalloc.$O\ + userinit.$O\ OBJ=\ l.$O\ @@ -104,36 +105,22 @@ install:V: /$objtype/$p$CONF arch.$O clock.$O fpiarm.$O main.$O mmu.$O screen.$O syscall.$O trap.$O: \ /$objtype/include/ureg.h - +arch.$O trap.$O main.$O: /sys/include/tos.h fpi.$O fpiarm.$O fpimem.$O: fpi.h l.$O lexception.$O lproc.$O mmu.$O: mem.h l.$O lexception.$O lproc.$O armv6.$O armv7.$O: arm.s armv7.$O: cache.v7.s -main.$O: errstr.h init.h reboot.h +main.$O: errstr.h rebootcode.i devmouse.$O mouse.$O screen.$O: screen.h usbdwc.$O: dwcotg.h ../port/usb.h -arch.$O archbcm.$O archbcm2.$O clock.$O coproc.$O fpiarn.$O mmu.$O trap.$O vfp3.$O: arm.h mem.h - -init.h:D: ../port/initcode.c init9.s - $CC ../port/initcode.c - $AS init9.s - $LD -l -R1 -s -o init.out init9.$O initcode.$O /$objtype/lib/libc.a - {echo 'uchar initcode[]={' - xd -1x <init.out | - sed -e 's/^[0-9a-f]+ //' -e 's/ ([0-9a-f][0-9a-f])/0x\1,/g' - echo '};'} > init.h - -reboot.h:D: rebootcode.s arm.s arm.h mem.h - $AS rebootcode.s - # -T arg is REBOOTADDR - $LD -l -s -T0x1c00 -R4 -o reboot.out rebootcode.$O - {echo 'uchar rebootcode[]={' - xd -1x reboot.out | - sed -e '1,2d' -e 's/^[0-9a-f]+ //' -e 's/ ([0-9a-f][0-9a-f])/0x\1,/g' - echo '};'} > reboot.h - -errstr.h:D: ../port/mkerrstr ../port/error.h - rc ../port/mkerrstr > errstr.h - -$CONF.clean: - rm -rf $p$CONF s$p$CONF errstr.h reboot.h $CONF.c boot$CONF.c +arch.$O archbcm.$O archbcm2.$O clock.$O coproc.$O fpiarn.$O mmu.$O trap.$O vfp3.$O rebootcode.$O: arm.h mem.h +rebootcode.$O: arm.s cache.v7.s + +init9.$O: ../omap/init9.s + $AS ../omap/init9.s + +initcode.out: init9.$O initcode.$O /$objtype/lib/libc.a + $LD -l -R1 -s -o $target $prereq + +rebootcode.out: rebootcode.$O + $LD -l -R4 -T0x1c00 -s -o $target $prereq diff --git a/sys/src/9/bcm64/main.c b/sys/src/9/bcm64/main.c index c76f388c8..6679d75d7 100644 --- a/sys/src/9/bcm64/main.c +++ b/sys/src/9/bcm64/main.c @@ -6,9 +6,8 @@ #include "fns.h" #include "../port/error.h" #include "io.h" -#include "init.h" #include "sysreg.h" -#include "reboot.h" +#include "rebootcode.i" #include <pool.h> #include <libsec.h> @@ -23,17 +22,6 @@ init0(void) { char buf[2*KNAMELEN], **sp; - up->nerrlab = 0; - spllo(); - - /* - * These are o.k. because rootinit is null. - * Then early kproc's will have a root and dot. - */ - up->slash = namec("#/", Atodir, 0, 0); - pathclose(up->slash->path); - up->slash->path = newpath("/"); - up->dot = cclone(up->slash); chandevinit(); if(!waserror()){ @@ -57,76 +45,7 @@ init0(void) sp[3] = sp[2] = sp[1] = nil; strcpy(sp[1] = (char*)&sp[4], "boot"); sp[0] = (void*)&sp[1]; - touser((uintptr)sp); - - assert(0); /* shouldn't have returned */ -} - -/* - * create the first process - */ -void -userinit(void) -{ - Proc *p; - Segment *s; - KMap *k; - Page *pg; - - /* no processes yet */ - up = nil; - - p = newproc(); - p->pgrp = newpgrp(); - p->egrp = smalloc(sizeof(Egrp)); - p->egrp->ref = 1; - p->fgrp = dupfgrp(nil); - p->rgrp = newrgrp(); - p->procmode = 0640; - - kstrdup(&eve, ""); - kstrdup(&p->text, "*init*"); - kstrdup(&p->user, eve); - - /* - * Kernel Stack - */ - p->sched.pc = (uintptr)init0; - p->sched.sp = (uintptr)p->kstack+KSTACK-sizeof(up->s.args)-sizeof(uintptr); - p->sched.sp = STACKALIGN(p->sched.sp); - *(void**)p->sched.sp = kproc; // fake - - /* - * User Stack - * - * Technically, newpage can't be called here because it - * should only be called when in a user context as it may - * try to sleep if there are no pages available, but that - * shouldn't be the case here. - */ - s = newseg(SG_STACK, USTKTOP-USTKSIZE, USTKSIZE/BY2PG); - s->flushme++; - p->seg[SSEG] = s; - pg = newpage(1, 0, USTKTOP-BY2PG); - segpage(s, pg); - k = kmap(pg); - memset((void*)VA(k), 0, BY2PG); - kunmap(k); - - /* - * Text - */ - s = newseg(SG_TEXT, UTZERO, 1); - p->seg[TSEG] = s; - pg = newpage(1, 0, UTZERO); - pg->txtflush = ~0; - segpage(s, pg); - k = kmap(pg); - memmove((void*)VA(k), initcode, sizeof initcode); - kunmap(k); - - ready(p); } void diff --git a/sys/src/9/bcm64/mkfile b/sys/src/9/bcm64/mkfile index 51ca9bedd..6177f4b70 100644 --- a/sys/src/9/bcm64/mkfile +++ b/sys/src/9/bcm64/mkfile @@ -37,6 +37,7 @@ PORT=\ taslock.$O\ tod.$O\ xalloc.$O\ + userinit.$O\ OBJ=\ l.$O\ @@ -99,10 +100,10 @@ REPCC=`{../port/mkfilelist ../bcm} arch.$O clock.$O fpiarm.$O main.$O mmu.$O screen.$O syscall.$O trap.$O: \ /$objtype/include/ureg.h - -l.$O cache.v8.$O mmu.$O: mem.h -l.$O cache.v8.$O archbcm3.$O clock.$O fpu.$O trap.$O mmu.$O: sysreg.h -main.$O: reboot.h +trap.$O main.$O: /sys/include/tos.h +l.$O cache.v8.$O mmu.$O rebootcode.$O: mem.h +l.$O cache.v8.$O archbcm3.$O clock.$O fpu.$O trap.$O mmu.$O rebootcode.$O: sysreg.h +main.$O: rebootcode.i devmouse.$O mouse.$O screen.$O: screen.h usbdwc.$O: dwcotg.h ../port/usb.h @@ -114,26 +115,11 @@ screen.h:D: ../bcm/screen.h dwcotg.h:D: ../bcm/dwcotg.h echo '#include "../bcm/dwcotg.h"' > dwcotg.h -init.h:D: ../port/initcode.c init9.s - $CC ../port/initcode.c - $AS init9.s - $LD -l -R1 -s -o init.out init9.$O initcode.$O /$objtype/lib/libc.a - {echo 'uchar initcode[]={' - xd -1x <init.out | - sed -e 's/^[0-9a-f]+ //' -e 's/ ([0-9a-f][0-9a-f])/0x\1,/g' - echo '};'} > init.h - -reboot.h:D: rebootcode.s cache.v8.$O mem.h sysreg.h - $AS rebootcode.s - # -T arg is REBOOTADDR - $LD -l -o reboot.out -H6 -R1 -T0x1c00 rebootcode.$O cache.v8.$O - {echo 'uchar rebootcode[]={' - xd -1x reboot.out | - sed -e 's/^[0-9a-f]+ //' -e 's/ ([0-9a-f][0-9a-f])/0x\1,/g' - echo '};'} > reboot.h - -errstr.h:D: ../port/mkerrstr ../port/error.h - rc ../port/mkerrstr > errstr.h +initcode.out: init9.$O initcode.$O /$objtype/lib/libc.a + $LD -l -R1 -s -o $target $prereq + +rebootcode.out: rebootcode.$O cache.v8.$O + $LD -l -H6 -R1 -T0x1c00 -s -o $target $prereq $CONF.clean: - rm -rf $p$CONF s$p$CONF errstr.h reboot.h screen.h dwcotg.h $CONF.c boot$CONF.c + rm -rf $p$CONF s$p$CONF errstr.h screen.h dwcotg.h $CONF.c boot$CONF.c diff --git a/sys/src/9/bcm64/trap.c b/sys/src/9/bcm64/trap.c index 3d74362a3..3c683765b 100644 --- a/sys/src/9/bcm64/trap.c +++ b/sys/src/9/bcm64/trap.c @@ -628,9 +628,6 @@ forkchild(Proc *p, Ureg *ureg) cureg = (Ureg*) (p->sched.sp + 16); memmove(cureg, ureg, sizeof(Ureg)); cureg->r0 = 0; - - p->psstate = 0; - p->insyscall = 0; } uintptr diff --git a/sys/src/9/cycv/main.c b/sys/src/9/cycv/main.c index 3c18148cb..20f0d72e2 100644 --- a/sys/src/9/cycv/main.c +++ b/sys/src/9/cycv/main.c @@ -1,13 +1,12 @@ #include "u.h" +#include "tos.h" #include "../port/lib.h" #include "mem.h" #include "dat.h" #include "fns.h" -#include "init.h" #include "pool.h" #include "io.h" #include "../port/error.h" -#include "tos.h" Conf conf; int normalprint, delaylink; @@ -143,22 +142,14 @@ confinit(void) imagmem->maxsize = kmem - (kmem/10); } -static void +void init0(void) { char buf[ERRMAX], **sp; int i; - up->nerrlab = 0; - spllo(); - - up->slash = namec("#/", Atodir, 0, 0); - pathclose(up->slash->path); - up->slash->path = newpath("/"); - up->dot = cclone(up->slash); - chandevinit(); - + if(!waserror()){ ksetenv("cputype", "arm", 0); if(cpuserver) @@ -181,55 +172,7 @@ init0(void) sp[3] = sp[2] = nil; strcpy(sp[1] = (char*)&sp[4], "boot"); sp[0] = nil; - touser(sp); -} - -void -userinit(void) -{ - Proc *p; - Segment *s; - void *v; - Page *pg; - - p = newproc(); - p->pgrp = newpgrp(); - p->egrp = smalloc(sizeof(Egrp)); - p->egrp->ref = 1; - p->fgrp = dupfgrp(nil); - p->rgrp = newrgrp(); - p->procmode = 0640; - - kstrdup(&eve, ""); - kstrdup(&p->text, "*init*"); - kstrdup(&p->user, eve); - - procsetup(p); - - p->sched.pc = (ulong)init0; - p->sched.sp = (ulong)p->kstack + KSTACK - (sizeof(Sargs) + BY2WD); - - s = newseg(SG_STACK, USTKTOP - USTKSIZE, USTKSIZE / BY2PG); - p->seg[SSEG] = s; - pg = newpage(0, 0, USTKTOP - BY2PG); - segpage(s, pg); - v = tmpmap(pg->pa); - memset(v, 0, BY2PG); - tmpunmap(v); - - s = newseg(SG_TEXT, UTZERO, 1); - s->flushme++; - p->seg[TSEG] = s; - pg = newpage(0, 0, UTZERO); - pg->txtflush = ~0; - - segpage(s, pg); - v = tmpmap(pg->pa); - memset(v, 0, BY2PG); - memmove(v, initcode, sizeof(initcode)); - tmpunmap(v); - - ready(p); + touser(sp); } void diff --git a/sys/src/9/cycv/mkfile b/sys/src/9/cycv/mkfile index f2920a265..e9e489f3d 100644 --- a/sys/src/9/cycv/mkfile +++ b/sys/src/9/cycv/mkfile @@ -39,6 +39,7 @@ PORT=\ random.$O\ rdb.$O\ syscallfmt.$O\ + userinit.$O\ OBJ=\ ltrap.$O\ @@ -74,14 +75,10 @@ $p$CONF:D: $CONF.c $OBJ $LIB mkfile <../port/portmkfile <|../port/mkbootrules $CONF -init.h:D: ../port/initcode.c init9.s - $CC ../port/initcode.c - $AS init9.s - $LD -l -R1 -s -o init.out init9.$O initcode.$O /arm/lib/libc.a - {echo 'uchar initcode[]={' - xd -1x <init.out | - sed -e 's/^[0-9a-f]+ //' -e 's/ ([0-9a-f][0-9a-f])/0x\1,/g' - echo '};'} > init.h +trap.$O main.$O: /sys/include/tos.h + +initcode.out: init9.$O initcode.$O /$objtype/lib/libc.a + $LD -l -R1 -s -o $target $prereq install:V: $p$CONF $p$CONF.u cp $p$CONF $p$CONF.u /$objtype/ diff --git a/sys/src/9/cycv/trap.c b/sys/src/9/cycv/trap.c index 5dbe809b2..52f08ba2d 100644 --- a/sys/src/9/cycv/trap.c +++ b/sys/src/9/cycv/trap.c @@ -569,9 +569,6 @@ forkchild(Proc *p, Ureg *ureg) cureg = (Ureg*) p->sched.sp; memmove(cureg, ureg, sizeof(Ureg)); cureg->r0 = 0; - - p->psstate = 0; - p->insyscall = 0; } uintptr diff --git a/sys/src/9/kw/fns.h b/sys/src/9/kw/fns.h index 6fcc3878f..e4cb96857 100644 --- a/sys/src/9/kw/fns.h +++ b/sys/src/9/kw/fns.h @@ -104,7 +104,6 @@ extern int fpuemu(Ureg*); /* * Miscellaneous machine dependent stuff. */ -extern char* getenv(char*, char*, int); char* getconf(char*); uintptr mmukmap(uintptr, uintptr, usize); uintptr mmukunmap(uintptr, uintptr, usize); diff --git a/sys/src/9/kw/init9.s b/sys/src/9/kw/init9.s deleted file mode 100644 index 1d7f2bec3..000000000 --- a/sys/src/9/kw/init9.s +++ /dev/null @@ -1,25 +0,0 @@ -/* - * This is the same as the C programme: - * - * void - * main(char* argv0) - * { - * startboot(argv0, &argv0); - * } - * - * It is in assembler because SB needs to be - * set and doing this in C drags in too many - * other routines. - */ -TEXT main(SB), 1, $8 - MOVW $setR12(SB), R12 /* load the SB */ - MOVW $boot(SB), R0 - - ADD $12, R13, R1 /* pointer to 0(FP) */ - - MOVW R0, 4(R13) /* pass argc, argv */ - MOVW R1, 8(R13) - - BL startboot(SB) -_loop: - B _loop diff --git a/sys/src/9/kw/main.c b/sys/src/9/kw/main.c index c0665ec77..060fe8b32 100644 --- a/sys/src/9/kw/main.c +++ b/sys/src/9/kw/main.c @@ -1,14 +1,14 @@ #include "u.h" +#include "tos.h" #include "../port/lib.h" #include "mem.h" #include "dat.h" #include "fns.h" -#include "init.h" #include "arm.h" #include <pool.h> -#include "reboot.h" +#include "rebootcode.i" /* * Where configuration info is left for the loaded programme. @@ -26,21 +26,6 @@ uintptr kseg0 = KZERO; Mach* machaddr[MAXMACH]; -/* - * Option arguments from the command line. - * oargv[0] is the boot file. - * Optionsinit() is called from multiboot() - * or some other machine-dependent place - * to set it all up. - */ -static int oargc; -static char* oargv[20]; -static char oargb[128]; -static int oargblen; -static char oenv[4096]; - -static uintptr sp; /* XXX - must go - user stack of init proc */ - int vflag; char debug[256]; @@ -150,44 +135,6 @@ plan9iniinit(void) } } -static void -optionsinit(char* s) -{ - char *o; - - o = strecpy(oargb, oargb+sizeof(oargb), s)+1; - if(getenv("bootargs", o, o - oargb) != nil) - *(o-1) = ' '; - - oargblen = strlen(oargb); - oargc = tokenize(oargb, oargv, nelem(oargv)-1); - oargv[oargc] = nil; -} - -char* -getenv(char* name, char* buf, int n) -{ - char *e, *p, *q; - - p = oenv; - while(*p != 0){ - if((e = strchr(p, '=')) == nil) - break; - for(q = name; p < e; p++){ - if(*p != *q) - break; - q++; - } - if(p == e && *q == 0){ - strecpy(buf, buf+n, e+1); - return buf; - } - p += strlen(p)+1; - } - - return nil; -} - #include "io.h" typedef struct Spiregs Spiregs; @@ -274,7 +221,6 @@ wave('9'); archreset(); mmuinit(); - optionsinit("/boot/boot boot"); quotefmtinstall(); archconsole(); wave(' '); @@ -406,22 +352,8 @@ reboot(void *entry, void *code, ulong size) void init0(void) { + char buf[2*KNAMELEN], **sp; int i; - char buf[2*KNAMELEN]; - - assert(up != nil); - up->nerrlab = 0; - coherence(); - spllo(); - - /* - * These are o.k. because rootinit is null. - * Then early kproc's will have a root and dot. - */ - up->slash = namec("#/", Atodir, 0, 0); - pathclose(up->slash->path); - up->slash->path = newpath("/"); - up->dot = cclone(up->slash); chandevinit(); @@ -443,112 +375,10 @@ init0(void) } kproc("alarm", alarmkproc, 0); - touser(sp); -} - -static void -bootargs(uintptr base) -{ - int i; - ulong ssize; - char **av, *p; - - /* - * Push the boot args onto the stack. - * The initial value of the user stack must be such - * that the total used is larger than the maximum size - * of the argument list checked in syscall. - */ - i = oargblen+1; - p = (void*)(STACKALIGN(base + BY2PG - sizeof(up->s.args) - i)); - memmove(p, oargb, i); - - /* - * Now push argc and the argv pointers. - * This isn't strictly correct as the code jumped to by - * touser in init9.s calls startboot (port/initcode.c) which - * expects arguments - * startboot(char *argv0, char **argv) - * not the usual (int argc, char* argv[]), but argv0 is - * unused so it doesn't matter (at the moment...). - */ - av = (char**)(p - (oargc+2)*sizeof(char*)); - ssize = base + BY2PG - (uintptr)av; - *av++ = (char*)oargc; - for(i = 0; i < oargc; i++) - *av++ = (oargv[i] - oargb) + (p - base) + (USTKTOP - BY2PG); - *av = nil; - - /* - * Leave space for the return PC of the - * caller of initcode. - */ - sp = USTKTOP - ssize - sizeof(void*); -} - -/* - * create the first process - */ -void -userinit(void) -{ - Proc *p; - Segment *s; - KMap *k; - Page *pg; - - /* no processes yet */ - up = nil; - - p = newproc(); - p->pgrp = newpgrp(); - p->egrp = smalloc(sizeof(Egrp)); - p->egrp->ref = 1; - p->fgrp = dupfgrp(nil); - p->rgrp = newrgrp(); - p->procmode = 0640; - - kstrdup(&eve, ""); - kstrdup(&p->text, "*init*"); - kstrdup(&p->user, eve); - - /* - * Kernel Stack - */ - p->sched.pc = (uintptr)init0; - p->sched.sp = (uintptr)p->kstack+KSTACK-sizeof(up->s.args)-sizeof(uintptr); - p->sched.sp = STACKALIGN(p->sched.sp); - - /* - * User Stack - * - * Technically, newpage can't be called here because it - * should only be called when in a user context as it may - * try to sleep if there are no pages available, but that - * shouldn't be the case here. - */ - s = newseg(SG_STACK, USTKTOP-USTKSIZE, USTKSIZE/BY2PG); - p->seg[SSEG] = s; - pg = newpage(1, 0, USTKTOP-BY2PG); - segpage(s, pg); - k = kmap(pg); - bootargs(VA(k)); - kunmap(k); - - /* - * Text - */ - s = newseg(SG_TEXT, UTZERO, 1); - s->flushme++; - p->seg[TSEG] = s; - pg = newpage(1, 0, UTZERO); - pg->txtflush = ~0; - segpage(s, pg); - k = kmap(s->map[0]->pages[0]); - memmove((void*)VA(k), initcode, sizeof initcode); - kunmap(k); - - ready(p); + sp = (char**)(USTKTOP - sizeof(Tos) - 8 - sizeof(sp[0])*4); + sp[3] = sp[2] = sp[1] = nil; + strcpy(sp[0] = (char*)&sp[4], "boot"); + touser((uintptr)sp); } Conf conf; /* XXX - must go - gag */ diff --git a/sys/src/9/kw/mkfile b/sys/src/9/kw/mkfile index 2f5af40d2..cf3564e38 100644 --- a/sys/src/9/kw/mkfile +++ b/sys/src/9/kw/mkfile @@ -39,6 +39,7 @@ PORT=\ tod.$O\ xalloc.$O\ random.$O\ + userinit.$O\ OBJ=\ l.$O\ @@ -122,36 +123,25 @@ paqdisk: arch.$O clock.$O fpiarm.$O main.$O mmu.$O screen.$O sdscsi.$O syscall.$O \ trap.$O: /$objtype/include/ureg.h - +arch.$O syscall.$O main.$O: /sys/include/tos.h archkw.$O devether.$O ether1116.$O ethermii.$O: \ ethermii.h ../port/etherif.h ../port/netif.h archkw.$O devflash.$O flashkw.$O: ../port/flashif.h fpi.$O fpiarm.$O fpimem.$O: fpi.h -l.$O lexception.$O lproc.$O mmu.$O: arm.s arm.h mem.h -main.$O: errstr.h init.h reboot.h +l.$O lexception.$O lproc.$O mmu.$O rebootcode.$O: arm.s arm.h mem.h +main.$O: errstr.h rebootcode.i mouse.$O: screen.h devusb.$O: ../port/usb.h usbehci.$O usbohci.$O usbuhci.$O: ../port/usb.h usbehci.h -init.h:D: ../port/initcode.c init9.s - $CC ../port/initcode.c - $AS init9.s - $LD -l -R1 -s -o init.out init9.$O initcode.$O /$objtype/lib/libc.a - {echo 'uchar initcode[]={' - xd -1x <init.out | - sed -e 's/^[0-9a-f]+ //' -e 's/ ([0-9a-f][0-9a-f])/0x\1,/g' - echo '};'} > init.h - -reboot.h:D: rebootcode.s arm.s arm.h mem.h - $AS rebootcode.s - # -lc is only for memmove. -T arg is PADDR(REBOOTADDR) - $LD -l -a -s -T0x100 -R4 -o reboot.out rebootcode.$O -lc >reboot.list - {echo 'uchar rebootcode[]={' - xd -1x reboot.out | - sed -e '1,2d' -e 's/^[0-9a-f]+ //' -e 's/ ([0-9a-f][0-9a-f])/0x\1,/g' - echo '};'} > reboot.h -errstr.h:D: ../port/mkerrstr ../port/error.h - rc ../port/mkerrstr > errstr.h +init9.$O: ../omap/init9.s + $AS ../omap/init9.s + +initcode.out: init9.$O initcode.$O /$objtype/lib/libc.a + $LD -l -R1 -s -o $target $prereq + +rebootcode.out: rebootcode.$O + $LD -l -R4 -T0x100 -s -o $target $prereq -lc plug.clean: rm -rf $p$CONF s$p$CONF armpaq paqdisk $CONF.c boot$CONF.c ../boot/libboot.a5 diff --git a/sys/src/9/kw/syscall.c b/sys/src/9/kw/syscall.c index 79ea7642e..773a151d5 100644 --- a/sys/src/9/kw/syscall.c +++ b/sys/src/9/kw/syscall.c @@ -325,8 +325,4 @@ forkchild(Proc *p, Ureg *ureg) /* syscall returns 0 for child */ cureg->r0 = 0; - - /* Things from bottom of syscall which were never executed */ - p->psstate = 0; - p->insyscall = 0; } diff --git a/sys/src/9/mtx/main.c b/sys/src/9/mtx/main.c index fb4132f37..71c31ce91 100644 --- a/sys/src/9/mtx/main.c +++ b/sys/src/9/mtx/main.c @@ -1,10 +1,10 @@ #include "u.h" +#include "tos.h" #include "../port/lib.h" #include "mem.h" #include "dat.h" #include "fns.h" #include "io.h" -#include "init.h" #include "pool.h" Conf conf; @@ -101,23 +101,8 @@ getconf(char *name) void init0(void) { -// char **p, *q, name[KNAMELEN]; -// int n; char buf[2*KNAMELEN]; - up->nerrlab = 0; - - spllo(); - - /* - * These are o.k. because rootinit is null. - * Then early kproc's will have a root and dot. - */ - up->slash = namec("#/", Atodir, 0, 0); - pathclose(up->slash->path); - up->slash->path = newpath("/"); - up->dot = cclone(up->slash); - chandevinit(); if(!waserror()){ @@ -128,82 +113,11 @@ init0(void) ksetenv("service", "cpu", 0); else ksetenv("service", "terminal", 0); - -/* - for(p = confenv; *p; p++) { - q = strchr(p[0], '='); - if(q == 0) - continue; - n = q-p[0]; - if(n >= KNAMELEN) - n = KNAMELEN-1; - memmove(name, p[0], n); - name[n] = 0; - if(name[0] != '*') - ksetenv(name, q+1, 0); - ksetenv(name, q+1, 1); - } -*/ poperror(); } kproc("alarm", alarmkproc, 0); kproc("mmusweep", mmusweep, 0); - touser((void*)(USTKTOP-8)); -} - -void -userinit(void) -{ - Proc *p; - Segment *s; - KMap *k; - Page *pg; - - p = newproc(); - p->pgrp = newpgrp(); - p->egrp = smalloc(sizeof(Egrp)); - p->egrp->ref = 1; - p->fgrp = dupfgrp(nil); - p->rgrp = newrgrp(); - p->procmode = 0640; - - kstrdup(&eve, ""); - kstrdup(&p->text, "*init*"); - kstrdup(&p->user, eve); - - p->fpstate = FPinit; - - /* - * Kernel Stack - * - * N.B. The -12 for the stack pointer is important. - * 4 bytes for gotolabel's return PC - */ - p->sched.pc = (ulong)init0; - p->sched.sp = (ulong)p->kstack+KSTACK-(sizeof(Sargs)+BY2WD); - - /* - * User Stack - */ - s = newseg(SG_STACK, USTKTOP-USTKSIZE, USTKSIZE/BY2PG); - p->seg[SSEG] = s; - pg = newpage(1, 0, USTKTOP-BY2PG); - segpage(s, pg); - - /* - * Text - */ - s = newseg(SG_TEXT, UTZERO, 1); - s->flushme++; - p->seg[TSEG] = s; - pg = newpage(1, 0, UTZERO); - pg->txtflush = ~0; - segpage(s, pg); - k = kmap(s->map[0]->pages[0]); - memmove((ulong*)VA(k), initcode, sizeof initcode); - kunmap(k); - - ready(p); + touser((void*)(USTKTOP - sizeof(Tos))); } /* still to do */ diff --git a/sys/src/9/mtx/mkfile b/sys/src/9/mtx/mkfile index 10bbb6e02..797e96091 100644 --- a/sys/src/9/mtx/mkfile +++ b/sys/src/9/mtx/mkfile @@ -36,6 +36,7 @@ PORT=\ tod.$O\ xalloc.$O\ random.$O\ + userinit.$O\ OBJ=\ l.$O\ @@ -79,15 +80,12 @@ install:V: $p$CONF clock.$O: /$objtype/include/ureg.h devether.$O: /$objtype/include/ureg.h -main.$O: /$objtype/include/ureg.h errstr.h init.h -trap.$O: /$objtype/include/ureg.h +main.$O: /$objtype/include/ureg.h errstr.h +trap.$O: /$objtype/include/ureg.h /sys/include/tos.h $ETHER: ../port/etherif.h ../port/netif.h -init.h: initcode /sys/src/libc/9syscall/sys.h +initcode.$O: initcode /sys/src/libc/9syscall/sys.h $AS initcode - $LD -l -s -R4 -o init.out initcode.$O -lc - {echo 'uchar initcode[]={' - xd -r -1x init.out | - sed -e 's/^[0-9a-f]+ //' -e 's/ ([0-9a-f][0-9a-f])/0x\1,/g' - echo '};'} > init.h +initcode.out: initcode.$O + $LD -l -R4 -s -o $target $prereq diff --git a/sys/src/9/mtx/trap.c b/sys/src/9/mtx/trap.c index 3072e0849..5408a6fe2 100644 --- a/sys/src/9/mtx/trap.c +++ b/sys/src/9/mtx/trap.c @@ -560,10 +560,6 @@ forkchild(Proc *p, Ureg *ur) cur = (Ureg*)(p->sched.sp+2*BY2WD); memmove(cur, ur, sizeof(Ureg)); cur->r3 = 0; - - /* Things from bottom of syscall we never got to execute */ - p->psstate = 0; - p->insyscall = 0; } uintptr diff --git a/sys/src/9/omap/fns.h b/sys/src/9/omap/fns.h index 39e0adbda..4e239355c 100644 --- a/sys/src/9/omap/fns.h +++ b/sys/src/9/omap/fns.h @@ -120,7 +120,6 @@ extern int fpuemu(Ureg*); /* * Miscellaneous machine dependent stuff. */ -extern char* getenv(char*, char*, int); char* getconf(char*); uintptr mmukmap(uintptr, uintptr, usize); uintptr mmukunmap(uintptr, uintptr, usize); diff --git a/sys/src/9/omap/main.c b/sys/src/9/omap/main.c index ab27d0f2b..839a6795e 100644 --- a/sys/src/9/omap/main.c +++ b/sys/src/9/omap/main.c @@ -1,14 +1,14 @@ #include "u.h" +#include "tos.h" #include "../port/lib.h" #include "mem.h" #include "dat.h" #include "fns.h" #include "io.h" -#include "init.h" #include <pool.h> -#include "reboot.h" +#include "rebootcode.i" /* * Where configuration info is left for the loaded programme. @@ -30,21 +30,6 @@ enum { uintptr kseg0 = KZERO; Mach* machaddr[MAXMACH]; -/* - * Option arguments from the command line. - * oargv[0] is the boot file. - * Optionsinit() is called from multiboot() - * or some other machine-dependent place - * to set it all up. - */ -static int oargc; -static char* oargv[20]; -static char oargb[128]; -static int oargblen; -static char oenv[4096]; - -static uintptr sp; /* XXX - must go - user stack of init proc */ - int vflag; int normalprint; char debug[256]; @@ -152,45 +137,6 @@ plan9iniinit(void) } } -static void -optionsinit(char* s) -{ - char *o; - - strcpy(oenv, ""); - o = strecpy(oargb, oargb+sizeof(oargb), s)+1; - if(getenv("bootargs", o, o - oargb) != nil) - *(o-1) = ' '; - - oargblen = strlen(oargb); - oargc = tokenize(oargb, oargv, nelem(oargv)-1); - oargv[oargc] = nil; -} - -char* -getenv(char* name, char* buf, int n) -{ - char *e, *p, *q; - - p = oenv; - while(*p != 0){ - if((e = strchr(p, '=')) == nil) - break; - for(q = name; p < e; p++){ - if(*p != *q) - break; - q++; - } - if(p == e && *q == 0){ - strecpy(buf, buf+n, e+1); - return buf; - } - p += strlen(p)+1; - } - - return nil; -} - void main(void) { @@ -222,7 +168,6 @@ wave('l'); machinit(); mmuinit(); - optionsinit("/boot/boot boot"); quotefmtinstall(); /* want plan9.ini to be able to affect memory sizing in confinit */ @@ -390,21 +335,8 @@ reboot(void *entry, void *code, ulong size) void init0(void) { + char buf[2*KNAMELEN], **sp; int i; - char buf[2*KNAMELEN]; - - up->nerrlab = 0; - coherence(); - spllo(); - - /* - * These are o.k. because rootinit is null. - * Then early kproc's will have a root and dot. - */ - up->slash = namec("#/", Atodir, 0, 0); - pathclose(up->slash->path); - up->slash->path = newpath("/"); - up->dot = cclone(up->slash); dmatest(); /* needs `up' set, so can't do it earlier */ chandevinit(); @@ -430,112 +362,11 @@ init0(void) poperror(); } kproc("alarm", alarmkproc, 0); - touser(sp); -} - -static void -bootargs(uintptr base) -{ - int i; - ulong ssize; - char **av, *p; - - /* - * Push the boot args onto the stack. - * The initial value of the user stack must be such - * that the total used is larger than the maximum size - * of the argument list checked in syscall. - */ - i = oargblen+1; - p = (void*)(STACKALIGN(base + BY2PG - sizeof(up->s.args) - i)); - memmove(p, oargb, i); - /* - * Now push argc and the argv pointers. - * This isn't strictly correct as the code jumped to by - * touser in init9.s calls startboot (port/initcode.c) which - * expects arguments - * startboot(char *argv0, char **argv) - * not the usual (int argc, char* argv[]), but argv0 is - * unused so it doesn't matter (at the moment...). - */ - av = (char**)(p - (oargc+2)*sizeof(char*)); - ssize = base + BY2PG - (uintptr)av; - *av++ = (char*)oargc; - for(i = 0; i < oargc; i++) - *av++ = (oargv[i] - oargb) + (p - base) + (USTKTOP - BY2PG); - *av = nil; - - /* - * Leave space for the return PC of the - * caller of initcode. - */ - sp = USTKTOP - ssize - sizeof(void*); -} - -/* - * create the first process - */ -void -userinit(void) -{ - Proc *p; - Segment *s; - KMap *k; - Page *pg; - - /* no processes yet */ - up = nil; - - p = newproc(); - p->pgrp = newpgrp(); - p->egrp = smalloc(sizeof(Egrp)); - p->egrp->ref = 1; - p->fgrp = dupfgrp(nil); - p->rgrp = newrgrp(); - p->procmode = 0640; - - kstrdup(&eve, ""); - kstrdup(&p->text, "*init*"); - kstrdup(&p->user, eve); - - /* - * Kernel Stack - */ - p->sched.pc = (uintptr)init0; - p->sched.sp = (uintptr)p->kstack+KSTACK-sizeof(up->s.args)-sizeof(uintptr); - p->sched.sp = STACKALIGN(p->sched.sp); - - /* - * User Stack - * - * Technically, newpage can't be called here because it - * should only be called when in a user context as it may - * try to sleep if there are no pages available, but that - * shouldn't be the case here. - */ - s = newseg(SG_STACK, USTKTOP-USTKSIZE, USTKSIZE/BY2PG); - s->flushme++; - p->seg[SSEG] = s; - pg = newpage(1, 0, USTKTOP-BY2PG); - segpage(s, pg); - k = kmap(pg); - bootargs(VA(k)); - kunmap(k); - - /* - * Text - */ - s = newseg(SG_TEXT, UTZERO, 1); - p->seg[TSEG] = s; - pg = newpage(1, 0, UTZERO); - pg->txtflush = ~0; - segpage(s, pg); - k = kmap(s->map[0]->pages[0]); - memmove((void*)VA(k), initcode, sizeof initcode); - kunmap(k); - - ready(p); + sp = (char**)(USTKTOP - sizeof(Tos) - 8 - sizeof(sp[0])*4); + sp[3] = sp[2] = sp[1] = nil; + strcpy(sp[0] = (char*)&sp[4], "boot"); + touser((uintptr)sp); } Conf conf; /* XXX - must go - gag */ diff --git a/sys/src/9/omap/mkfile b/sys/src/9/omap/mkfile index 0695e8cfa..b3a359f2b 100644 --- a/sys/src/9/omap/mkfile +++ b/sys/src/9/omap/mkfile @@ -39,6 +39,7 @@ PORT=\ tod.$O\ xalloc.$O\ random.$O\ + userinit.$O\ OBJ=\ l.$O\ @@ -100,35 +101,20 @@ CFLAGS= -I. -I../port $CFLAGS # hack to compile private sysproc.c (e.g.) arch.$O clock.$O fpiarm.$O main.$O mmu.$O screen.$O sdscsi.$O syscall.$O \ trap.$O: /$objtype/include/ureg.h - +arch.$O syscall.$O: /sys/include/tos.h archomap.$O devether.$0 ether9221.$O: ../port/etherif.h ../port/netif.h archomap.$O devflash.$O flashbeagle.$O flashigep.$O: ../port/flashif.h ecc.$O flashbeagle.$O flashigep.$O: ../port/nandecc.h io.h fpi.$O fpiarm.$O fpimem.$O: fpi.h -l.$O lexception.$O lproc.$O mmu.$O: arm.s arm.h mem.h +l.$O lexception.$O lproc.$O mmu.$O rebootcode.$O: arm.s arm.h mem.h l.$O rebootcode.$O: cache.v7.s -main.$O: errstr.h init.h reboot.h +main.$O: errstr.h rebootcode.i devdss.$O devmouse.$O mouse.$O screen.$O: screen.h devusb.$O: ../port/usb.h usbehci.$O usbohci.$O usbuhci.$O: ../port/usb.h usbehci.h -init.h:D: ../port/initcode.c init9.s - $CC ../port/initcode.c - $AS init9.s - $LD -l -R1 -s -o init.out init9.$O initcode.$O /$objtype/lib/libc.a - {echo 'uchar initcode[]={' - xd -1x <init.out | - sed -e 's/^[0-9a-f]+ //' -e 's/ ([0-9a-f][0-9a-f])/0x\1,/g' - echo '};'} > init.h - -reboot.h:D: rebootcode.s cache.v7.s arm.s arm.h mem.h - $AS rebootcode.s - # -lc is only for memmove. -T arg is PADDR(REBOOTADDR) -# $LD -l -a -s -T0x100 -R4 -o reboot.out rebootcode.$O -lc >reboot.list - $LD -l -s -T0x100 -R4 -o reboot.out rebootcode.$O -lc - {echo 'uchar rebootcode[]={' - xd -1x reboot.out | - sed -e '1,2d' -e 's/^[0-9a-f]+ //' -e 's/ ([0-9a-f][0-9a-f])/0x\1,/g' - echo '};'} > reboot.h -errstr.h:D: ../port/mkerrstr ../port/error.h - rc ../port/mkerrstr > errstr.h +initcode.out: init9.$O initcode.$O /$objtype/lib/libc.a + $LD -l -R1 -s -o $target $prereq + +rebootcode.out: rebootcode.$O + $LD -l -R4 -T0x100 -s -o $target $prereq -lc diff --git a/sys/src/9/omap/syscall.c b/sys/src/9/omap/syscall.c index 08089093c..9c957a701 100644 --- a/sys/src/9/omap/syscall.c +++ b/sys/src/9/omap/syscall.c @@ -322,8 +322,4 @@ forkchild(Proc *p, Ureg *ureg) /* syscall returns 0 for child */ cureg->r0 = 0; - - /* Things from bottom of syscall which were never executed */ - p->psstate = 0; - p->insyscall = 0; } diff --git a/sys/src/9/pc/main.c b/sys/src/9/pc/main.c index 5efebc809..b8486ef78 100644 --- a/sys/src/9/pc/main.c +++ b/sys/src/9/pc/main.c @@ -1,14 +1,13 @@ #include "u.h" +#include "tos.h" #include "../port/lib.h" #include "mem.h" #include "dat.h" #include "fns.h" #include "io.h" -#include "tos.h" #include "ureg.h" -#include "init.h" #include "pool.h" -#include "reboot.h" +#include "rebootcode.i" Mach *m; Conf conf; @@ -110,19 +109,6 @@ init0(void) { char buf[2*KNAMELEN], **sp; - up->nerrlab = 0; - - spllo(); - - /* - * These are o.k. because rootinit is null. - * Then early kproc's will have a root and dot. - */ - up->slash = namec("#/", Atodir, 0, 0); - pathclose(up->slash->path); - up->slash->path = newpath("/"); - up->dot = cclone(up->slash); - chandevinit(); if(!waserror()){ @@ -146,69 +132,6 @@ init0(void) } void -userinit(void) -{ - void *v; - Proc *p; - Segment *s; - Page *pg; - - p = newproc(); - p->pgrp = newpgrp(); - p->egrp = smalloc(sizeof(Egrp)); - p->egrp->ref = 1; - p->fgrp = dupfgrp(nil); - p->rgrp = newrgrp(); - p->procmode = 0640; - - kstrdup(&eve, ""); - kstrdup(&p->text, "*init*"); - kstrdup(&p->user, eve); - - procsetup(p); - - /* - * Kernel Stack - * - * N.B. make sure there's enough space for syscall to check - * for valid args and - * 4 bytes for gotolabel's return PC - */ - p->sched.pc = (ulong)init0; - p->sched.sp = (ulong)p->kstack+KSTACK-(sizeof(Sargs)+BY2WD); - - /* - * User Stack - * - * N.B. cannot call newpage() with clear=1, because pc kmap - * requires up != nil. use tmpmap instead. - */ - s = newseg(SG_STACK, USTKTOP-USTKSIZE, USTKSIZE/BY2PG); - p->seg[SSEG] = s; - pg = newpage(0, 0, USTKTOP-BY2PG); - segpage(s, pg); - v = tmpmap(pg); - memset(v, 0, BY2PG); - tmpunmap(v); - - /* - * Text - */ - s = newseg(SG_TEXT, UTZERO, 1); - s->flushme++; - p->seg[TSEG] = s; - pg = newpage(0, 0, UTZERO); - pg->txtflush = ~0; - segpage(s, pg); - v = tmpmap(pg); - memset(v, 0, BY2PG); - memmove(v, initcode, sizeof initcode); - tmpunmap(v); - - ready(p); -} - -void confinit(void) { char *p; diff --git a/sys/src/9/pc/mkfile b/sys/src/9/pc/mkfile index 4a33c6739..90670cb30 100644 --- a/sys/src/9/pc/mkfile +++ b/sys/src/9/pc/mkfile @@ -42,6 +42,7 @@ PORT=\ taslock.$O\ tod.$O\ xalloc.$O\ + userinit.$O\ OBJ=\ l.$O\ @@ -109,19 +110,19 @@ etheryuk.$O: yukdump.h $VGA mouse.$O: screen.h /sys/include/memdraw.h vgavesa.$O: /386/include/ureg.h devfloppy.$O: floppy.h -archmp.$O mp.$O: apbootstrap.h +mp.$O: apbootstrap.i apic.$O archmp.$O mp.$O: mp.h squidboy.$O: mp.h $SDEV: ../port/sd.h sd53c8xx.$O: sd53c8xx.i sdiahci.$O: ahci.h devaoe.$O sdaoe.$O: ../port/aoe.h -main.$O: init.h reboot.h +main.$O: rebootcode.i wavelan.$O: wavelan.c ../pc/wavelan.c ../pc/wavelan.h etherwavelan.$O: etherwavelan.c ../pc/wavelan.h devusb.$O usbuhci.$O usbohci.$O usbehci.$O usbehcipc.$O usbxhci.$O: ../port/usb.h usbehci.$O usbehcipc.$O: usbehci.h -trap.$O: /sys/include/tos.h +trap.$O main.$O: /sys/include/tos.h uartaxp.$O: uartaxp.i ether8169.$O: ../port/ethermii.h etherdp83820.$O: ../port/ethermii.h @@ -133,31 +134,16 @@ etherm10g.$O: etherm10g2k.i etherm10g4k.i etheriwl.$O: ../port/wifi.h etherwpi.$O: ../port/wifi.h etherrt2860.$O: ../port/wifi.h +l.$O rebootcode.$O apbootstrap.$O: mem.h -init.h:D: ../port/initcode.c init9.c - $CC ../port/initcode.c - $CC init9.c - $LD -l -R1 -s -o init.out init9.$O initcode.$O /386/lib/libc.a - {echo 'uchar initcode[]={' - xd -1x <init.out | - sed -e 's/^[0-9a-f]+ //' -e 's/ ([0-9a-f][0-9a-f])/0x\1,/g' - echo '};'} > init.h - -reboot.h:D: rebootcode.s mem.h - $AS rebootcode.s - $LD -l -s -T$REBOOTADDR -R4 -o reboot.out rebootcode.$O - {echo 'uchar rebootcode[]={' - xd -1x reboot.out | - sed -e '1,2d' -e 's/^[0-9a-f]+ //' -e 's/ ([0-9a-f][0-9a-f])/0x\1,/g' - echo '};'} > reboot.h - -apbootstrap.h:D: apbootstrap.s mem.h - $AS $prereq - $LD -o apbootstrap.out -T$APBOOTSTRAP -R4 -l -s apbootstrap.$O - {echo 'uchar apbootstrap[]={' - xd -1x apbootstrap.out | - sed -e '1,2d' -e 's/^[0-9a-f]+ //' -e 's/ ([0-9a-f][0-9a-f])/0x\1,/g' - echo '};'} > $target +initcode.out: init9.$O initcode.$O /$objtype/lib/libc.a + $LD -l -R1 -s -o $target $prereq + +rebootcode.out: rebootcode.$O + $LD -l -R4 -s -o $target -T$REBOOTADDR $prereq + +apbootstrap.out: apbootstrap.$O + $LD -l -R4 -s -o $target -T$APBOOTSTRAP $prereq sd53c8xx.i: sd53c8xx.n aux/na $prereq > $target @@ -199,6 +185,3 @@ checkdist:VQ: for(i in pcdisk pcflop) for(j in checkvga checkether) mk $i.$j - -%.clean:V: - rm -f $stem.c [9bz]$stem [9bz]$stem.gz boot$stem.* reboot.h apbootstrap.h init.h diff --git a/sys/src/9/pc/mp.c b/sys/src/9/pc/mp.c index 52a71c938..382e247f7 100644 --- a/sys/src/9/pc/mp.c +++ b/sys/src/9/pc/mp.c @@ -7,7 +7,7 @@ #include "ureg.h" #include "mp.h" -#include "apbootstrap.h" +#include "apbootstrap.i" /* filled in by pcmpinit or acpiinit */ Bus* mpbus; diff --git a/sys/src/9/pc/trap.c b/sys/src/9/pc/trap.c index 97931807f..22cef6d8a 100644 --- a/sys/src/9/pc/trap.c +++ b/sys/src/9/pc/trap.c @@ -1107,10 +1107,6 @@ forkchild(Proc *p, Ureg *ureg) memmove(cureg, ureg, sizeof(Ureg)); /* return value of syscall in child */ cureg->ax = 0; - - /* Things from bottom of syscall which were never executed */ - p->psstate = 0; - p->insyscall = 0; } /* Give enough context in the ureg to produce a kernel stack for diff --git a/sys/src/9/pc64/main.c b/sys/src/9/pc64/main.c index aab95a484..3e11f6eed 100644 --- a/sys/src/9/pc64/main.c +++ b/sys/src/9/pc64/main.c @@ -1,14 +1,13 @@ #include "u.h" +#include "tos.h" #include "../port/lib.h" #include "mem.h" #include "dat.h" #include "fns.h" #include "io.h" -#include "tos.h" #include "ureg.h" -#include "init.h" #include "pool.h" -#include "reboot.h" +#include "rebootcode.i" Conf conf; int delaylink; @@ -150,19 +149,6 @@ init0(void) { char buf[2*KNAMELEN], **sp; - up->nerrlab = 0; - - spllo(); - - /* - * These are o.k. because rootinit is null. - * Then early kproc's will have a root and dot. - */ - up->slash = namec("#/", Atodir, 0, 0); - pathclose(up->slash->path); - up->slash->path = newpath("/"); - up->dot = cclone(up->slash); - chandevinit(); if(!waserror()){ @@ -186,74 +172,7 @@ init0(void) } void -userinit(void) -{ - void *v; - Proc *p; - Segment *s; - Page *pg; - - p = newproc(); - p->pgrp = newpgrp(); - p->egrp = smalloc(sizeof(Egrp)); - p->egrp->ref = 1; - p->fgrp = dupfgrp(nil); - p->rgrp = newrgrp(); - p->procmode = 0640; - - kstrdup(&eve, ""); - kstrdup(&p->text, "*init*"); - kstrdup(&p->user, eve); - - procsetup(p); - - /* - * Kernel Stack - * - * N.B. make sure there's enough space for syscall to check - * for valid args and - * 8 bytes for gotolabel's return PC - */ - p->sched.pc = (uintptr)init0; - p->sched.sp = (uintptr)p->kstack+KSTACK-(sizeof(Sargs)+BY2WD); - - /* temporarily set up for kmap() */ - up = p; - - /* - * User Stack - */ - s = newseg(SG_STACK, USTKTOP-USTKSIZE, USTKSIZE/BY2PG); - p->seg[SSEG] = s; - pg = newpage(0, 0, USTKTOP-BY2PG); - segpage(s, pg); - v = kmap(pg); - memset(v, 0, BY2PG); - kunmap(v); - - /* - * Text - */ - s = newseg(SG_TEXT, UTZERO, 1); - s->flushme++; - p->seg[TSEG] = s; - pg = newpage(0, 0, UTZERO); - pg->txtflush = ~0; - segpage(s, pg); - v = kmap(pg); - memset(v, 0, BY2PG); - memmove(v, initcode, sizeof initcode); - kunmap(v); - - /* free kmap */ - mmurelease(p); - up = nil; - - ready(p); -} - -void -main() +main(void) { mach0init(); bootargsinit(); diff --git a/sys/src/9/pc64/mkfile b/sys/src/9/pc64/mkfile index 98c7540d4..034ae6717 100644 --- a/sys/src/9/pc64/mkfile +++ b/sys/src/9/pc64/mkfile @@ -40,6 +40,7 @@ PORT=\ taslock.$O\ tod.$O\ xalloc.$O\ + userinit.$O\ OBJ=\ l.$O\ @@ -100,7 +101,7 @@ REPCC=`{../port/mkfilelist ../pc} <../port/portmkfile <|../port/mkbootrules $CONF -l.$O: mem.h +l.$O rebootcode.$O apbootstrap.$O: mem.h $ETHER: ../port/etherif.h ../port/netif.h $AUDIO: ../port/audioif.h @@ -109,7 +110,7 @@ etheryuk.$O: yukdump.h $VGA mouse.$O: screen.h /sys/include/memdraw.h vgavesa.$O: /386/include/ureg.h -mp.$O: mp.h apbootstrap.h +mp.$O: mp.h apbootstrap.i apic.$O squidboy.$O: mp.h archmp.$O archacpi.$O: mp.h @@ -120,13 +121,12 @@ sd53c8xx.$O: ../pc/sd53c8xx.i $SDEV: ../port/sd.h sdiahci.$O: ahci.h devaoe.$O sdaoe.$O: ../port/aoe.h - -main.$O: init.h reboot.h +main.$O: rebootcode.i devusb.$O usbuhci.$O usbohci.$O usbehci.$O usbehcipc.$O usbxhci.$O: ../port/usb.h usbehci.$O usbehcipc.$O: usbehci.h -trap.$O: /sys/include/tos.h +trap.$O main.$O: /sys/include/tos.h ether8169.$O: ../port/ethermii.h etherdp83820.$O: ../port/ethermii.h @@ -139,32 +139,18 @@ etheriwl.$O: ../port/wifi.h etherwpi.$O: ../port/wifi.h etherrt2860.$O: ../port/wifi.h -init.h:D: ../port/initcode.c ../pc/init9.c - $CC ../port/initcode.c - $CC ../pc/init9.c - $LD -l -R1 -s -o init.out init9.$O initcode.$O /$objtype/lib/libc.a - {echo 'uchar initcode[]={' - xd -1x <init.out | - sed -e 's/^[0-9a-f]+ //' -e 's/ ([0-9a-f][0-9a-f])/0x\1,/g' - echo '};'} > init.h - -reboot.h:D: rebootcode.s mem.h - $AS rebootcode.s - $LD -l -R1 -s -o reboot.out -T$REBOOTADDR rebootcode.$O - {echo 'uchar rebootcode[]={' - dd -if reboot.out -bs 1 -iseek 40 | - xd -1x | - sed -e 's/^[0-9a-f]+ //' -e 's/ ([0-9a-f][0-9a-f])/0x\1,/g' - echo '};'} > $target - -apbootstrap.h:D: apbootstrap.s mem.h - $AS apbootstrap.s - $LD -l -R1 -s -o apbootstrap.out -T$APBOOTSTRAP apbootstrap.$O - {echo 'uchar apbootstrap[]={' - dd -if apbootstrap.out -bs 1 -iseek 40 | - xd -1x | - sed -e 's/^[0-9a-f]+ //' -e 's/ ([0-9a-f][0-9a-f])/0x\1,/g' - echo '};'} > $target +initcode.out: init9.$O initcode.$O /$objtype/lib/libc.a + $LD -l -R1 -s -o $target $prereq + +$O.rebootcode: rebootcode.$O + $LD -l -R1 -s -o $target -T$REBOOTADDR $prereq +rebootcode.out: $O.rebootcode + dd -if $prereq(1) -of $target -bs 1 -iseek 40 + +$O.apbootstrap: apbootstrap.$O + $LD -l -R1 -s -o $target -T$APBOOTSTRAP $prereq +apbootstrap.out: $O.apbootstrap + dd -if $prereq(1) -of $target -bs 1 -iseek 40 sd53c8xx.i: sd53c8xx.n aux/na $prereq > $target @@ -173,4 +159,4 @@ acid:V: $CC -a -w main.c>acid %.clean:V: - rm -f $stem.c [9bz]$stem [9bz]$stem.gz boot$stem.* apbootstrap.h reboot.h init.h $PCHEADERS + rm -f $stem.c [9bz]$stem [9bz]$stem.gz boot$stem.* $O.rebootcode $O.apbootstrap $PCHEADERS diff --git a/sys/src/9/pc64/trap.c b/sys/src/9/pc64/trap.c index 7fc8b55fa..9e322f408 100644 --- a/sys/src/9/pc64/trap.c +++ b/sys/src/9/pc64/trap.c @@ -1095,10 +1095,6 @@ forkchild(Proc *p, Ureg *ureg) memmove(cureg, ureg, sizeof(Ureg)); cureg->ax = 0; - - /* Things from bottom of syscall which were never executed */ - p->psstate = 0; - p->insyscall = 0; } /* Give enough context in the ureg to produce a kernel stack for diff --git a/sys/src/9/port/initcode.c b/sys/src/9/port/initcode.c index 7fb15cc13..d9251829a 100644 --- a/sys/src/9/port/initcode.c +++ b/sys/src/9/port/initcode.c @@ -18,7 +18,7 @@ char srv[] = "/srv"; char env[] = "/env"; void -startboot(char *argv0, char **argv) +startboot(char*, char **argv) { char buf[200]; /* keep this fairly large to capture error details */ diff --git a/sys/src/9/port/portdat.h b/sys/src/9/port/portdat.h index 830ebd95e..2a1cd3b07 100644 --- a/sys/src/9/port/portdat.h +++ b/sys/src/9/port/portdat.h @@ -661,6 +661,7 @@ struct Proc QLock seglock; /* locked whenever seg[] changes */ ulong pid; ulong noteid; /* Equivalent of note group */ + ulong parentpid; Proc *pidhash; /* next proc in pid hash */ Lock exl; /* Lock count and waitq */ @@ -678,8 +679,6 @@ struct Proc Fgrp *closingfgrp; /* used during teardown */ - ulong parentpid; - int insyscall; ulong time[6]; /* User, Sys, Real; child U, S, R */ @@ -698,6 +697,7 @@ struct Proc Proc *pdbg; /* the debugging process */ ulong procmode; /* proc device default file mode */ int privatemem; /* proc does not let anyone read mem */ + int noswap; /* process is not swappable */ int hang; /* hang at next exec for debug */ int procctl; /* Control for /proc debugging */ uintptr pc; /* DEBUG only */ @@ -710,7 +710,6 @@ struct Proc Proc *palarm; /* Next alarm time */ ulong alarm; /* Time of call */ int newtlb; /* Pager has changed my pte's, I must flush */ - int noswap; /* process is not swappable */ uintptr rendtag; /* Tag for rendezvous */ uintptr rendval; /* Value for rendezvous */ @@ -722,8 +721,8 @@ struct Proc void (*kpfun)(void*); void *kparg; - int scallnr; /* sys call number */ Sargs s; /* syscall arguments */ + int scallnr; /* sys call number */ int nerrlab; Label errlab[NERR]; char *syserrstr; /* last error from a system call, errbuf0 or 1 */ diff --git a/sys/src/9/port/portfns.h b/sys/src/9/port/portfns.h index b460ec935..c73ba2aa1 100644 --- a/sys/src/9/port/portfns.h +++ b/sys/src/9/port/portfns.h @@ -136,6 +136,7 @@ void iunlock(Lock*); ulong imagecached(void); ulong imagereclaim(ulong); long incref(Ref*); +void init0(void); void initseg(void); int iprint(char*, ...); void isdir(Chan*); diff --git a/sys/src/9/port/portmkfile b/sys/src/9/port/portmkfile index efd892356..d9beaf144 100644 --- a/sys/src/9/port/portmkfile +++ b/sys/src/9/port/portmkfile @@ -30,7 +30,7 @@ all:V: mk 'CONF='$i clean:V: - rm -f *.[$OS] *.i *.root.s *.rootc.c cfs.h fs.h init.h conf.h *.out *.m errstr.h boot bootfs.paq + rm -f *.[$OS] *.i *.root.s *.rootc.c cfs.h fs.h conf.h *.out *.m errstr.h init.h reboot.h boot bootfs.paq for(i in $CONFLIST $CRAPLIST) mk $i.clean @@ -56,9 +56,15 @@ $CONF.c: ../port/mkdevc $CONF echo 0, echo '};'} >> $CONF.c -errstr.h: ../port/mkerrstr ../port/error.h +errstr.h:D: ../port/mkerrstr ../port/error.h rc ../port/mkerrstr > errstr.h +%.i: %.out + {echo 'uchar '^$stem^'[]={' + xd -1x <$stem.out | + sed -e 's/^[0-9a-f]+ //' -e 's/ ([0-9a-f][0-9a-f])/0x\1,/g' + echo '};'} > $target + %.db: main.$O $CC -s$stem main.c | dbfmt > $stem.db @@ -74,7 +80,7 @@ sdscsi.$O: ../port/sd.h /$objtype/include/ureg.h sdaoe.$O: ../port/sd.h /$objtype/include/ureg.h trap.$O: /$objtype/include/ureg.h devproc.$O: /$objtype/include/ureg.h -main.$O: init.h +userinit.$O: initcode.i trap.$O: ../port/systab.h devpipe.$O: ../port/netif.h netif.$O: ../port/netif.h diff --git a/sys/src/9/port/proc.c b/sys/src/9/port/proc.c index 30f1c592a..61d2833a8 100644 --- a/sys/src/9/port/proc.c +++ b/sys/src/9/port/proc.c @@ -608,7 +608,7 @@ newproc(void) procalloc.free = p->qnext; unlock(&procalloc); - p->state = Scheding; + assert(p->state == Dead); p->psstate = "New"; p->mach = nil; p->eql = nil; @@ -628,8 +628,10 @@ newproc(void) p->syscalltrace = nil; p->notepending = 0; p->ureg = nil; + p->dbgreg = nil; p->privatemem = 0; p->noswap = 0; + p->nerrlab = 0; p->errstr = p->errbuf0; p->syserrstr = p->errbuf1; p->errbuf0[0] = '\0'; @@ -637,14 +639,11 @@ newproc(void) p->nlocks = 0; p->delaysched = 0; p->trace = 0; - kstrdup(&p->user, "*nouser"); - kstrdup(&p->text, "*notext"); - kstrdup(&p->args, ""); p->nargs = 0; p->setargs = 0; memset(p->seg, 0, sizeof p->seg); p->parentpid = 0; - p->noteid = pidalloc(p); + p->noteid = 0; if(p->kstack == nil) p->kstack = smalloc(KSTACK); @@ -924,7 +923,7 @@ postnote(Proc *p, int dolock, char *n, int flag) return 0; } - if(n != nil && flag != NUser && (p->notify == 0 || p->notified)) + if(n != nil && flag != NUser && (p->notify == nil || p->notified)) p->nnote = 0; ret = 0; @@ -1443,44 +1442,49 @@ scheddump(void) void kproc(char *name, void (*func)(void *), void *arg) { - Proc *p; static Pgrp *kpgrp; + Proc *p; p = newproc(); - p->psstate = nil; - p->procmode = 0640; - p->kp = 1; - p->noswap = 1; - p->scallnr = up->scallnr; - p->s = up->s; - p->nerrlab = 0; - p->slash = up->slash; - p->dot = up->slash; /* unlike fork, do not inherit the dot for kprocs */ - if(p->dot != nil) - incref(p->dot); + if(up != nil){ + p->slash = up->slash; + p->dot = up->slash; /* unlike fork, do not inherit the dot for kprocs */ + if(p->dot != nil) + incref(p->dot); + } else { + p->slash = nil; + p->dot = nil; + } - memmove(p->note, up->note, sizeof(p->note)); - p->nnote = up->nnote; + p->nnote = 0; + p->notify = nil; p->notified = 0; - p->lastnote = up->lastnote; - p->notify = up->notify; - p->ureg = nil; - p->dbgreg = nil; - procpriority(p, PriKproc, 0); + p->procmode = 0640; + p->noswap = 1; + p->kp = 1; kprocchild(p, func, arg); - kstrdup(&p->user, eve); kstrdup(&p->text, name); + kstrdup(&p->user, eve); + kstrdup(&p->args, ""); + if(kpgrp == nil) kpgrp = newpgrp(); p->pgrp = kpgrp; incref(kpgrp); + p->insyscall = 1; memset(p->time, 0, sizeof(p->time)); p->time[TReal] = MACHP(0)->ticks; + + pidalloc(p); + + procpriority(p, PriKproc, 0); + + p->psstate = nil; ready(p); } diff --git a/sys/src/9/port/sysproc.c b/sys/src/9/port/sysproc.c index e5aa537d9..56cae1723 100644 --- a/sys/src/9/port/sysproc.c +++ b/sys/src/9/port/sysproc.c @@ -80,7 +80,7 @@ sysrfork(va_list list) closeegrp(oeg); } if(flag & RFNOTEG) - up->noteid = pidalloc(0); + up->noteid = pidalloc(nil); return 0; } @@ -88,20 +88,38 @@ sysrfork(va_list list) p->scallnr = up->scallnr; p->s = up->s; - p->nerrlab = 0; p->slash = up->slash; p->dot = up->dot; incref(p->dot); memmove(p->note, up->note, sizeof(p->note)); - p->privatemem = up->privatemem; - p->noswap = up->noswap; p->nnote = up->nnote; + p->notify = up->notify; p->notified = 0; p->lastnote = up->lastnote; - p->notify = up->notify; - p->ureg = up->ureg; - p->dbgreg = 0; + + p->parentpid = up->pid; + p->procmode = up->procmode; + p->privatemem = up->privatemem; + p->noswap = up->noswap; + p->hang = up->hang; + if(up->procctl == Proc_tracesyscall) + p->procctl = Proc_tracesyscall; + + /* Craft a return frame which will cause the child to pop out of + * the scheduler in user mode with the return register zero + */ + forkchild(p, up->dbgreg); + + kstrdup(&p->text, up->text); + kstrdup(&p->user, up->user); + kstrdup(&p->args, ""); + + p->insyscall = 0; + memset(p->time, 0, sizeof(p->time)); + p->time[TReal] = MACHP(0)->ticks; + + pid = pidalloc(p); /* Abort the child process on error */ if(waserror()){ @@ -169,36 +187,20 @@ sysrfork(va_list list) p->egrp = up->egrp; incref(p->egrp); } - p->hang = up->hang; - p->procmode = up->procmode; - if(up->procctl == Proc_tracesyscall) - p->procctl = Proc_tracesyscall; - poperror(); /* abortion */ + if(flag & RFNOTEG) + p->noteid = pid; - /* Craft a return frame which will cause the child to pop out of - * the scheduler in user mode with the return register zero - */ - forkchild(p, up->dbgreg); + procfork(p); + + poperror(); /* abortion */ - p->parentpid = up->pid; if((flag&RFNOWAIT) == 0){ p->parent = up; lock(&up->exl); up->nchild++; unlock(&up->exl); } - if((flag&RFNOTEG) == 0) - p->noteid = up->noteid; - - pid = p->pid; - memset(p->time, 0, sizeof(p->time)); - p->time[TReal] = MACHP(0)->ticks; - - kstrdup(&p->text, up->text); - kstrdup(&p->user, up->user); - - procfork(p); /* * since the bss/data segments are now shareable, @@ -211,8 +213,9 @@ sysrfork(va_list list) p->fixedpri = up->fixedpri; p->mp = up->mp; wm = up->wired; - if(wm) + if(wm != nil) procwired(p, wm->machno); + p->psstate = nil; ready(p); sched(); return pid; @@ -565,7 +568,7 @@ sysexec(va_list list) up->setargs = 0; up->nnote = 0; - up->notify = 0; + up->notify = nil; up->notified = 0; up->privatemem = 0; up->noswap = 0; diff --git a/sys/src/9/port/userinit.c b/sys/src/9/port/userinit.c new file mode 100644 index 000000000..bf4fc8e25 --- /dev/null +++ b/sys/src/9/port/userinit.c @@ -0,0 +1,88 @@ +#include "u.h" +#include "../port/lib.h" +#include "mem.h" +#include "dat.h" +#include "fns.h" +#include "../port/error.h" + +/* + * The initcode array contains the binary text of the first + * user process. Its job is to invoke the exec system call + * for /boot/boot. + * Initcode does not link with standard plan9 libc _main() + * trampoline due to size constrains. Instead it is linked + * with a small machine specific trampoline init9.s that + * only sets the base address register and passes arguments + * to startboot() (see port/initcode.c). + */ +#include "initcode.i" + +/* + * The first process kernel process starts here. + */ +static void +proc0(void*) +{ + KMap *k; + Page *p; + + spllo(); + + up->pgrp = newpgrp(); + up->egrp = smalloc(sizeof(Egrp)); + up->egrp->ref = 1; + up->fgrp = dupfgrp(nil); + up->rgrp = newrgrp(); + + /* + * These are o.k. because rootinit is null. + * Then early kproc's will have a root and dot. + */ + up->slash = namec("#/", Atodir, 0, 0); + pathclose(up->slash->path); + up->slash->path = newpath("/"); + up->dot = cclone(up->slash); + + /* + * Setup Text and Stack segments for initcode. + */ + up->seg[SSEG] = newseg(SG_STACK | SG_NOEXEC, USTKTOP-USTKSIZE, USTKSIZE / BY2PG); + up->seg[TSEG] = newseg(SG_TEXT | SG_RONLY, UTZERO, 1); + p = newpage(1, 0, UTZERO); + k = kmap(p); + memmove((void*)VA(k), initcode, sizeof(initcode)); + kunmap(k); + p->txtflush = ~0; + segpage(up->seg[TSEG], p); + up->seg[TSEG]->flushme++; + + /* + * Become a user process. + */ + up->kp = 0; + up->noswap = 0; + procpriority(up, PriNormal, 0); + procsetup(up); + + flushmmu(); + + /* + * init0(): + * call chandevinit() + * setup environment variables + * prepare the stack for initcode + * switch to usermode to run initcode + */ + init0(); + + /* init0 will never return */ + panic("init0"); +} + +void +userinit(void) +{ + up = nil; + kstrdup(&eve, ""); + kproc("*init*", proc0, nil); +} diff --git a/sys/src/9/ppc/initcode b/sys/src/9/ppc/initcode deleted file mode 100644 index 1d846abe5..000000000 --- a/sys/src/9/ppc/initcode +++ /dev/null @@ -1,25 +0,0 @@ -#include "/sys/src/libc/9syscall/sys.h" - -/* - * we pass in the argument of the exec parameters as 0(FP) - */ - -TEXT main(SB),$8 - - MOVW $setSB(SB), R2 - MOVW $boot(SB), R3 - ADD $12, R1, R4 /* get a pointer to 0(FP) */ - MOVW R3, 4(R1) - MOVW R4, 8(R1) - MOVW $EXEC, R3 - SYSCALL - - /* should never get here */ -loop: - BR loop - -DATA boot+0(SB)/5,$"/boot" -DATA boot+5(SB)/5,$"/boot" -DATA bootv+0(SB)/4,$boot+6(SB) -GLOBL boot+0(SB),$11 -GLOBL bootv+0(SB),$8 diff --git a/sys/src/9/ppc/main.c b/sys/src/9/ppc/main.c index e2ab259cd..1eaabe8f7 100644 --- a/sys/src/9/ppc/main.c +++ b/sys/src/9/ppc/main.c @@ -1,12 +1,11 @@ #include "u.h" +#include "tos.h" #include "../port/lib.h" #include "mem.h" #include "dat.h" #include "fns.h" #include "io.h" -#include "init.h" #include "pool.h" -#include "tos.h" #define MAXCONF 64 @@ -147,21 +146,8 @@ plan9iniinit(void) void init0(void) { -// char **p, *q, name[KNAMELEN]; - int i; char buf[2*KNAMELEN]; - - up->nerrlab = 0; - spllo(); - - /* - * These are o.k. because rootinit is null. - * Then early kproc's will have a root and dot. - */ - up->slash = namec("#/", Atodir, 0, 0); - pathclose(up->slash->path); - up->slash->path = newpath("/"); - up->dot = cclone(up->slash); + int i; chandevinit(); @@ -183,62 +169,7 @@ init0(void) } kproc("alarm", alarmkproc, 0); kproc("mmusweep", mmusweep, 0); - touser((void*)(USTKTOP-sizeof(Tos))); -} - -void -userinit(void) -{ - Proc *p; - Segment *s; - KMap *k; - Page *pg; - - p = newproc(); - p->pgrp = newpgrp(); - p->egrp = smalloc(sizeof(Egrp)); - p->egrp->ref = 1; - p->fgrp = dupfgrp(nil); - p->rgrp = newrgrp(); - p->procmode = 0640; - - kstrdup(&eve, ""); - kstrdup(&p->text, "*init*"); - kstrdup(&p->user, eve); - - p->fpstate = FPinit; - - /* - * Stack - * - * N.B. The -12 for the stack pointer is important. - * 4 bytes for gotolabel's return PC - */ - p->sched.pc = (ulong)init0; - p->sched.sp = (ulong)p->kstack+KSTACK-(sizeof(Sargs)+BY2WD); - - /* - * User Stack - */ - s = newseg(SG_STACK, USTKTOP-USTKSIZE, USTKSIZE/BY2PG); - p->seg[SSEG] = s; - pg = newpage(1, 0, USTKTOP-BY2PG); - segpage(s, pg); - - /* - * Text - */ - s = newseg(SG_TEXT, UTZERO, 1); - s->flushme++; - p->seg[TSEG] = s; - pg = newpage(1, 0, UTZERO); - pg->txtflush = ~0; - segpage(s, pg); - k = kmap(s->map[0]->pages[0]); - memmove((ulong*)VA(k), initcode, sizeof initcode); - kunmap(k); - - ready(p); + touser((void*)(USTKTOP - sizeof(Tos))); } void diff --git a/sys/src/9/ppc/mkfile b/sys/src/9/ppc/mkfile index 97457c142..8891f94e5 100644 --- a/sys/src/9/ppc/mkfile +++ b/sys/src/9/ppc/mkfile @@ -53,7 +53,6 @@ HFILES=\ dat.h\ errstr.h\ fns.h\ - init.h\ io.h\ mem.h\ @@ -90,16 +89,11 @@ install:V: $p$CONF <|../port/mkbootrules $CONF clock.$O devether.$O main.$O trap.$O: /$objtype/include/ureg.h +trap.$O main.$O: /sys/include/tos.h %.$O: $HFILES $ETHER: ../port/etherif.h ../port/netif.h -init.h: ../port/initcode.c init9.s - $CC ../port/initcode.c - $AS init9.s - $LD -l -s -R4 -o init.out init9.$O initcode.$O /power/lib/libc.a - {echo 'uchar initcode[]={' - <init.out xd -1x | - sed -e 's/^[0-9a-f]+ //' -e 's/ ([0-9a-f][0-9a-f])/0x\1,/g' - echo '};'} > init.h +initcode.out: init9.$O initcode.$O /$objtype/lib/libc.a + $LD -l -R4 -s -o $target $prereq diff --git a/sys/src/9/ppc/trap.c b/sys/src/9/ppc/trap.c index ebfb87fe6..b11b9fa0d 100644 --- a/sys/src/9/ppc/trap.c +++ b/sys/src/9/ppc/trap.c @@ -553,10 +553,6 @@ forkchild(Proc *p, Ureg *ur) cur = (Ureg*)(p->sched.sp+2*BY2WD); memmove(cur, ur, sizeof(Ureg)); cur->r3 = 0; - - /* Things from bottom of syscall we never got to execute */ - p->psstate = 0; - p->insyscall = 0; } uintptr diff --git a/sys/src/9/sgi/main.c b/sys/src/9/sgi/main.c index 13d7b9888..c86f8801b 100644 --- a/sys/src/9/sgi/main.c +++ b/sys/src/9/sgi/main.c @@ -1,21 +1,14 @@ #include "u.h" +#include "tos.h" #include "../port/lib.h" #include "mem.h" #include "dat.h" #include "fns.h" #include "io.h" -#include "init.h" #include "pool.h" #include "../ip/ip.h" -#include <tos.h> #include <../port/error.h> -enum { - /* space for syscall args, return PC, top-of-stack struct */ - Stkheadroom = sizeof(Sargs) + sizeof(uintptr) + sizeof(Tos), -}; - -static uchar *sp; /* XXX - must go - user stack of init proc */ static FPsave initfp; /* @@ -233,20 +226,7 @@ machinit(void) void init0(void) { - char buf[128]; - - up->nerrlab = 0; - - spllo(); - - /* - * These are o.k. because rootinit is null. - * Then early kproc's will have a root and dot. - */ - up->slash = namec("#/", Atodir, 0, 0); - pathclose(up->slash->path); - up->slash->path = newpath("/"); - up->dot = cclone(up->slash); + char buf[128], **sp; chandevinit(); @@ -274,99 +254,11 @@ init0(void) kproc("arcs", arcsproc, 0); kproc("alarm", alarmkproc, 0); - touser(sp); -} - -static uchar * -pusharg(char *p) -{ - int n; - - n = strlen(p) + 1; - sp -= n; - memmove(sp, p, n); - return sp; -} - -static void -bootargs(uintptr base) -{ int i, ac; - uchar *av[32]; - uchar **lsp; - - sp = (uchar *) base + BY2PG - sizeof(Tos); - - ac = 0; - av[ac++] = pusharg("boot"); - sp = (uchar *) ((ulong) sp & ~7); - sp -= ROUND((ac + 1) * sizeof(sp), 8) + 4; - lsp = (uchar **) sp; - for(i = 0; i < ac; i++) - lsp[i] = av[i] + ((USTKTOP - BY2PG) - (ulong) base); - lsp[i] = 0; - sp += (USTKTOP - BY2PG) - (ulong) base; -} - -void -userinit(void) -{ - Proc *p; - KMap *k; - Page *pg; - Segment *s; - - p = newproc(); - p->pgrp = newpgrp(); - p->egrp = smalloc(sizeof(Egrp)); - p->egrp->ref = 1; - p->fgrp = dupfgrp(nil); - p->rgrp = newrgrp(); - p->procmode = 0640; - - kstrdup(&eve, ""); - kstrdup(&p->text, "*init*"); - kstrdup(&p->user, eve); - - procsetup(p); - - /* - * Kernel Stack - */ - p->sched.pc = (ulong)init0; - p->sched.sp = (ulong)p->kstack+KSTACK-Stkheadroom; - p->sched.sp = STACKALIGN(p->sched.sp); - - /* - * User Stack - * - * Technically, newpage can't be called here because it - * should only be called when in a user context as it may - * try to sleep if there are no pages available, but that - * shouldn't be the case here. - */ - s = newseg(SG_STACK, USTKTOP-USTKSIZE, USTKSIZE/BY2PG); - p->seg[SSEG] = s; - pg = newpage(1, 0, USTKTOP-BY2PG); - segpage(s, pg); - k = kmap(pg); - bootargs(VA(k)); - kunmap(k); - /* - * Text - */ - s = newseg(SG_TEXT, UTZERO, 1); - s->flushme++; - p->seg[TSEG] = s; - pg = newpage(1, 0, UTZERO); - pg->txtflush = ~0; - segpage(s, pg); - k = kmap(s->map[0]->pages[0]); - memset((void *)VA(k), 0, BY2PG); - memmove((ulong*)VA(k), initcode, sizeof initcode); - kunmap(k); - - ready(p); + sp = (char**)(USTKTOP-sizeof(Tos) - 8 - sizeof(sp[0])*4); + sp[3] = sp[2] = sp[1] = nil; + strcpy(sp[0] = (char*)&sp[4], "boot"); + touser(sp); } void diff --git a/sys/src/9/sgi/mkfile b/sys/src/9/sgi/mkfile index 1e39e89f8..ff0ea189f 100644 --- a/sys/src/9/sgi/mkfile +++ b/sys/src/9/sgi/mkfile @@ -44,6 +44,7 @@ PORT=\ taslock.$O\ tod.$O\ xalloc.$O\ + userinit.$O\ OBJ=\ l.$O\ @@ -79,17 +80,12 @@ install:V: $p$CONF <../port/portmkfile <|../port/mkbootrules $CONF -init.h: init9.s ../port/initcode.c /sys/src/libc/9syscall/sys.h - va init9.s - vc ../port/initcode.c - vl -T$UTZERO -R4 -o init.out init9.$O initcode.$O - {echo 'uchar initcode[]={' - xd -r -1x init.out | - sed -e 's/^[0-9a-f]+ //' -e 's/ ([0-9a-f][0-9a-f])/0x\1,/g' - echo '};'} > init.h +initcode.out: init9.$O initcode.$O /$objtype/lib/libc.a + $LD -T$UTZERO -R4 -s -o $target $prereq faultmips.$O mmu.$O syscall.$O trap.$O: /$objtype/include/ureg.h -main.$O: /$objtype/include/ureg.h errstr.h init.h +main.$O: /$objtype/include/ureg.h errstr.h +main.$O trap.$O: /sys/include/tos.h %.clean:V: - rm -f $stem.c [9bz]$stem [9bz]$stem.gz boot$stem.* init.h + rm -f $stem.c [9bz]$stem [9bz]$stem.gz boot$stem.* diff --git a/sys/src/9/sgi/trap.c b/sys/src/9/sgi/trap.c index 588e6861d..08b3960df 100644 --- a/sys/src/9/sgi/trap.c +++ b/sys/src/9/sgi/trap.c @@ -2,13 +2,13 @@ * traps, exceptions, faults and interrupts on ar7161 */ #include "u.h" +#include "tos.h" #include "../port/lib.h" #include "mem.h" #include "dat.h" #include "fns.h" #include "ureg.h" #include "io.h" -#include <tos.h> #include "../port/error.h" typedef struct Handler Handler; @@ -792,10 +792,6 @@ forkchild(Proc *p, Ureg *ur) cur->r1 = 0; cur->pc += 4; - - /* Things from bottom of syscall we never got to execute */ - p->psstate = 0; - p->insyscall = 0; } static diff --git a/sys/src/9/teg2/fns.h b/sys/src/9/teg2/fns.h index d4bf7e919..9ddec97b2 100644 --- a/sys/src/9/teg2/fns.h +++ b/sys/src/9/teg2/fns.h @@ -177,7 +177,6 @@ extern int fpuemu(Ureg*); * Miscellaneous machine dependent stuff. */ extern int cas(int *, int, int); -extern char* getenv(char*, char*, int); char* getconf(char*); uintptr mmukmap(uintptr, uintptr, usize); uintptr mmukunmap(uintptr, uintptr, usize); diff --git a/sys/src/9/teg2/init9.s b/sys/src/9/teg2/init9.s deleted file mode 100644 index 1d7f2bec3..000000000 --- a/sys/src/9/teg2/init9.s +++ /dev/null @@ -1,25 +0,0 @@ -/* - * This is the same as the C programme: - * - * void - * main(char* argv0) - * { - * startboot(argv0, &argv0); - * } - * - * It is in assembler because SB needs to be - * set and doing this in C drags in too many - * other routines. - */ -TEXT main(SB), 1, $8 - MOVW $setR12(SB), R12 /* load the SB */ - MOVW $boot(SB), R0 - - ADD $12, R13, R1 /* pointer to 0(FP) */ - - MOVW R0, 4(R13) /* pass argc, argv */ - MOVW R1, 8(R13) - - BL startboot(SB) -_loop: - B _loop diff --git a/sys/src/9/teg2/main.c b/sys/src/9/teg2/main.c index 53c5ed456..b08a00178 100644 --- a/sys/src/9/teg2/main.c +++ b/sys/src/9/teg2/main.c @@ -1,15 +1,15 @@ #include "u.h" +#include "tos.h" #include "../port/lib.h" #include "mem.h" #include "dat.h" #include "fns.h" #include "io.h" -#include "init.h" #include <pool.h> #include "arm.h" -#include "reboot.h" +#include "rebootcode.i" /* * Where configuration info is left for the loaded programme. @@ -40,21 +40,6 @@ Memcache cachel[8]; /* arm arch v7 supports 1-7 */ */ Lowmemcache *cacheconf; -/* - * Option arguments from the command line. - * oargv[0] is the boot file. - * Optionsinit() is called from multiboot() - * or some other machine-dependent place - * to set it all up. - */ -static int oargc; -static char* oargv[20]; -static char oargb[128]; -static int oargblen; -static char oenv[4096]; - -static uintptr sp; /* XXX - must go - user stack of init proc */ - int vflag; int normalprint; char debug[256]; @@ -165,45 +150,6 @@ plan9iniinit(void) } } -static void -optionsinit(char* s) -{ - char *o; - - strcpy(oenv, ""); - o = strecpy(oargb, oargb+sizeof(oargb), s)+1; - if(getenv("bootargs", o, o - oargb) != nil) - *(o-1) = ' '; - - oargblen = strlen(oargb); - oargc = tokenize(oargb, oargv, nelem(oargv)-1); - oargv[oargc] = nil; -} - -char* -getenv(char* name, char* buf, int n) -{ - char *e, *p, *q; - - p = oenv; - while(*p != 0){ - if((e = strchr(p, '=')) == nil) - break; - for(q = name; p < e; p++){ - if(*p != *q) - break; - q++; - } - if(p == e && *q == 0){ - strecpy(buf, buf+n, e+1); - return buf; - } - p += strlen(p)+1; - } - - return nil; -} - /* enable scheduling of this cpu */ void machon(uint cpu) @@ -386,7 +332,6 @@ main(void) l2pageinit(); mmuinit(); - optionsinit("/boot/boot boot"); quotefmtinstall(); /* want plan9.ini to be able to affect memory sizing in confinit */ @@ -586,21 +531,8 @@ reboot(void *entry, void *code, ulong size) void init0(void) { + char buf[2*KNAMELEN], **sp; int i; - char buf[2*KNAMELEN]; - - up->nerrlab = 0; - coherence(); - spllo(); - - /* - * These are o.k. because rootinit is null. - * Then early kproc's will have a root and dot. - */ - up->slash = namec("#/", Atodir, 0, 0); - pathclose(up->slash->path); - up->slash->path = newpath("/"); - up->dot = cclone(up->slash); chandevinit(); i8250console(); /* might be redundant, but harmless */ @@ -626,112 +558,10 @@ init0(void) } kproc("alarm", alarmkproc, 0); - touser(sp); -} - -static void -bootargs(uintptr base) -{ - int i; - ulong ssize; - char **av, *p; - - /* - * Push the boot args onto the stack. - * The initial value of the user stack must be such - * that the total used is larger than the maximum size - * of the argument list checked in syscall. - */ - i = oargblen+1; - p = (void*)(STACKALIGN(base + BY2PG - sizeof(up->s.args) - i)); - memmove(p, oargb, i); - - /* - * Now push argc and the argv pointers. - * This isn't strictly correct as the code jumped to by - * touser in init9.s calls startboot (port/initcode.c) which - * expects arguments - * startboot(char *argv0, char **argv) - * not the usual (int argc, char* argv[]), but argv0 is - * unused so it doesn't matter (at the moment...). - */ - av = (char**)(p - (oargc+2)*sizeof(char*)); - ssize = base + BY2PG - (uintptr)av; - *av++ = (char*)oargc; - for(i = 0; i < oargc; i++) - *av++ = (oargv[i] - oargb) + (p - base) + (USTKTOP - BY2PG); - *av = nil; - - /* - * Leave space for the return PC of the - * caller of initcode. - */ - sp = USTKTOP - ssize - sizeof(void*); -} - -/* - * create the first process - */ -void -userinit(void) -{ - Proc *p; - Segment *s; - KMap *k; - Page *pg; - - /* no processes yet */ - up = nil; - - p = newproc(); - p->pgrp = newpgrp(); - p->egrp = smalloc(sizeof(Egrp)); - p->egrp->ref = 1; - p->fgrp = dupfgrp(nil); - p->rgrp = newrgrp(); - p->procmode = 0640; - - kstrdup(&eve, ""); - kstrdup(&p->text, "*init*"); - kstrdup(&p->user, eve); - - /* - * Kernel Stack - */ - p->sched.pc = (uintptr)init0; - p->sched.sp = (uintptr)p->kstack+KSTACK-sizeof(up->s.args)-sizeof(uintptr); - p->sched.sp = STACKALIGN(p->sched.sp); - - /* - * User Stack - * - * Technically, newpage can't be called here because it - * should only be called when in a user context as it may - * try to sleep if there are no pages available, but that - * shouldn't be the case here. - */ - s = newseg(SG_STACK, USTKTOP-USTKSIZE, USTKSIZE/BY2PG); - s->flushme++; - p->seg[SSEG] = s; - pg = newpage(1, 0, USTKTOP-BY2PG); - segpage(s, pg); - k = kmap(pg); - bootargs(VA(k)); - kunmap(k); - - /* - * Text - */ - s = newseg(SG_TEXT, UTZERO, 1); - p->seg[TSEG] = s; - pg = newpage(1, 0, UTZERO); - pg->txtflush = ~0; - segpage(s, pg); - k = kmap(s->map[0]->pages[0]); - memmove((void*)VA(k), initcode, sizeof initcode); - kunmap(k); - - ready(p); + sp = (char**)(USTKTOP - sizeof(Tos) - 8 - sizeof(sp[0])*4); + sp[3] = sp[2] = sp[1] = nil; + strcpy(sp[0] = (char*)&sp[4], "boot"); + touser((uintptr)sp); } Conf conf; /* XXX - must go - gag */ diff --git a/sys/src/9/teg2/mkfile b/sys/src/9/teg2/mkfile index 3f8150af7..6ea2c9894 100644 --- a/sys/src/9/teg2/mkfile +++ b/sys/src/9/teg2/mkfile @@ -40,6 +40,7 @@ PORT=\ taslock.$O\ tod.$O\ xalloc.$O\ + userinit.$O\ OBJ=\ l.$O\ @@ -121,32 +122,17 @@ archtegra.$O devether.$0 ether9221.$O: ../port/etherif.h ../port/netif.h archtegra.$O devflash.$O flashtegra.$O flashigep.$O: ../port/flashif.h ecc.$O flashtegra.$O flashigep.$O: ../port/nandecc.h io.h fpi.$O fpiarm.$O fpimem.$O: fpi.h -l.$O lexception.$O lproc.$O mmu.$O: arm.s mem.h +l.$O lexception.$O lproc.$O mmu.$O rebootcode.$O: arm.s mem.h l.$O rebootcode.$O: cache.v7.s -main.$O: errstr.h init.h reboot.h +main.$O: errstr.h rebootcode.i /sys/include/tos.h devusb.$O: ../port/usb.h usbehci.$O usbohci.$O usbuhci.$O: ../port/usb.h usbehci.h uncached.h -init.h:D: ../port/initcode.c init9.s - $CC ../port/initcode.c - $AS init9.s - $LD -l -R1 -s -o init.out init9.$O initcode.$O /$objtype/lib/libc.a - {echo 'uchar initcode[]={' - xd -1x <init.out | - sed -e 's/^[0-9a-f]+ //' -e 's/ ([0-9a-f][0-9a-f])/0x\1,/g' - echo '};'} > init.h - -reboot.h:D: rebootcode.s cache.v7.s arm.s arm.h mem.h - $AS rebootcode.s - # -lc is only for memmove. -T arg is PADDR(REBOOTADDR) -# $LD -l -a -s -T0x100 -R4 -o reboot.out rebootcode.$O -lc >reboot.list - $LD -l -s -T0x100 -R4 -o reboot.out rebootcode.$O -lc - {echo 'uchar rebootcode[]={' - xd -1x reboot.out | - sed -e '1,2d' -e 's/^[0-9a-f]+ //' -e 's/ ([0-9a-f][0-9a-f])/0x\1,/g' - echo '};'} > reboot.h -errstr.h:D: ../port/mkerrstr ../port/error.h - rc ../port/mkerrstr > errstr.h - -$CONF.clean: - rm -rf $p$CONF s$p$CONF errstr.h reboot.h $CONF.c boot$CONF.c +init9.$O: ../omap/init9.s + $AS ../omap/init9.s + +initcode.out: init9.$O initcode.$O /$objtype/lib/libc.a + $LD -l -R1 -s -o $target $prereq + +rebootcode.out: rebootcode.$O + $LD -l -R4 -T0x100 -s -o $target $prereq -lc diff --git a/sys/src/9/teg2/syscall.c b/sys/src/9/teg2/syscall.c index 4a5ec8559..6f49ac4d5 100644 --- a/sys/src/9/teg2/syscall.c +++ b/sys/src/9/teg2/syscall.c @@ -353,8 +353,4 @@ forkchild(Proc *p, Ureg *ureg) /* syscall returns 0 for child */ cureg->r0 = 0; - - /* Things from bottom of syscall which were never executed */ - p->psstate = 0; - p->insyscall = 0; } diff --git a/sys/src/9/xen/main.c b/sys/src/9/xen/main.c index e28716a28..19af3a820 100644 --- a/sys/src/9/xen/main.c +++ b/sys/src/9/xen/main.c @@ -1,14 +1,13 @@ #include "u.h" +#include "tos.h" #include "../port/lib.h" #include "mem.h" #include "dat.h" #include "fns.h" #include "io.h" #include "ureg.h" -#include "init.h" #include "pool.h" -#include "reboot.h" -#include <tos.h> +#include "rebootcode.i" Mach *m; @@ -16,16 +15,10 @@ Mach *m; #define BOOTARGSLEN (sizeof xenstart->cmd_line) #define MAXCONF 64 -enum { - /* space for syscall args, return PC, top-of-stack struct */ - Ustkheadroom = sizeof(Sargs) + sizeof(uintptr) + sizeof(Tos), -}; - Conf conf; char *confname[MAXCONF]; char *confval[MAXCONF]; int nconf; -uchar *sp; /* user stack of init proc */ int idle_spin; static void @@ -152,21 +145,8 @@ machinit(void) void init0(void) { + char buf[2*KNAMELEN], **sp; int i; - char buf[2*KNAMELEN]; - - up->nerrlab = 0; - - spllo(); - - /* - * These are o.k. because rootinit is null. - * Then early kproc's will have a root and dot. - */ - up->slash = namec("#/", Atodir, 0, 0); - pathclose(up->slash->path); - up->slash->path = newpath("/"); - up->dot = cclone(up->slash); chandevinit(); @@ -186,104 +166,13 @@ init0(void) } poperror(); } - kproc("alarm", alarmkproc, 0); - touser(sp); -} -void -userinit(void) -{ - Proc *p; - Segment *s; - KMap *k; - Page *pg; - - p = newproc(); - p->pgrp = newpgrp(); - p->egrp = smalloc(sizeof(Egrp)); - p->egrp->ref = 1; - p->fgrp = dupfgrp(nil); - p->rgrp = newrgrp(); - p->procmode = 0640; - - kstrdup(&eve, ""); - kstrdup(&p->text, "*init*"); - kstrdup(&p->user, eve); - - p->fpstate = FPinit; - fpoff(); - - /* - * Kernel Stack - * - * N.B. make sure there's enough space for syscall to check - * for valid args and - * 4 bytes for gotolabel's return PC - */ - p->sched.pc = (ulong)init0; - p->sched.sp = (ulong)p->kstack+KSTACK-(sizeof(Sargs)+BY2WD); - - /* - * User Stack - */ - s = newseg(SG_STACK, USTKTOP-USTKSIZE, USTKSIZE/BY2PG); - p->seg[SSEG] = s; - pg = newpage(1, 0, USTKTOP-BY2PG); - segpage(s, pg); - k = kmap(pg); - bootargs(VA(k)); - kunmap(k); - - /* - * Text - */ - s = newseg(SG_TEXT, UTZERO, 1); - s->flushme++; - p->seg[TSEG] = s; - pg = newpage(1, 0, UTZERO); - pg->txtflush = ~0; - segpage(s, pg); - k = kmap(s->map[0]->pages[0]); - memmove((ulong*)VA(k), initcode, sizeof initcode); - kunmap(k); - ready(p); -} - -uchar * -pusharg(char *p) -{ - int n; - - n = strlen(p)+1; - sp -= n; - memmove(sp, p, n); - return sp; -} - -void -bootargs(ulong base) -{ - int i, ac; - uchar *av[32]; - uchar **lsp; - - sp = (uchar*)base + BY2PG - Ustkheadroom; - - ac = 0; - av[ac++] = pusharg("boot"); - av[ac++] = pusharg("-D"); - - /* 4 byte word align stack */ - sp = (uchar*)((ulong)sp & ~3); - - /* build argc, argv on stack */ - sp -= (ac+1)*sizeof(sp); - lsp = (uchar**)sp; - for(i = 0; i < ac; i++) - *lsp++ = av[i] + ((USTKTOP - BY2PG) - base); - *lsp = 0; - sp += (USTKTOP - BY2PG) - base - sizeof(ulong); + sp = (char**)(USTKTOP - sizeof(Tos) - 8 - sizeof(sp[0])*4); + sp[3] = sp[2] = nil; + strcpy(sp[1] = (char*)&sp[4], "boot"); + sp[0] = nil; + touser(sp); } char* diff --git a/sys/src/9/xen/mkfile b/sys/src/9/xen/mkfile index 4649210aa..9fc3131a7 100644 --- a/sys/src/9/xen/mkfile +++ b/sys/src/9/xen/mkfile @@ -37,6 +37,7 @@ PORT=\ taslock.$O\ tod.$O\ xalloc.$O\ + userinit.$O\ XEN=\ xengrant.$O\ @@ -131,8 +132,8 @@ REPCC=`{../port/mkfilelist ../pc} # we inherited these.. revisit. $ETHER: ../port/etherif.h ../port/netif.h $SDEV: ../port/sd.h -main.$O: init.h reboot.h -trap.$O: /sys/include/tos.h +main.$O: rebootcode.i +main.$O trap.$O: /sys/include/tos.h %.$O: /$objtype/include/u.h ../port/lib.h mem.h dat.h fns.h io.h ../port/error.h ../port/portdat.h ../port/portfns.h xendat.h xendefs.h @@ -146,22 +147,14 @@ xendat.h: cat xen-public/^($XENHEADERS) } | \ ./cppx > $target -init.h: ../port/initcode.c ../pc/init9.c - $CC ../port/initcode.c - $CC ../pc/init9.c - $LD -l -R1 -o init.out init9.$O initcode.$O /386/lib/libc.a - {echo 'uchar initcode[]={' - strip -o /fd/1 init.out | xd -1x | - sed -e 's/^[0-9a-f]+ //' -e 's/ ([0-9a-f][0-9a-f])/0x\1,/g' - echo '};'} > init.h +initcode.out: init9.$O initcode.$O /$objtype/lib/libc.a + $LD -l -R1 -s -o $target $prereq -reboot.h: ../pc/rebootcode.s +rebootcode.$O: ../pc/rebootcode.s mem.h $AS ../pc/rebootcode.s - $LD -l -s -T0x1000 -R4 -o reboot.out rebootcode.$O - {echo 'uchar rebootcode[]={' - xd -1x reboot.out | - sed -e '1,2d' -e 's/^[0-9a-f]+ //' -e 's/ ([0-9a-f][0-9a-f])/0x\1,/g' - echo '};'} > reboot.h + +rebootcode.out: rebootcode.$O + $LD -l -R4 -s -o $target -T0x1000 $prereq acid:V: $CC -a -w main.c>acid @@ -176,6 +169,6 @@ xenbin.$cputype xenelf.$cputype: utilmkfile mk -f utilmkfile $target %.clean:V: - rm -f $stem.c [9bz]$stem [9bz]$stem.gz 9$stem.elf boot$stem.* reboot.h init.h xendat.h xendefs.h $PCHEADERS dpart xenbin.$cputype xenelf.$cputype xenstore + rm -f $stem.c [9bz]$stem [9bz]$stem.gz 9$stem.elf boot$stem.* xendat.h xendefs.h $PCHEADERS dpart xenbin.$cputype xenelf.$cputype xenstore diff --git a/sys/src/9/xen/trap.c b/sys/src/9/xen/trap.c index e8e401585..8d77b8c43 100644 --- a/sys/src/9/xen/trap.c +++ b/sys/src/9/xen/trap.c @@ -1015,10 +1015,6 @@ forkchild(Proc *p, Ureg *ureg) memmove(cureg, ureg, sizeof(Ureg)); /* return value of syscall in child */ cureg->ax = 0; - - /* Things from bottom of syscall which were never executed */ - p->psstate = 0; - p->insyscall = 0; } /* Give enough context in the ureg to produce a kernel stack for diff --git a/sys/src/9/zynq/main.c b/sys/src/9/zynq/main.c index 042c06e45..ce2a0c259 100644 --- a/sys/src/9/zynq/main.c +++ b/sys/src/9/zynq/main.c @@ -1,13 +1,12 @@ #include "u.h" +#include "tos.h" #include "../port/lib.h" #include "mem.h" #include "dat.h" #include "fns.h" -#include "init.h" #include "pool.h" #include "io.h" #include "../port/error.h" -#include "tos.h" Conf conf; int normalprint, delaylink; @@ -213,20 +212,12 @@ confinit(void) imagmem->maxsize = kmem - (kmem/10); } -static void +void init0(void) { char buf[ERRMAX], **sp; int i; - up->nerrlab = 0; - spllo(); - - up->slash = namec("#/", Atodir, 0, 0); - pathclose(up->slash->path); - up->slash->path = newpath("/"); - up->dot = cclone(up->slash); - chandevinit(); uartconsole(); @@ -256,54 +247,6 @@ init0(void) } void -userinit(void) -{ - Proc *p; - Segment *s; - void *v; - Page *pg; - - p = newproc(); - p->pgrp = newpgrp(); - p->egrp = smalloc(sizeof(Egrp)); - p->egrp->ref = 1; - p->fgrp = dupfgrp(nil); - p->rgrp = newrgrp(); - p->procmode = 0640; - - kstrdup(&eve, ""); - kstrdup(&p->text, "*init*"); - kstrdup(&p->user, eve); - - procsetup(p); - - p->sched.pc = (ulong)init0; - p->sched.sp = (ulong)p->kstack + KSTACK - (sizeof(Sargs) + BY2WD); - - s = newseg(SG_STACK, USTKTOP - USTKSIZE, USTKSIZE / BY2PG); - p->seg[SSEG] = s; - pg = newpage(0, 0, USTKTOP - BY2PG); - segpage(s, pg); - v = tmpmap(pg->pa); - memset(v, 0, BY2PG); - tmpunmap(v); - - s = newseg(SG_TEXT, UTZERO, 1); - s->flushme++; - p->seg[TSEG] = s; - pg = newpage(0, 0, UTZERO); - pg->txtflush = ~0; - - segpage(s, pg); - v = tmpmap(pg->pa); - memset(v, 0, BY2PG); - memmove(v, initcode, sizeof(initcode)); - tmpunmap(v); - - ready(p); -} - -void sanity(void) { static int dat = 0xdeadbeef; diff --git a/sys/src/9/zynq/mkfile b/sys/src/9/zynq/mkfile index fca5f7f5c..999d0ea2b 100644 --- a/sys/src/9/zynq/mkfile +++ b/sys/src/9/zynq/mkfile @@ -39,6 +39,7 @@ PORT=\ random.$O\ rdb.$O\ syscallfmt.$O\ + userinit.$O\ OBJ=\ ltrap.$O\ @@ -71,19 +72,14 @@ $p$CONF:D: $CONF.c $OBJ $LIB mkfile <../port/portmkfile <|../port/mkbootrules $CONF -init.h:D: ../port/initcode.c init9.s - $CC ../port/initcode.c - $AS init9.s - $LD -l -R1 -s -o init.out init9.$O initcode.$O /arm/lib/libc.a - {echo 'uchar initcode[]={' - xd -1x <init.out | - sed -e 's/^[0-9a-f]+ //' -e 's/ ([0-9a-f][0-9a-f])/0x\1,/g' - echo '};'} > init.h +initcode.out: init9.$O initcode.$O /$objtype/lib/libc.a + $LD -l -R1 -s -o $target $prereq install:V: $p$CONF cp $p$CONF /$objtype/ for(i in $EXTRACOPIES) import $i / /n/$i && cp $p$CONF $p$CONF.gz /n/$i/$objtype/ +main.$O trap.$O: /sys/include/tos.h devusb.$O usbehci.$O usbehcizynq.$O: ../port/usb.h usbehci.$O usbehcizynq.$O: usbehci.h diff --git a/sys/src/9/zynq/trap.c b/sys/src/9/zynq/trap.c index d9ceee74c..fbd55e74a 100644 --- a/sys/src/9/zynq/trap.c +++ b/sys/src/9/zynq/trap.c @@ -569,9 +569,6 @@ forkchild(Proc *p, Ureg *ureg) cureg = (Ureg*) p->sched.sp; memmove(cureg, ureg, sizeof(Ureg)); cureg->r0 = 0; - - p->psstate = 0; - p->insyscall = 0; } uintptr |