Changeset 3b5c119 in mainline for boot

Timestamp:

2012-04-08T08:07:21Z (14 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

1196df6

Parents:

ce6de59 (diff), f3378ba (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/arm32/Makefile.inc (modified) (1 diff)
• arch/arm32/src/eabi.S (added)
• genarch/include/division.h (modified) (1 diff)
• genarch/src/division.c (modified) (5 diffs)
• generic/src/str.c (modified) (4 diffs)

boot/arch/arm32/Makefile.inc

@@ -49 +49 @@
 SOURCES = \
         arch/$(BARCH)/src/asm.S \
+        arch/$(BARCH)/src/eabi.S \
         arch/$(BARCH)/src/main.c \
         arch/$(BARCH)/src/mm.c \

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/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;