2006-04-25 Yoshinori K. Okuji <okuji@enbug.org>
A new machine-specific function "grub_machine_set_prefix" is
defined. This is called after loading modules, so that a prefix
initialization can use modules. Also, this change adds an
intensive debugging feature for the memory manager via the
configure option "--enable-mm-debug".
* partmap/gpt.c (gpt_partition_map_iterate): Add one more into
PART.LEN.
* kern/sparc64/ieee1275/init.c (abort): Removed.
(grub_stop): Likewise.
(grub_exit): New function.
(grub_set_prefix): Renamed to ...
(grub_machine_set_prefix): ... this.
(grub_machine_init): Do not call grub_set_prefix.
* kern/powerpc/ieee1275/init.c (grub_set_prefix): Renamed to ...
(grub_machine_set_prefix): ... this.
(grub_machine_init): Do not call grub_set_prefix.
* kern/i386/pc/init.c (grub_machine_set_prefix): New function.
(grub_machine_init): Do not set the prefix here.
* kern/i386/efi/init.c (grub_machine_set_prefix): New function.
* kern/efi/init.c: Include grub/mm.h.
(grub_efi_set_prefix): New function.
* kern/efi/efi.c (grub_exit): Call grub_efi_fini.
(grub_efi_get_filename): New function.
(grub_print_device_path): Renamed to ...
(grub_efi_print_device_path): ... this.
* kern/mm.c [MM_DEBUG] (grub_malloc): Undefined.
[MM_DEBUG] (grub_realloc): Likewise.
[MM_DEBUG] (grub_free): Likewise.
[MM_DEBUG] (grub_memalign): Likewise.
[MM_DEBUG] (grub_mm_debug): New variable.
[MM_DEBUG] (grub_debug_malloc): New function.
[MM_DEBUG] (grub_debug_free): New function.
[MM_DEBUG] (grub_debug_realloc): New function.
[MM_DEBUG] (grub_debug_memalign): New function.
* kern/misc.c (grub_abort): Print a newline to distinguish
the message.
* kern/main.c (grub_main): Call grub_machine_set_prefix and
grub_set_root_dev after loading modules. This is necessary when
setting a prefix depends on modules.
* include/grub/efi/efi.h (grub_print_device_path): Renamed to ...
(grub_efi_print_device_path): ... this.
(grub_efi_get_filename): New prototype.
(grub_efi_set_prefix): Likewise.
* include/grub/efi/disk.h: Include grub/efi/api.h, grub/symbol.h
and grub/disk.h.
(grub_efidisk_get_device_handle): New prototype.
(grub_efidisk_get_device_name): Likewise.
* include/grub/mm.h: Include config.h.
(MM_DEBUG): Removed.
[MM_DEBUG && !GRUB_UTIL] (grub_mm_debug): New prototype.
[MM_DEBUG && !GRUB_UTIL] (grub_malloc): New macro.
[MM_DEBUG && !GRUB_UTIL] (grub_realloc): Likewise.
[MM_DEBUG && !GRUB_UTIL] (grub_memalign): Likewise.
[MM_DEBUG && !GRUB_UTIL] (grub_free): Likewise.
[MM_DEBUG && !GRUB_UTIL] (grub_debug_malloc): New prototype.
[MM_DEBUG && !GRUB_UTIL] (grub_debug_realloc): New prototype.
[MM_DEBUG && !GRUB_UTIL] (grub_debug_memalign): New prototype.
[MM_DEBUG && !GRUB_UTIL] (grub_debug_free): New prototype.
* include/grub/kernel.h (grub_machine_set_prefix): New prototype.
* disk/efi/efidisk.c: Include grub/partition.h.
(iterate_child_devices): New function.
(add_device): First, compare only last device path nodes, so that
devices are sorted by the types.
(grub_efidisk_get_device_handle): New function.
(grub_efidisk_get_device_name): Likewise.
* configure.ac (--enable-mm-debug): New option to enable the
memory manager debugging feature. This makes the binary much
bigger, so is disabled by default.
This commit is contained in:
okuji
parent
9cacaa174c
commit
2965c7cc2d
19 changed files with 590 additions and 35 deletions
|
|
@ -154,6 +154,7 @@ grub_efi_get_loaded_image (void)
|
|||
void
|
||||
grub_exit (void)
|
||||
{
|
||||
grub_efi_fini ();
|
||||
grub_efi_system_table->boot_services->exit (grub_efi_image_handle,
|
||||
GRUB_EFI_SUCCESS,
|
||||
0, 0);
|
||||
|
|
@ -218,9 +219,68 @@ grub_arch_modules_addr (void)
|
|||
return (grub_addr_t) info;
|
||||
}
|
||||
|
||||
char *
|
||||
grub_efi_get_filename (grub_efi_device_path_t *dp)
|
||||
{
|
||||
char *name = 0;
|
||||
|
||||
while (1)
|
||||
{
|
||||
grub_efi_uint8_t type = GRUB_EFI_DEVICE_PATH_TYPE (dp);
|
||||
grub_efi_uint8_t subtype = GRUB_EFI_DEVICE_PATH_SUBTYPE (dp);
|
||||
|
||||
if (type == GRUB_EFI_END_DEVICE_PATH_TYPE)
|
||||
break;
|
||||
else if (type == GRUB_EFI_MEDIA_DEVICE_PATH_TYPE
|
||||
&& subtype == GRUB_EFI_FILE_PATH_DEVICE_PATH_SUBTYPE)
|
||||
{
|
||||
grub_efi_file_path_device_path_t *fp;
|
||||
grub_efi_uint16_t len;
|
||||
char *p;
|
||||
grub_size_t size;
|
||||
|
||||
if (name)
|
||||
{
|
||||
size = grub_strlen (name);
|
||||
name[size] = '/';
|
||||
size++;
|
||||
}
|
||||
else
|
||||
size = 0;
|
||||
|
||||
len = GRUB_EFI_DEVICE_PATH_LENGTH (dp) - 4;
|
||||
p = grub_realloc (name, size + len * 4 + 1);
|
||||
if (! p)
|
||||
{
|
||||
grub_free (name);
|
||||
return 0;
|
||||
}
|
||||
|
||||
name = p;
|
||||
fp = (grub_efi_file_path_device_path_t *) dp;
|
||||
*grub_utf16_to_utf8 ((grub_uint8_t *) name + size,
|
||||
fp->path_name, len) = '\0';
|
||||
}
|
||||
|
||||
dp = GRUB_EFI_NEXT_DEVICE_PATH (dp);
|
||||
}
|
||||
|
||||
if (name)
|
||||
{
|
||||
/* EFI breaks paths with backslashes. */
|
||||
char *p;
|
||||
|
||||
for (p = name; *p; p++)
|
||||
if (*p == '\\')
|
||||
*p = '/';
|
||||
}
|
||||
|
||||
return name;
|
||||
}
|
||||
|
||||
/* Print the chain of Device Path nodes. This is mainly for debugging. */
|
||||
void
|
||||
grub_print_device_path (grub_efi_device_path_t *dp)
|
||||
grub_efi_print_device_path (grub_efi_device_path_t *dp)
|
||||
{
|
||||
while (1)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@
|
|||
#include <grub/term.h>
|
||||
#include <grub/misc.h>
|
||||
#include <grub/env.h>
|
||||
#include <grub/mm.h>
|
||||
#include <grub/machine/kernel.h>
|
||||
|
||||
void
|
||||
|
|
@ -38,9 +39,45 @@ grub_efi_init (void)
|
|||
grub_efi_mm_init ();
|
||||
|
||||
grub_efidisk_init ();
|
||||
}
|
||||
|
||||
/* FIXME: this must be set to something meaningful. */
|
||||
grub_env_set ("prefix", grub_prefix);
|
||||
void
|
||||
grub_efi_set_prefix (void)
|
||||
{
|
||||
grub_efi_loaded_image_t *image;
|
||||
|
||||
image = grub_efi_get_loaded_image ();
|
||||
if (image)
|
||||
{
|
||||
char *device;
|
||||
char *file;
|
||||
|
||||
device = grub_efidisk_get_device_name (image->device_handle);
|
||||
file = grub_efi_get_filename (image->file_path);
|
||||
|
||||
if (device && file)
|
||||
{
|
||||
char *p;
|
||||
char *prefix;
|
||||
|
||||
/* Get the directory. */
|
||||
p = grub_strrchr (file, '/');
|
||||
if (p)
|
||||
*p = '\0';
|
||||
|
||||
prefix = grub_malloc (1 + grub_strlen (device) + 1
|
||||
+ grub_strlen (file) + 1);
|
||||
if (prefix)
|
||||
{
|
||||
grub_sprintf (prefix, "(%s)%s", device, file);
|
||||
grub_env_set ("prefix", prefix);
|
||||
grub_free (prefix);
|
||||
}
|
||||
}
|
||||
|
||||
grub_free (device);
|
||||
grub_free (file);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
|||
|
|
@ -40,6 +40,12 @@ grub_machine_fini (void)
|
|||
grub_efi_fini ();
|
||||
}
|
||||
|
||||
void
|
||||
grub_machine_set_prefix (void)
|
||||
{
|
||||
grub_efi_set_prefix ();
|
||||
}
|
||||
|
||||
void
|
||||
grub_arch_sync_caches (void *address __attribute__ ((unused)),
|
||||
grub_size_t len __attribute__ ((unused)))
|
||||
|
|
|
|||
|
|
@ -226,8 +226,11 @@ grub_machine_init (void)
|
|||
|
||||
/* The memory system was initialized, thus register built-in devices. */
|
||||
grub_biosdisk_init ();
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
grub_machine_set_prefix (void)
|
||||
{
|
||||
/* Initialize the prefix. */
|
||||
grub_env_set ("prefix", make_install_device ());
|
||||
}
|
||||
|
|
|
|||
|
|
@ -118,14 +118,15 @@ grub_main (void)
|
|||
grub_printf ("Welcome to GRUB!\n\n");
|
||||
grub_setcolorstate (GRUB_TERM_COLOR_STANDARD);
|
||||
|
||||
/* It is better to set the root device as soon as possible,
|
||||
for convenience. */
|
||||
grub_set_root_dev ();
|
||||
|
||||
/* Load pre-loaded modules and free the space. */
|
||||
grub_register_exported_symbols ();
|
||||
grub_load_modules ();
|
||||
|
||||
/* It is better to set the root device as soon as possible,
|
||||
for convenience. */
|
||||
grub_machine_set_prefix ();
|
||||
grub_set_root_dev ();
|
||||
|
||||
/* Load the normal mode module. */
|
||||
grub_load_normal_mode ();
|
||||
|
||||
|
|
|
|||
|
|
@ -964,9 +964,9 @@ grub_abort (void)
|
|||
{
|
||||
if (grub_term_get_current ())
|
||||
{
|
||||
grub_printf ("Abort. Press any key to exit.");
|
||||
grub_printf ("\nAborted. Press any key to exit.");
|
||||
grub_getkey ();
|
||||
}
|
||||
|
||||
|
||||
grub_exit ();
|
||||
}
|
||||
|
|
|
|||
58
kern/mm.c
58
kern/mm.c
|
|
@ -67,6 +67,13 @@
|
|||
#include <grub/disk.h>
|
||||
#include <grub/dl.h>
|
||||
|
||||
#ifdef MM_DEBUG
|
||||
# undef grub_malloc
|
||||
# undef grub_realloc
|
||||
# undef grub_free
|
||||
# undef grub_memalign
|
||||
#endif
|
||||
|
||||
/* Magic words. */
|
||||
#define GRUB_MM_FREE_MAGIC 0x2d3c2808
|
||||
#define GRUB_MM_ALLOC_MAGIC 0x6db08fa4
|
||||
|
|
@ -388,7 +395,9 @@ grub_realloc (void *ptr, grub_size_t size)
|
|||
return q;
|
||||
}
|
||||
|
||||
#if MM_DEBUG
|
||||
#ifdef MM_DEBUG
|
||||
grub_mm_debug = 0;
|
||||
|
||||
void
|
||||
grub_mm_dump (unsigned lineno)
|
||||
{
|
||||
|
|
@ -419,4 +428,51 @@ grub_mm_dump (unsigned lineno)
|
|||
|
||||
grub_printf ("\n");
|
||||
}
|
||||
|
||||
void *
|
||||
grub_debug_malloc (const char *file, int line, grub_size_t size)
|
||||
{
|
||||
void *ptr;
|
||||
|
||||
if (grub_mm_debug)
|
||||
grub_printf ("%s:%d: malloc (0x%x) = ", file, line, size);
|
||||
ptr = grub_malloc (size);
|
||||
if (grub_mm_debug)
|
||||
grub_printf ("%p\n", ptr);
|
||||
return ptr;
|
||||
}
|
||||
|
||||
void
|
||||
grub_debug_free (const char *file, int line, void *ptr)
|
||||
{
|
||||
if (grub_mm_debug)
|
||||
grub_printf ("%s:%d: free (%p)\n", file, line, ptr);
|
||||
}
|
||||
|
||||
void *
|
||||
grub_debug_realloc (const char *file, int line, void *ptr, grub_size_t size)
|
||||
{
|
||||
if (grub_mm_debug)
|
||||
grub_printf ("%s:%d: realloc (%p, 0x%x) = ", file, line, ptr, size);
|
||||
ptr = grub_realloc (ptr, size);
|
||||
if (grub_mm_debug)
|
||||
grub_printf ("%p\n", ptr);
|
||||
return ptr;
|
||||
}
|
||||
|
||||
void *
|
||||
grub_debug_memalign (const char *file, int line, grub_size_t align,
|
||||
grub_size_t size)
|
||||
{
|
||||
void *ptr;
|
||||
|
||||
if (grub_mm_debug)
|
||||
grub_printf ("%s:%d: memalign (0x%x, 0x%x) = ",
|
||||
file, line, align, size);
|
||||
ptr = grub_memalign (align, size);
|
||||
if (grub_mm_debug)
|
||||
grub_printf ("%p\n", ptr);
|
||||
return ptr;
|
||||
}
|
||||
|
||||
#endif /* MM_DEBUG */
|
||||
|
|
|
|||
|
|
@ -62,8 +62,8 @@ grub_translate_ieee1275_path (char *filepath)
|
|||
}
|
||||
}
|
||||
|
||||
static void
|
||||
grub_set_prefix (void)
|
||||
void
|
||||
grub_machine_set_prefix (void)
|
||||
{
|
||||
char bootpath[64]; /* XXX check length */
|
||||
char *filename;
|
||||
|
|
@ -130,8 +130,6 @@ grub_machine_init (void)
|
|||
}
|
||||
grub_mm_init_region ((void *) grub_heap_start, grub_heap_len);
|
||||
|
||||
grub_set_prefix ();
|
||||
|
||||
grub_ofdisk_init ();
|
||||
|
||||
/* Process commandline. */
|
||||
|
|
|
|||
|
|
@ -79,13 +79,6 @@ grub_ieee1275_set_flag (enum grub_ieee1275_flag flag)
|
|||
grub_ieee1275_flags |= (1 << flag);
|
||||
}
|
||||
|
||||
void
|
||||
abort (void)
|
||||
{
|
||||
/* Trap to Open Firmware. */
|
||||
grub_ieee1275_enter ();
|
||||
}
|
||||
|
||||
/* Translate an OF filesystem path (separated by backslashes), into a GRUB
|
||||
path (separated by forward slashes). */
|
||||
static void
|
||||
|
|
@ -101,8 +94,8 @@ grub_translate_ieee1275_path (char *filepath)
|
|||
}
|
||||
}
|
||||
|
||||
static void
|
||||
grub_set_prefix (void)
|
||||
void
|
||||
grub_machine_set_prefix (void)
|
||||
{
|
||||
char bootpath[64]; /* XXX check length */
|
||||
char *filename;
|
||||
|
|
@ -163,8 +156,6 @@ grub_machine_init (void)
|
|||
grub_heap_len);
|
||||
grub_mm_init_region ((void *) grub_heap_start, grub_heap_len);
|
||||
|
||||
grub_set_prefix ();
|
||||
|
||||
grub_ofdisk_init ();
|
||||
|
||||
/* Process commandline. */
|
||||
|
|
@ -215,9 +206,9 @@ grub_machine_fini (void)
|
|||
}
|
||||
|
||||
void
|
||||
grub_stop (void)
|
||||
grub_exit (void)
|
||||
{
|
||||
grub_ieee1275_exit ();
|
||||
grub_ieee1275_enter ();
|
||||
}
|
||||
|
||||
grub_uint32_t
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue