ce5bf700ca
* include/pupa/normal.h: New file. * include/pupa/setjmp.h: Likewise. * include/pupa/i386/setjmp.h: Likewise. * normal/cmdline.c: Likewise. * normal/command.c: Likewise. * normal/main.c: Likewise. * normal/menu.c: Likewise. * normal/i386/setjmp.S: Likewise. * loader/i386/pc/linux.c (pupa_rescue_cmd_linux): Made global. (pupa_rescue_cmd_initrd): Likewise. * loader/i386/pc/chainloader.c (pupa_rescue_cmd_chainloader): Likewise. * kern/i386/pc/startup.S (translation_table): New variable. (translate_keycode): New function. (pupa_console_getkey): Call translate_keycode. * kern/rescue.c (attempt_normal_mode): New function. (pupa_enter_rescue_mode): Attempt to execute the normal mode. If it failed, print a message. * kern/mm.c (pupa_real_malloc): Print more information when a free magic is broken. (pupa_free): If the first free header is not free actually, set it to P. * kern/main.c (pupa_load_normal_mode): Just load the module "normal". (pupa_main): Don't print the message "Entering into rescue mode..." here. * include/pupa/i386/pc/loader.h (pupa_rescue_cmd_initrd): Declared. (pupa_rescue_cmd_initrd): Likewise. (pupa_rescue_cmd_initrd): Likewise. * include/pupa/symbol.h (FUNCTION): Specify the type. (VARIABLE): Likewise. * include/pupa/err.h (pupa_err_t): Added PUPA_ERR_UNKNOWN_COMMAND. * include/pupa/dl.h (pupa_dl_set_prefix): Exported. (pupa_dl_get_prefix): Likewise. * conf/i386-pc.rmk (pkgdata_MODULES): Added normal.mod. Added _chain.mod and _linux.mod instead of chain.mod and linux.mod. (chain_mod_SOURCES): Renamed to ... (_chain_mod_SOURCES): ... this. (chain_mod_CFLAGS): Renamed to ... (_chain_mod_CFLAGS): ... this. (linux_mod_SOURCES): Renamed to ... (_linux_mod_SOURCES): ... this. (linux_mod_CFLAGS): Renamed to ... (_linux_mod_CFLAGS): ... this. (normal_mod_SOURCES): New variable. (normal_mod_CFLAGS): Likewise. (normal_mod_ASFLAGS): Likewise. 2003-01-18 Yoshinori K. Okuji <okuji@enbug.org> * kern/rescue.c (pupa_rescue_cmd_rmmod): Call pupa_dl_unload, if possible. * kern/dl.c (pupa_dl_ref): Refer dependending modules recursively. (pupa_dl_unref): Unrefer depending modules recursively. Don't call pupa_dl_unload implicitly, because PUPA can crash if a module is unloaded before one depending on that module is unloaded. (pupa_dl_unload): Unload depending modules explicitly, if possible.
153 lines
3.5 KiB
C
153 lines
3.5 KiB
C
/* chainloader.c - boot another boot loader */
|
|
/*
|
|
* PUPA -- Preliminary Universal Programming Architecture for GRUB
|
|
* Copyright (C) 2002 Yoshinori K. Okuji <okuji@enbug.org>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* 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>
|
|
|
|
static pupa_dl_t my_mod;
|
|
|
|
static pupa_err_t
|
|
pupa_chainloader_boot (void)
|
|
{
|
|
pupa_device_t dev;
|
|
int drive = -1;
|
|
void *part_addr = 0;
|
|
|
|
/* Open the root device. */
|
|
dev = pupa_device_open (0);
|
|
if (dev)
|
|
{
|
|
pupa_disk_t disk = dev->disk;
|
|
|
|
if (disk)
|
|
{
|
|
pupa_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);
|
|
|
|
/* Ignore errors. Perhaps it's not fatal. */
|
|
part_addr = (void *) (PUPA_MEMORY_MACHINE_PART_TABLE_ADDR
|
|
+ (p->index << 4));
|
|
}
|
|
}
|
|
|
|
pupa_device_close (dev);
|
|
}
|
|
|
|
pupa_chainloader_real_boot (drive, part_addr);
|
|
|
|
/* Never reach here. */
|
|
return PUPA_ERR_NONE;
|
|
}
|
|
|
|
static pupa_err_t
|
|
pupa_chainloader_unload (void)
|
|
{
|
|
pupa_dl_unref (my_mod);
|
|
return PUPA_ERR_NONE;
|
|
}
|
|
|
|
void
|
|
pupa_rescue_cmd_chainloader (int argc, char *argv[])
|
|
{
|
|
pupa_file_t file = 0;
|
|
pupa_uint16_t signature;
|
|
int force = 0;
|
|
|
|
pupa_dl_ref (my_mod);
|
|
|
|
if (argc > 0 && pupa_strcmp (argv[0], "--force") == 0)
|
|
{
|
|
force = 1;
|
|
argc--;
|
|
argv++;
|
|
}
|
|
|
|
if (argc == 0)
|
|
{
|
|
pupa_error (PUPA_ERR_BAD_ARGUMENT, "no file specified");
|
|
goto fail;
|
|
}
|
|
|
|
file = pupa_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 (pupa_errno == PUPA_ERR_NONE)
|
|
pupa_error (PUPA_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)
|
|
{
|
|
pupa_error (PUPA_ERR_BAD_OS, "invalid signature");
|
|
goto fail;
|
|
}
|
|
|
|
pupa_file_close (file);
|
|
pupa_loader_set (pupa_chainloader_boot, pupa_chainloader_unload);
|
|
return;
|
|
|
|
fail:
|
|
|
|
if (file)
|
|
pupa_file_close (file);
|
|
|
|
pupa_dl_unref (my_mod);
|
|
}
|
|
|
|
static const char loader_name[] = "chainloader";
|
|
|
|
PUPA_MOD_INIT
|
|
{
|
|
pupa_rescue_register_command (loader_name,
|
|
pupa_rescue_cmd_chainloader,
|
|
"load another boot loader");
|
|
my_mod = mod;
|
|
}
|
|
|
|
PUPA_MOD_FINI
|
|
{
|
|
pupa_rescue_unregister_command (loader_name);
|
|
}
|