xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix overlapping arguments with Tos for initcode process

Browse source
This commit is contained in:
cinap_lenrek 2011-05-14 17:05:51 +00:00
parent 545fc5e329
commit b4f2bf77b3
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sys/src/9/pc/main.c
View file

@ -4,6 +4,7 @@
#include "dat.h"
#include "fns.h"
#include "io.h"
#include "tos.h"
#include "ureg.h"
#include "init.h"
#include "pool.h"
@ -289,10 +290,10 @@ bootargs(void *base)
char *cp = BOOTLINE;
char buf[64];
sp = (uchar*)base + BY2PG - MAXSYSARG*BY2WD;
sp = (uchar*)base + BY2PG - sizeof(Tos);
ac = 0;
av[ac++] = pusharg("/386/9dos");
av[ac++] = pusharg("boot");
/* when boot is changed to only use rc, this code can go away */
cp[BOOTLINELEN-1] = 0;
@ -313,9 +314,10 @@ bootargs(void *base)
sp -= (ac+1)*sizeof(sp);
lsp = (uchar**)sp;
for(i = 0; i < ac; i++)
*lsp++ = av[i] + ((USTKTOP - BY2PG) - (ulong)base);
*lsp = 0;
sp += (USTKTOP - BY2PG) - (ulong)base - sizeof(ulong);
lsp[i] = av[i] + ((USTKTOP - BY2PG) - (ulong)base);
lsp[i] = 0;
sp += (USTKTOP - BY2PG) - (ulong)base;
sp -= BY2WD;
}
char*