diff options
| author | cinap_lenrek <cinap_lenrek@gmx.de> | 2012-07-14 23:08:38 +0200 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@gmx.de> | 2012-07-14 23:08:38 +0200 |
| commit | b494f61baa98f9ebb17cae13257d056af995b9f3 (patch) | |
| tree | 1a440028dc229b188eec37079455380e854e8941 | |
| parent | 983bd80477a6ed52cdf7f15191ef70bb5a6ac24e (diff) | |
| parent | c612f9c41fd876c181f89472861245404cef65c5 (diff) | |
merge
| -rw-r--r-- | sys/src/9/pc/l.s | 28 | ||||
| -rw-r--r-- | sys/src/9/pc/main.c | 16 |
2 files changed, 43 insertions, 1 deletions
diff --git a/sys/src/9/pc/l.s b/sys/src/9/pc/l.s index d3e5f5201..83e6e91a3 100644 --- a/sys/src/9/pc/l.s +++ b/sys/src/9/pc/l.s @@ -46,12 +46,38 @@ TEXT _multibootheader(SB), $0 LONG $_startKADDR-KZERO(SB) /* load_addr */ LONG $edata-KZERO(SB) /* load_end_addr */ LONG $end-KZERO(SB) /* bss_end_addr */ - LONG $_startKADDR-KZERO(SB) /* entry_addr */ + LONG $_multibootentry-KZERO(SB) /* entry_addr */ LONG $0 /* mode_type */ LONG $0 /* width */ LONG $0 /* height */ 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 + MOVL $etext-KZERO(SB), SI + MOVL SI, DI + ADDL $0xfff, DI + ANDL $~0xfff, DI + MOVL $edata-KZERO(SB), CX + SUBL DI, CX + ADDL CX, SI + ADDL CX, DI + STD + REP; MOVSB + CLD + ADDL $KZERO, BX + MOVL BX, multiboot-KZERO(SB) + MOVL $_startPADDR(SB), AX + ANDL $~KZERO, AX + JMP* AX + +/* multiboot structure pointer */ +TEXT multiboot(SB), $0 + LONG $0 + /* * In protected mode with paging turned off and segment registers setup * to linear map all memory. Entered via a jump to PADDR(entry), diff --git a/sys/src/9/pc/main.c b/sys/src/9/pc/main.c index 1ea96d6c7..71c469650 100644 --- a/sys/src/9/pc/main.c +++ b/sys/src/9/pc/main.c @@ -37,6 +37,22 @@ options(void) { long i, n; 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 |