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

2004-04-04 Yoshinori K. Okuji <okuji@enbug.org>

Browse source 
All symbols prefixed with PUPA_ and pupa_ are renamed to GRUB_
	and grub_, respectively. Because the conversion is trivial and
	mechanical, I omit the details here. Please refer to the CVS
	if you need more information.
This commit is contained in:
okuji 2004-04-04 13:46:03 +00:00
parent 6a1425510d
commit 4b13b216f4
125 changed files with 6198 additions and 6181 deletions
Download patch file Download diff file Expand all files Collapse all files

108
loader/i386/pc/chainloader.c
View file

@ -1,6 +1,6 @@
/* chainloader.c - boot another boot loader */
/*
* PUPA -- Preliminary Universal Programming Architecture for GRUB
* GRUB -- GRand Unified Bootloader
* Copyright (C) 2002 Free Software Foundation, Inc.
*
* This program is free software; you can redistribute it and/or modify
@ -18,79 +18,79 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <pupa/loader.h>
#include <pupa/machine/loader.h>
#include <pupa/file.h>
#include <pupa/err.h>
#include <pupa/device.h>
#include <pupa/disk.h>
#include <pupa/misc.h>
#include <pupa/types.h>
#include <pupa/machine/init.h>
#include <pupa/machine/partition.h>
#include <pupa/machine/memory.h>
#include <pupa/rescue.h>
#include <pupa/dl.h>
#include <grub/loader.h>
#include <grub/machine/loader.h>
#include <grub/file.h>
#include <grub/err.h>
#include <grub/device.h>
#include <grub/disk.h>
#include <grub/misc.h>
#include <grub/types.h>
#include <grub/machine/init.h>
#include <grub/machine/partition.h>
#include <grub/machine/memory.h>
#include <grub/rescue.h>
#include <grub/dl.h>
static pupa_dl_t my_mod;
static grub_dl_t my_mod;
static pupa_err_t
pupa_chainloader_boot (void)
static grub_err_t
grub_chainloader_boot (void)
{
pupa_device_t dev;
grub_device_t dev;
int drive = -1;
void *part_addr = 0;
/* Open the root device. */
dev = pupa_device_open (0);
dev = grub_device_open (0);
if (dev)
{
pupa_disk_t disk = dev->disk;
grub_disk_t disk = dev->disk;
if (disk)
{
pupa_partition_t p = disk->partition;
grub_partition_t p = disk->partition;
/* In i386-pc, the id is equal to the BIOS drive number. */
drive = (int) disk->id;
if (p)
{
pupa_disk_read (disk, p->offset, 446, 64,
(char *) PUPA_MEMORY_MACHINE_PART_TABLE_ADDR);
grub_disk_read (disk, p->offset, 446, 64,
(char *) GRUB_MEMORY_MACHINE_PART_TABLE_ADDR);
/* Ignore errors. Perhaps it's not fatal. */
part_addr = (void *) (PUPA_MEMORY_MACHINE_PART_TABLE_ADDR
part_addr = (void *) (GRUB_MEMORY_MACHINE_PART_TABLE_ADDR
+ (p->index << 4));
}
}
pupa_device_close (dev);
grub_device_close (dev);
}
pupa_chainloader_real_boot (drive, part_addr);
grub_chainloader_real_boot (drive, part_addr);
/* Never reach here. */
return PUPA_ERR_NONE;
return GRUB_ERR_NONE;
}
static pupa_err_t
pupa_chainloader_unload (void)
static grub_err_t
grub_chainloader_unload (void)
{
pupa_dl_unref (my_mod);
return PUPA_ERR_NONE;
grub_dl_unref (my_mod);
return GRUB_ERR_NONE;
}
void
pupa_rescue_cmd_chainloader (int argc, char *argv[])
grub_rescue_cmd_chainloader (int argc, char *argv[])
{
pupa_file_t file = 0;
pupa_uint16_t signature;
grub_file_t file = 0;
grub_uint16_t signature;
int force = 0;
pupa_dl_ref (my_mod);
grub_dl_ref (my_mod);
if (argc > 0 && pupa_strcmp (argv[0], "--force") == 0)
if (argc > 0 && grub_strcmp (argv[0], "--force") == 0)
{
force = 1;
argc--;
@ -99,55 +99,55 @@ pupa_rescue_cmd_chainloader (int argc, char *argv[])
if (argc == 0)
{
pupa_error (PUPA_ERR_BAD_ARGUMENT, "no file specified");
grub_error (GRUB_ERR_BAD_ARGUMENT, "no file specified");
goto fail;
}
file = pupa_file_open (argv[0]);
file = grub_file_open (argv[0]);
if (! file)
goto fail;
/* Read the first block. */
if (pupa_file_read (file, (char *) 0x7C00, PUPA_DISK_SECTOR_SIZE)
!= PUPA_DISK_SECTOR_SIZE)
if (grub_file_read (file, (char *) 0x7C00, GRUB_DISK_SECTOR_SIZE)
!= GRUB_DISK_SECTOR_SIZE)
{
if (pupa_errno == PUPA_ERR_NONE)
pupa_error (PUPA_ERR_BAD_OS, "too small");
if (grub_errno == GRUB_ERR_NONE)
grub_error (GRUB_ERR_BAD_OS, "too small");
goto fail;
}
/* Check the signature. */
signature = *((pupa_uint16_t *) (0x7C00 + PUPA_DISK_SECTOR_SIZE - 2));
if (signature != pupa_le_to_cpu16 (0xaa55) && ! force)
signature = *((grub_uint16_t *) (0x7C00 + GRUB_DISK_SECTOR_SIZE - 2));
if (signature != grub_le_to_cpu16 (0xaa55) && ! force)
{
pupa_error (PUPA_ERR_BAD_OS, "invalid signature");
grub_error (GRUB_ERR_BAD_OS, "invalid signature");
goto fail;
}
pupa_file_close (file);
pupa_loader_set (pupa_chainloader_boot, pupa_chainloader_unload);
grub_file_close (file);
grub_loader_set (grub_chainloader_boot, grub_chainloader_unload);
return;
fail:
if (file)
pupa_file_close (file);
grub_file_close (file);
pupa_dl_unref (my_mod);
grub_dl_unref (my_mod);
}
static const char loader_name[] = "chainloader";
PUPA_MOD_INIT
GRUB_MOD_INIT
{
pupa_rescue_register_command (loader_name,
pupa_rescue_cmd_chainloader,
grub_rescue_register_command (loader_name,
grub_rescue_cmd_chainloader,
"load another boot loader");
my_mod = mod;
}
PUPA_MOD_FINI
GRUB_MOD_FINI
{
pupa_rescue_unregister_command (loader_name);
grub_rescue_unregister_command (loader_name);
}

282
loader/i386/pc/linux.c
View file

@ -1,6 +1,6 @@
/* linux.c - boot Linux zImage or bzImage */
/*
* PUPA -- Preliminary Universal Programming Architecture for GRUB
* GRUB -- GRand Unified Bootloader
* Copyright (C) 1999,2000,2001,2002,2003,2004 Free Software Foundation, Inc.
*
* This program is free software; you can redistribute it and/or modify
@ -18,90 +18,90 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <pupa/loader.h>
#include <pupa/machine/loader.h>
#include <pupa/file.h>
#include <pupa/err.h>
#include <pupa/device.h>
#include <pupa/disk.h>
#include <pupa/misc.h>
#include <pupa/types.h>
#include <pupa/machine/init.h>
#include <pupa/machine/memory.h>
#include <pupa/rescue.h>
#include <pupa/dl.h>
#include <pupa/machine/linux.h>
#include <grub/loader.h>
#include <grub/machine/loader.h>
#include <grub/file.h>
#include <grub/err.h>
#include <grub/device.h>
#include <grub/disk.h>
#include <grub/misc.h>
#include <grub/types.h>
#include <grub/machine/init.h>
#include <grub/machine/memory.h>
#include <grub/rescue.h>
#include <grub/dl.h>
#include <grub/machine/linux.h>
static pupa_dl_t my_mod;
static grub_dl_t my_mod;
static int big_linux;
static pupa_size_t linux_mem_size;
static grub_size_t linux_mem_size;
static int loaded;
static pupa_err_t
pupa_linux_boot (void)
static grub_err_t
grub_linux_boot (void)
{
if (big_linux)
pupa_linux_boot_bzimage ();
grub_linux_boot_bzimage ();
else
pupa_linux_boot_zimage ();
grub_linux_boot_zimage ();
/* Never reach here. */
return PUPA_ERR_NONE;
return GRUB_ERR_NONE;
}
static pupa_err_t
pupa_linux_unload (void)
static grub_err_t
grub_linux_unload (void)
{
pupa_dl_unref (my_mod);
grub_dl_unref (my_mod);
loaded = 0;
return PUPA_ERR_NONE;
return GRUB_ERR_NONE;
}
void
pupa_rescue_cmd_linux (int argc, char *argv[])
grub_rescue_cmd_linux (int argc, char *argv[])
{
pupa_file_t file = 0;
grub_file_t file = 0;
struct linux_kernel_header lh;
pupa_uint8_t setup_sects;
pupa_size_t real_size, prot_size;
pupa_ssize_t len;
grub_uint8_t setup_sects;
grub_size_t real_size, prot_size;
grub_ssize_t len;
int i;
char *dest;
pupa_dl_ref (my_mod);
grub_dl_ref (my_mod);
if (argc == 0)
{
pupa_error (PUPA_ERR_BAD_ARGUMENT, "no kernel specified");
grub_error (GRUB_ERR_BAD_ARGUMENT, "no kernel specified");
goto fail;
}
file = pupa_file_open (argv[0]);
file = grub_file_open (argv[0]);
if (! file)
goto fail;
if (pupa_file_size (file) > (pupa_ssize_t) pupa_os_area_size)
if (grub_file_size (file) > (grub_ssize_t) grub_os_area_size)
{
pupa_error (PUPA_ERR_OUT_OF_RANGE, "too big kernel");
grub_error (GRUB_ERR_OUT_OF_RANGE, "too big kernel");
goto fail;
}
if (pupa_file_read (file, (char *) &lh, sizeof (lh)) != sizeof (lh))
if (grub_file_read (file, (char *) &lh, sizeof (lh)) != sizeof (lh))
{
pupa_error (PUPA_ERR_READ_ERROR, "cannot read the linux header");
grub_error (GRUB_ERR_READ_ERROR, "cannot read the linux header");
goto fail;
}
if (lh.boot_flag != pupa_cpu_to_le16 (0xaa55))
if (lh.boot_flag != grub_cpu_to_le16 (0xaa55))
{
pupa_error (PUPA_ERR_BAD_OS, "invalid magic number");
grub_error (GRUB_ERR_BAD_OS, "invalid magic number");
goto fail;
}
if (lh.setup_sects > PUPA_LINUX_MAX_SETUP_SECTS)
if (lh.setup_sects > GRUB_LINUX_MAX_SETUP_SECTS)
{
pupa_error (PUPA_ERR_BAD_OS, "too many setup sectors");
grub_error (GRUB_ERR_BAD_OS, "too many setup sectors");
goto fail;
}
@ -109,109 +109,109 @@ pupa_rescue_cmd_linux (int argc, char *argv[])
setup_sects = lh.setup_sects;
linux_mem_size = 0;
if (lh.header == pupa_cpu_to_le32 (PUPA_LINUX_MAGIC_SIGNATURE)
&& pupa_le_to_cpu16 (lh.version) >= 0x0200)
if (lh.header == grub_cpu_to_le32 (GRUB_LINUX_MAGIC_SIGNATURE)
&& grub_le_to_cpu16 (lh.version) >= 0x0200)
{
big_linux = (lh.loadflags & PUPA_LINUX_FLAG_BIG_KERNEL);
lh.type_of_loader = PUPA_LINUX_BOOT_LOADER_TYPE;
big_linux = (lh.loadflags & GRUB_LINUX_FLAG_BIG_KERNEL);
lh.type_of_loader = GRUB_LINUX_BOOT_LOADER_TYPE;
/* Put the real mode part at as a high location as possible. */
pupa_linux_real_addr = (char *) (pupa_lower_mem
- PUPA_LINUX_SETUP_MOVE_SIZE);
grub_linux_real_addr = (char *) (grub_lower_mem
- GRUB_LINUX_SETUP_MOVE_SIZE);
/* But it must not exceed the traditional area. */
if (pupa_linux_real_addr > (char *) PUPA_LINUX_OLD_REAL_MODE_ADDR)
pupa_linux_real_addr = (char *) PUPA_LINUX_OLD_REAL_MODE_ADDR;
if (grub_linux_real_addr > (char *) GRUB_LINUX_OLD_REAL_MODE_ADDR)
grub_linux_real_addr = (char *) GRUB_LINUX_OLD_REAL_MODE_ADDR;
if (pupa_le_to_cpu16 (lh.version) >= 0x0201)
if (grub_le_to_cpu16 (lh.version) >= 0x0201)
{
lh.heap_end_ptr = pupa_cpu_to_le16 (PUPA_LINUX_HEAP_END_OFFSET);
lh.loadflags |= PUPA_LINUX_FLAG_CAN_USE_HEAP;
lh.heap_end_ptr = grub_cpu_to_le16 (GRUB_LINUX_HEAP_END_OFFSET);
lh.loadflags |= GRUB_LINUX_FLAG_CAN_USE_HEAP;
}
if (pupa_le_to_cpu16 (lh.version) >= 0x0202)
lh.cmd_line_ptr = pupa_linux_real_addr + PUPA_LINUX_CL_OFFSET;
if (grub_le_to_cpu16 (lh.version) >= 0x0202)
lh.cmd_line_ptr = grub_linux_real_addr + GRUB_LINUX_CL_OFFSET;
else
{
lh.cl_magic = pupa_cpu_to_le16 (PUPA_LINUX_CL_MAGIC);
lh.cl_offset = pupa_cpu_to_le16 (PUPA_LINUX_CL_OFFSET);
lh.setup_move_size = pupa_cpu_to_le16 (PUPA_LINUX_SETUP_MOVE_SIZE);
lh.cl_magic = grub_cpu_to_le16 (GRUB_LINUX_CL_MAGIC);
lh.cl_offset = grub_cpu_to_le16 (GRUB_LINUX_CL_OFFSET);
lh.setup_move_size = grub_cpu_to_le16 (GRUB_LINUX_SETUP_MOVE_SIZE);
}
}
else
{
/* Your kernel is quite old... */
lh.cl_magic = pupa_cpu_to_le16 (PUPA_LINUX_CL_MAGIC);
lh.cl_offset = pupa_cpu_to_le16 (PUPA_LINUX_CL_OFFSET);
lh.cl_magic = grub_cpu_to_le16 (GRUB_LINUX_CL_MAGIC);
lh.cl_offset = grub_cpu_to_le16 (GRUB_LINUX_CL_OFFSET);
setup_sects = PUPA_LINUX_DEFAULT_SETUP_SECTS;
setup_sects = GRUB_LINUX_DEFAULT_SETUP_SECTS;
pupa_linux_real_addr = (char *) PUPA_LINUX_OLD_REAL_MODE_ADDR;
grub_linux_real_addr = (char *) GRUB_LINUX_OLD_REAL_MODE_ADDR;
}
/* If SETUP_SECTS is not set, set it to the default (4). */
if (! setup_sects)
setup_sects = PUPA_LINUX_DEFAULT_SETUP_SECTS;
setup_sects = GRUB_LINUX_DEFAULT_SETUP_SECTS;
real_size = setup_sects << PUPA_DISK_SECTOR_BITS;
prot_size = pupa_file_size (file) - real_size - PUPA_DISK_SECTOR_SIZE;
real_size = setup_sects << GRUB_DISK_SECTOR_BITS;
prot_size = grub_file_size (file) - real_size - GRUB_DISK_SECTOR_SIZE;
pupa_linux_tmp_addr = (char *) PUPA_LINUX_BZIMAGE_ADDR + prot_size;
grub_linux_tmp_addr = (char *) GRUB_LINUX_BZIMAGE_ADDR + prot_size;
if (! big_linux
&& prot_size > (pupa_size_t) (pupa_linux_real_addr
- (char *) PUPA_LINUX_ZIMAGE_ADDR))
&& prot_size > (grub_size_t) (grub_linux_real_addr
- (char *) GRUB_LINUX_ZIMAGE_ADDR))
{
pupa_error (PUPA_ERR_BAD_OS, "too big zImage, use bzImage instead");
grub_error (GRUB_ERR_BAD_OS, "too big zImage, use bzImage instead");
goto fail;
}
if (pupa_linux_real_addr + PUPA_LINUX_SETUP_MOVE_SIZE
> (char *) pupa_lower_mem)
if (grub_linux_real_addr + GRUB_LINUX_SETUP_MOVE_SIZE
> (char *) grub_lower_mem)
{
pupa_error (PUPA_ERR_OUT_OF_RANGE, "too small lower memory");
grub_error (GRUB_ERR_OUT_OF_RANGE, "too small lower memory");
goto fail;
}
pupa_printf (" [Linux-%s, setup=0x%x, size=0x%x]\n",
grub_printf (" [Linux-%s, setup=0x%x, size=0x%x]\n",
big_linux ? "bzImage" : "zImage", real_size, prot_size);
for (i = 1; i < argc; i++)
if (pupa_memcmp (argv[i], "vga=", 4) == 0)
if (grub_memcmp (argv[i], "vga=", 4) == 0)
{
/* Video mode selection support. */
pupa_uint16_t vid_mode;
grub_uint16_t vid_mode;
char *val = argv[i] + 4;
if (pupa_strcmp (val, "normal") == 0)
vid_mode = PUPA_LINUX_VID_MODE_NORMAL;
else if (pupa_strcmp (val, "ext") == 0)
vid_mode = PUPA_LINUX_VID_MODE_EXTENDED;
else if (pupa_strcmp (val, "ask") == 0)
vid_mode = PUPA_LINUX_VID_MODE_ASK;
if (grub_strcmp (val, "normal") == 0)
vid_mode = GRUB_LINUX_VID_MODE_NORMAL;
else if (grub_strcmp (val, "ext") == 0)
vid_mode = GRUB_LINUX_VID_MODE_EXTENDED;
else if (grub_strcmp (val, "ask") == 0)
vid_mode = GRUB_LINUX_VID_MODE_ASK;
else
vid_mode = (pupa_uint16_t) pupa_strtoul (val, 0, 0);
vid_mode = (grub_uint16_t) grub_strtoul (val, 0, 0);
if (pupa_errno)
if (grub_errno)
goto fail;
lh.vid_mode = pupa_cpu_to_le16 (vid_mode);
lh.vid_mode = grub_cpu_to_le16 (vid_mode);
}
else if (pupa_memcmp (argv[i], "mem=", 4) == 0)
else if (grub_memcmp (argv[i], "mem=", 4) == 0)
{
char *val = argv[i] + 4;
linux_mem_size = pupa_strtoul (val, &val, 0);
linux_mem_size = grub_strtoul (val, &val, 0);
if (pupa_errno)
if (grub_errno)
{
pupa_errno = PUPA_ERR_NONE;
grub_errno = GRUB_ERR_NONE;
linux_mem_size = 0;
}
else
{
int shift = 0;
switch (pupa_tolower (val[0]))
switch (grub_tolower (val[0]))
{
case 'g':
shift += 10;
@ -232,33 +232,33 @@ pupa_rescue_cmd_linux (int argc, char *argv[])
}
/* Put the real mode code at the temporary address. */
pupa_memmove (pupa_linux_tmp_addr, &lh, sizeof (lh));
grub_memmove (grub_linux_tmp_addr, &lh, sizeof (lh));
len = real_size + PUPA_DISK_SECTOR_SIZE - sizeof (lh);
if (pupa_file_read (file, pupa_linux_tmp_addr + sizeof (lh), len) != len)
len = real_size + GRUB_DISK_SECTOR_SIZE - sizeof (lh);
if (grub_file_read (file, grub_linux_tmp_addr + sizeof (lh), len) != len)
{
pupa_error (PUPA_ERR_FILE_READ_ERROR, "Couldn't read file");
grub_error (GRUB_ERR_FILE_READ_ERROR, "Couldn't read file");
goto fail;
}
if (lh.header != pupa_cpu_to_le32 (PUPA_LINUX_MAGIC_SIGNATURE)
|| pupa_le_to_cpu16 (lh.version) < 0x0200)
if (lh.header != grub_cpu_to_le32 (GRUB_LINUX_MAGIC_SIGNATURE)
|| grub_le_to_cpu16 (lh.version) < 0x0200)
/* Clear the heap space. */
pupa_memset (pupa_linux_tmp_addr
+ ((setup_sects + 1) << PUPA_DISK_SECTOR_BITS),
grub_memset (grub_linux_tmp_addr
+ ((setup_sects + 1) << GRUB_DISK_SECTOR_BITS),
0,
((PUPA_LINUX_MAX_SETUP_SECTS - setup_sects - 1)
<< PUPA_DISK_SECTOR_BITS));
((GRUB_LINUX_MAX_SETUP_SECTS - setup_sects - 1)
<< GRUB_DISK_SECTOR_BITS));
/* Copy kernel parameters. */
for (i = 1, dest = pupa_linux_tmp_addr + PUPA_LINUX_CL_OFFSET;
for (i = 1, dest = grub_linux_tmp_addr + GRUB_LINUX_CL_OFFSET;
i < argc
&& dest + pupa_strlen (argv[i]) < (pupa_linux_tmp_addr
+ PUPA_LINUX_CL_END_OFFSET);
&& dest + grub_strlen (argv[i]) < (grub_linux_tmp_addr
+ GRUB_LINUX_CL_END_OFFSET);
i++, *dest++ = ' ')
{
pupa_strcpy (dest, argv[i]);
dest += pupa_strlen (argv[i]);
grub_strcpy (dest, argv[i]);
dest += grub_strlen (argv[i]);
}
if (i != 1)
@ -267,63 +267,63 @@ pupa_rescue_cmd_linux (int argc, char *argv[])
*dest = '\0';
len = prot_size;
if (pupa_file_read (file, (char *) PUPA_LINUX_BZIMAGE_ADDR, len) != len)
pupa_error (PUPA_ERR_FILE_READ_ERROR, "Couldn't read file");
if (grub_file_read (file, (char *) GRUB_LINUX_BZIMAGE_ADDR, len) != len)
grub_error (GRUB_ERR_FILE_READ_ERROR, "Couldn't read file");
if (pupa_errno == PUPA_ERR_NONE)
if (grub_errno == GRUB_ERR_NONE)
{
pupa_linux_prot_size = prot_size;
pupa_loader_set (pupa_linux_boot, pupa_linux_unload);
grub_linux_prot_size = prot_size;
grub_loader_set (grub_linux_boot, grub_linux_unload);
loaded = 1;
}
fail:
if (file)
pupa_file_close (file);
grub_file_close (file);
if (pupa_errno != PUPA_ERR_NONE)
if (grub_errno != GRUB_ERR_NONE)
{
pupa_dl_unref (my_mod);
grub_dl_unref (my_mod);
loaded = 0;
}
}
void
pupa_rescue_cmd_initrd (int argc __attribute__ ((unused)),
grub_rescue_cmd_initrd (int argc __attribute__ ((unused)),
char *argv[] __attribute__ ((unused)))
{
pupa_file_t file = 0;
pupa_ssize_t size;
pupa_addr_t addr_max, addr_min, addr;
grub_file_t file = 0;
grub_ssize_t size;
grub_addr_t addr_max, addr_min, addr;
struct linux_kernel_header *lh;
if (argc == 0)
{
pupa_error (PUPA_ERR_BAD_ARGUMENT, "No module specified");
grub_error (GRUB_ERR_BAD_ARGUMENT, "No module specified");
goto fail;
}
if (!loaded)
{
pupa_error (PUPA_ERR_BAD_ARGUMENT, "You need to load the kernel first.");
grub_error (GRUB_ERR_BAD_ARGUMENT, "You need to load the kernel first.");
goto fail;
}
lh = (struct linux_kernel_header *) pupa_linux_tmp_addr;
lh = (struct linux_kernel_header *) grub_linux_tmp_addr;
if (!(lh->header == pupa_cpu_to_le32 (PUPA_LINUX_MAGIC_SIGNATURE)
&& pupa_le_to_cpu16 (lh->version) >= 0x0200))
if (!(lh->header == grub_cpu_to_le32 (GRUB_LINUX_MAGIC_SIGNATURE)
&& grub_le_to_cpu16 (lh->version) >= 0x0200))
{
pupa_error (PUPA_ERR_BAD_OS, "The kernel is too old for initrd.");
grub_error (GRUB_ERR_BAD_OS, "The kernel is too old for initrd.");
goto fail;
}
/* Get the highest address available for the initrd. */
if (pupa_le_to_cpu16 (lh->version) >= 0x0203)
addr_max = pupa_cpu_to_le32 (lh->initrd_addr_max);
if (grub_le_to_cpu16 (lh->version) >= 0x0203)
addr_max = grub_cpu_to_le32 (lh->initrd_addr_max);
else
addr_max = PUPA_LINUX_INITRD_MAX_ADDRESS;
addr_max = GRUB_LINUX_INITRD_MAX_ADDRESS;
if (!linux_mem_size && linux_mem_size < addr_max)
addr_max = linux_mem_size;
@ -334,29 +334,29 @@ pupa_rescue_cmd_initrd (int argc __attribute__ ((unused)),
worse than that of Linux 2.3.xx, so avoid the last 64kb. */
addr_max -= 0x10000;
if (addr_max > pupa_os_area_addr + pupa_os_area_size)
addr_max = pupa_os_area_addr + pupa_os_area_size;
if (addr_max > grub_os_area_addr + grub_os_area_size)
addr_max = grub_os_area_addr + grub_os_area_size;
addr_min = (pupa_addr_t) pupa_linux_tmp_addr + PUPA_LINUX_CL_END_OFFSET;
addr_min = (grub_addr_t) grub_linux_tmp_addr + GRUB_LINUX_CL_END_OFFSET;
file = pupa_file_open (argv[0]);
file = grub_file_open (argv[0]);
if (!file)
goto fail;
size = pupa_file_size (file);
size = grub_file_size (file);
/* Put the initrd as high as possible, 4Ki aligned. */
addr = (addr_max - size) & ~0xFFF;
if (addr < addr_min)
{
pupa_error (PUPA_ERR_OUT_OF_RANGE, "The initrd is too big");
grub_error (GRUB_ERR_OUT_OF_RANGE, "The initrd is too big");
goto fail;
}
if (pupa_file_read (file, (void *)addr, size) != size)
if (grub_file_read (file, (void *)addr, size) != size)
{
pupa_error (PUPA_ERR_FILE_READ_ERROR, "Couldn't read file");
grub_error (GRUB_ERR_FILE_READ_ERROR, "Couldn't read file");
goto fail;
}
@ -365,23 +365,23 @@ pupa_rescue_cmd_initrd (int argc __attribute__ ((unused)),
fail:
if (file)
pupa_file_close (file);
grub_file_close (file);
}
PUPA_MOD_INIT
GRUB_MOD_INIT
{
pupa_rescue_register_command ("linux",
pupa_rescue_cmd_linux,
grub_rescue_register_command ("linux",
grub_rescue_cmd_linux,
"load linux");
pupa_rescue_register_command ("initrd",
pupa_rescue_cmd_initrd,
grub_rescue_register_command ("initrd",
grub_rescue_cmd_initrd,
"load initrd");
my_mod = mod;
}
PUPA_MOD_FINI
GRUB_MOD_FINI
{
pupa_rescue_unregister_command ("linux");
pupa_rescue_unregister_command ("initrd");
grub_rescue_unregister_command ("linux");
grub_rescue_unregister_command ("initrd");
}

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

@ -1,6 +1,6 @@
/* multiboot.c - boot a multiboot OS image. */
/*
* PUPA -- Preliminary Universal Programming Architecture for GRUB
* GRUB -- GRand Unified Bootloader
* Copyright (C) 2003, 2004 Free Software Foundation, Inc.
*
* This program is free software; you can redistribute it and/or modify
@ -31,110 +31,110 @@
* - APM table
*/
#include <pupa/loader.h>
#include <pupa/machine/loader.h>
#include <pupa/machine/multiboot.h>
#include <pupa/machine/init.h>
#include <pupa/elf.h>
#include <pupa/file.h>
#include <pupa/err.h>
#include <pupa/rescue.h>
#include <pupa/dl.h>
#include <pupa/mm.h>
#include <pupa/misc.h>
#include <grub/loader.h>
#include <grub/machine/loader.h>
#include <grub/machine/multiboot.h>
#include <grub/machine/init.h>
#include <grub/elf.h>
#include <grub/file.h>
#include <grub/err.h>
#include <grub/rescue.h>
#include <grub/dl.h>
#include <grub/mm.h>
#include <grub/misc.h>
static pupa_dl_t my_mod;
static struct pupa_multiboot_info *mbi;
static pupa_addr_t entry;
static grub_dl_t my_mod;
static struct grub_multiboot_info *mbi;
static grub_addr_t entry;
static pupa_err_t
pupa_multiboot_boot (void)
static grub_err_t
grub_multiboot_boot (void)
{
pupa_multiboot_real_boot (entry, mbi);
grub_multiboot_real_boot (entry, mbi);
/* Not reached. */
return PUPA_ERR_NONE;
return GRUB_ERR_NONE;
}
static pupa_err_t
pupa_multiboot_unload (void)
static grub_err_t
grub_multiboot_unload (void)
{
if (mbi)
{
unsigned int i;
for (i = 0; i < mbi->mods_count; i++)
{
pupa_free ((void *)
((struct pupa_mod_list *) mbi->mods_addr)[i].mod_start);
pupa_free ((void *)
((struct pupa_mod_list *) mbi->mods_addr)[i].cmdline);
grub_free ((void *)
((struct grub_mod_list *) mbi->mods_addr)[i].mod_start);
grub_free ((void *)
((struct grub_mod_list *) mbi->mods_addr)[i].cmdline);
}
pupa_free ((void *) mbi->mods_addr);
pupa_free ((void *) mbi->cmdline);
pupa_free (mbi);
grub_free ((void *) mbi->mods_addr);
grub_free ((void *) mbi->cmdline);
grub_free (mbi);
}
mbi = 0;
pupa_dl_unref (my_mod);
grub_dl_unref (my_mod);
return PUPA_ERR_NONE;
return GRUB_ERR_NONE;
}
void
pupa_rescue_cmd_multiboot (int argc, char *argv[])
grub_rescue_cmd_multiboot (int argc, char *argv[])
{
pupa_file_t file = 0;
char buffer[PUPA_MB_SEARCH], *cmdline = 0, *p;
struct pupa_multiboot_header *header;
pupa_ssize_t len;
grub_file_t file = 0;
char buffer[GRUB_MB_SEARCH], *cmdline = 0, *p;
struct grub_multiboot_header *header;
grub_ssize_t len;
int i;
Elf32_Ehdr *ehdr;
pupa_dl_ref (my_mod);
grub_dl_ref (my_mod);
pupa_loader_unset();
grub_loader_unset();
if (argc == 0)
{
pupa_error (PUPA_ERR_BAD_ARGUMENT, "No kernel specified");
grub_error (GRUB_ERR_BAD_ARGUMENT, "No kernel specified");
goto fail;
}
file = pupa_file_open (argv[0]);
file = grub_file_open (argv[0]);
if (!file)
{
pupa_error (PUPA_ERR_BAD_ARGUMENT, "Couldn't open file");
grub_error (GRUB_ERR_BAD_ARGUMENT, "Couldn't open file");
goto fail;
}
len = pupa_file_read (file, buffer, PUPA_MB_SEARCH);
len = grub_file_read (file, buffer, GRUB_MB_SEARCH);
if (len < 32)
{
pupa_error (PUPA_ERR_BAD_OS, "File too small");
grub_error (GRUB_ERR_BAD_OS, "File too small");
goto fail;
}
/* Look for the multiboot header in the buffer. The header should
be at least 12 bytes and aligned on a 4-byte boundary. */
for (header = (struct pupa_multiboot_header *) buffer;
for (header = (struct grub_multiboot_header *) buffer;
((char *) header <= buffer + len - 12) || (header = 0);
header = (struct pupa_multiboot_header *) ((char *)header + 4))
header = (struct grub_multiboot_header *) ((char *)header + 4))
{
if (header->magic == PUPA_MB_MAGIC
if (header->magic == GRUB_MB_MAGIC
&& !(header->magic + header->flags + header->checksum))
break;
}
if (header == 0)
{
pupa_error (PUPA_ERR_BAD_ARGUMENT, "No multiboot header found");
grub_error (GRUB_ERR_BAD_ARGUMENT, "No multiboot header found");
goto fail;
}
if (header->flags & PUPA_MB_UNSUPPORTED)
if (header->flags & GRUB_MB_UNSUPPORTED)
{
pupa_error (PUPA_ERR_UNKNOWN_OS, "Unsupported flag: 0x%x", header->flags);
grub_error (GRUB_ERR_UNKNOWN_OS, "Unsupported flag: 0x%x", header->flags);
goto fail;
}
@ -150,14 +150,14 @@ pupa_rescue_cmd_multiboot (int argc, char *argv[])
&& (ehdr->e_type == ET_EXEC) && (ehdr->e_machine == EM_386)
&& (ehdr->e_version == EV_CURRENT)))
{
pupa_error (PUPA_ERR_UNKNOWN_OS, "No valid ELF header found");
grub_error (GRUB_ERR_UNKNOWN_OS, "No valid ELF header found");
goto fail;
}
/* FIXME: Should we support program headers at strange locations? */
if (ehdr->e_phoff + ehdr->e_phnum * ehdr->e_phentsize > PUPA_MB_SEARCH)
if (ehdr->e_phoff + ehdr->e_phnum * ehdr->e_phentsize > GRUB_MB_SEARCH)
{
pupa_error (PUPA_ERR_UNKNOWN_OS, "Program header at a too high offset");
grub_error (GRUB_ERR_UNKNOWN_OS, "Program header at a too high offset");
goto fail;
}
@ -172,186 +172,186 @@ pupa_rescue_cmd_multiboot (int argc, char *argv[])
if (phdr->p_type == PT_LOAD)
{
/* The segment should fit in the area reserved for the OS. */
if ((phdr->p_paddr < pupa_os_area_addr)
if ((phdr->p_paddr < grub_os_area_addr)
|| (phdr->p_paddr + phdr->p_memsz
> pupa_os_area_addr + pupa_os_area_size))
> grub_os_area_addr + grub_os_area_size))
{
pupa_error (PUPA_ERR_BAD_OS,
grub_error (GRUB_ERR_BAD_OS,
"Segment doesn't fit in memory reserved for the OS");
goto fail;
}
if (pupa_file_seek (file, phdr->p_offset) == -1)
if (grub_file_seek (file, phdr->p_offset) == -1)
{
pupa_error (PUPA_ERR_BAD_OS, "Invalid offset in program header");
grub_error (GRUB_ERR_BAD_OS, "Invalid offset in program header");
goto fail;
}
if (pupa_file_read (file, (void *) phdr->p_paddr, phdr->p_filesz)
!= (pupa_ssize_t) phdr->p_filesz)
if (grub_file_read (file, (void *) phdr->p_paddr, phdr->p_filesz)
!= (grub_ssize_t) phdr->p_filesz)
{
pupa_error (PUPA_ERR_BAD_OS, "Couldn't read segment from file");
grub_error (GRUB_ERR_BAD_OS, "Couldn't read segment from file");
goto fail;
}
if (phdr->p_filesz < phdr->p_memsz)
pupa_memset ((char *) phdr->p_paddr + phdr->p_filesz, 0,
grub_memset ((char *) phdr->p_paddr + phdr->p_filesz, 0,
phdr->p_memsz - phdr->p_filesz);
}
}
mbi = pupa_malloc (sizeof (struct pupa_multiboot_info));
mbi = grub_malloc (sizeof (struct grub_multiboot_info));
if (!mbi)
goto fail;
mbi->flags = PUPA_MB_INFO_MEMORY;
mbi->flags = GRUB_MB_INFO_MEMORY;
/* Convert from bytes to kilobytes. */
mbi->mem_lower = pupa_lower_mem / 1024;
mbi->mem_upper = pupa_upper_mem / 1024;
mbi->mem_lower = grub_lower_mem / 1024;
mbi->mem_upper = grub_upper_mem / 1024;
for (i = 0, len = 0; i < argc; i++)
len += pupa_strlen (argv[i]) + 1;
len += grub_strlen (argv[i]) + 1;
cmdline = p = pupa_malloc (len);
cmdline = p = grub_malloc (len);
if (!cmdline)
goto fail;
for (i = 0; i < argc; i++)
{
p = pupa_stpcpy (p, argv[i]);
p = grub_stpcpy (p, argv[i]);
*(p++) = ' ';
}
/* Remove the space after the last word. */
*(--p) = '\0';
mbi->flags |= PUPA_MB_INFO_CMDLINE;
mbi->cmdline = (pupa_uint32_t) cmdline;
mbi->flags |= GRUB_MB_INFO_CMDLINE;
mbi->cmdline = (grub_uint32_t) cmdline;
mbi->flags |= PUPA_MB_INFO_BOOT_LOADER_NAME;
mbi->boot_loader_name = (pupa_uint32_t) pupa_strdup (PACKAGE_STRING);
mbi->flags |= GRUB_MB_INFO_BOOT_LOADER_NAME;
mbi->boot_loader_name = (grub_uint32_t) grub_strdup (PACKAGE_STRING);
pupa_loader_set (pupa_multiboot_boot, pupa_multiboot_unload);
grub_loader_set (grub_multiboot_boot, grub_multiboot_unload);
fail:
if (file)
pupa_file_close (file);
grub_file_close (file);
if (pupa_errno != PUPA_ERR_NONE)
if (grub_errno != GRUB_ERR_NONE)
{
pupa_free (cmdline);
pupa_free (mbi);
pupa_dl_unref (my_mod);
grub_free (cmdline);
grub_free (mbi);
grub_dl_unref (my_mod);
}
}
void
pupa_rescue_cmd_module (int argc, char *argv[])
grub_rescue_cmd_module (int argc, char *argv[])
{
pupa_file_t file = 0;
pupa_ssize_t size, len = 0;
grub_file_t file = 0;
grub_ssize_t size, len = 0;
char *module = 0, *cmdline = 0, *p;
int i;
if (argc == 0)
{
pupa_error (PUPA_ERR_BAD_ARGUMENT, "No module specified");
grub_error (GRUB_ERR_BAD_ARGUMENT, "No module specified");
goto fail;
}
if (!mbi)
{
pupa_error (PUPA_ERR_BAD_ARGUMENT,
grub_error (GRUB_ERR_BAD_ARGUMENT,
"You need to load the multiboot kernel first");
goto fail;
}
file = pupa_file_open (argv[0]);
file = grub_file_open (argv[0]);
if (!file)
goto fail;
size = pupa_file_size (file);
module = pupa_memalign (PUPA_MB_MOD_ALIGN, size);
size = grub_file_size (file);
module = grub_memalign (GRUB_MB_MOD_ALIGN, size);
if (!module)
goto fail;
if (pupa_file_read (file, module, size) != size)
if (grub_file_read (file, module, size) != size)
{
pupa_error (PUPA_ERR_FILE_READ_ERROR, "Couldn't read file");
grub_error (GRUB_ERR_FILE_READ_ERROR, "Couldn't read file");
goto fail;
}
for (i = 0; i < argc; i++)
len += pupa_strlen (argv[i]) + 1;
len += grub_strlen (argv[i]) + 1;
cmdline = p = pupa_malloc (len);
cmdline = p = grub_malloc (len);
if (!cmdline)
goto fail;
for (i = 0; i < argc; i++)
{
p = pupa_stpcpy (p, argv[i]);
p = grub_stpcpy (p, argv[i]);
*(p++) = ' ';
}
/* Remove the space after the last word. */
*(--p) = '\0';
if (mbi->flags & PUPA_MB_INFO_MODS)
if (mbi->flags & GRUB_MB_INFO_MODS)
{
struct pupa_mod_list *modlist = (struct pupa_mod_list *) mbi->mods_addr;
struct grub_mod_list *modlist = (struct grub_mod_list *) mbi->mods_addr;
modlist = pupa_realloc (modlist, (mbi->mods_count + 1)
* sizeof (struct pupa_mod_list));
modlist = grub_realloc (modlist, (mbi->mods_count + 1)
* sizeof (struct grub_mod_list));
if (!modlist)
goto fail;
mbi->mods_addr = (pupa_uint32_t) modlist;
mbi->mods_addr = (grub_uint32_t) modlist;
modlist += mbi->mods_count;
modlist->mod_start = (pupa_uint32_t) module;
modlist->mod_end = (pupa_uint32_t) module + size;
modlist->cmdline = (pupa_uint32_t) cmdline;
modlist->mod_start = (grub_uint32_t) module;
modlist->mod_end = (grub_uint32_t) module + size;
modlist->cmdline = (grub_uint32_t) cmdline;
modlist->pad = 0;
mbi->mods_count++;
}
else
{
struct pupa_mod_list *modlist = pupa_malloc (sizeof (struct pupa_mod_list));
struct grub_mod_list *modlist = grub_malloc (sizeof (struct grub_mod_list));
if (!modlist)
goto fail;
modlist->mod_start = (pupa_uint32_t) module;
modlist->mod_end = (pupa_uint32_t) module + size;
modlist->cmdline = (pupa_uint32_t) cmdline;
modlist->mod_start = (grub_uint32_t) module;
modlist->mod_end = (grub_uint32_t) module + size;
modlist->cmdline = (grub_uint32_t) cmdline;
modlist->pad = 0;
mbi->mods_count = 1;
mbi->mods_addr = (pupa_uint32_t) modlist;
mbi->flags |= PUPA_MB_INFO_MODS;
mbi->mods_addr = (grub_uint32_t) modlist;
mbi->flags |= GRUB_MB_INFO_MODS;
}
fail:
if (file)
pupa_file_close (file);
grub_file_close (file);
if (pupa_errno != PUPA_ERR_NONE)
if (grub_errno != GRUB_ERR_NONE)
{
pupa_free (module);
pupa_free (cmdline);
grub_free (module);
grub_free (cmdline);
}
}
PUPA_MOD_INIT
GRUB_MOD_INIT
{
pupa_rescue_register_command ("multiboot", pupa_rescue_cmd_multiboot,
grub_rescue_register_command ("multiboot", grub_rescue_cmd_multiboot,
"load a multiboot kernel");
pupa_rescue_register_command ("module", pupa_rescue_cmd_module,
grub_rescue_register_command ("module", grub_rescue_cmd_module,
"load a multiboot module");
my_mod = mod;
}
PUPA_MOD_FINI
GRUB_MOD_FINI
{
pupa_rescue_unregister_command ("multiboot");
pupa_rescue_unregister_command ("module");
grub_rescue_unregister_command ("multiboot");
grub_rescue_unregister_command ("module");
}