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

2003-01-20 Yoshinori K. Okuji <okuji@enbug.org>

Browse source 
* 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.
This commit is contained in:
okuji 2003-01-20 04:13:46 +00:00
parent 82cefbd307
commit ce5bf700ca
22 changed files with 1664 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/grub/dl.h
View file

@ -83,8 +83,8 @@ pupa_dl_t EXPORT_FUNC(pupa_dl_get) (const char *name);
pupa_err_t EXPORT_FUNC(pupa_dl_register_symbol) (const char *name, void *addr,
pupa_dl_t mod);
void *EXPORT_FUNC(pupa_dl_resolve_symbol) (const char *name);
void pupa_dl_set_prefix (const char *dir);
const char *pupa_dl_get_prefix (void);
void EXPORT_FUNC(pupa_dl_set_prefix) (const char *dir);
const char *EXPORT_FUNC(pupa_dl_get_prefix) (void);
int pupa_arch_dl_check_header (void *ehdr, pupa_size_t size);
pupa_err_t pupa_arch_dl_relocate_symbols (pupa_dl_t mod, void *ehdr);

1
include/grub/err.h
View file

@ -40,6 +40,7 @@ typedef enum
PUPA_ERR_BAD_DEVICE,
PUPA_ERR_READ_ERROR,
PUPA_ERR_WRITE_ERROR,
PUPA_ERR_UNKNOWN_COMMAND,
PUPA_ERR_BAD_ARGUMENT,
PUPA_ERR_BAD_PART_TABLE,
PUPA_ERR_UNKNOWN_OS,

6
include/grub/i386/pc/loader.h
View file

@ -33,4 +33,10 @@ void EXPORT_FUNC(pupa_linux_boot_bzimage) (void) __attribute__ ((noreturn));
/* This is an asm part of the chainloader. */
void EXPORT_FUNC(pupa_chainloader_real_boot) (int drive, void *part_addr) __attribute__ ((noreturn));
/* It is necessary to export these functions, because normal mode commands
reuse rescue mode commands. */
void pupa_rescue_cmd_chainloader (int argc, char *argv[]);
void pupa_rescue_cmd_linux (int argc, char *argv[]);
void pupa_rescue_cmd_initrd (int argc, char *argv[]);
#endif /* ! PUPA_LOADER_MACHINE_HEADER */

25
include/grub/i386/setjmp.h Normal file
View file

@ -0,0 +1,25 @@
/*
* PUPA -- Preliminary Universal Programming Architecture for GRUB
* Copyright (C) 2003 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.
*/
#ifndef PUPA_SETJMP_CPU_HEADER
#define PUPA_SETJMP_CPU_HEADER 1
typedef unsigned long pupa_jmp_buf[6];
#endif /* ! PUPA_SETJMP_CPU_HEADER */

131
include/grub/normal.h Normal file
View file

@ -0,0 +1,131 @@
/* normal.h - prototypes for the normal mode */
/*
* PUPA -- Preliminary Universal Programming Architecture for GRUB
* Copyright (C) 2002,2003 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.
*/
#ifndef PUPA_NORMAL_HEADER
#define PUPA_NORMAL_HEADER 1
#include <pupa/setjmp.h>
/* The maximum size of a command-line. */
#define PUPA_MAX_CMDLINE 1600
/* Can be run in the command-line. */
#define PUPA_COMMAND_FLAG_CMDLINE 0x1
/* Can be run in the menu. */
#define PUPA_COMMAND_FLAG_MENU 0x2
/* Can be run in both interfaces. */
#define PUPA_COMMAND_FLAG_BOTH 0x3
/* Only for the command title. */
#define PUPA_COMMAND_FLAG_TITLE 0x4
/* Don't print the command on booting. */
#define PUPA_COMMAND_FLAG_NO_ECHO 0x8
/* The command description. */
struct pupa_command
{
/* The name. */
const char *name;
/* The callback function. */
int (*func) (int argc, char *argv[]);
/* The flags. */
unsigned flags;
/* The summary of the command usage. */
const char *summary;
/* The description of the command. */
const char *description;
/* The next element. */
struct pupa_command *next;
};
typedef struct pupa_command *pupa_command_t;
/* The command list. */
struct pupa_command_list
{
/* The string of a command. */
const char *command;
/* The next element. */
struct pupa_command_list *next;
};
typedef struct pupa_command_list *pupa_command_list_t;
/* The menu entry. */
struct pupa_menu_entry
{
/* The title name. */
const char *title;
/* The number of commands. */
int num;
/* The list of commands. */
pupa_command_list_t command_list;
/* The next element. */
struct pupa_menu_entry *next;
};
typedef struct pupa_menu_entry *pupa_menu_entry_t;
/* The menu. */
struct pupa_menu
{
/* The default entry number. */
int default_entry;
/* The fallback entry number. */
int fallback_entry;
/* The timeout to boot the default entry automatically. */
int timeout;
/* The size of a menu. */
int size;
/* The list of menu entries. */
pupa_menu_entry_t entry_list;
};
typedef struct pupa_menu *pupa_menu_t;
/* To exit from the normal mode. */
extern pupa_jmp_buf pupa_exit_env;
void pupa_enter_normal_mode (const char *config);
void pupa_normal_execute (const char *config, int nested);
void pupa_menu_run (pupa_menu_t menu, int nested);
void pupa_cmdline_run (int nested);
int pupa_cmdline_get (const char *prompt, char cmdline[], unsigned max_len,
int echo_char, int readline);
void pupa_register_command (const char *name,
int (*func) (int argc, char *argv[]),
unsigned flags,
const char *summary,
const char *description);
void pupa_unregister_command (const char *name);
pupa_command_t pupa_command_find (char *cmdline);
int pupa_command_execute (char *cmdline);
void pupa_command_init (void);
void pupa_normal_init_page (void);
#endif /* ! PUPA_NORMAL_HEADER */

29
include/grub/setjmp.h Normal file
View file

@ -0,0 +1,29 @@
/*
* PUPA -- Preliminary Universal Programming Architecture for GRUB
* Copyright (C) 2003 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.
*/
#ifndef PUPA_SETJMP_HEADER
#define PUPA_SETJMP_HEADER 1
/* This must define pupa_jmp_buf. */
#include <pupa/cpu/setjmp.h>
int pupa_setjmp (pupa_jmp_buf env);
void pupa_longjmp (pupa_jmp_buf env, int val) __attribute__ ((noreturn));
#endif /* ! PUPA_SETJMP_HEADER */

4
include/grub/symbol.h
View file

@ -30,8 +30,8 @@
# define EXT_C(sym) sym
#endif
#define FUNCTION(x) .globl EXT_C(x) ; EXT_C(x):
#define VARIABLE(x) FUNCTION(x)
#define FUNCTION(x) .globl EXT_C(x) ; .type EXT_C(x), @function ; EXT_C(x):
#define VARIABLE(x) .globl EXT_C(x) ; .type EXT_C(x), @object ; EXT_C(x):
/* Mark an exported symbol. */
#define EXPORT_FUNC(x) x