a5bd9f6
From efd159c0660c89f90089c7570c17c58c68df6dbe Mon Sep 17 00:00:00 2001
a5bd9f6
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
a5bd9f6
Date: Sat, 2 Mar 2013 16:45:57 +0100
a5bd9f6
Subject: [PATCH 184/364] 	Make elfload not use hooks. Opt for flags and
a5bd9f6
 iterators instead.
a5bd9f6
a5bd9f6
---
a5bd9f6
 ChangeLog                                    |   4 +
a5bd9f6
 grub-core/kern/elf.c                         | 455 +++------------------------
a5bd9f6
 grub-core/kern/elfXX.c                       | 144 +++++++++
a5bd9f6
 grub-core/loader/i386/bsd.c                  | 137 +++-----
a5bd9f6
 grub-core/loader/i386/coreboot/chainloader.c |  69 ++--
a5bd9f6
 grub-core/loader/mips/linux.c                |  37 +--
a5bd9f6
 grub-core/loader/powerpc/ieee1275/linux.c    |  34 +-
a5bd9f6
 grub-core/loader/sparc64/ieee1275/linux.c    |  18 +-
a5bd9f6
 include/grub/elfload.h                       |  35 ++-
a5bd9f6
 9 files changed, 301 insertions(+), 632 deletions(-)
a5bd9f6
 create mode 100644 grub-core/kern/elfXX.c
a5bd9f6
a5bd9f6
diff --git a/ChangeLog b/ChangeLog
a5bd9f6
index d55dd8f..7c80ed6 100644
a5bd9f6
--- a/ChangeLog
a5bd9f6
+++ b/ChangeLog
a5bd9f6
@@ -1,5 +1,9 @@
a5bd9f6
 2013-03-02  Vladimir Serbinenko  <phcoder@gmail.com>
a5bd9f6
 
a5bd9f6
+	Make elfload not use hooks. Opt for flags and iterators instead.
a5bd9f6
+
a5bd9f6
+2013-03-02  Vladimir Serbinenko  <phcoder@gmail.com>
a5bd9f6
+
a5bd9f6
 	* grub-core/lib/ia64/longjmp.S: Fix the name of longjmp function.
a5bd9f6
 	* grub-core/lib/ia64/setjmp.S: Fix the name of setjmp function.
a5bd9f6
 
a5bd9f6
diff --git a/grub-core/kern/elf.c b/grub-core/kern/elf.c
a5bd9f6
index f52ca21..5f99c43 100644
a5bd9f6
--- a/grub-core/kern/elf.c
a5bd9f6
+++ b/grub-core/kern/elf.c
a5bd9f6
@@ -51,6 +51,7 @@ grub_elf_close (grub_elf_t elf)
a5bd9f6
   grub_file_t file = elf->file;
a5bd9f6
 
a5bd9f6
   grub_free (elf->phdrs);
a5bd9f6
+  grub_free (elf->filename);
a5bd9f6
   grub_free (elf);
a5bd9f6
 
a5bd9f6
   if (file)
a5bd9f6
@@ -85,9 +86,14 @@ grub_elf_file (grub_file_t file, const char *filename)
a5bd9f6
   if (grub_elf_check_header (elf))
a5bd9f6
     goto fail;
a5bd9f6
 
a5bd9f6
+  elf->filename = grub_strdup (filename);
a5bd9f6
+  if (!elf->filename)
a5bd9f6
+    goto fail;
a5bd9f6
+
a5bd9f6
   return elf;
a5bd9f6
 
a5bd9f6
 fail:
a5bd9f6
+  grub_free (elf->filename);
a5bd9f6
   grub_free (elf->phdrs);
a5bd9f6
   grub_free (elf);
a5bd9f6
   return 0;
a5bd9f6
@@ -112,420 +118,41 @@ grub_elf_open (const char *name)
a5bd9f6
 
a5bd9f6
 
a5bd9f6
 /* 32-bit */
