vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

2008-09-07 Robert Millan <rmh@aybabtu.com>

Browse source 
* loader/i386/pc/multiboot.c (mmap_addr, mmap_length): Remove
        variables.
        (grub_multiboot): Move `mbi' allocation upwards, so that mmap address
        and length can be stored directly in the `mbi->mmap_addr' and
        `mbi->mmap_length' struct fields.
This commit is contained in:
robertmh 2008-09-07 17:13:00 +00:00
parent 548e2ea57c
commit 783d0f484f
2 changed files with 22 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2008-09-07 Robert Millan <rmh@aybabtu.com>
* loader/i386/pc/multiboot.c (mmap_addr, mmap_length): Remove
variables.
(grub_multiboot): Move `mbi' allocation upwards, so that mmap address
and length can be stored directly in the `mbi->mmap_addr' and
`mbi->mmap_length' struct fields.
2008-09-07 Robert Millan <rmh@aybabtu.com> 2008-09-07 Robert Millan <rmh@aybabtu.com>
* conf/i386.rmk: New file. Provides declaration for building * conf/i386.rmk: New file. Provides declaration for building

34
loader/i386/pc/multiboot.c
View file

@ -1,7 +1,7 @@
/* multiboot.c - boot a multiboot OS image. */ /* multiboot.c - boot a multiboot OS image. */
/* /*
* GRUB -- GRand Unified Bootloader * GRUB -- GRand Unified Bootloader
* Copyright (C) 2003,2004,2005,2007,2008 Free Software Foundation, Inc. * Copyright (C) 1999,2000,2001,2002,2003,2004,2005,2007,2008 Free Software Foundation, Inc.
* *
* GRUB is free software: you can redistribute it and/or modify * GRUB is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -82,11 +82,6 @@ grub_multiboot_unload (void)
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
} }
/* FIXME: grub_uint32_t will break for addresses above 4 GiB, but is mandated
by the spec. Is there something we can do about it? */
static grub_uint32_t mmap_addr = 0;
static grub_uint32_t mmap_length;
/* Return the length of the Multiboot mmap that will be needed to allocate /* Return the length of the Multiboot mmap that will be needed to allocate
our platform's map. */ our platform's map. */
static grub_uint32_t static grub_uint32_t
@ -422,8 +417,14 @@ grub_multiboot (int argc, char *argv[])
playground = NULL; playground = NULL;
} }
mmap_length = grub_get_multiboot_mmap_len (); mbi = grub_malloc (sizeof (struct grub_multiboot_info));
grub_multiboot_payload_size = mmap_length; if (! mbi)
goto fail;
grub_memset (mbi, 0, sizeof (struct grub_multiboot_info));
mbi->mmap_length = grub_get_multiboot_mmap_len ();
grub_multiboot_payload_size = mbi->mmap_length;
if (header->flags & MULTIBOOT_AOUT_KLUDGE) if (header->flags & MULTIBOOT_AOUT_KLUDGE)
{ {
@ -464,9 +465,12 @@ grub_multiboot (int argc, char *argv[])
grub_fill_multiboot_mmap ((struct grub_multiboot_mmap_entry *) (grub_multiboot_payload_orig grub_fill_multiboot_mmap ((struct grub_multiboot_mmap_entry *) (grub_multiboot_payload_orig
+ grub_multiboot_payload_size + grub_multiboot_payload_size
- mmap_length)); - mbi->mmap_length));
mmap_addr = grub_multiboot_payload_dest + grub_multiboot_payload_size - mmap_length; /* FIXME: grub_uint32_t will break for addresses above 4 GiB, but is mandated
by the spec. Is there something we can do about it? */
mbi->mmap_addr = grub_multiboot_payload_dest + grub_multiboot_payload_size - mbi->mmap_length;
mbi->flags |= MULTIBOOT_INFO_MEM_MAP;
if (grub_multiboot_payload_dest >= grub_multiboot_payload_orig) if (grub_multiboot_payload_dest >= grub_multiboot_payload_orig)
{ {
@ -485,21 +489,11 @@ grub_multiboot (int argc, char *argv[])
grub_multiboot_payload_size, grub_multiboot_payload_size,
grub_multiboot_payload_entry_offset); grub_multiboot_payload_entry_offset);
mbi = grub_malloc (sizeof (struct grub_multiboot_info));
if (! mbi)
goto fail;
grub_memset (mbi, 0, sizeof (struct grub_multiboot_info));
/* Convert from bytes to kilobytes. */ /* Convert from bytes to kilobytes. */
mbi->mem_lower = grub_lower_mem / 1024; mbi->mem_lower = grub_lower_mem / 1024;
mbi->mem_upper = grub_upper_mem / 1024; mbi->mem_upper = grub_upper_mem / 1024;
mbi->flags |= MULTIBOOT_INFO_MEMORY; mbi->flags |= MULTIBOOT_INFO_MEMORY;
mbi->mmap_addr = mmap_addr;
mbi->mmap_length = mmap_length;
mbi->flags |= MULTIBOOT_INFO_MEM_MAP;
for (i = 0, len = 0; i < argc; i++) for (i = 0, len = 0; i < argc; i++)
len += grub_strlen (argv[i]) + 1; len += grub_strlen (argv[i]) + 1;