Changeset 38384ae in mainline

Timestamp:

2012-03-30T06:56:10Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

1ac1ab4

Parents:

fffb061 (diff), bb1b44e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with mainline

Location:

boot

Files:

• arch/ia64/src/main.c (modified) (1 diff)
• generic/include/memstr.h (modified) (1 diff)
• generic/src/memstr.c (modified) (1 diff)

boot/arch/ia64/src/main.c

@@ -189 +189 @@
         printf("\nInflating components ... ");
         
+        /*
+         * We will use the next available address for a copy of each component to
+         * make sure that inflate() works with disjunctive memory regions.
+         */
+        top = ALIGN_UP(top, PAGE_SIZE);
+
         for (i = cnt; i > 0; i--) {
                 printf("%s ", components[i - 1].name);
                 
-                int err = inflate(components[i - 1].start, components[i - 1].size,
+                /*
+                 * Copy the component to a location which is guaranteed not to
+                 * overlap with the destination for inflate().
+                 */
+                memmove((void *) top, components[i - 1].start, components[i - 1].size);
+                
+                int err = inflate((void *) top, components[i - 1].size,
                     dest[i - 1], components[i - 1].inflated);
                 

boot/generic/include/memstr.h

@@ -36 +36 @@
 
 extern void *memcpy(void *, const void *, size_t);
+extern void *memmove(void *, const void *, size_t);
 
 #endif

boot/generic/src/memstr.c

@@ -51 +51 @@
 }
 
+/** Move memory block with possible overlapping.
+ *
+ * Copy cnt bytes from src address to dst address. The source
+ * and destination memory areas may overlap.
+ *
+ * @param dst Destination address to copy to.
+ * @param src Source address to copy from.
+ * @param cnt Number of bytes to copy.
+ *
+ * @return Destination address.
+ *
+ */
+void *memmove(void *dst, const void *src, size_t cnt)
+{
+        /* Nothing to do? */
+        if (src == dst)
+                return dst;
+        
+        /* Non-overlapping? */
+        if ((dst >= src + cnt) || (src >= dst + cnt))
+                return memcpy(dst, src, cnt);
+        
+        uint8_t *dp;
+        const uint8_t *sp;
+        
+        /* Which direction? */
+        if (src > dst) {
+                /* Forwards. */
+                dp = dst;
+                sp = src;
+                
+                while (cnt-- != 0)
+                        *dp++ = *sp++;
+        } else {
+                /* Backwards. */
+                dp = dst + (cnt - 1);
+                sp = src + (cnt - 1);
+                
+                while (cnt-- != 0)
+                        *dp-- = *sp--;
+        }
+        
+        return dst;
+}
+
 /** @}
  */