a5bd9f6
-
a5bd9f6
-int
a5bd9f6
-grub_elf_is_elf32 (grub_elf_t elf)
a5bd9f6
-{
a5bd9f6
-  return elf->ehdr.ehdr32.e_ident[EI_CLASS] == ELFCLASS32;
a5bd9f6
-}
a5bd9f6
-
a5bd9f6
-static grub_err_t
a5bd9f6
-grub_elf32_load_phdrs (grub_elf_t elf, const char *filename)
a5bd9f6
-{
a5bd9f6
-  grub_ssize_t phdrs_size;
a5bd9f6
-
a5bd9f6
-  phdrs_size = elf->ehdr.ehdr32.e_phnum * elf->ehdr.ehdr32.e_phentsize;
a5bd9f6
-
a5bd9f6
-  grub_dprintf ("elf", "Loading program headers at 0x%llx, size 0x%lx.\n",
a5bd9f6
-		(unsigned long long) elf->ehdr.ehdr32.e_phoff,
a5bd9f6
-		(unsigned long) phdrs_size);
a5bd9f6
-
a5bd9f6
-  elf->phdrs = grub_malloc (phdrs_size);
a5bd9f6
-  if (! elf->phdrs)
a5bd9f6
-    return grub_errno;
a5bd9f6
-
a5bd9f6
-  if ((grub_file_seek (elf->file, elf->ehdr.ehdr32.e_phoff) == (grub_off_t) -1)
a5bd9f6
-      || (grub_file_read (elf->file, elf->phdrs, phdrs_size) != phdrs_size))
a5bd9f6
-    {
a5bd9f6
-      if (!grub_errno)
a5bd9f6
-	grub_error (GRUB_ERR_FILE_READ_ERROR, N_("premature end of file %s"),
a5bd9f6
-		    filename);
a5bd9f6
-      return grub_errno;
a5bd9f6
-    }
a5bd9f6
-
a5bd9f6
-  return GRUB_ERR_NONE;
a5bd9f6
-}
a5bd9f6
-
a5bd9f6
-grub_err_t
a5bd9f6
-grub_elf32_phdr_iterate (grub_elf_t elf,
a5bd9f6
-			 const char *filename,
a5bd9f6
-			 grub_elf32_phdr_iterate_hook_t hook, void *hook_arg)
a5bd9f6
-{
a5bd9f6
-  Elf32_Phdr *phdrs;
a5bd9f6
-  unsigned int i;
a5bd9f6
-
a5bd9f6
-  if (! elf->phdrs)
a5bd9f6
-    if (grub_elf32_load_phdrs (elf, filename))
a5bd9f6
-      return grub_errno;
a5bd9f6
-  phdrs = elf->phdrs;
a5bd9f6
-
a5bd9f6
-  for (i = 0; i < elf->ehdr.ehdr32.e_phnum; i++)
a5bd9f6
-    {
a5bd9f6
-      Elf32_Phdr *phdr = phdrs + i;
a5bd9f6
-      grub_dprintf ("elf",
a5bd9f6
-		    "Segment %u: type 0x%x paddr 0x%lx memsz 0x%lx "
a5bd9f6
-		    "filesz %lx\n",
a5bd9f6
-		    i, phdr->p_type,
a5bd9f6
-		    (unsigned long) phdr->p_paddr,
a5bd9f6
-		    (unsigned long) phdr->p_memsz,
a5bd9f6
-		    (unsigned long) phdr->p_filesz);
a5bd9f6
-      if (hook (elf, phdr, hook_arg))
a5bd9f6
-	break;
a5bd9f6
-    }
a5bd9f6
-
a5bd9f6
-  return grub_errno;
a5bd9f6
-}
a5bd9f6
-
a5bd9f6
-struct grub_elf32_size_ctx
a5bd9f6
-{
a5bd9f6
-  Elf32_Addr segments_start, segments_end;
a5bd9f6
-  int nr_phdrs;
a5bd9f6
-  grub_uint32_t curr_align;
a5bd9f6
-};
a5bd9f6
-
a5bd9f6
-/* Run through the program headers to calculate the total memory size we
a5bd9f6
- * should claim.  */
a5bd9f6
-static int
a5bd9f6
-grub_elf32_calcsize (grub_elf_t _elf  __attribute__ ((unused)),
a5bd9f6
-		     Elf32_Phdr *phdr, void *data)
a5bd9f6
-{
a5bd9f6
-  struct grub_elf32_size_ctx *ctx = data;
a5bd9f6
-
a5bd9f6
-  /* Only consider loadable segments.  */
a5bd9f6
-  if (phdr->p_type != PT_LOAD)
a5bd9f6
-    return 0;
a5bd9f6
-  ctx->nr_phdrs++;
a5bd9f6
-  if (phdr->p_paddr < ctx->segments_start)
a5bd9f6
-    ctx->segments_start = phdr->p_paddr;
a5bd9f6
-  if (phdr->p_paddr + phdr->p_memsz > ctx->segments_end)
a5bd9f6
-    ctx->segments_end = phdr->p_paddr + phdr->p_memsz;
a5bd9f6
-  if (ctx->curr_align < phdr->p_align)
a5bd9f6
-    ctx->curr_align = phdr->p_align;
a5bd9f6
-  return 0;
a5bd9f6
-}
a5bd9f6
-
a5bd9f6
-/* Calculate the amount of memory spanned by the segments.  */
a5bd9f6
-grub_size_t
a5bd9f6
-grub_elf32_size (grub_elf_t elf, const char *filename,
a5bd9f6
-		 Elf32_Addr *base, grub_uint32_t *max_align)
a5bd9f6
-{
a5bd9f6
-  struct grub_elf32_size_ctx ctx = {
a5bd9f6
-    .segments_start = (Elf32_Addr) -1,
a5bd9f6
-    .segments_end = 0,
a5bd9f6
-    .nr_phdrs = 0,
a5bd9f6
-    .curr_align = 1
a5bd9f6
-  };
a5bd9f6
-
a5bd9f6
-  grub_elf32_phdr_iterate (elf, filename, grub_elf32_calcsize, &ctx;;
a5bd9f6
-
a5bd9f6
-  if (base)
a5bd9f6
-    *base = 0;
a5bd9f6
-
a5bd9f6
-  if (ctx.nr_phdrs == 0)
a5bd9f6
-    {
a5bd9f6
-      grub_error (GRUB_ERR_BAD_OS, "no program headers present");
a5bd9f6
-      return 0;
a5bd9f6
-    }
a5bd9f6
-
a5bd9f6
-  if (ctx.segments_end < ctx.segments_start)
a5bd9f6
-    {
a5bd9f6
-      /* Very bad addresses.  */
a5bd9f6
-      grub_error (GRUB_ERR_BAD_OS, "bad program header load addresses");
a5bd9f6
-      return 0;
a5bd9f6
-    }
a5bd9f6
-
a5bd9f6
-  if (base)
a5bd9f6
-    *base = ctx.segments_start;
a5bd9f6
-  if (max_align)
a5bd9f6
-    *max_align = ctx.curr_align;
a5bd9f6
-  return ctx.segments_end - ctx.segments_start;
a5bd9f6
-}
a5bd9f6
-
a5bd9f6
-struct grub_elf32_load_ctx
a5bd9f6
-{
a5bd9f6
-  const char *filename;
a5bd9f6
-  grub_elf32_load_hook_t load_hook;
a5bd9f6
-  grub_addr_t load_base;
a5bd9f6
-  grub_size_t load_size;
a5bd9f6
-};
a5bd9f6
-
a5bd9f6
-static int
a5bd9f6
-grub_elf32_load_segment (grub_elf_t elf, Elf32_Phdr *phdr, void *data)
a5bd9f6
-{
a5bd9f6
-  struct grub_elf32_load_ctx *ctx = data;
a5bd9f6
-  grub_addr_t load_addr;
a5bd9f6
-  int do_load = 1;
a5bd9f6
-
a5bd9f6
-  load_addr = phdr->p_paddr;
a5bd9f6
-  if (ctx->load_hook && ctx->load_hook (phdr, &load_addr, &do_load))
a5bd9f6
-    return 1;
a5bd9f6
-
a5bd9f6
-  if (! do_load)
a5bd9f6
-    return 0;
a5bd9f6
-
a5bd9f6
-  if (load_addr < ctx->load_base)
a5bd9f6
-    ctx->load_base = load_addr;
a5bd9f6
-
a5bd9f6
-  grub_dprintf ("elf", "Loading segment at 0x%llx, size 0x%llx\n",
a5bd9f6
-		(unsigned long long) load_addr,
a5bd9f6
-		(unsigned long long) phdr->p_memsz);
a5bd9f6
-
a5bd9f6
-  if (grub_file_seek (elf->file, phdr->p_offset) == (grub_off_t) -1)
a5bd9f6
-    return grub_errno;
a5bd9f6
-
a5bd9f6
-  if (phdr->p_filesz)
a5bd9f6
-    {
a5bd9f6
-      grub_ssize_t read;
a5bd9f6
-      read = grub_file_read (elf->file, (void *) load_addr, phdr->p_filesz);
a5bd9f6
-      if (read != (grub_ssize_t) phdr->p_filesz)
a5bd9f6
-	{
a5bd9f6
-	  /* XXX How can we free memory from `ctx->load_hook'? */
a5bd9f6
-	  if (!grub_errno)
a5bd9f6
-	    grub_error (GRUB_ERR_FILE_READ_ERROR, N_("premature end of file %s"),
a5bd9f6
-			ctx->filename);
a5bd9f6
-	  return grub_errno;
a5bd9f6
-	}
a5bd9f6
-    }
a5bd9f6
-
a5bd9f6
-  if (phdr->p_filesz < phdr->p_memsz)
a5bd9f6
-    grub_memset ((void *) (long) (load_addr + phdr->p_filesz),
a5bd9f6
-		 0, phdr->p_memsz - phdr->p_filesz);
a5bd9f6
-
a5bd9f6
-  ctx->load_size += phdr->p_memsz;
a5bd9f6
-
a5bd9f6
-  return 0;
a5bd9f6
-}
a5bd9f6
-
a5bd9f6
-/* Load every loadable segment into memory specified by `_load_hook'.  */
a5bd9f6
-grub_err_t
a5bd9f6
-grub_elf32_load (grub_elf_t elf, const char *filename,
a5bd9f6
-		 grub_elf32_load_hook_t load_hook,
a5bd9f6
-		 grub_addr_t *base, grub_size_t *size)
a5bd9f6
-{
a5bd9f6
-  struct grub_elf32_load_ctx ctx = {
a5bd9f6
-    .filename = filename,
a5bd9f6
-    .load_hook = load_hook,
a5bd9f6
-    .load_base = (grub_addr_t) -1ULL,
a5bd9f6
-    .load_size = 0
a5bd9f6
-  };
a5bd9f6
-  grub_err_t err;
a5bd9f6
-
a5bd9f6
-  err = grub_elf32_phdr_iterate (elf, filename, grub_elf32_load_segment, &ctx;;
a5bd9f6
-
a5bd9f6
-  if (base)
a5bd9f6
-    *base = ctx.load_base;
a5bd9f6
-  if (size)
a5bd9f6
-    *size = ctx.load_size;
a5bd9f6
-
a5bd9f6
-  return err;
a5bd9f6
-}
a5bd9f6
+#define ehdrXX ehdr32
a5bd9f6
+#define ELFCLASSXX ELFCLASS32
a5bd9f6
+#define ElfXX_Addr Elf32_Addr
a5bd9f6
+#define grub_elfXX_size grub_elf32_size
a5bd9f6
+#define grub_elfXX_load grub_elf32_load
a5bd9f6
+#define FOR_ELFXX_PHDRS FOR_ELF32_PHDRS
a5bd9f6
+#define grub_elf_is_elfXX grub_elf_is_elf32
a5bd9f6
+#define grub_elfXX_load_phdrs grub_elf32_load_phdrs
a5bd9f6
+#define ElfXX_Phdr Elf32_Phdr
a5bd9f6
+#define grub_uintXX_t grub_uint32_t
a5bd9f6
+
a5bd9f6
+#include "elfXX.c"
a5bd9f6
+
a5bd9f6
+#undef ehdrXX
a5bd9f6
+#undef ELFCLASSXX
a5bd9f6
+#undef ElfXX_Addr
a5bd9f6
+#undef grub_elfXX_size
a5bd9f6
+#undef grub_elfXX_load
a5bd9f6
+#undef FOR_ELFXX_PHDRS
a5bd9f6
+#undef grub_elf_is_elfXX
a5bd9f6
+#undef grub_elfXX_load_phdrs
a5bd9f6
+#undef ElfXX_Phdr
a5bd9f6
+#undef grub_uintXX_t
a5bd9f6
 
a5bd9f6
 
a5bd9f6
 /* 64-bit */
a5bd9f6
-
a5bd9f6
-int
a5bd9f6
-grub_elf_is_elf64 (grub_elf_t elf)
a5bd9f6
-{
a5bd9f6
-  return elf->ehdr.ehdr64.e_ident[EI_CLASS] == ELFCLASS64;
a5bd9f6
-}
a5bd9f6
-
a5bd9f6
-static grub_err_t
a5bd9f6
-grub_elf64_load_phdrs (grub_elf_t elf, const char *filename)
a5bd9f6
-{
a5bd9f6
-  grub_ssize_t phdrs_size;
a5bd9f6
-
a5bd9f6
-  phdrs_size = elf->ehdr.ehdr64.e_phnum * elf->ehdr.ehdr64.e_phentsize;
a5bd9f6
-
a5bd9f6
-  grub_dprintf ("elf", "Loading program headers at 0x%llx, size 0x%lx.\n",
a5bd9f6
-		(unsigned long long) elf->ehdr.ehdr64.e_phoff,
a5bd9f6
-		(unsigned long) phdrs_size);
a5bd9f6
-
a5bd9f6
-  elf->phdrs = grub_malloc (phdrs_size);
a5bd9f6
-  if (! elf->phdrs)
a5bd9f6
-    return grub_errno;
a5bd9f6
-
a5bd9f6
-  if ((grub_file_seek (elf->file, elf->ehdr.ehdr64.e_phoff) == (grub_off_t) -1)
a5bd9f6
-      || (grub_file_read (elf->file, elf->phdrs, phdrs_size) != phdrs_size))
a5bd9f6
-    {
a5bd9f6
-      if (!grub_errno)
a5bd9f6
-	grub_error (GRUB_ERR_FILE_READ_ERROR, N_("premature end of file %s"),
a5bd9f6
-		    filename);
a5bd9f6
-      return grub_errno;
a5bd9f6
-    }
a5bd9f6
-
a5bd9f6
-  return GRUB_ERR_NONE;
a5bd9f6
-}
a5bd9f6
-
a5bd9f6
-grub_err_t
a5bd9f6
-grub_elf64_phdr_iterate (grub_elf_t elf,
a5bd9f6
-			 const char *filename,
a5bd9f6
-			 grub_elf64_phdr_iterate_hook_t hook, void *hook_arg)
a5bd9f6
-{
a5bd9f6
-  Elf64_Phdr *phdrs;
a5bd9f6
-  unsigned int i;
a5bd9f6
-
a5bd9f6
-  if (! elf->phdrs)
a5bd9f6
-    if (grub_elf64_load_phdrs (elf, filename))
a5bd9f6
-      return grub_errno;
a5bd9f6
-  phdrs = elf->phdrs;
a5bd9f6
-
a5bd9f6
-  for (i = 0; i < elf->ehdr.ehdr64.e_phnum; i++)
a5bd9f6
-    {
a5bd9f6
-      Elf64_Phdr *phdr = phdrs + i;
a5bd9f6
-      grub_dprintf ("elf",
a5bd9f6
-		    "Segment %u: type 0x%x paddr 0x%lx memsz 0x%lx "
a5bd9f6
-		    "filesz %lx\n",
a5bd9f6
-		    i, phdr->p_type,
a5bd9f6
-		    (unsigned long) phdr->p_paddr,
a5bd9f6
-		    (unsigned long) phdr->p_memsz,
a5bd9f6
-		    (unsigned long) phdr->p_filesz);
a5bd9f6
-      if (hook (elf, phdr, hook_arg))
a5bd9f6
-	break;
a5bd9f6
-    }
a5bd9f6
-
a5bd9f6
-  return grub_errno;
a5bd9f6
-}
a5bd9f6
-
a5bd9f6
-struct grub_elf64_size_ctx
a5bd9f6
-{
a5bd9f6
-  Elf64_Addr segments_start, segments_end;
a5bd9f6
-  int nr_phdrs;
a5bd9f6
-  grub_uint64_t curr_align;
a5bd9f6
-};
a5bd9f6
-
a5bd9f6
-/* Run through the program headers to calculate the total memory size we
a5bd9f6
- * should claim.  */
a5bd9f6
-static int
a5bd9f6
-grub_elf64_calcsize (grub_elf_t _elf  __attribute__ ((unused)),
a5bd9f6
-		     Elf64_Phdr *phdr, void *data)
a5bd9f6
-{
a5bd9f6
-  struct grub_elf64_size_ctx *ctx = data;
a5bd9f6
-
a5bd9f6
-  /* Only consider loadable segments.  */
a5bd9f6
-  if (phdr->p_type != PT_LOAD)
a5bd9f6
-    return 0;
a5bd9f6
-  ctx->nr_phdrs++;
a5bd9f6
-  if (phdr->p_paddr < ctx->segments_start)
a5bd9f6
-    ctx->segments_start = phdr->p_paddr;
a5bd9f6
-  if (phdr->p_paddr + phdr->p_memsz > ctx->segments_end)
a5bd9f6
-    ctx->segments_end = phdr->p_paddr + phdr->p_memsz;
a5bd9f6
-  if (ctx->curr_align < phdr->p_align)
a5bd9f6
-    ctx->curr_align = phdr->p_align;
a5bd9f6
-  return 0;
a5bd9f6
-}
a5bd9f6
-
a5bd9f6
-/* Calculate the amount of memory spanned by the segments.  */
a5bd9f6
-grub_size_t
a5bd9f6
-grub_elf64_size (grub_elf_t elf, const char *filename,
a5bd9f6
-		 Elf64_Addr *base, grub_uint64_t *max_align)
a5bd9f6
-{
a5bd9f6
-  struct grub_elf64_size_ctx ctx = {
a5bd9f6
-    .segments_start = (Elf64_Addr) -1,
a5bd9f6
-    .segments_end = 0,
a5bd9f6
-    .nr_phdrs = 0,
a5bd9f6
-    .curr_align = 1
a5bd9f6
-  };
a5bd9f6
-
a5bd9f6
-  grub_elf64_phdr_iterate (elf, filename, grub_elf64_calcsize, &ctx;;
a5bd9f6
-
a5bd9f6
-  if (base)
a5bd9f6
-    *base = 0;
a5bd9f6
-
a5bd9f6
-  if (ctx.nr_phdrs == 0)
a5bd9f6
-    {
a5bd9f6
-      grub_error (GRUB_ERR_BAD_OS, "no program headers present");
a5bd9f6
-      return 0;
a5bd9f6
-    }
a5bd9f6
-
a5bd9f6
-  if (ctx.segments_end < ctx.segments_start)
a5bd9f6
-    {
a5bd9f6
-      /* Very bad addresses.  */
a5bd9f6
-      grub_error (GRUB_ERR_BAD_OS, "bad program header load addresses");
a5bd9f6
-      return 0;
a5bd9f6
-    }
a5bd9f6
-
a5bd9f6
-  if (base)
a5bd9f6
-    *base = ctx.segments_start;
a5bd9f6
-  if (max_align)
a5bd9f6
-    *max_align = ctx.curr_align;
a5bd9f6
-  return ctx.segments_end - ctx.segments_start;
a5bd9f6
-}
a5bd9f6
-
a5bd9f6
-struct grub_elf64_load_ctx
a5bd9f6
-{
a5bd9f6
-  const char *filename;
a5bd9f6
-  grub_elf64_load_hook_t load_hook;
a5bd9f6
-  grub_addr_t load_base;
a5bd9f6
-  grub_size_t load_size;
a5bd9f6
-};
a5bd9f6
-
a5bd9f6
-static int
a5bd9f6
-grub_elf64_load_segment (grub_elf_t elf, Elf64_Phdr *phdr, void *data)
a5bd9f6
-{
a5bd9f6
-  struct grub_elf64_load_ctx *ctx = data;
a5bd9f6
-  grub_addr_t load_addr;
a5bd9f6
-  int do_load = 1;
a5bd9f6
-
a5bd9f6
-  load_addr = phdr->p_paddr;
a5bd9f6
-  if (ctx->load_hook && ctx->load_hook (phdr, &load_addr, &do_load))
a5bd9f6
-    return 1;
a5bd9f6
-
a5bd9f6
-  if (! do_load)
a5bd9f6
-    return 0;
a5bd9f6
-
a5bd9f6
-  if (load_addr < ctx->load_base)
a5bd9f6
-    ctx->load_base = load_addr;
a5bd9f6
-
a5bd9f6
-  grub_dprintf ("elf", "Loading segment at 0x%llx, size 0x%llx\n",
a5bd9f6
-		(unsigned long long) load_addr,
a5bd9f6
-		(unsigned long long) phdr->p_memsz);
a5bd9f6
-
a5bd9f6
-  if (grub_file_seek (elf->file, phdr->p_offset) == (grub_off_t) -1)
a5bd9f6
-    return grub_errno;
a5bd9f6
-
a5bd9f6
-  if (phdr->p_filesz)
a5bd9f6
-    {
a5bd9f6
-      grub_ssize_t read;
a5bd9f6
-      read = grub_file_read (elf->file, (void *) load_addr, phdr->p_filesz);
a5bd9f6
-      if (read != (grub_ssize_t) phdr->p_filesz)
a5bd9f6
-	{
a5bd9f6
-	  /* XXX How can we free memory from `ctx->load_hook'?  */
a5bd9f6
-	  if (!grub_errno)
a5bd9f6
-	    grub_error (GRUB_ERR_FILE_READ_ERROR, N_("premature end of file %s"),
a5bd9f6
-			ctx->filename);
a5bd9f6
-	  return grub_errno;
a5bd9f6
-	}
a5bd9f6
-    }
a5bd9f6
-
a5bd9f6
-  if (phdr->p_filesz < phdr->p_memsz)
a5bd9f6
-    grub_memset ((void *) (long) (load_addr + phdr->p_filesz),
a5bd9f6
-		 0, phdr->p_memsz - phdr->p_filesz);
a5bd9f6
-
a5bd9f6
-  ctx->load_size += phdr->p_memsz;
a5bd9f6
-
a5bd9f6
-  return 0;
a5bd9f6
-}
a5bd9f6
-
a5bd9f6
-/* Load every loadable segment into memory specified by `_load_hook'.  */
a5bd9f6
-grub_err_t
a5bd9f6
-grub_elf64_load (grub_elf_t elf, const char *filename,
a5bd9f6
-		 grub_elf64_load_hook_t load_hook,
a5bd9f6
-		 grub_addr_t *base, grub_size_t *size)
a5bd9f6
-{
a5bd9f6
-  struct grub_elf64_load_ctx ctx = {
a5bd9f6
-    .filename = filename,
a5bd9f6
-    .load_hook = load_hook,
a5bd9f6
-    .load_base = (grub_addr_t) -1ULL,
a5bd9f6
-    .load_size = 0
a5bd9f6
-  };
a5bd9f6
-  grub_err_t err;
a5bd9f6
-
a5bd9f6
-  err = grub_elf64_phdr_iterate (elf, filename, grub_elf64_load_segment, &ctx;;
a5bd9f6
-
a5bd9f6
-  if (base)
a5bd9f6
-    *base = ctx.load_base;
a5bd9f6
-  if (size)
a5bd9f6
-    *size = ctx.load_size;
a5bd9f6
-
a5bd9f6
-  return err;
a5bd9f6
-}
a5bd9f6
+#define ehdrXX ehdr64
a5bd9f6
+#define ELFCLASSXX ELFCLASS64
a5bd9f6
+#define ElfXX_Addr Elf64_Addr
a5bd9f6
+#define grub_elfXX_size grub_elf64_size
a5bd9f6
+#define grub_elfXX_load grub_elf64_load
a5bd9f6
+#define FOR_ELFXX_PHDRS FOR_ELF64_PHDRS
a5bd9f6
+#define grub_elf_is_elfXX grub_elf_is_elf64
a5bd9f6
+#define grub_elfXX_load_phdrs grub_elf64_load_phdrs
a5bd9f6
+#define ElfXX_Phdr Elf64_Phdr
a5bd9f6
+#define grub_uintXX_t grub_uint64_t
a5bd9f6
+
a5bd9f6
+#include "elfXX.c"
a5bd9f6
diff --git a/grub-core/kern/elfXX.c b/grub-core/kern/elfXX.c
a5bd9f6
new file mode 100644
a5bd9f6
index 0000000..b35e235
a5bd9f6
--- /dev/null
a5bd9f6
+++ b/grub-core/kern/elfXX.c
a5bd9f6
@@ -0,0 +1,144 @@
a5bd9f6
+int
a5bd9f6
+grub_elf_is_elfXX (grub_elf_t elf)
a5bd9f6
+{
a5bd9f6
+  return elf->ehdr.ehdrXX.e_ident[EI_CLASS] == ELFCLASSXX;
a5bd9f6
+}
a5bd9f6
+
a5bd9f6
+grub_err_t
a5bd9f6
+grub_elfXX_load_phdrs (grub_elf_t elf)
a5bd9f6
+{
a5bd9f6
+  grub_ssize_t phdrs_size;
a5bd9f6
+
a5bd9f6
+  if (elf->phdrs)
a5bd9f6
+    return GRUB_ERR_NONE;
a5bd9f6
+
a5bd9f6
+  phdrs_size = elf->ehdr.ehdrXX.e_phnum * elf->ehdr.ehdrXX.e_phentsize;
a5bd9f6
+
a5bd9f6
+  grub_dprintf ("elf", "Loading program headers at 0x%llx, size 0x%lx.\n",
a5bd9f6
+		(unsigned long long) elf->ehdr.ehdrXX.e_phoff,
a5bd9f6
+		(unsigned long) phdrs_size);
a5bd9f6
+
a5bd9f6
+  elf->phdrs = grub_malloc (phdrs_size);
a5bd9f6
+  if (! elf->phdrs)
a5bd9f6
+    return grub_errno;
a5bd9f6
+
a5bd9f6
+  if ((grub_file_seek (elf->file, elf->ehdr.ehdrXX.e_phoff) == (grub_off_t) -1)
a5bd9f6
+      || (grub_file_read (elf->file, elf->phdrs, phdrs_size) != phdrs_size))
a5bd9f6
+    {
a5bd9f6
+      if (!grub_errno)
a5bd9f6
+	grub_error (GRUB_ERR_FILE_READ_ERROR, N_("premature end of file %s"),
a5bd9f6
+		    elf->filename);
a5bd9f6
+      return grub_errno;
a5bd9f6
+    }
a5bd9f6
+
a5bd9f6
+  return GRUB_ERR_NONE;
a5bd9f6
+}
a5bd9f6
+
a5bd9f6
+/* Calculate the amount of memory spanned by the segments.  */
a5bd9f6
+grub_size_t
a5bd9f6
+grub_elfXX_size (grub_elf_t elf,
a5bd9f6
+		 ElfXX_Addr *base, grub_uintXX_t *max_align)
a5bd9f6
+{
a5bd9f6
+  ElfXX_Addr segments_start = (ElfXX_Addr) -1;
a5bd9f6
+  ElfXX_Addr segments_end = 0;
a5bd9f6
+  int nr_phdrs = 0;
a5bd9f6
+  grub_uint32_t curr_align = 1;
a5bd9f6
+  ElfXX_Phdr *phdr;
a5bd9f6
+
a5bd9f6
+  /* Run through the program headers to calculate the total memory size we
a5bd9f6
+   * should claim.  */
a5bd9f6
+  FOR_ELFXX_PHDRS (elf, phdr)
a5bd9f6
+    {
a5bd9f6
+      /* Only consider loadable segments.  */
a5bd9f6
+      if (phdr->p_type != PT_LOAD)
a5bd9f6
+	continue;
a5bd9f6
+      nr_phdrs++;
a5bd9f6
+      if (phdr->p_paddr < segments_start)
a5bd9f6
+	segments_start = phdr->p_paddr;
a5bd9f6
+      if (phdr->p_paddr + phdr->p_memsz > segments_end)
a5bd9f6
+	segments_end = phdr->p_paddr + phdr->p_memsz;
a5bd9f6
+      if (curr_align < phdr->p_align)
a5bd9f6
+	curr_align = phdr->p_align;
a5bd9f6
+    }
a5bd9f6
+
a5bd9f6
+  if (base)
a5bd9f6
+    *base = 0;
a5bd9f6
+
a5bd9f6
+  if (nr_phdrs == 0)
a5bd9f6
+    {
a5bd9f6
+      grub_error (GRUB_ERR_BAD_OS, "no program headers present");
a5bd9f6
+      return 0;
a5bd9f6
+    }
a5bd9f6
+
a5bd9f6
+  if (segments_end < segments_start)
a5bd9f6
+    {
a5bd9f6
+      /* Very bad addresses.  */
a5bd9f6
+      grub_error (GRUB_ERR_BAD_OS, "bad program header load addresses");
a5bd9f6
+      return 0;
a5bd9f6
+    }
a5bd9f6
+
a5bd9f6
+  if (base)
a5bd9f6
+    *base = segments_start;
a5bd9f6
+  if (max_align)
a5bd9f6
+    *max_align = curr_align;
a5bd9f6
+  return segments_end - segments_start;
a5bd9f6
+}
a5bd9f6
+
a5bd9f6
+grub_err_t
a5bd9f6
+grub_elfXX_load (grub_elf_t elf, const char *filename,
a5bd9f6
+		 void *load_offset, enum grub_elf_load_flags load_flags,
a5bd9f6
+		 grub_addr_t *base, grub_size_t *size)
a5bd9f6
+{
a5bd9f6
+  grub_addr_t load_base = (grub_addr_t) -1ULL;
a5bd9f6
+  grub_size_t load_size = 0;
a5bd9f6
+  ElfXX_Phdr *phdr;
a5bd9f6
+
a5bd9f6
+  FOR_ELFXX_PHDRS(elf, phdr)
a5bd9f6
+  {
a5bd9f6
+    grub_addr_t load_addr;
a5bd9f6
+
a5bd9f6
+    if (phdr->p_type != PT_LOAD && !((load_flags & GRUB_ELF_LOAD_FLAGS_LOAD_PT_DYNAMIC) && phdr->p_type == PT_DYNAMIC))
a5bd9f6
+      continue;
a5bd9f6
+
a5bd9f6
+    load_addr = (grub_addr_t) phdr->p_paddr;
a5bd9f6
+    if (load_flags & GRUB_ELF_LOAD_FLAGS_28BITS)
a5bd9f6
+      load_addr &= 0xFFFFFFF;
a5bd9f6
+    load_addr += (grub_addr_t) load_offset;
a5bd9f6
+
a5bd9f6
+    if (load_addr < load_base)
a5bd9f6
+      load_base = load_addr;
a5bd9f6
+
a5bd9f6
+    grub_dprintf ("elf", "Loading segment at 0x%llx, size 0x%llx\n",
a5bd9f6
+		  (unsigned long long) load_addr,
a5bd9f6
+		  (unsigned long long) phdr->p_memsz);
a5bd9f6
+
a5bd9f6
+    if (grub_file_seek (elf->file, phdr->p_offset) == (grub_off_t) -1)
a5bd9f6
+      return grub_errno;
a5bd9f6
+
a5bd9f6
+    if (phdr->p_filesz)
a5bd9f6
+      {
a5bd9f6
+	grub_ssize_t read;
a5bd9f6
+	read = grub_file_read (elf->file, (void *) load_addr, phdr->p_filesz);
a5bd9f6
+	if (read != (grub_ssize_t) phdr->p_filesz)
a5bd9f6
+	  {
a5bd9f6
+	    if (!grub_errno)
a5bd9f6
+	      grub_error (GRUB_ERR_FILE_READ_ERROR, N_("premature end of file %s"),
a5bd9f6
+			  filename);
a5bd9f6
+	    return grub_errno;
a5bd9f6
+	  }
a5bd9f6
+      }
a5bd9f6
+
a5bd9f6
+    if (phdr->p_filesz < phdr->p_memsz)
a5bd9f6
+      grub_memset ((void *) (long) (load_addr + phdr->p_filesz),
a5bd9f6
+		   0, phdr->p_memsz - phdr->p_filesz);
a5bd9f6
+
a5bd9f6
+    load_size += phdr->p_memsz;
a5bd9f6
+  }
a5bd9f6
+
a5bd9f6
+  if (base)
a5bd9f6
+    *base = load_base;
a5bd9f6
+  if (size)
a5bd9f6
+    *size = load_size;
a5bd9f6
+
a5bd9f6
+  return grub_errno;
a5bd9f6
+}
a5bd9f6
diff --git a/grub-core/loader/i386/bsd.c b/grub-core/loader/i386/bsd.c
a5bd9f6
index 9b86158..6199609 100644
a5bd9f6
--- a/grub-core/loader/i386/bsd.c
a5bd9f6
+++ b/grub-core/loader/i386/bsd.c
a5bd9f6
@@ -1311,89 +1311,6 @@ grub_bsd_load_aout (grub_file_t file, const char *filename)
a5bd9f6
 			 bss_size);
a5bd9f6
 }
a5bd9f6
 
a5bd9f6
-static int
a5bd9f6
-grub_bsd_elf32_size_hook (grub_elf_t elf __attribute__ ((unused)),
a5bd9f6
-			  Elf32_Phdr *phdr, void *arg __attribute__ ((unused)))
a5bd9f6
-{
a5bd9f6
-  Elf32_Addr paddr;
a5bd9f6
-
a5bd9f6
-  if (phdr->p_type != PT_LOAD
a5bd9f6
-      && phdr->p_type != PT_DYNAMIC)
a5bd9f6
-      return 0;
a5bd9f6
-
a5bd9f6
-  paddr = phdr->p_paddr & 0xFFFFFFF;
a5bd9f6
-
a5bd9f6
-  if (paddr < kern_start)
a5bd9f6
-    kern_start = paddr;
a5bd9f6
-
a5bd9f6
-  if (paddr + phdr->p_memsz > kern_end)
a5bd9f6
-    kern_end = paddr + phdr->p_memsz;
a5bd9f6
-
a5bd9f6
-  return 0;
a5bd9f6
-}
a5bd9f6
-
a5bd9f6
-static grub_err_t
a5bd9f6
-grub_bsd_elf32_hook (Elf32_Phdr * phdr, grub_addr_t * addr, int *do_load)
a5bd9f6
-{
a5bd9f6
-  Elf32_Addr paddr;
a5bd9f6
-
a5bd9f6
-  if (phdr->p_type != PT_LOAD
a5bd9f6
-      && phdr->p_type != PT_DYNAMIC)
a5bd9f6
-    {
a5bd9f6
-      *do_load = 0;
a5bd9f6
-      return 0;
a5bd9f6
-    }
a5bd9f6
-
a5bd9f6
-  *do_load = 1;
a5bd9f6
-  phdr->p_paddr &= 0xFFFFFFF;
a5bd9f6
-  paddr = phdr->p_paddr;
a5bd9f6
-
a5bd9f6
-  *addr = (grub_addr_t) (paddr - kern_start + (grub_uint8_t *) kern_chunk_src);
a5bd9f6
-
a5bd9f6
-  return GRUB_ERR_NONE;
a5bd9f6
-}
a5bd9f6
-
a5bd9f6
-static int
a5bd9f6
-grub_bsd_elf64_size_hook (grub_elf_t elf __attribute__ ((unused)),
a5bd9f6
-			  Elf64_Phdr *phdr, void *arg __attribute__ ((unused)))
a5bd9f6
-{
a5bd9f6
-  Elf64_Addr paddr;
a5bd9f6
-
a5bd9f6
-  if (phdr->p_type != PT_LOAD
a5bd9f6
-      && phdr->p_type != PT_DYNAMIC)
a5bd9f6
-    return 0;
a5bd9f6
-
a5bd9f6
-  paddr = phdr->p_paddr & 0xfffffff;
a5bd9f6
-
a5bd9f6
-  if (paddr < kern_start)
a5bd9f6
-    kern_start = paddr;
a5bd9f6
-
a5bd9f6
-  if (paddr + phdr->p_memsz > kern_end)
a5bd9f6
-    kern_end = paddr + phdr->p_memsz;
a5bd9f6
-
a5bd9f6
-  return 0;
a5bd9f6
-}
a5bd9f6
-
a5bd9f6
-static grub_err_t
a5bd9f6
-grub_bsd_elf64_hook (Elf64_Phdr * phdr, grub_addr_t * addr, int *do_load)
a5bd9f6
-{
a5bd9f6
-  Elf64_Addr paddr;
a5bd9f6
-
a5bd9f6
-  if (phdr->p_type != PT_LOAD
a5bd9f6
-      && phdr->p_type != PT_DYNAMIC)
a5bd9f6
-    {
a5bd9f6
-      *do_load = 0;
a5bd9f6
-      return 0;
a5bd9f6
-    }
a5bd9f6
-
a5bd9f6
-  *do_load = 1;
a5bd9f6
-  paddr = phdr->p_paddr & 0xfffffff;
a5bd9f6
-
a5bd9f6
-  *addr = (grub_addr_t) (paddr - kern_start + (grub_uint8_t *) kern_chunk_src);
a5bd9f6
-
a5bd9f6
-  return GRUB_ERR_NONE;
a5bd9f6
-}
a5bd9f6
-
a5bd9f6
 static grub_err_t
a5bd9f6
 grub_bsd_load_elf (grub_elf_t elf, const char *filename)
a5bd9f6
 {
a5bd9f6
@@ -1405,12 +1322,29 @@ grub_bsd_load_elf (grub_elf_t elf, const char *filename)
a5bd9f6
   if (grub_elf_is_elf32 (elf))
a5bd9f6
     {
a5bd9f6
       grub_relocator_chunk_t ch;
a5bd9f6
+      Elf32_Phdr *phdr;
a5bd9f6
 
a5bd9f6
       entry = elf->ehdr.ehdr32.e_entry & 0xFFFFFFF;
a5bd9f6
-      err = grub_elf32_phdr_iterate (elf, filename,
a5bd9f6
-				     grub_bsd_elf32_size_hook, NULL);
a5bd9f6
-      if (err)
a5bd9f6
-	return err;
a5bd9f6
+
a5bd9f6
+      FOR_ELF32_PHDRS (elf, phdr)
a5bd9f6
+	{
a5bd9f6
+	  Elf32_Addr paddr;
a5bd9f6
+
a5bd9f6
+	  if (phdr->p_type != PT_LOAD
a5bd9f6
+	      && phdr->p_type != PT_DYNAMIC)
a5bd9f6
+	    continue;
a5bd9f6
+
a5bd9f6
+	  paddr = phdr->p_paddr & 0xFFFFFFF;
a5bd9f6
+
a5bd9f6
+	  if (paddr < kern_start)
a5bd9f6
+	    kern_start = paddr;
a5bd9f6
+
a5bd9f6
+	  if (paddr + phdr->p_memsz > kern_end)
a5bd9f6
+	    kern_end = paddr + phdr->p_memsz;
a5bd9f6
+	}
a5bd9f6
+
a5bd9f6
+      if (grub_errno)
a5bd9f6
+	return grub_errno;
a5bd9f6
       err = grub_relocator_alloc_chunk_addr (relocator, &ch,
a5bd9f6
 					     kern_start, kern_end - kern_start);
a5bd9f6
       if (err)
a5bd9f6
@@ -1418,7 +1352,7 @@ grub_bsd_load_elf (grub_elf_t elf, const char *filename)
a5bd9f6
 
a5bd9f6
       kern_chunk_src = get_virtual_current_address (ch);
a5bd9f6
 
a5bd9f6
-      err = grub_elf32_load (elf, filename, grub_bsd_elf32_hook, 0, 0);
a5bd9f6
+      err = grub_elf32_load (elf, filename, (grub_uint8_t *) kern_chunk_src - kern_start, GRUB_ELF_LOAD_FLAGS_LOAD_PT_DYNAMIC | GRUB_ELF_LOAD_FLAGS_28BITS, 0, 0);
a5bd9f6
       if (err)
a5bd9f6
 	return err;
a5bd9f6
       if (kernel_type != KERNEL_TYPE_OPENBSD)
a5bd9f6
@@ -1428,6 +1362,8 @@ grub_bsd_load_elf (grub_elf_t elf, const char *filename)
a5bd9f6
     }
a5bd9f6
   else if (grub_elf_is_elf64 (elf))
a5bd9f6
     {
a5bd9f6
+      Elf64_Phdr *phdr;
a5bd9f6
+
a5bd9f6
       is_64bit = 1;
a5bd9f6
 
a5bd9f6
       if (! grub_cpuid_has_longmode)
a5bd9f6
@@ -1445,10 +1381,25 @@ grub_bsd_load_elf (grub_elf_t elf, const char *filename)
a5bd9f6
 	  entry_hi = 0;
a5bd9f6
 	}
a5bd9f6
 
a5bd9f6
-      err = grub_elf64_phdr_iterate (elf, filename,
a5bd9f6
-				     grub_bsd_elf64_size_hook, NULL);
a5bd9f6
-      if (err)
a5bd9f6
-	return err;
a5bd9f6
+      FOR_ELF64_PHDRS (elf, phdr)
a5bd9f6
+	{
a5bd9f6
+	  Elf64_Addr paddr;
a5bd9f6
+
a5bd9f6
+	  if (phdr->p_type != PT_LOAD
a5bd9f6
+	      && phdr->p_type != PT_DYNAMIC)
a5bd9f6
+	    continue;
a5bd9f6
+
a5bd9f6
+	  paddr = phdr->p_paddr & 0xFFFFFFF;
a5bd9f6
+
a5bd9f6
+	  if (paddr < kern_start)
a5bd9f6
+	    kern_start = paddr;
a5bd9f6
+
a5bd9f6
+	  if (paddr + phdr->p_memsz > kern_end)
a5bd9f6
+	    kern_end = paddr + phdr->p_memsz;
a5bd9f6
+	}
a5bd9f6
+
a5bd9f6
+      if (grub_errno)
a5bd9f6
+	return grub_errno;
a5bd9f6
 
a5bd9f6
       grub_dprintf ("bsd", "kern_start = %lx, kern_end = %lx\n",
a5bd9f6
 		    (unsigned long) kern_start, (unsigned long) kern_end);
a5bd9f6
@@ -1463,7 +1414,7 @@ grub_bsd_load_elf (grub_elf_t elf, const char *filename)
a5bd9f6
       }
a5bd9f6
 
a5bd9f6
       err = grub_elf64_load (elf, filename,
a5bd9f6
-			     grub_bsd_elf64_hook, 0, 0);
a5bd9f6
+			     (grub_uint8_t *) kern_chunk_src - kern_start, GRUB_ELF_LOAD_FLAGS_LOAD_PT_DYNAMIC | GRUB_ELF_LOAD_FLAGS_28BITS, 0, 0);
a5bd9f6
       if (err)
a5bd9f6
 	return err;
a5bd9f6
       if (kernel_type != KERNEL_TYPE_OPENBSD)
a5bd9f6
diff --git a/grub-core/loader/i386/coreboot/chainloader.c b/grub-core/loader/i386/coreboot/chainloader.c
a5bd9f6
index df4e276..505aa0b 100644
a5bd9f6
--- a/grub-core/loader/i386/coreboot/chainloader.c
a5bd9f6
+++ b/grub-core/loader/i386/coreboot/chainloader.c
a5bd9f6
@@ -56,36 +56,13 @@ grub_chain_unload (void)
a5bd9f6
 }
