From 4f33c88a51587681b7be1ae57cfbc43b627c6bc4 Mon Sep 17 00:00:00 2001 From: cinap_lenrek Date: Mon, 30 Jul 2012 19:11:16 +0200 Subject: import updated compilers from sources --- sys/src/cmd/ki/ki.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'sys/src/cmd/ki/ki.c') diff --git a/sys/src/cmd/ki/ki.c b/sys/src/cmd/ki/ki.c index 6a07e7be5..38427584a 100644 --- a/sys/src/cmd/ki/ki.c +++ b/sys/src/cmd/ki/ki.c @@ -2,6 +2,7 @@ #include #include #include +#include #define Extern #include "sparc.h" @@ -277,12 +278,22 @@ reset(void) void initstk(int argc, char *argv[]) { - ulong size, sp, ap; + ulong size, sp, ap, tos; int i; char *p; initmap(); - sp = STACKTOP - 4; + tos = STACKTOP - sizeof(Tos)*2; /* we'll assume twice the host's is big enough */ + sp = tos; + for (i = 0; i < sizeof(Tos)*2; i++) + putmem_b(tos + i, 0); + + /* + * pid is second word from end of tos and needs to be set for nsec(). + * we know sparc is a 32-bit cpu, so we'll assume knowledge of the Tos + * struct for now, and use our pid. + */ + putmem_w(tos + 4*4 + 2*sizeof(ulong) + 3*sizeof(uvlong), getpid()); /* Build exec stack */ size = strlen(file)+1+BY2WD+BY2WD+(BY2WD*2); @@ -292,7 +303,7 @@ initstk(int argc, char *argv[]) sp -= size; sp &= ~7; reg.r[1] = sp; - reg.r[7] = STACKTOP-4; /* Plan 9 profiling clock */ + reg.r[7] = tos; /* Plan 9 profiling clock, etc. */ /* Push argc */ putmem_w(sp, argc+1); -- cgit v1.2.3