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

seems to work now. A lot is still missing though

Browse source
This commit is contained in:
phcoder 2009-10-11 14:18:58 +02:00
parent ffa9860a86
commit 50739170db
6 changed files with 15 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

17
kern/dl.c
View file

@ -342,6 +342,7 @@ grub_dl_resolve_symbols (grub_dl_t mod, Elf_Ehdr *e)
switch (type)
{
case STT_NOTYPE:
case STT_OBJECT:
/* Resolve a global symbol. */
if (sym->st_name != 0 && sym->st_shndx == 0)
{
@ -351,15 +352,13 @@ grub_dl_resolve_symbols (grub_dl_t mod, Elf_Ehdr *e)
"the symbol `%s' not found", name);
}
else
sym->st_value = 0;
break;
case STT_OBJECT:
sym->st_value += (Elf_Addr) grub_dl_get_section_addr (mod,
sym->st_shndx);
if (bind != STB_LOCAL)
if (grub_dl_register_symbol (name, (void *) sym->st_value, mod))
return grub_errno;
{
sym->st_value += (Elf_Addr) grub_dl_get_section_addr (mod,
sym->st_shndx);
if (bind != STB_LOCAL)
if (grub_dl_register_symbol (name, (void *) sym->st_value, mod))
return grub_errno;
}
break;
case STT_FUNC:

5
kern/mips/qemu-r4k/init.c
View file

@ -22,9 +22,8 @@ grub_get_rtc (void)
void
grub_machine_init (void)
{
void *tst;
grub_mm_init_region ((void *) GRUB_MACHINE_MEMORY_STACK_HIGH,
RAMSIZE - (GRUB_MACHINE_MEMORY_STACK_HIGH & 0x7fffffff));
grub_mm_init_region ((void *) GRUB_MACHINE_MEMORY_USABLE,
RAMSIZE - (GRUB_MACHINE_MEMORY_USABLE & 0x7fffffff));
grub_install_get_time_ms (grub_rtc_get_time_ms);
}

1
kern/term.c
View file

@ -136,7 +136,6 @@ grub_getcharwidth (grub_uint32_t code)
int
grub_getkey (void)
{
int c;
if (!grub_cur_term_input)
return 0;
return (grub_cur_term_input->getkey) ();