a5bd9f6
 
a5bd9f6
 static grub_err_t
a5bd9f6
-grub_chain_elf32_hook (Elf32_Phdr * phdr, grub_addr_t * addr, int *do_load)
a5bd9f6
-{
a5bd9f6
-  grub_err_t err;
a5bd9f6
-  grub_relocator_chunk_t ch;
a5bd9f6
-
a5bd9f6
-  if (phdr->p_type != PT_LOAD)
a5bd9f6
-    {
a5bd9f6
-      *do_load = 0;
a5bd9f6
-      return 0;
a5bd9f6
-    }
a5bd9f6
-
a5bd9f6
-  *do_load = 1;
a5bd9f6
-  err = grub_relocator_alloc_chunk_addr (relocator, &ch,
a5bd9f6
-					 phdr->p_paddr, phdr->p_memsz);
a5bd9f6
-  if (err)
a5bd9f6
-    return err;
a5bd9f6
-
a5bd9f6
-  *addr = (grub_addr_t) get_virtual_current_address (ch);
a5bd9f6
-
a5bd9f6
-  return GRUB_ERR_NONE;
a5bd9f6
-}
a5bd9f6
-
a5bd9f6
-
a5bd9f6
-static grub_err_t
a5bd9f6
 grub_cmd_chain (grub_command_t cmd __attribute__ ((unused)),
a5bd9f6
 		int argc, char *argv[])
