Changeset 3b5c119 in mainline for kernel/genarch/src/softint/division.c

Timestamp:

2012-04-08T08:07:21Z (12 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

File:

• kernel/genarch/src/softint/division.c (modified) (12 diffs)

kernel/genarch/src/softint/division.c

@@ -27 +27 @@
  */
 
-/** @addtogroup genarch 
+/** @addtogroup genarch
  * @{
  */
@@ -35 +35 @@
 #include <genarch/softint/division.h>
 
-#define ABSVAL(x) ((x) > 0 ? (x) : -(x))
-#define SGN(x) ((x) >= 0 ? 1 : 0)
-                                      
+#define ABSVAL(x)  ((x) > 0 ? (x) : -(x))
+#define SGN(x)     ((x) >= 0 ? 1 : 0)
+
 static unsigned int divandmod32(unsigned int a, unsigned int b,
     unsigned int *remainder)
@@ -56 +56 @@
                 return 0;
         }
-
+        
         for (; steps > 0; steps--) {
                 /* shift one bit to remainder */
@@ -68 +68 @@
                 a <<= 1;
         }
-
+        
         return result;
 }
-
 
 static unsigned long long divandmod64(unsigned long long a,
@@ -77 +76 @@
 {
         unsigned long long result;
-        int steps = sizeof(unsigned long long) * 8; 
+        int steps = sizeof(unsigned long long) * 8;
         
         *remainder = 0;
@@ -91 +90 @@
                 return 0;
         }
-
+        
         for (; steps > 0; steps--) {
                 /* shift one bit to remainder */
@@ -103 +102 @@
                 a <<= 1;
         }
-
+        
         return result;
 }
 
 /* 32bit integer division */
-int __divsi3(int a, int b) 
-{
-        unsigned int rem;
-        int result;
-        
-        result = (int) divandmod32(ABSVAL(a), ABSVAL(b), &rem);
-
+int __divsi3(int a, int b)
+{
+        unsigned int rem;
+        int result = (int) divandmod32(ABSVAL(a), ABSVAL(b), &rem);
+        
         if (SGN(a) == SGN(b))
                 return result;
+        
         return -result;
 }
 
 /* 64bit integer division */
-long long __divdi3(long long a, long long b) 
-{
-        unsigned long long rem;
-        long long result;
-        
-        result = (long long) divandmod64(ABSVAL(a), ABSVAL(b), &rem);
-
+long long __divdi3(long long a, long long b)
+{
+        unsigned long long rem;
+        long long result = (long long) divandmod64(ABSVAL(a), ABSVAL(b), &rem);
+        
         if (SGN(a) == SGN(b))
                 return result;
+        
         return -result;
 }
@@ -143 +140 @@
 unsigned long long __udivdi3(unsigned long long a, unsigned long long b)
 {
-        unsigned long long  rem;
+        unsigned long long rem;
         return divandmod64(a, b, &rem);
 }
@@ -154 +151 @@
         
         /* if divident is negative, remainder must be too */
-        if (!(SGN(a))) {
+        if (!(SGN(a)))
                 return -((int) rem);
-        }
         
         return (int) rem;
@@ -162 +158 @@
 
 /* 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;
@@ -168 +164 @@
         
         /* if divident is negative, remainder must be too */
-        if (!(SGN(a))) {
+        if (!(SGN(a)))
                 return -((long long) rem);
-        }
         
         return (long long) rem;
@@ -191 +186 @@
 }
 
+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)