Index: kernel/genarch/Makefile.inc =================================================================== --- kernel/genarch/Makefile.inc (revision c22e964a598c0c20654391f6a11e7333830cbf37) +++ kernel/genarch/Makefile.inc (revision 89b1b64f71aaaf3d8f3db35a293d36cb6056e718) @@ -102,4 +102,9 @@ endif +ifeq ($(CONFIG_MULTIBOOT), y) + GENARCH_SOURCES += \ + genarch/src/multiboot/multiboot.c +endif + ifeq ($(CONFIG_EGA), y) GENARCH_SOURCES += \ Index: kernel/genarch/include/multiboot/multiboot.h =================================================================== --- kernel/genarch/include/multiboot/multiboot.h (revision 89b1b64f71aaaf3d8f3db35a293d36cb6056e718) +++ kernel/genarch/include/multiboot/multiboot.h (revision 89b1b64f71aaaf3d8f3db35a293d36cb6056e718) @@ -0,0 +1,100 @@ +/* + * Copyright (c) 2009 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup genarch + * @{ + */ +/** @file + */ + +#ifndef KERN_MULTIBOOT_H_ +#define KERN_MULTIBOOT_H_ + +#include +#include + +/** Multiboot 32-bit address. */ +typedef uint32_t mbaddr_t; + +/** Multiboot mod structure */ +typedef struct { + mbaddr_t start; + mbaddr_t end; + mbaddr_t string; + uint32_t reserved; +} __attribute__ ((packed)) multiboot_mod_t; + +/** Multiboot mmap structure */ +typedef struct { + uint32_t size; + e820memmap_t mm_info; +} __attribute__ ((packed)) multiboot_mmap_t; + +/** Multiboot information structure */ +typedef struct { + uint32_t flags; + uint32_t mem_lower; + uint32_t mem_upper; + + uint32_t boot_device; + uint32_t cmdline; + + uint32_t mods_count; + mbaddr_t mods_addr; + + uint32_t syms[4]; + + uint32_t mmap_length; + mbaddr_t mmap_addr; + + /* ... */ +} __attribute__ ((packed)) multiboot_info_t; + +enum multiboot_info_flags { + MBINFO_FLAGS_MEM = 0x01, + MBINFO_FLAGS_BOOT = 0x02, + MBINFO_FLAGS_CMDLINE = 0x04, + MBINFO_FLAGS_MODS = 0x08, + MBINFO_FLAGS_SYMS1 = 0x10, + MBINFO_FLAGS_SYMS2 = 0x20, + MBINFO_FLAGS_MMAP = 0x40 + + /* ... */ +}; + +#define MULTIBOOT_LOADER_MAGIC 0x2BADB002 + +/** Convert 32-bit multiboot address to a pointer. */ +#define MULTIBOOT_PTR(mba) ((void *)(uintptr_t) (mba)) + +extern void multiboot_info_parse(uint32_t, const multiboot_info_t *); + +#endif + +/** @} + */ Index: kernel/genarch/src/multiboot/multiboot.c =================================================================== --- kernel/genarch/src/multiboot/multiboot.c (revision 89b1b64f71aaaf3d8f3db35a293d36cb6056e718) +++ kernel/genarch/src/multiboot/multiboot.c (revision 89b1b64f71aaaf3d8f3db35a293d36cb6056e718) @@ -0,0 +1,148 @@ +/* + * Copyright (c) 2009 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup genarch + * @{ + */ +/** @file + */ + +#include +#include +#include +#include +#include +#include + +/** Extract command name from the multiboot module command line. + * + * @param buf Destination buffer (will always null-terminate). + * @param n Size of destination buffer. + * @param cmd_line Input string (the command line). + * + */ +static void extract_command(char *buf, size_t n, const char *cmd_line) +{ + const char *start, *end, *cp; + size_t max_len; + + /* Find the first space. */ + end = strchr(cmd_line, ' '); + if (end == NULL) + end = cmd_line + strlen(cmd_line); + + /* + * Find last occurence of '/' before 'end'. If found, place start at + * next character. Otherwise, place start at beginning of buffer. + */ + cp = end; + start = buf; + while (cp != start) { + if (*cp == '/') { + start = cp + 1; + break; + } + --cp; + } + + /* Copy the command and null-terminate the string. */ + max_len = min(n - 1, (size_t) (end - start)); + strncpy(buf, start, max_len + 1); + buf[max_len] = '\0'; +} + +/** Parse multiboot information structure. + * + * If @a signature does not contain a valid multiboot signature, + * assumes no multiboot information is available. + * + * @param signature Should contain the multiboot signature. + * @param mi Pointer to the multiboot information structure. + */ +void multiboot_info_parse(uint32_t signature, const multiboot_info_t *mi) +{ + uint32_t flags; + multiboot_mod_t *mods; + uint32_t i; + + if (signature == MULTIBOOT_LOADER_MAGIC) + flags = mi->flags; + else { + /* No multiboot info available. */ + flags = 0; + } + + /* Copy module information. */ + + if ((flags & MBINFO_FLAGS_MODS) != 0) { + init.cnt = mi->mods_count; + mods = (multiboot_mod_t *) MULTIBOOT_PTR(mi->mods_addr); + + for (i = 0; i < init.cnt; i++) { + init.tasks[i].addr = PA2KA(mods[i].start); + init.tasks[i].size = mods[i].end - mods[i].start; + + /* Copy command line, if available. */ + if (mods[i].string) { + extract_command(init.tasks[i].name, + CONFIG_TASK_NAME_BUFLEN, + MULTIBOOT_PTR(mods[i].string)); + } else + init.tasks[i].name[0] = '\0'; + } + } else + init.cnt = 0; + + /* Copy memory map. */ + + int32_t mmap_length; + multiboot_mmap_t *mme; + uint32_t size; + + if ((flags & MBINFO_FLAGS_MMAP) != 0) { + mmap_length = mi->mmap_length; + mme = MULTIBOOT_PTR(mi->mmap_addr); + e820counter = 0; + + i = 0; + while (mmap_length > 0) { + e820table[i++] = mme->mm_info; + + /* Compute address of next structure. */ + size = sizeof(mme->size) + mme->size; + mme = ((void *) mme) + size; + mmap_length -= size; + } + + e820counter = i; + } else + e820counter = 0; +} + +/** @} + */