a5bd9f6
 {
a5bd9f6
   grub_err_t err;
a5bd9f6
   grub_file_t file;
a5bd9f6
   grub_elf_t elf;
a5bd9f6
+  Elf32_Phdr *phdr;
a5bd9f6
 
a5bd9f6
   if (argc != 1)
a5bd9f6
     return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));
a5bd9f6
@@ -118,13 +95,47 @@ grub_cmd_chain (grub_command_t cmd __attribute__ ((unused)),
a5bd9f6
       grub_elf_close (elf);
a5bd9f6
     }
a5bd9f6
 
a5bd9f6
-  entry = elf->ehdr.ehdr32.e_entry & 0xFFFFFF;
a5bd9f6
-  
a5bd9f6
-  err = grub_elf32_load (elf, argv[0], grub_chain_elf32_hook, 0, 0);
a5bd9f6
+  entry = elf->ehdr.ehdr32.e_entry;
a5bd9f6
+
a5bd9f6
+  FOR_ELF32_PHDRS(elf, phdr)
a5bd9f6
+    {
a5bd9f6
+      grub_uint8_t *load_addr;
a5bd9f6
+      grub_relocator_chunk_t ch;
a5bd9f6
+
a5bd9f6
+      if (phdr->p_type != PT_LOAD)
a5bd9f6
+	continue;
a5bd9f6
+
a5bd9f6
+      err = grub_relocator_alloc_chunk_addr (relocator, &ch,
a5bd9f6
+					     phdr->p_paddr, phdr->p_memsz);
a5bd9f6
+      if (err)
a5bd9f6
+	break;
a5bd9f6
+
a5bd9f6
+      load_addr = get_virtual_current_address (ch);
a5bd9f6
+
a5bd9f6
+      if (grub_file_seek (elf->file, phdr->p_offset) == (grub_off_t) -1)
a5bd9f6
+	return grub_errno;
a5bd9f6
+
a5bd9f6
+      if (phdr->p_filesz)
a5bd9f6
+	{
a5bd9f6
+	  grub_ssize_t read;
a5bd9f6
+	  read = grub_file_read (elf->file, load_addr, phdr->p_filesz);
a5bd9f6
+	  if (read != (grub_ssize_t) phdr->p_filesz)
a5bd9f6
+	    {
a5bd9f6
+	      if (!grub_errno)
a5bd9f6
+		grub_error (GRUB_ERR_FILE_READ_ERROR, N_("premature end of file %s"),
a5bd9f6
+			    argv[0]);
a5bd9f6
+	      break;
a5bd9f6
+	    }
a5bd9f6
+	}
a5bd9f6
+
a5bd9f6
+      if (phdr->p_filesz < phdr->p_memsz)
a5bd9f6
+	grub_memset ((load_addr + phdr->p_filesz),
a5bd9f6
+		     0, phdr->p_memsz - phdr->p_filesz);
a5bd9f6
+    }
a5bd9f6
 
