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

multiboot: use initrd for config

Browse source
This commit is contained in:
aiju 2012-07-13 18:52:39 +02:00
parent c03913c62d
commit c612f9c41f
2 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sys/src/9/pc/l.s
View file

@ -52,6 +52,10 @@ TEXT _multibootheader(SB), $0
LONG $0 /* height */ LONG $0 /* height */
LONG $0 /* depth */ LONG $0 /* depth */
/*
* the kernel expects the data segment to be page-aligned
* multiboot bootloaders put the data segment right behind text
*/
TEXT _multibootentry(SB), $0 TEXT _multibootentry(SB), $0
MOVL $etext-KZERO(SB), SI MOVL $etext-KZERO(SB), SI
MOVL SI, DI MOVL SI, DI
@ -64,10 +68,16 @@ TEXT _multibootentry(SB), $0
STD STD
REP; MOVSB REP; MOVSB
CLD CLD
ADDL $KZERO, BX
MOVL BX, multiboot-KZERO(SB)
MOVL $_startPADDR(SB), AX MOVL $_startPADDR(SB), AX
ANDL $~KZERO, AX ANDL $~KZERO, AX
JMP* AX JMP* AX
/* multiboot structure pointer */
TEXT multiboot(SB), $0
LONG $0
/* /*
* In protected mode with paging turned off and segment registers setup * In protected mode with paging turned off and segment registers setup
* to linear map all memory. Entered via a jump to PADDR(entry), * to linear map all memory. Entered via a jump to PADDR(entry),

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

@ -37,6 +37,22 @@ options(void)
{ {
long i, n; long i, n;
char *cp, *line[MAXCONF], *p, *q; char *cp, *line[MAXCONF], *p, *q;
ulong *m, l;
extern ulong *multiboot;
if(multiboot != nil){
cp = BOOTARGS;
*cp = 0;
if((*multiboot & 8) != 0 && multiboot[5] > 0){
m = KADDR(multiboot[6]);
l = m[1] - m[0];
m = KADDR(m[0]);
if(l >= BOOTARGSLEN)
l = BOOTARGSLEN - 1;
memmove(cp, m, l);
cp[l] = 0;
}
}
/* /*
* parse configuration args from dos file plan9.ini * parse configuration args from dos file plan9.ini