[1892] 2008-11-03 Bean <[email protected]>

Revision: 1892
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=1892
Author:   bean
Date:     2008-11-03 13:08:21 +0000 (Mon, 03 Nov 2008)

Log Message:
-----------
2008-11-03  Bean  <[email protected]>

	* kern/elf.c (grub_elf32_load): Revert to previous code.
	(grub_elf64_load): Likewise.

	* loader/i386/bsd.c (grub_bsd_elf32_hook): Change return address.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/kern/elf.c
    trunk/grub2/loader/i386/bsd.c

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog	2008-11-01 17:44:47 UTC (rev 1891)
+++ trunk/grub2/ChangeLog	2008-11-03 13:08:21 UTC (rev 1892)
@@ -1,3 +1,10 @@
+2008-11-03  Bean  <[email protected]>
+
+	* kern/elf.c (grub_elf32_load): Revert to previous code.
+	(grub_elf64_load): Likewise.
+
+	* loader/i386/bsd.c (grub_bsd_elf32_hook): Change return address.
+
 2008-11-01  Robert Millan  <[email protected]>
 
 	* Makefile.in (CPPFLAGS): Fix builddir=. assumption.

Modified: trunk/grub2/kern/elf.c
===================================================================
--- trunk/grub2/kern/elf.c	2008-11-01 17:44:47 UTC (rev 1891)
+++ trunk/grub2/kern/elf.c	2008-11-03 13:08:21 UTC (rev 1892)
@@ -232,9 +232,9 @@
     if (phdr->p_type != PT_LOAD)
       return 0;
 
+    load_addr = phdr->p_paddr;
     if (load_hook && load_hook (phdr, &load_addr))
       return 1;
-    load_addr = phdr->p_paddr;
 
     if (load_addr < load_base)
       load_base = load_addr;
@@ -411,9 +411,9 @@
     if (phdr->p_type != PT_LOAD)
       return 0;
 
+    load_addr = phdr->p_paddr;
     if (load_hook && load_hook (phdr, &load_addr))
       return 1;
-    load_addr = phdr->p_paddr;
 
     if (load_addr < load_base)
       load_base = load_addr;

Modified: trunk/grub2/loader/i386/bsd.c
===================================================================
--- trunk/grub2/loader/i386/bsd.c	2008-11-01 17:44:47 UTC (rev 1891)
+++ trunk/grub2/loader/i386/bsd.c	2008-11-03 13:08:21 UTC (rev 1892)
@@ -454,7 +454,7 @@
 }
 
 static grub_err_t
-grub_bsd_elf32_hook (Elf32_Phdr * phdr, UNUSED grub_addr_t * addr)
+grub_bsd_elf32_hook (Elf32_Phdr * phdr, grub_addr_t * addr)
 {
   Elf32_Addr paddr;
 
@@ -472,6 +472,8 @@
   if (paddr + phdr->p_memsz > kern_end)
     kern_end = paddr + phdr->p_memsz;
 
+  *addr = paddr;
+
   return GRUB_ERR_NONE;
 }