a5bd9f6
   grub_elf_close (elf);
a5bd9f6
-  if (err)
a5bd9f6
-    return err;
a5bd9f6
+  if (grub_errno)
a5bd9f6
+    return grub_errno;
a5bd9f6
 
a5bd9f6
   grub_loader_set (grub_chain_boot, grub_chain_unload, 0);
a5bd9f6
   return GRUB_ERR_NONE;
a5bd9f6
diff --git a/grub-core/loader/mips/linux.c b/grub-core/loader/mips/linux.c
a5bd9f6
index f2cf7cc..653f8a2 100644
a5bd9f6
--- a/grub-core/loader/mips/linux.c
a5bd9f6
+++ b/grub-core/loader/mips/linux.c
a5bd9f6
@@ -144,7 +144,7 @@ grub_linux_load32 (grub_elf_t elf, const char *filename,
a5bd9f6
   /* Linux's entry point incorrectly contains a virtual address.  */
a5bd9f6
   entry_addr = elf->ehdr.ehdr32.e_entry;
a5bd9f6
 
a5bd9f6
-  linux_size = grub_elf32_size (elf, filename, &base, 0);
a5bd9f6
+  linux_size = grub_elf32_size (elf, &base, 0);
a5bd9f6
   if (linux_size == 0)
a5bd9f6
     return grub_errno;
a5bd9f6
   target_addr = base;
a5bd9f6
@@ -171,22 +171,7 @@ grub_linux_load32 (grub_elf_t elf, const char *filename,
a5bd9f6
   *extra_mem = playground + extraoff;
a5bd9f6
 
a5bd9f6
   /* Now load the segments into the area we claimed.  */
a5bd9f6
-  auto grub_err_t offset_phdr (Elf32_Phdr *phdr, grub_addr_t *addr, int *do_load);
a5bd9f6
-  grub_err_t offset_phdr (Elf32_Phdr *phdr, grub_addr_t *addr, int *do_load)
a5bd9f6
-    {
a5bd9f6
-      if (phdr->p_type != PT_LOAD)
a5bd9f6
-	{
a5bd9f6
-	  *do_load = 0;
a5bd9f6
-	  return 0;
a5bd9f6
-	}
a5bd9f6
-      *do_load = 1;
a5bd9f6
-
a5bd9f6
-      /* Linux's program headers incorrectly contain virtual addresses.
a5bd9f6
-       * Translate those to physical, and offset to the area we claimed.  */
a5bd9f6
-      *addr = (grub_addr_t) (phdr->p_paddr - base + playground);
a5bd9f6
-      return 0;
a5bd9f6
-    }
a5bd9f6
-  return grub_elf32_load (elf, filename, offset_phdr, 0, 0);
a5bd9f6
+  return grub_elf32_load (elf, filename, playground - base, GRUB_ELF_LOAD_FLAGS_NONE, 0, 0);
a5bd9f6
 }
a5bd9f6
 
a5bd9f6
 static grub_err_t
a5bd9f6
@@ -200,7 +185,7 @@ grub_linux_load64 (grub_elf_t elf, const char *filename,
a5bd9f6
   /* Linux's entry point incorrectly contains a virtual address.  */
a5bd9f6
   entry_addr = elf->ehdr.ehdr64.e_entry;
a5bd9f6
 
a5bd9f6
-  linux_size = grub_elf64_size (elf, filename, &base, 0);
a5bd9f6
+  linux_size = grub_elf64_size (elf, &base, 0);
a5bd9f6
   if (linux_size == 0)
a5bd9f6
     return grub_errno;
a5bd9f6
   target_addr = base;
a5bd9f6
@@ -227,21 +212,7 @@ grub_linux_load64 (grub_elf_t elf, const char *filename,
a5bd9f6
   *extra_mem = playground + extraoff;
a5bd9f6
 
a5bd9f6
   /* Now load the segments into the area we claimed.  */
a5bd9f6
-  auto grub_err_t offset_phdr (Elf64_Phdr *phdr, grub_addr_t *addr, int *do_load);
a5bd9f6
-  grub_err_t offset_phdr (Elf64_Phdr *phdr, grub_addr_t *addr, int *do_load)
a5bd9f6
-    {
a5bd9f6
-      if (phdr->p_type != PT_LOAD)
a5bd9f6
-	{
a5bd9f6
-	  *do_load = 0;
a5bd9f6
-	  return 0;
a5bd9f6
-	}
a5bd9f6
-      *do_load = 1;
a5bd9f6
-      /* Linux's program headers incorrectly contain virtual addresses.
a5bd9f6
-       * Translate those to physical, and offset to the area we claimed.  */
a5bd9f6
-      *addr = (grub_addr_t) (phdr->p_paddr - base + playground);
a5bd9f6
-      return 0;
a5bd9f6
-    }
a5bd9f6
-  return grub_elf64_load (elf, filename, offset_phdr, 0, 0);
a5bd9f6
+  return grub_elf64_load (elf, filename, playground - base, GRUB_ELF_LOAD_FLAGS_NONE, 0, 0);
a5bd9f6
 }
a5bd9f6
 
a5bd9f6
 static grub_err_t
a5bd9f6
diff --git a/grub-core/loader/powerpc/ieee1275/linux.c b/grub-core/loader/powerpc/ieee1275/linux.c
a5bd9f6
index c977941..9055399 100644
a5bd9f6
--- a/grub-core/loader/powerpc/ieee1275/linux.c
a5bd9f6
+++ b/grub-core/loader/powerpc/ieee1275/linux.c
a5bd9f6
@@ -179,7 +179,7 @@ grub_linux_load32 (grub_elf_t elf, const char *filename)
a5bd9f6
   grub_uint32_t offset;
a5bd9f6
   Elf32_Addr entry;
a5bd9f6
 
a5bd9f6
-  linux_size = grub_elf32_size (elf, filename, &base_addr, &align);
a5bd9f6
+  linux_size = grub_elf32_size (elf, &base_addr, &align);
a5bd9f6
   if (linux_size == 0)
a5bd9f6
     return grub_errno;
a5bd9f6
   /* Pad it; the kernel scribbles over memory beyond its load address.  */
a5bd9f6
@@ -203,20 +203,7 @@ grub_linux_load32 (grub_elf_t elf, const char *filename)
a5bd9f6
   linux_addr = seg_addr;
a5bd9f6
 
a5bd9f6
   /* Now load the segments into the area we claimed.  */
a5bd9f6
-  auto grub_err_t offset_phdr (Elf32_Phdr *phdr, grub_addr_t *addr, int *do_load);
a5bd9f6
-  grub_err_t offset_phdr (Elf32_Phdr *phdr, grub_addr_t *addr, int *do_load)
a5bd9f6
-    {
a5bd9f6
-      if (phdr->p_type != PT_LOAD)
a5bd9f6
-	{
a5bd9f6
-	  *do_load = 0;
a5bd9f6
-	  return 0;
a5bd9f6
-	}
a5bd9f6
-      *do_load = 1;
a5bd9f6
-
a5bd9f6
-      *addr = (phdr->p_paddr - base_addr) + seg_addr;
a5bd9f6
-      return 0;
a5bd9f6
-    }
a5bd9f6
-  return grub_elf32_load (elf, filename, offset_phdr, 0, 0);
a5bd9f6
+  return grub_elf32_load (elf, filename, (void *) (seg_addr - base_addr), GRUB_ELF_LOAD_FLAGS_NONE, 0, 0);
a5bd9f6
 }
a5bd9f6
 
a5bd9f6
 static grub_err_t
a5bd9f6
@@ -228,7 +215,7 @@ grub_linux_load64 (grub_elf_t elf, const char *filename)
a5bd9f6
   grub_uint64_t offset;
a5bd9f6
   Elf64_Addr entry;
a5bd9f6
 
a5bd9f6
-  linux_size = grub_elf64_size (elf, filename, &base_addr, &align);
a5bd9f6
+  linux_size = grub_elf64_size (elf, &base_addr, &align);
a5bd9f6
   if (linux_size == 0)
a5bd9f6
     return grub_errno;
a5bd9f6
   /* Pad it; the kernel scribbles over memory beyond its load address.  */
a5bd9f6
@@ -250,20 +237,7 @@ grub_linux_load64 (grub_elf_t elf, const char *filename)
a5bd9f6
   linux_addr = seg_addr;
a5bd9f6
 
a5bd9f6
   /* Now load the segments into the area we claimed.  */
a5bd9f6
-  auto grub_err_t offset_phdr (Elf64_Phdr *phdr, grub_addr_t *addr, int *do_load);
a5bd9f6
-  grub_err_t offset_phdr (Elf64_Phdr *phdr, grub_addr_t *addr, int *do_load)
a5bd9f6
-    {
a5bd9f6
-      if (phdr->p_type != PT_LOAD)
a5bd9f6
-	{
a5bd9f6
-	  *do_load = 0;
a5bd9f6
-	  return 0;
a5bd9f6
-	}
a5bd9f6
-      *do_load = 1;
a5bd9f6
-
a5bd9f6
-      *addr = (phdr->p_paddr - base_addr) + seg_addr;
a5bd9f6
-      return 0;
a5bd9f6
-    }
a5bd9f6
-  return grub_elf64_load (elf, filename, offset_phdr, 0, 0);
a5bd9f6
+  return grub_elf64_load (elf, filename, (void *) (grub_addr_t) (seg_addr - base_addr), GRUB_ELF_LOAD_FLAGS_NONE, 0, 0);
a5bd9f6
 }
