Avoid unnecessary copying on MIPS.

	* grub-core/boot/decompressor/none.c (grub_decompress_core): Exit
	early if src == dest.
	* util/grub-mkimage.c (generate_image): Arange for src == dest if
	compression is none.

diff --git a/ChangeLog b/ChangeLog
index bf7d7d110e7d20bba00d686717754212de7b0989..2d6a02d08ff63eba5c20e23506460971231710f5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-05-17  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       Avoid unnecessary copying on MIPS.
+
+       * grub-core/boot/decompressor/none.c (grub_decompress_core): Exit
+       early if src == dest.
+       * util/grub-mkimage.c (generate_image): Arange for src == dest if
+       compression is none.
+
 2011-05-17  Vladimir Serbinenko  <phcoder@gmail.com>
 
        Reduce memory footprint on SGI by putting modules before the kernel

diff --git a/grub-core/boot/decompressor/none.c b/grub-core/boot/decompressor/none.c
index 44f56ce90b4525d75804eb39e98b58bc62ad9e45..911e861e3ea1c55e3d6480143330e116d0ae7deb 100644 (file)
--- a/grub-core/boot/decompressor/none.c
+++ b/grub-core/boot/decompressor/none.c
@@ -25,6 +25,9 @@ grub_decompress_core (void *src, void *dest, unsigned long n,
   char *d = (char *) dest;
   const char *s = (const char *) src;
 
+  if (d == s)
+    return;
+
   if (d < s)
     while (n--)
       *d++ = *s++;

diff --git a/util/grub-mkimage.c b/util/grub-mkimage.c
index 5ae744a8e3f45f876f2b1f4de3b2a34e9996a841..2003a86d23522405ef4ff18d879bae217be8c558 100644 (file)
--- a/util/grub-mkimage.c
+++ b/util/grub-mkimage.c
@@ -736,6 +736,7 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
   grub_uint64_t start_address;
   void *rel_section;
   grub_size_t reloc_size, align;
+  size_t decompress_size;
 
   if (comp == COMPRESSION_AUTO)
     comp = image_target->default_compression;
@@ -913,7 +914,6 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
       char *full_img;
       size_t full_size;
       char *decompress_path, *decompress_img;
-      size_t decompress_size;
       const char *name;
 
       switch (comp)
@@ -1410,9 +1410,13 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
        size_t program_size;
 
        program_size = ALIGN_ADDR (core_size);
-       target_addr = (image_target->link_addr 
-                      - ALIGN_UP(total_module_size + core_size, 1048576)
-                      - (1 << 20));
+       if (comp == COMPRESSION_NONE)
+         target_addr = (image_target->link_addr 
+                        - total_module_size - decompress_size);
+       else
+         target_addr = (image_target->link_addr 
+                        - ALIGN_UP(total_module_size + core_size, 1048576)
+                        - (1 << 20));
 
        ecoff_img = xmalloc (program_size + sizeof (*head) + sizeof (*section));
        grub_memset (ecoff_img, 0, program_size + sizeof (*head) + sizeof (*section));
@@ -1500,8 +1504,13 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
        phdr->p_flags = grub_host_to_target32 (PF_R | PF_W | PF_X);
 
        if (image_target->id == IMAGE_LOONGSON_ELF)
-         target_addr = ALIGN_UP (image_target->link_addr
-                                 + kernel_size + total_module_size, 32);
+         {
+           if (comp == COMPRESSION_NONE)
+             target_addr = (image_target->link_addr - decompress_size);
+           else
+             target_addr = ALIGN_UP (image_target->link_addr
+                                     + kernel_size + total_module_size, 32);
+         }
        else
          target_addr = image_target->link_addr;
        ehdr->e_entry = grub_host_to_target32 (target_addr);