Merge from trunk

loader/i386/multiboot.c

@@ -59,7 +59,6 @@ char *grub_multiboot_payload_orig;
 grub_addr_t grub_multiboot_payload_dest;
 grub_size_t grub_multiboot_payload_size;
 grub_uint32_t grub_multiboot_payload_eip;
-grub_uint32_t grub_multiboot_payload_esp;
 
 static grub_err_t
 grub_multiboot_boot (void)
@@ -71,7 +70,9 @@ grub_multiboot_boot (void)
       .ecx = 0,
       .edx = 0,
       .eip = grub_multiboot_payload_eip,
-      .esp = grub_multiboot_payload_esp
+      /* Set esp to some random location in low memory to avoid breaking
+	 non-compliant kernels.  */
+      .esp = 0x7ff00
     };
 
   grub_relocator32_boot (grub_multiboot_payload_orig,
@@ -290,13 +291,11 @@ grub_multiboot (int argc, char *argv[])
 				((void *) ((x) + code_size + cmdline_length))
 #define mbi_addr(x)		((void *) ((x) + code_size + cmdline_length + boot_loader_name_length))
 #define mmap_addr(x)		((void *) ((x) + code_size + cmdline_length + boot_loader_name_length + sizeof (struct multiboot_info)))
-#define stack_addr(x)		((void *) ((x) + code_size + cmdline_length + boot_loader_name_length + sizeof (struct multiboot_info) + mmap_length + GRUB_MULTIBOOT_STACK_SIZE))
 
   grub_multiboot_payload_size = cmdline_length
     /* boot_loader_name_length might need to grow for mbi,etc to be aligned (see below) */
     + boot_loader_name_length + 3
-    + sizeof (struct multiboot_info) + mmap_length
-    + GRUB_MULTIBOOT_STACK_SIZE;
+    + sizeof (struct multiboot_info) + mmap_length;
 
   if (header->flags & MULTIBOOT_AOUT_KLUDGE)
     {
@@ -319,7 +318,7 @@ grub_multiboot (int argc, char *argv[])
       if (! grub_multiboot_payload_orig)
 	goto fail;
 
-      if ((grub_file_seek (file, offset)) == (grub_off_t) - 1)
+      if ((grub_file_seek (file, offset)) == (grub_off_t) -1)
 	goto fail;
 
       grub_file_read (file, (void *) grub_multiboot_payload_orig, load_size);
@@ -382,8 +381,6 @@ grub_multiboot (int argc, char *argv[])
   if (grub_multiboot_get_bootdev (&mbi->boot_device))
     mbi->flags |= MULTIBOOT_INFO_BOOTDEV;
 
-  grub_multiboot_payload_esp = PTR_TO_UINT32 (stack_addr (grub_multiboot_payload_dest));
-
   grub_loader_set (grub_multiboot_boot, grub_multiboot_unload, 1);
 
  fail:

loader/i386/multiboot_elfxx.c

@@ -138,7 +138,8 @@ CONCAT(grub_multiboot_load_elf, XX) (grub_file_t file, void *buffer)
     if (phdr(i)->p_vaddr <= ehdr->e_entry
 	&& phdr(i)->p_vaddr + phdr(i)->p_memsz > ehdr->e_entry)
       {
-	grub_multiboot_payload_eip = ehdr->e_entry;
+	grub_multiboot_payload_eip = grub_multiboot_payload_dest
+	  + (ehdr->e_entry - phdr(i)->p_vaddr) + (phdr(i)->p_paddr  - phdr(lowest_segment)->p_paddr);
 	break;
       }
 

loader/powerpc/ieee1275/linux.c

@@ -110,7 +110,7 @@ grub_linux_load32 (grub_elf_t elf)
   if (entry == 0)
     entry = 0x01400000;
 
-  linux_size = grub_elf32_size (elf, 0);
+  linux_size = grub_elf32_size (elf);
   if (linux_size == 0)
     return grub_errno;
   /* Pad it; the kernel scribbles over memory beyond its load address.  */
@@ -160,7 +160,7 @@ grub_linux_load64 (grub_elf_t elf)
   if (entry == 0)
     entry = 0x01400000;
 
-  linux_size = grub_elf64_size (elf, 0);
+  linux_size = grub_elf64_size (elf);
   if (linux_size == 0)
     return grub_errno;
   /* Pad it; the kernel scribbles over memory beyond its load address.  */

loader/xnu_resume.c

@@ -94,16 +94,28 @@ grub_xnu_resume (char *imagename)
   /* Try to allocate necessary space.
      FIXME: mm isn't good enough yet to handle huge allocations.
    */
-  grub_xnu_hibernate_image = buf = XNU_RELOCATOR (alloc) (hibhead.image_size);
+  grub_xnu_hibernate_image = buf = XNU_RELOCATOR (alloc) (hibhead.image_size
+							  + codesize
+							  + GRUB_XNU_PAGESIZE);
   if (! buf)
     {
       grub_file_close (file);
       return grub_errno;
     }
 
+  /* Read code part. */
+  if (grub_file_seek (file, total_header_size) == (grub_off_t) -1
+      || grub_file_read (file, buf, codesize)
+      != (grub_ssize_t) codesize)
+    {
+      grub_file_close (file);
+      return grub_error (GRUB_ERR_READ_ERROR, "Cannot read resume image.");
+    }
+
   /* Read image. */
-  if (grub_file_seek (file, 0) == (grub_off_t)-1
-      || grub_file_read (file, buf, hibhead.image_size)
+  if (grub_file_seek (file, 0) == (grub_off_t) -1
+      || grub_file_read (file, buf + codesize + GRUB_XNU_PAGESIZE,
+			 hibhead.image_size)
       != (grub_ssize_t) hibhead.image_size)
     {
       grub_file_close (file);
@@ -114,10 +126,14 @@ grub_xnu_resume (char *imagename)
   /* Setup variables needed by asm helper. */
   grub_xnu_heap_will_be_at = codedest;
   grub_xnu_heap_start = buf;
-  grub_xnu_heap_size = codesize;
+  grub_xnu_heap_size = codesize + GRUB_XNU_PAGESIZE + hibhead.image_size;
   grub_xnu_stack = (codedest + hibhead.stack);
   grub_xnu_entry_point = (codedest + hibhead.entry_point);
-  grub_xnu_arg1 = (long) buf;
+  grub_xnu_arg1 = codedest + codesize + GRUB_XNU_PAGESIZE;
+
+  grub_dprintf ("xnu", "entry point 0x%x\n", codedest + hibhead.entry_point);
+  grub_dprintf ("xnu", "image at 0x%x\n",
+		codedest + codesize + GRUB_XNU_PAGESIZE);
 
   /* We're ready now. */
   grub_loader_set (grub_xnu_boot_resume,