a5bd9f6
 
a5bd9f6
 static grub_err_t
a5bd9f6
diff --git a/grub-core/loader/sparc64/ieee1275/linux.c b/grub-core/loader/sparc64/ieee1275/linux.c
a5bd9f6
index c85fcfd..d203377 100644
a5bd9f6
--- a/grub-core/loader/sparc64/ieee1275/linux.c
a5bd9f6
+++ b/grub-core/loader/sparc64/ieee1275/linux.c
a5bd9f6
@@ -261,7 +261,7 @@ grub_linux_load64 (grub_elf_t elf, const char *filename)
a5bd9f6
   linux_entry = elf->ehdr.ehdr64.e_entry;
a5bd9f6
   linux_addr = 0x40004000;
a5bd9f6
   off = 0x4000;
a5bd9f6
-  linux_size = grub_elf64_size (elf, filename, 0, 0);
a5bd9f6
+  linux_size = grub_elf64_size (elf, 0, 0);
a5bd9f6
   if (linux_size == 0)
a5bd9f6
     return grub_errno;
a5bd9f6
 
a5bd9f6
@@ -286,21 +286,7 @@ grub_linux_load64 (grub_elf_t elf, const char *filename)
a5bd9f6
   base = linux_entry - off;
a5bd9f6
 
