Changeset c7afcba7 in mainline

Timestamp:

2012-04-07T17:50:49Z (12 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

446ac2a

Parents:

8e893ae

Message:

unification and cstyle

Files:

• boot/genarch/include/division.h (modified) (1 diff)
• boot/genarch/src/division.c (modified) (2 diffs)
• kernel/genarch/include/softint/division.h (modified) (1 diff)
• kernel/genarch/include/softint/multiplication.h (modified) (2 diffs)
• kernel/genarch/src/softint/division.c (modified) (3 diffs)
• kernel/genarch/src/softint/multiplication.c (modified) (2 diffs)

boot/genarch/include/division.h

@@ -45 +45 @@
 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

@@ -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)
@@ -189 +203 @@
 }
 
+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)

kernel/genarch/include/softint/division.h

@@ -48 +48 @@
 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 *);

kernel/genarch/include/softint/multiplication.h

@@ -29 +29 @@
 /** @addtogroup genarch
  * @{
- */ 
+ */
 /**
  * @file
  */
 
-#ifndef __SOFTINT_MULTIPLICATION_H__
-#define __SOFTINT_MULTIPLICATION_H__
+#ifndef KERN_MULTIPLICATION_H_
+#define KERN_MULTIPLICATION_H_
 
 /* 64 bit multiplication */
-long long __muldi3(long long a, long long b);
+extern long long __muldi3(long long, long long);
 
 #endif
@@ -44 +44 @@
 /** @}
  */
-
-

kernel/genarch/src/softint/division.c

@@ -27 +27 @@
  */
 
-/** @addtogroup genarch 
+/** @addtogroup genarch
  * @{
  */
@@ -186 +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)
@@ -192 +206 @@
 }
 
+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)

kernel/genarch/src/softint/multiplication.c

@@ -29 +29 @@
 /** @addtogroup genarch
  * @{
- */ 
+ */
 /**
  * @file
@@ -130 +130 @@
 
         return result;
-}       
+}
 
 /** @}