From 93af6fa198dc7c3017c3f8cd32bbbf254ce4190d Mon Sep 17 00:00:00 2001 From: David du Colombier <0intro@gmail.com> Date: Fri, 16 Aug 2002 00:00:00 +0000 Subject: [PATCH] Plan 9 from Bell Labs 2002-08-16 --- boot/bootip.c | 2 +- port/devcons.c | 2 +- port/sysproc.c | 2 ++ port/xalloc.c | 1 - 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/boot/bootip.c b/boot/bootip.c index e2f67d9b0476de857819bb6632ca0b845b4ada0d..4b943959cdbd74581b5e8aec06effea45c6f1888 100644 --- a/boot/bootip.c +++ b/boot/bootip.c @@ -20,7 +20,7 @@ configip(void) Waitmsg *w; char **arg; char buf[32]; - + fmtinstall('I', eipfmt); fmtinstall('M', eipfmt); fmtinstall('E', eipfmt); diff --git a/port/devcons.c b/port/devcons.c index 4abbde0a8985a833c70e7fab201d838b3a61da1e..87b7d7277f5bd30851ffae3f3c44b6af9b8bdf0e 100644 --- a/port/devcons.c +++ b/port/devcons.c @@ -65,7 +65,7 @@ Cmdtab rebootmsg[] = void printinit(void) { - lineq = qopen(2*1024, 0, 0, 0); + lineq = qopen(2*1024, 0, nil, nil); if(lineq == nil) panic("printinit"); qnoblock(lineq, 1); diff --git a/port/sysproc.c b/port/sysproc.c index c23d205790aa7e547b9cd81db81a0b5887efc50c..513aafb01e2a15fe13ad5cdd55031a69d136f17c 100644 --- a/port/sysproc.c +++ b/port/sysproc.c @@ -432,6 +432,7 @@ sysexec(ulong *arg) for(i=0; i<=f->maxfd; i++) fdclose(i, CCEXEC); +print("set up segments\n"); /* Text. Shared. Attaches to cache image if possible */ /* attachimage returns a locked cache image */ img = attachimage(SG_TEXT|SG_RONLY, tc, UTZERO, (t-UTZERO)>>PGSHIFT); @@ -491,6 +492,7 @@ sysexec(ulong *arg) qunlock(&up->debug); if(up->hang) up->procctl = Proc_stopme; +print("go\n"); return execregs(entry, ssize, nargs); } diff --git a/port/xalloc.c b/port/xalloc.c index 26211ac04d67bb36e497f4efbfc32c02c7875168..965988145ef5aaaab66d440d5be4cbc1b35e8b21 100644 --- a/port/xalloc.c +++ b/port/xalloc.c @@ -87,7 +87,6 @@ void* xspanalloc(ulong size, int align, ulong span) { ulong a, v, t; - a = (ulong)xalloc(size+align+span); if(a == 0) panic("xspanalloc: %lud %d %lux\n", size, align, span);