a5bd9f6
   /* Now load the segments into the area we claimed.  */
a5bd9f6
-  auto grub_err_t offset_phdr (Elf64_Phdr *phdr, grub_addr_t *addr, int *do_load);
a5bd9f6
-  grub_err_t offset_phdr (Elf64_Phdr *phdr, grub_addr_t *addr, int *do_load)
a5bd9f6
-    {
a5bd9f6
-      if (phdr->p_type != PT_LOAD)
a5bd9f6
-	{
a5bd9f6
-	  *do_load = 0;
a5bd9f6
-	  return 0;
a5bd9f6
-	}
a5bd9f6
-      *do_load = 1;
a5bd9f6
-
a5bd9f6
-      /* Adjust the program load address to linux_addr.  */
a5bd9f6
-      *addr = (phdr->p_paddr - base) + (linux_addr - off);
a5bd9f6
-      return 0;
a5bd9f6
-    }
a5bd9f6
-  return grub_elf64_load (elf, filename, offset_phdr, 0, 0);
a5bd9f6
+  return grub_elf64_load (elf, filename, (void *) (linux_addr - off - base), GRUB_ELF_LOAD_FLAGS_NONE, 0, 0);
a5bd9f6
 }
a5bd9f6
 
a5bd9f6
 static grub_err_t
