| 46,19 → 46,21 |
|---|
| |
| /** 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). |
| * @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); |
| |
| 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. |
| 72,7 → 74,7 |
|---|
| } |
| --cp; |
| } |
| |
| |
| /* Copy the command and null-terminate the string. */ |
| max_len = min(n - 1, (size_t) (end - start)); |
| strncpy(buf, start, max_len + 1); |
| 80,8 → 82,9 |
|---|
| } |
| |
| /** C part of ia32 boot sequence. |
| * @param signature Should contain the multiboot signature. |
| * @param mi Pointer to the multiboot information structure. |
| * |
| * @param signature Should contain the multiboot signature. |
| * @param mi Pointer to the multiboot information structure. |
| */ |
| void ia32_cboot(uint32_t signature, const mb_info_t *mi) |
| { |
| 88,69 → 91,66 |
|---|
| uint32_t flags; |
| mb_mod_t *mods; |
| uint32_t i; |
| |
| if (signature == MULTIBOOT_LOADER_MAGIC) { |
| |
| if (signature == MULTIBOOT_LOADER_MAGIC) |
| flags = mi->flags; |
| } else { |
| else { |
| /* No multiboot info available. */ |
| flags = 0; |
| } |
| |
| |
| /* Copy module information. */ |
| |
| |
| if ((flags & MBINFO_FLAGS_MODS) != 0) { |
| init.cnt = mi->mods_count; |
| mods = mi->mods_addr; |
| |
| |
| for (i = 0; i < init.cnt; i++) { |
| init.tasks[i].addr = mods[i].start + 0x80000000; |
| 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, |
| mods[i].string); |
| } else { |
| } else |
| init.tasks[i].name[0] = '\0'; |
| } |
| } |
| } else { |
| } else |
| init.cnt = 0; |
| } |
| |
| |
| /* Copy memory map. */ |
| |
| |
| int32_t mmap_length; |
| mb_mmap_t *mme; |
| uint32_t size; |
| |
| |
| if ((flags & MBINFO_FLAGS_MMAP) != 0) { |
| mmap_length = mi->mmap_length; |
| mme = 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 { |
| } else |
| e820counter = 0; |
| } |
| |
| |
| #ifdef CONFIG_SMP |
| /* Copy AP bootstrap routines below 1 MB. */ |
| memcpy((void *) AP_BOOT_OFFSET, (void *) BOOT_OFFSET, |
| (size_t) &_hardcoded_unmapped_size); |
| #endif |
| |
| |
| main_bsp(); |
| } |
| |