commit-grub
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[1762] 2008-08-02 Robert Millan <address@hidden>


From: Robert Millan
Subject: [1762] 2008-08-02 Robert Millan <address@hidden>
Date: Sat, 02 Aug 2008 15:51:12 +0000

Revision: 1762
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=1762
Author:   robertmh
Date:     2008-08-02 15:51:12 +0000 (Sat, 02 Aug 2008)

Log Message:
-----------
2008-08-02  Robert Millan  <address@hidden>

        * loader/i386/pc/multiboot.c (grub_multiboot_load_elf32): Add a pair
        of informational grub_dprintf() calls.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/loader/i386/pc/multiboot.c

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2008-08-02 12:17:44 UTC (rev 1761)
+++ trunk/grub2/ChangeLog       2008-08-02 15:51:12 UTC (rev 1762)
@@ -1,5 +1,10 @@
 2008-08-02  Robert Millan  <address@hidden>
 
+       * loader/i386/pc/multiboot.c (grub_multiboot_load_elf32): Add a pair
+       of informational grub_dprintf() calls.
+
+2008-08-02  Robert Millan  <address@hidden>
+
        * disk/memdisk.c (memdisk_size): Don't initialize.
        (GRUB_MOD_INIT(memdisk)): Find memdisk using grub_module_iterate().
 

Modified: trunk/grub2/loader/i386/pc/multiboot.c
===================================================================
--- trunk/grub2/loader/i386/pc/multiboot.c      2008-08-02 12:17:44 UTC (rev 
1761)
+++ trunk/grub2/loader/i386/pc/multiboot.c      2008-08-02 15:51:12 UTC (rev 
1762)
@@ -174,6 +174,9 @@
         {
          char *load_this_module_at = grub_multiboot_payload_orig + 
(phdr(i)->p_paddr - phdr(0)->p_paddr);
 
+         grub_dprintf ("multiboot_loader", "segment %d: paddr=%p, memsz=%p\n",
+                       i, phdr(i)->p_paddr, phdr(i)->p_memsz);
+
          if (grub_file_seek (file, (grub_off_t) phdr(i)->p_offset)
              == (grub_off_t) -1)
            return grub_error (GRUB_ERR_BAD_OS,
@@ -199,6 +202,11 @@
   else
     entry = (grub_addr_t) grub_multiboot_payload_orig + 
grub_multiboot_payload_size;
 
+  grub_dprintf ("multiboot_loader", "dest=%p, size=%p, entry_offset=%p\n",
+               grub_multiboot_payload_dest,
+               grub_multiboot_payload_size,
+               grub_multiboot_payload_entry_offset);
+
   return grub_errno;
 }
 






reply via email to

[Prev in Thread] Current Thread [Next in Thread]