Merge mainline into newreloc. For now without boot tests
This commit is contained in:
Vladimir 'phcoder' Serbinenko
commit
16bd6cfab2
625 changed files with 45066 additions and 10823 deletions
59
grub-core/efiemu/i386/coredetect.c
Normal file
59
grub-core/efiemu/i386/coredetect.c
Normal file
|
|
@ -0,0 +1,59 @@
|
|||
/*
|
||||
* GRUB -- GRand Unified Bootloader
|
||||
* Copyright (C) 2009 Free Software Foundation, Inc.
|
||||
*
|
||||
* GRUB 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 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* GRUB 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 GRUB. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <grub/efiemu/efiemu.h>
|
||||
#include <grub/command.h>
|
||||
|
||||
#define cpuid(num,a,b,c,d) \
|
||||
asm volatile ("xchgl %%ebx, %1; cpuid; xchgl %%ebx, %1" \
|
||||
: "=a" (a), "=r" (b), "=c" (c), "=d" (d) \
|
||||
: "0" (num))
|
||||
|
||||
#define bit_LM (1 << 29)
|
||||
|
||||
char *
|
||||
grub_efiemu_get_default_core_name (void)
|
||||
{
|
||||
|
||||
unsigned int eax, ebx, ecx, edx;
|
||||
unsigned int max_level;
|
||||
unsigned int ext_level;
|
||||
|
||||
/* See if we can use cpuid. */
|
||||
asm volatile ("pushfl; pushfl; popl %0; movl %0,%1; xorl %2,%0;"
|
||||
"pushl %0; popfl; pushfl; popl %0; popfl"
|
||||
: "=&r" (eax), "=&r" (ebx)
|
||||
: "i" (0x00200000));
|
||||
if (((eax ^ ebx) & 0x00200000) == 0)
|
||||
return "efiemu32.o";
|
||||
|
||||
/* Check the highest input value for eax. */
|
||||
cpuid (0, eax, ebx, ecx, edx);
|
||||
/* We only look at the first four characters. */
|
||||
max_level = eax;
|
||||
if (max_level == 0)
|
||||
return "efiemu32.o";
|
||||
|
||||
cpuid (0x80000000, eax, ebx, ecx, edx);
|
||||
ext_level = eax;
|
||||
if (ext_level < 0x80000000)
|
||||
return "efiemu32.o";
|
||||
|
||||
cpuid (0x80000001, eax, ebx, ecx, edx);
|
||||
return (edx & bit_LM) ? "efiemu64.o" : "efiemu32.o";
|
||||
}
|
||||
114
grub-core/efiemu/i386/loadcore32.c
Normal file
114
grub-core/efiemu/i386/loadcore32.c
Normal file
|
|
@ -0,0 +1,114 @@
|
|||
/* i386 CPU-specific part of loadcore.c for 32-bit mode */
|
||||
/*
|
||||
* GRUB -- GRand Unified Bootloader
|
||||
* Copyright (C) 2009 Free Software Foundation, Inc.
|
||||
*
|
||||
* GRUB 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 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* GRUB 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 GRUB. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <grub/err.h>
|
||||
#include <grub/mm.h>
|
||||
#include <grub/misc.h>
|
||||
#include <grub/efiemu/efiemu.h>
|
||||
#include <grub/cpu/efiemu.h>
|
||||
#include <grub/elf.h>
|
||||
|
||||
/* Check if EHDR is a valid ELF header. */
|
||||
int
|
||||
grub_arch_efiemu_check_header32 (void *ehdr)
|
||||
{
|
||||
Elf32_Ehdr *e = ehdr;
|
||||
|
||||
/* Check the magic numbers. */
|
||||
return (e->e_ident[EI_CLASS] == ELFCLASS32
|
||||
&& e->e_ident[EI_DATA] == ELFDATA2LSB
|
||||
&& e->e_machine == EM_386);
|
||||
}
|
||||
|
||||
/* Relocate symbols. */
|
||||
grub_err_t
|
||||
grub_arch_efiemu_relocate_symbols32 (grub_efiemu_segment_t segs,
|
||||
struct grub_efiemu_elf_sym *elfsyms,
|
||||
void *ehdr)
|
||||
{
|
||||
unsigned i;
|
||||
Elf32_Ehdr *e = ehdr;
|
||||
Elf32_Shdr *s;
|
||||
grub_err_t err;
|
||||
|
||||
grub_dprintf ("efiemu", "relocating symbols %d %d\n",
|
||||
e->e_shoff, e->e_shnum);
|
||||
|
||||
for (i = 0, s = (Elf32_Shdr *) ((char *) e + e->e_shoff);
|
||||
i < e->e_shnum;
|
||||
i++, s = (Elf32_Shdr *) ((char *) s + e->e_shentsize))
|
||||
if (s->sh_type == SHT_REL)
|
||||
{
|
||||
grub_efiemu_segment_t seg;
|
||||
grub_dprintf ("efiemu", "shtrel\n");
|
||||
|
||||
/* Find the target segment. */
|
||||
for (seg = segs; seg; seg = seg->next)
|
||||
if (seg->section == s->sh_info)
|
||||
break;
|
||||
|
||||
if (seg)
|
||||
{
|
||||
Elf32_Rel *rel, *max;
|
||||
|
||||
for (rel = (Elf32_Rel *) ((char *) e + s->sh_offset),
|
||||
max = rel + s->sh_size / s->sh_entsize;
|
||||
rel < max;
|
||||
rel++)
|
||||
{
|
||||
Elf32_Word *addr;
|
||||
struct grub_efiemu_elf_sym sym;
|
||||
if (seg->size < rel->r_offset)
|
||||
return grub_error (GRUB_ERR_BAD_MODULE,
|
||||
"reloc offset is out of the segment");
|
||||
|
||||
addr = (Elf32_Word *)
|
||||
((char *) grub_efiemu_mm_obtain_request (seg->handle)
|
||||
+ seg->off + rel->r_offset);
|
||||
sym = elfsyms[ELF32_R_SYM (rel->r_info)];
|
||||
|
||||
switch (ELF32_R_TYPE (rel->r_info))
|
||||
{
|
||||
case R_386_32:
|
||||
if ((err = grub_efiemu_write_value
|
||||
(addr, sym.off + *addr, sym.handle, 0,
|
||||
seg->ptv_rel_needed, sizeof (grub_uint32_t))))
|
||||
return err;
|
||||
|
||||
break;
|
||||
|
||||
case R_386_PC32:
|
||||
if ((err = grub_efiemu_write_value
|
||||
(addr, sym.off + *addr - rel->r_offset
|
||||
- seg->off, sym.handle, seg->handle,
|
||||
seg->ptv_rel_needed, sizeof (grub_uint32_t))))
|
||||
return err;
|
||||
break;
|
||||
default:
|
||||
return grub_error (GRUB_ERR_BAD_OS,
|
||||
"unrecognised relocation");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
|
||||
|
||||
120
grub-core/efiemu/i386/loadcore64.c
Normal file
120
grub-core/efiemu/i386/loadcore64.c
Normal file
|
|
@ -0,0 +1,120 @@
|
|||
/* i386 CPU-specific part of loadcore.c for 32-bit mode */
|
||||
/*
|
||||
* GRUB -- GRand Unified Bootloader
|
||||
* Copyright (C) 2009 Free Software Foundation, Inc.
|
||||
*
|
||||
* GRUB 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 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* GRUB 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 GRUB. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <grub/err.h>
|
||||
#include <grub/mm.h>
|
||||
#include <grub/misc.h>
|
||||
#include <grub/efiemu/efiemu.h>
|
||||
#include <grub/cpu/efiemu.h>
|
||||
#include <grub/elf.h>
|
||||
|
||||
/* Check if EHDR is a valid ELF header. */
|
||||
int
|
||||
grub_arch_efiemu_check_header64 (void *ehdr)
|
||||
{
|
||||
Elf64_Ehdr *e = ehdr;
|
||||
|
||||
return (e->e_ident[EI_CLASS] == ELFCLASS64
|
||||
&& e->e_ident[EI_DATA] == ELFDATA2LSB
|
||||
&& e->e_machine == EM_X86_64);
|
||||
}
|
||||
|
||||
/* Relocate symbols. */
|
||||
grub_err_t
|
||||
grub_arch_efiemu_relocate_symbols64 (grub_efiemu_segment_t segs,
|
||||
struct grub_efiemu_elf_sym *elfsyms,
|
||||
void *ehdr)
|
||||
{
|
||||
unsigned i;
|
||||
Elf64_Ehdr *e = ehdr;
|
||||
Elf64_Shdr *s;
|
||||
grub_err_t err;
|
||||
|
||||
for (i = 0, s = (Elf64_Shdr *) ((char *) e + e->e_shoff);
|
||||
i < e->e_shnum;
|
||||
i++, s = (Elf64_Shdr *) ((char *) s + e->e_shentsize))
|
||||
if (s->sh_type == SHT_RELA)
|
||||
{
|
||||
grub_efiemu_segment_t seg;
|
||||
grub_dprintf ("efiemu", "shtrel\n");
|
||||
|
||||
/* Find the target segment. */
|
||||
for (seg = segs; seg; seg = seg->next)
|
||||
if (seg->section == s->sh_info)
|
||||
break;
|
||||
|
||||
if (seg)
|
||||
{
|
||||
Elf64_Rela *rel, *max;
|
||||
|
||||
for (rel = (Elf64_Rela *) ((char *) e + s->sh_offset),
|
||||
max = rel + (unsigned long) s->sh_size
|
||||
/ (unsigned long)s->sh_entsize;
|
||||
rel < max;
|
||||
rel++)
|
||||
{
|
||||
void *addr;
|
||||
grub_uint32_t *addr32;
|
||||
grub_uint64_t *addr64;
|
||||
struct grub_efiemu_elf_sym sym;
|
||||
if (seg->size < rel->r_offset)
|
||||
return grub_error (GRUB_ERR_BAD_MODULE,
|
||||
"reloc offset is out of the segment");
|
||||
|
||||
addr =
|
||||
((char *) grub_efiemu_mm_obtain_request (seg->handle)
|
||||
+ seg->off + rel->r_offset);
|
||||
addr32 = (grub_uint32_t *) addr;
|
||||
addr64 = (grub_uint64_t *) addr;
|
||||
sym = elfsyms[ELF64_R_SYM (rel->r_info)];
|
||||
|
||||
switch (ELF64_R_TYPE (rel->r_info))
|
||||
{
|
||||
case R_X86_64_64:
|
||||
if ((err = grub_efiemu_write_value
|
||||
(addr, *addr64 + rel->r_addend + sym.off, sym.handle,
|
||||
0, seg->ptv_rel_needed, sizeof (grub_uint64_t))))
|
||||
return err;
|
||||
break;
|
||||
|
||||
case R_X86_64_PC32:
|
||||
if ((err = grub_efiemu_write_value
|
||||
(addr, *addr32 + rel->r_addend + sym.off
|
||||
- rel->r_offset - seg->off, sym.handle, seg->handle,
|
||||
seg->ptv_rel_needed, sizeof (grub_uint32_t))))
|
||||
return err;
|
||||
break;
|
||||
|
||||
case R_X86_64_32:
|
||||
case R_X86_64_32S:
|
||||
if ((err = grub_efiemu_write_value
|
||||
(addr, *addr32 + rel->r_addend + sym.off, sym.handle,
|
||||
0, seg->ptv_rel_needed, sizeof (grub_uint32_t))))
|
||||
return err;
|
||||
break;
|
||||
default:
|
||||
return grub_error (GRUB_ERR_BAD_OS,
|
||||
"unrecognised relocation");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
30
grub-core/efiemu/i386/nocfgtables.c
Normal file
30
grub-core/efiemu/i386/nocfgtables.c
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
/* Register SMBIOS and ACPI tables. */
|
||||
/*
|
||||
* GRUB -- GRand Unified Bootloader
|
||||
* Copyright (C) 2009 Free Software Foundation, Inc.
|
||||
*
|
||||
* GRUB 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 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* GRUB 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 GRUB. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <grub/err.h>
|
||||
#include <grub/efiemu/efiemu.h>
|
||||
#include <grub/misc.h>
|
||||
#include <grub/mm.h>
|
||||
#include <grub/acpi.h>
|
||||
|
||||
grub_err_t
|
||||
grub_machine_efiemu_init_tables (void)
|
||||
{
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
75
grub-core/efiemu/i386/pc/cfgtables.c
Normal file
75
grub-core/efiemu/i386/pc/cfgtables.c
Normal file
|
|
@ -0,0 +1,75 @@
|
|||
/* Register SMBIOS and ACPI tables. */
|
||||
/*
|
||||
* GRUB -- GRand Unified Bootloader
|
||||
* Copyright (C) 2009 Free Software Foundation, Inc.
|
||||
*
|
||||
* GRUB 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 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* GRUB 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 GRUB. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <grub/err.h>
|
||||
#include <grub/efiemu/efiemu.h>
|
||||
#include <grub/misc.h>
|
||||
#include <grub/mm.h>
|
||||
#include <grub/acpi.h>
|
||||
|
||||
grub_err_t
|
||||
grub_machine_efiemu_init_tables ()
|
||||
{
|
||||
grub_uint8_t *ptr;
|
||||
void *table;
|
||||
grub_err_t err;
|
||||
grub_efi_guid_t smbios = GRUB_EFI_SMBIOS_TABLE_GUID;
|
||||
grub_efi_guid_t acpi20 = GRUB_EFI_ACPI_20_TABLE_GUID;
|
||||
grub_efi_guid_t acpi = GRUB_EFI_ACPI_TABLE_GUID;
|
||||
|
||||
err = grub_efiemu_unregister_configuration_table (smbios);
|
||||
if (err)
|
||||
return err;
|
||||
err = grub_efiemu_unregister_configuration_table (acpi);
|
||||
if (err)
|
||||
return err;
|
||||
err = grub_efiemu_unregister_configuration_table (acpi20);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
table = grub_acpi_get_rsdpv1 ();
|
||||
if (table)
|
||||
{
|
||||
err = grub_efiemu_register_configuration_table (acpi, 0, 0, table);
|
||||
if (err)
|
||||
return err;
|
||||
}
|
||||
table = grub_acpi_get_rsdpv2 ();
|
||||
if (table)
|
||||
{
|
||||
err = grub_efiemu_register_configuration_table (acpi20, 0, 0, table);
|
||||
if (err)
|
||||
return err;
|
||||
}
|
||||
|
||||
for (ptr = (grub_uint8_t *) 0xf0000; ptr < (grub_uint8_t *) 0x100000;
|
||||
ptr += 16)
|
||||
if (grub_memcmp (ptr, "_SM_", 4) == 0
|
||||
&& grub_byte_checksum (ptr, *(ptr + 5)) == 0)
|
||||
break;
|
||||
|
||||
if (ptr < (grub_uint8_t *) 0x100000)
|
||||
{
|
||||
grub_dprintf ("efiemu", "Registering SMBIOS\n");
|
||||
if ((err = grub_efiemu_register_configuration_table (smbios, 0, 0, ptr)))
|
||||
return err;
|
||||
}
|
||||
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue