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

* grub-core/kern/elfXX.c (grub_elfXX_load): Handle

Browse source 
GRUB_ELF_LOAD_FLAGS_30BITS and GRUB_ELF_LOAD_FLAGS_62BITS.
	* grub-core/loader/powerpc/ieee1275/linux.c (grub_linux_load32),
	(grub_linux_load64): Mask out 2 high bits.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-04-19 15:05:11 +02:00
parent 4eafa17565
commit aeace7f71c
4 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2013-04-19 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/kern/elfXX.c (grub_elfXX_load): Handle
GRUB_ELF_LOAD_FLAGS_30BITS and GRUB_ELF_LOAD_FLAGS_62BITS.
* grub-core/loader/powerpc/ieee1275/linux.c (grub_linux_load32),
(grub_linux_load64): Mask out 2 high bits.
2013-04-19 Andrey Borzenkov <arvidjaar@gmail.com>
* util/grub.d/30_os-prober.in: Add onstr to linux entries in one

16
grub-core/kern/elfXX.c
View file

@ -101,8 +101,20 @@ grub_elfXX_load (grub_elf_t elf, const char *filename,
continue;
load_addr = (grub_addr_t) phdr->p_paddr;
if (load_flags & GRUB_ELF_LOAD_FLAGS_28BITS)
load_addr &= 0xFFFFFFF;
switch (load_flags & GRUB_ELF_LOAD_FLAGS_BITS)
{
case GRUB_ELF_LOAD_FLAGS_ALL_BITS:
break;
case GRUB_ELF_LOAD_FLAGS_28BITS:
load_addr &= 0xFFFFFFF;
break;
case GRUB_ELF_LOAD_FLAGS_30BITS:
load_addr &= 0x3FFFFFFF;
break;
case GRUB_ELF_LOAD_FLAGS_62BITS:
load_addr &= 0x3FFFFFFFFFFFFFFFULL;
break;
}
load_addr += (grub_addr_t) load_offset;
if (load_addr < load_base)

4
grub-core/loader/powerpc/ieee1275/linux.c
View file

@ -204,7 +204,7 @@ grub_linux_load32 (grub_elf_t elf, const char *filename)
linux_addr = seg_addr;
/* Now load the segments into the area we claimed. */
return grub_elf32_load (elf, filename, (void *) (seg_addr - base_addr), GRUB_ELF_LOAD_FLAGS_NONE, 0, 0);
return grub_elf32_load (elf, filename, (void *) (seg_addr - base_addr), GRUB_ELF_LOAD_FLAGS_30BITS, 0, 0);
}
static grub_err_t
@ -238,7 +238,7 @@ grub_linux_load64 (grub_elf_t elf, const char *filename)
linux_addr = seg_addr;
/* Now load the segments into the area we claimed. */
return grub_elf64_load (elf, filename, (void *) (grub_addr_t) (seg_addr - base_addr), GRUB_ELF_LOAD_FLAGS_NONE, 0, 0);
return grub_elf64_load (elf, filename, (void *) (grub_addr_t) (seg_addr - base_addr), GRUB_ELF_LOAD_FLAGS_62BITS, 0, 0);
}
static grub_err_t

4
include/grub/elfload.h
View file

@ -53,7 +53,11 @@ enum grub_elf_load_flags
{
GRUB_ELF_LOAD_FLAGS_NONE = 0,
GRUB_ELF_LOAD_FLAGS_LOAD_PT_DYNAMIC = 1,
GRUB_ELF_LOAD_FLAGS_BITS = 6,
GRUB_ELF_LOAD_FLAGS_ALL_BITS = 0,
GRUB_ELF_LOAD_FLAGS_28BITS = 2,
GRUB_ELF_LOAD_FLAGS_30BITS = 4,
GRUB_ELF_LOAD_FLAGS_62BITS = 6,
};
grub_err_t grub_elf32_load (grub_elf_t, const char *filename,
void *load_offset, enum grub_elf_load_flags flags, grub_addr_t *,