a5bd9f6
diff --git a/include/grub/elfload.h b/include/grub/elfload.h
a5bd9f6
index d1a8d54..f854d0b 100644
a5bd9f6
--- a/include/grub/elfload.h
a5bd9f6
+++ b/include/grub/elfload.h
a5bd9f6
@@ -33,14 +33,10 @@ struct grub_elf_file
a5bd9f6
     Elf32_Ehdr ehdr32;
a5bd9f6
   } ehdr;
a5bd9f6
   void *phdrs;
a5bd9f6
+  char *filename;
a5bd9f6
 };
a5bd9f6
 typedef struct grub_elf_file *grub_elf_t;
a5bd9f6
 
a5bd9f6
-typedef grub_err_t (*grub_elf32_load_hook_t)
a5bd9f6
-  (Elf32_Phdr *phdr, grub_addr_t *addr, int *load);
a5bd9f6
-typedef grub_err_t (*grub_elf64_load_hook_t)
a5bd9f6
-  (Elf64_Phdr *phdr, grub_addr_t *addr, int *load);
a5bd9f6
-
a5bd9f6
 typedef int (*grub_elf32_phdr_iterate_hook_t)
a5bd9f6
   (grub_elf_t elf, Elf32_Phdr *phdr, void *arg);
a5bd9f6
 typedef int (*grub_elf64_phdr_iterate_hook_t)
a5bd9f6
@@ -52,26 +48,31 @@ grub_err_t grub_elf_close (grub_elf_t);
a5bd9f6
 
a5bd9f6
 int grub_elf_is_elf32 (grub_elf_t);
a5bd9f6
 grub_size_t grub_elf32_size (grub_elf_t,
a5bd9f6
-			     const char *filename,
a5bd9f6
 			     Elf32_Addr *, grub_uint32_t *);
a5bd9f6
+enum grub_elf_load_flags
a5bd9f6
+  {
a5bd9f6
+    GRUB_ELF_LOAD_FLAGS_NONE = 0,
a5bd9f6
+    GRUB_ELF_LOAD_FLAGS_LOAD_PT_DYNAMIC = 1,
a5bd9f6
+    GRUB_ELF_LOAD_FLAGS_28BITS = 2,
a5bd9f6
+  };
a5bd9f6
 grub_err_t grub_elf32_load (grub_elf_t, const char *filename,
a5bd9f6
-			    grub_elf32_load_hook_t, grub_addr_t *,
a5bd9f6
+			    void *load_offset, enum grub_elf_load_flags flags, grub_addr_t *,
a5bd9f6
 			    grub_size_t *);
a5bd9f6
 
a5bd9f6
 int grub_elf_is_elf64 (grub_elf_t);
a5bd9f6
 grub_size_t grub_elf64_size (grub_elf_t,
a5bd9f6
-			     const char *filename,
a5bd9f6
 			     Elf64_Addr *, grub_uint64_t *);
a5bd9f6
 grub_err_t grub_elf64_load (grub_elf_t, const char *filename,
a5bd9f6
-			    grub_elf64_load_hook_t, grub_addr_t *,
a5bd9f6
+			    void *load_offset, enum grub_elf_load_flags flags, grub_addr_t *,
a5bd9f6
 			    grub_size_t *);
a5bd9f6
-grub_err_t
a5bd9f6
-grub_elf32_phdr_iterate (grub_elf_t elf,
a5bd9f6
-			 const char *filename,
a5bd9f6
-			 grub_elf32_phdr_iterate_hook_t hook, void *hook_arg);
a5bd9f6
-grub_err_t
a5bd9f6
-grub_elf64_phdr_iterate (grub_elf_t elf,
a5bd9f6
-			 const char *filename,
a5bd9f6
-			 grub_elf64_phdr_iterate_hook_t hook, void *hook_arg);
a5bd9f6
+grub_err_t grub_elf32_load_phdrs (grub_elf_t elf);
a5bd9f6
+grub_err_t grub_elf64_load_phdrs (grub_elf_t elf);
a5bd9f6
+
a5bd9f6
+#define FOR_ELF32_PHDRS(elf, phdr) \
a5bd9f6
+  for (grub_elf32_load_phdrs (elf), phdr = elf->phdrs; \
a5bd9f6
+       phdr && phdr < (Elf32_Phdr *) elf->phdrs + elf->ehdr.ehdr32.e_phnum; phdr++)
a5bd9f6
+#define FOR_ELF64_PHDRS(elf, phdr) \
a5bd9f6
+  for (grub_elf64_load_phdrs (elf), phdr = elf->phdrs;		\
a5bd9f6
+       phdr && phdr < (Elf64_Phdr *) elf->phdrs + elf->ehdr.ehdr64.e_phnum; phdr++)
a5bd9f6
 
a5bd9f6
 #endif /* ! GRUB_ELFLOAD_HEADER */
a5bd9f6
-- 
a5bd9f6
1.8.1.4
a5bd9f6