Changeset 85f2064 in mainline for boot

Timestamp:

2012-04-12T14:21:46Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

bb8f69d

Parents:

751cabc (diff), d11a181 (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 mainline changes

Location:

boot

Files:

• Makefile.build (modified) (1 diff)
• arch/arm32/Makefile.inc (modified) (2 diffs)
• arch/arm32/src/asm.S (modified) (1 diff)
• arch/arm32/src/eabi.S (added)
• arch/ia64/src/main.c (modified) (1 diff)
• genarch/include/division.h (modified) (1 diff)
• genarch/src/division.c (modified) (5 diffs)
• generic/include/memstr.h (modified) (1 diff)
• generic/src/memstr.c (modified) (1 diff)
• generic/src/str.c (modified) (4 diffs)
• generic/src/version.c (modified) (1 diff)

boot/Makefile.build

@@ -34 +34 @@
 OPTIMIZATION = 3
 
-DEFS = -DRELEASE=$(RELEASE) "-DNAME=$(NAME)" -D__$(BITS)_BITS__ -D__$(ENDIANESS)__
+DEFS = -DRELEASE=$(RELEASE) "-DCOPYRIGHT=$(COPYRIGHT)" "-DNAME=$(NAME)" -D__$(BITS)_BITS__ -D__$(ENDIANESS)__
 
 GCC_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \

boot/arch/arm32/Makefile.inc

@@ -39 +39 @@
 BITS = 32
 ENDIANESS = LE
+EXTRA_CFLAGS = -march=armv4
 
 RD_SRVS_ESSENTIAL += \
@@ -49 +50 @@
 SOURCES = \
         arch/$(BARCH)/src/asm.S \
+        arch/$(BARCH)/src/eabi.S \
         arch/$(BARCH)/src/main.c \
         arch/$(BARCH)/src/mm.c \

boot/arch/arm32/src/asm.S

@@ -60 +60 @@
         # before passing control to the copied code.
         #
-        bx r0
+        mov pc, r0

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/genarch/include/division.h

@@ -33 +33 @@
 #define BOOT_DIVISION_H_
 
-/* 32bit integer division */
 extern int __divsi3(int, int);
-
-/* 64bit integer division */
 extern long long __divdi3(long long, long long);
 
-/* 32bit unsigned integer division */
 extern unsigned int __udivsi3(unsigned int, unsigned int);
-
-/* 64bit unsigned integer division */
 extern unsigned long long __udivdi3(unsigned long long, unsigned long long);
 
-/* 32bit remainder of the signed division */
 extern int __modsi3(int, int);
-
-/* 64bit remainder of the signed division */
 extern long long __moddi3(long long, long long);
 
-/* 32bit remainder of the unsigned division */
 extern unsigned int __umodsi3(unsigned int, unsigned int);
-
-/* 64bit remainder of the unsigned division */
 extern unsigned long long __umoddi3(unsigned long long, unsigned long long);
 
+extern int __divmodsi3(int, int, int *);
+extern unsigned int __udivmodsi3(unsigned int, unsigned int, unsigned int *);
+
+extern long long __divmoddi3(long long, long long, long long *);
 extern unsigned long long __udivmoddi3(unsigned long long, unsigned long long,
     unsigned long long *);

boot/genarch/src/division.c

@@ -73 +73 @@
 {
         unsigned long long result;
-        int steps = sizeof(unsigned long long) * 8; 
+        int steps = sizeof(unsigned long long) * 8;
         
         *remainder = 0;
@@ -104 +104 @@
 
 /* 32bit integer division */
-int __divsi3(int a, int b) 
+int __divsi3(int a, int b)
 {
         unsigned int rem;
@@ -116 +116 @@
 
 /* 64bit integer division */
-long long __divdi3(long long a, long long b) 
+long long __divdi3(long long a, long long b)
 {
         unsigned long long rem;
@@ -155 +155 @@
 
 /* 64bit remainder of the signed division */
-long long __moddi3(long long a,long  long b)
+long long __moddi3(long long a, long long b)
 {
         unsigned long long rem;
@@ -183 +183 @@
 }
 
+int __divmodsi3(int a, int b, int *c)
+{
+        unsigned int rem;
+        int result = (int) divandmod32(ABSVAL(a), ABSVAL(b), &rem);
+        
+        if (SGN(a) == SGN(b)) {
+                *c = rem;
+                return result;
+        }
+        
+        *c = -rem;
+        return -result;
+}
+
+unsigned int __udivmodsi3(unsigned int a, unsigned int b,
+    unsigned int *c)
+{
+        return divandmod32(a, b, c);
+}
+
+long long __divmoddi3(long long a, long long b, long long *c)
+{
+        unsigned long long rem;
+        long long result = (int) divandmod64(ABSVAL(a), ABSVAL(b), &rem);
+        
+        if (SGN(a) == SGN(b)) {
+                *c = rem;
+                return result;
+        }
+        
+        *c = -rem;
+        return -result;
+}
+
 unsigned long long __udivmoddi3(unsigned long long a, unsigned long long b,
     unsigned long long *c)

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;
+}
+
 /** @}
  */

boot/generic/src/str.c

@@ -100 +100 @@
 #include <str.h>
 #include <errno.h>
+
+/** Check the condition if wchar_t is signed */
+#ifdef WCHAR_IS_UNSIGNED
+        #define WCHAR_SIGNED_CHECK(cond)  (true)
+#else
+        #define WCHAR_SIGNED_CHECK(cond)  (cond)
+#endif
 
 /** Byte mask consisting of lowest @n bits (out of 8) */
@@ -198 +205 @@
  *         code was invalid.
  */
-int chr_encode(wchar_t ch, char *str, size_t *offset, size_t size)
+int chr_encode(const wchar_t ch, char *str, size_t *offset, size_t size)
 {
         if (*offset >= size)
@@ -325 +332 @@
 bool ascii_check(wchar_t ch)
 {
-        if ((ch >= 0) && (ch <= 127))
+        if (WCHAR_SIGNED_CHECK(ch >= 0) && (ch <= 127))
                 return true;
         
@@ -338 +345 @@
 bool chr_check(wchar_t ch)
 {
-        if ((ch >= 0) && (ch <= 1114111))
+        if (WCHAR_SIGNED_CHECK(ch >= 0) && (ch <= 1114111))
                 return true;
         

boot/generic/src/version.c

@@ -32 +32 @@
 
 static const char *project = "HelenOS bootloader";
-static const char *copyright = "Copyright (c) 2001-2011 HelenOS project";
+static const char *copyright = STRING(COPYRIGHT);
 static const char *release = STRING(RELEASE);
 static const char *name = STRING(NAME);