2003-01-20 Yoshinori K. Okuji <okuji@enbug.org>
* 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
parent
82cefbd307
commit
ce5bf700ca
22 changed files with 1664 additions and 103 deletions
21
kern/dl.c
21
kern/dl.c
|
|
@ -459,19 +459,23 @@ pupa_dl_resolve_dependencies (pupa_dl_t mod, Elf_Ehdr *e)
|
|||
int
|
||||
pupa_dl_ref (pupa_dl_t mod)
|
||||
{
|
||||
pupa_dl_dep_t dep;
|
||||
|
||||
for (dep = mod->dep; dep; dep = dep->next)
|
||||
pupa_dl_ref (dep->mod);
|
||||
|
||||
return ++mod->ref_count;
|
||||
}
|
||||
|
||||
int
|
||||
pupa_dl_unref (pupa_dl_t mod)
|
||||
{
|
||||
int ret;
|
||||
pupa_dl_dep_t dep;
|
||||
|
||||
ret = --mod->ref_count;
|
||||
if (ret <= 0)
|
||||
pupa_dl_unload (mod);
|
||||
|
||||
return ret;
|
||||
for (dep = mod->dep; dep; dep = dep->next)
|
||||
pupa_dl_unref (dep->mod);
|
||||
|
||||
return --mod->ref_count;
|
||||
}
|
||||
|
||||
/* Load a module from core memory. */
|
||||
|
|
@ -605,7 +609,10 @@ pupa_dl_unload (pupa_dl_t mod)
|
|||
for (dep = mod->dep; dep; dep = depn)
|
||||
{
|
||||
depn = dep->next;
|
||||
pupa_dl_unref (dep->mod);
|
||||
|
||||
if (! pupa_dl_unref (dep->mod))
|
||||
pupa_dl_unload (dep->mod);
|
||||
|
||||
pupa_free (dep);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1080,6 +1080,50 @@ FUNCTION(pupa_console_putchar)
|
|||
* %al = ASCII character
|
||||
*/
|
||||
|
||||
/* this table is used in translate_keycode below */
|
||||
translation_table:
|
||||
.word PUPA_CONSOLE_KEY_LEFT, 2
|
||||
.word PUPA_CONSOLE_KEY_RIGHT, 6
|
||||
.word PUPA_CONSOLE_KEY_UP, 16
|
||||
.word PUPA_CONSOLE_KEY_DOWN, 14
|
||||
.word PUPA_CONSOLE_KEY_HOME, 1
|
||||
.word PUPA_CONSOLE_KEY_END, 5
|
||||
.word PUPA_CONSOLE_KEY_DC, 4
|
||||
.word PUPA_CONSOLE_KEY_BACKSPACE, 8
|
||||
.word PUPA_CONSOLE_KEY_PPAGE, 7
|
||||
.word PUPA_CONSOLE_KEY_NPAGE, 3
|
||||
.word 0
|
||||
|
||||
/*
|
||||
* translate_keycode translates the key code %dx to an ascii code.
|
||||
*/
|
||||
.code16
|
||||
|
||||
translate_keycode:
|
||||
pushw %bx
|
||||
pushw %si
|
||||
|
||||
movw $ABS(translation_table), %si
|
||||
|
||||
1: lodsw
|
||||
/* check if this is the end */
|
||||
testw %ax, %ax
|
||||
jz 2f
|
||||
/* load the ascii code into %ax */
|
||||
movw %ax, %bx
|
||||
lodsw
|
||||
/* check if this matches the key code */
|
||||
cmpw %bx, %dx
|
||||
jne 1b
|
||||
/* translate %dx, if successful */
|
||||
movw %ax, %dx
|
||||
|
||||
2: popw %si
|
||||
popw %bx
|
||||
ret
|
||||
|
||||
.code32
|
||||
|
||||
FUNCTION(pupa_console_getkey)
|
||||
pushl %ebp
|
||||
|
||||
|
|
@ -1089,7 +1133,8 @@ FUNCTION(pupa_console_getkey)
|
|||
int $0x16
|
||||
|
||||
movw %ax, %dx /* real_to_prot uses %eax */
|
||||
|
||||
call translate_keycode
|
||||
|
||||
DATA32 call real_to_prot
|
||||
.code32
|
||||
|
||||
|
|
|
|||
35
kern/main.c
35
kern/main.c
|
|
@ -84,34 +84,8 @@ pupa_set_root_dev (void)
|
|||
static void
|
||||
pupa_load_normal_mode (void)
|
||||
{
|
||||
if (pupa_dl_load ("normal"))
|
||||
{
|
||||
void (*normal_func) (const char *config);
|
||||
|
||||
/* If the function pupa_enter_normal_mode is present, call it. */
|
||||
normal_func = pupa_dl_resolve_symbol ("pupa_enter_normal_mode");
|
||||
if (normal_func)
|
||||
{
|
||||
char *config;
|
||||
char *prefix;
|
||||
|
||||
prefix = pupa_dl_get_prefix ();
|
||||
if (! prefix)
|
||||
pupa_fatal ("The dl prefix is not set!");
|
||||
|
||||
config = pupa_malloc (pupa_strlen (prefix) + sizeof ("/pupa.cfg"));
|
||||
if (! config)
|
||||
pupa_fatal ("out of memory");
|
||||
|
||||
pupa_sprintf (config, "%s/pupa.cfg", prefix);
|
||||
(*normal_func) (config);
|
||||
pupa_free (config);
|
||||
}
|
||||
else
|
||||
pupa_printf ("No entrance routine in the normal mode!\n");
|
||||
}
|
||||
else
|
||||
pupa_printf ("Failed to load the normal mode.\n");
|
||||
/* Load the module. */
|
||||
pupa_dl_load ("normal");
|
||||
|
||||
/* Ignore any error, because we have the rescue mode anyway. */
|
||||
pupa_errno = PUPA_ERR_NONE;
|
||||
|
|
@ -138,10 +112,9 @@ pupa_main (void)
|
|||
pupa_load_modules ();
|
||||
pupa_add_unused_region ();
|
||||
|
||||
/* Go to the real world. */
|
||||
/* Load the normal mode module. */
|
||||
pupa_load_normal_mode ();
|
||||
|
||||
/* If pupa_enter_normal_mode fails or doesn't exist, enter rescue mode. */
|
||||
pupa_printf ("Entering into rescue mode...\n");
|
||||
/* Enter the rescue mode. */
|
||||
pupa_enter_rescue_mode ();
|
||||
}
|
||||
|
|
|
|||
20
kern/mm.c
20
kern/mm.c
|
|
@ -151,7 +151,7 @@ pupa_real_malloc (pupa_mm_header_t *first, pupa_size_t n, pupa_size_t align)
|
|||
pupa_fatal ("null in the ring");
|
||||
|
||||
if (p->magic != PUPA_MM_FREE_MAGIC)
|
||||
pupa_fatal ("free magic is broken at %p", p);
|
||||
pupa_fatal ("free magic is broken at %p: 0x%x", p, p->magic);
|
||||
|
||||
if (p->size >= n + extra)
|
||||
{
|
||||
|
|
@ -184,6 +184,7 @@ pupa_real_malloc (pupa_mm_header_t *first, pupa_size_t n, pupa_size_t align)
|
|||
}
|
||||
|
||||
*first = q;
|
||||
|
||||
return p + 1;
|
||||
}
|
||||
|
||||
|
|
@ -259,19 +260,30 @@ pupa_free (void *ptr)
|
|||
|
||||
get_header_from_pointer (ptr, &p, &r);
|
||||
|
||||
if (p == r->first)
|
||||
if (r->first->magic == PUPA_MM_ALLOC_MAGIC)
|
||||
{
|
||||
p->magic = PUPA_MM_FREE_MAGIC;
|
||||
p->next = p;
|
||||
r->first = p->next = p;
|
||||
}
|
||||
else
|
||||
{
|
||||
pupa_mm_header_t q;
|
||||
|
||||
#if 0
|
||||
q = r->first;
|
||||
do
|
||||
{
|
||||
pupa_printf ("%s:%d: q=%p, q->size=0x%x, q->magic=0x%x\n",
|
||||
__FILE__, __LINE__, q, q->size, q->magic);
|
||||
q = q->next;
|
||||
}
|
||||
while (q != r->first);
|
||||
#endif
|
||||
|
||||
for (q = r->first; q >= p || q->next <= p; q = q->next)
|
||||
{
|
||||
if (q->magic != PUPA_MM_FREE_MAGIC)
|
||||
pupa_fatal ("free magic is broken at %p", q);
|
||||
pupa_fatal ("free magic is broken at %p: 0x%x", q, q->magic);
|
||||
|
||||
if (q >= q->next && (q < p || q->next > p))
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -560,7 +560,8 @@ pupa_rescue_cmd_rmmod (int argc, char *argv[])
|
|||
return;
|
||||
}
|
||||
|
||||
pupa_dl_unref (mod);
|
||||
if (! pupa_dl_unref (mod))
|
||||
pupa_dl_unload (mod);
|
||||
}
|
||||
|
||||
/* lsmod */
|
||||
|
|
@ -590,10 +591,30 @@ pupa_rescue_cmd_lsmod (int argc __attribute__ ((unused)),
|
|||
pupa_dl_iterate (print_module);
|
||||
}
|
||||
|
||||
static void
|
||||
attempt_normal_mode (void)
|
||||
{
|
||||
pupa_rescue_command_t cmd;
|
||||
|
||||
for (cmd = pupa_rescue_command_list; cmd; cmd = cmd->next)
|
||||
{
|
||||
if (pupa_strcmp ("normal", cmd->name) == 0)
|
||||
{
|
||||
(cmd->func) (0, 0);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* Enter the rescue mode. */
|
||||
void
|
||||
pupa_enter_rescue_mode (void)
|
||||
{
|
||||
/* First of all, attempt to execute the normal mode. */
|
||||
attempt_normal_mode ();
|
||||
|
||||
pupa_printf ("Entering into rescue mode...\n");
|
||||
|
||||
pupa_rescue_register_command ("boot", pupa_rescue_cmd_boot,
|
||||
"boot an operating system");
|
||||
pupa_rescue_register_command ("cat", pupa_rescue_cmd_cat,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue