Changeset 2467b41 in mainline

Timestamp:

2018-01-17T16:58:41Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

17c14273

Parents:

33b8d024

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-01-17 16:58:14)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-01-17 16:58:41)

Message:

Temporarily revert libsoftint changes.

Location:

uspace/lib/softint

Files:

• generic/comparison.c (modified) (4 diffs)
• generic/division.c (modified) (10 diffs)
• generic/multiplication.c (modified) (3 diffs)
• generic/shift.c (modified) (4 diffs)
• include/alias.h (deleted)
• include/comparison.h (modified) (1 diff)
• include/division.h (modified) (1 diff)
• include/multiplication.h (modified) (1 diff)
• include/shift.h (modified) (1 diff)

uspace/lib/softint/generic/comparison.c

@@ -34 +34 @@
  */
 
-#include <alias.h>
 #include <comparison.h>
 #include <lltype.h>
@@ -42 +41 @@
 #define GREATER 2;
 
-int __cmpti2 (long long a, long long b)
+int __cmpdi2 (long long a, long long b)
 {
         union lltype lla;
@@ -65 +64 @@
 }
 
-int __ucmpti2 (unsigned long long a, unsigned long long b)
+int __ucmpdi2 (unsigned long long a, unsigned long long b)
 {
         union lltype lla;
@@ -88 +87 @@
 }
 
-#if LONG_MAX == LLONG_MAX
-int ALIAS(__cmp, i2);
-int ALIAS(__ucmp, i2);
-#else
-
-int __cmpdi2(long a, long b)
-{
-        if ((int)a < (int)b) {
-                return LESSER;
-        } else if ((int)a > (int)b) {
-                return GREATER;
-        } else {
-                return EQUAL;
-        }
-}
-
-int __ucmpdi2(unsigned long a, unsigned long b)
-{
-        if ((int)a < (int)b) {
-                return LESSER;
-        } else if ((int)a > (int)b) {
-                return GREATER;
-        } else {
-                return EQUAL;
-        }
-}
-
-#endif
-
 /** @}
  */

uspace/lib/softint/generic/division.c

@@ -35 +35 @@
  */
 
-#include <alias.h>
 #include <division.h>
 
@@ -122 +121 @@
 
 /* 64bit integer division */
-long long __divti3(long long a, long long b)
+long long __divdi3(long long a, long long b)
 {
         unsigned long long rem;
@@ -141 +140 @@
 
 /* 64bit unsigned integer division */
-unsigned long long __udivti3(unsigned long long a, unsigned long long b)
+unsigned long long __udivdi3(unsigned long long a, unsigned long long b)
 {
         unsigned long long rem;
@@ -161 +160 @@
 
 /* 64bit remainder of the signed division */
-long long __modti3(long long a, long long b)
+long long __moddi3(long long a, long long b)
 {
         unsigned long long rem;
@@ -182 +181 @@
 
 /* 64bit remainder of the unsigned division */
-unsigned long long __umodti3(unsigned long long a, unsigned long long b)
+unsigned long long __umoddi3(unsigned long long a, unsigned long long b)
 {
         unsigned long long rem;
@@ -203 +202 @@
 }
 
-int __divmodsi4(int a, int b, int *c)
-{
-        return __divmodsi3(a, b, c);
-}
-
 unsigned int __udivmodsi3(unsigned int a, unsigned int b,
     unsigned int *c)
@@ -214 +208 @@
 }
 
-unsigned int __udivmodsi4(unsigned int a, unsigned int b,
-    unsigned int *c)
-{
-        return divandmod32(a, b, c);
-}
-
-long long __divmodti3(long long a, long long b, long long *c)
+long long __divmoddi3(long long a, long long b, long long *c)
 {
         unsigned long long rem;
@@ -234 +222 @@
 }
 
-
-long long __divmodti4(long long a, long long b, long long *c)
+long long __divmoddi4(long long a, long long b, long long *c)
 {
         unsigned long long rem;
@@ -249 +236 @@
 }
 
-unsigned long long __udivmodti3(unsigned long long a, unsigned long long b,
+unsigned long long __udivmoddi3(unsigned long long a, unsigned long long b,
     unsigned long long *c)
 {
@@ -255 +242 @@
 }
 
-unsigned long long __udivmodti4(unsigned long long a, unsigned long long b,
+unsigned long long __udivmoddi4(unsigned long long a, unsigned long long b,
     unsigned long long *c)
 {
         return divandmod64(a, b, c);
 }
-
-long ALIAS(__div, i3);
-long ALIAS(__mod, i3);
-long ALIAS(__divmod, i3);
-long ALIAS(__divmod, i4);
-unsigned long ALIAS(__udiv, i3);
-unsigned long ALIAS(__umod, i3);
-unsigned long ALIAS(__udivmod, i3);
-unsigned long ALIAS(__udivmod, i4);
 
 /** @}

uspace/lib/softint/generic/multiplication.c

@@ -35 +35 @@
  */
 
-#include <alias.h>
 #include <multiplication.h>
 #include <stdint.h>
@@ -68 +67 @@
  *
  */
-long long __multi3 (long long a, long long b)
+long long __muldi3 (long long a, long long b)
 {
         char neg = 0;
@@ -121 +120 @@
 }
 
-#if LONG_MAX == LLONG_MAX
-long ALIAS(__mul, i3);
-#else
-long __muldi3(long a, long b)
-{
-        return (int)a * (int)b;
-}
-#endif
-
 /** @}
  */

uspace/lib/softint/generic/shift.c

@@ -34 +34 @@
  */
 
-#include <alias.h>
 #include <shift.h>
 #include <lltype.h>
 
-long long __ashlti3 (long long val, int shift)
+long long __ashldi3 (long long val, int shift)
 {
         union lltype ll;
@@ -66 +65 @@
 }
 
-long long __ashrti3 (long long val, int shift)
+long long __ashrdi3 (long long val, int shift)
 {
         union lltype ll;
@@ -96 +95 @@
 }
 
-long long __lshrti3 (long long val, int shift)
+long long __lshrdi3 (long long val, int shift)
 {
         union lltype ll;
@@ -126 +125 @@
 long long __aeabi_llsl(long long val, int shift)
 {
-        return __ashlti3(val, shift);
+        return __ashldi3(val, shift);
 }
 
 long long __aeabi_llsr(long long val, int shift)
 {
-        return __lshrti3(val, shift);
+        return __lshrdi3(val, shift);
 }
-
-#if LONG_MAX == LLONG_MAX
-long ALIAS(__ashl, i3);
-long ALIAS(__ashr, i3);
-long ALIAS(__lshr, i3);
-#else
-
-long __ashldi3(long val, int shift)
-{
-        return ((int) val) << shift;
-}
-
-long __ashrdi3(long val, int shift)
-{
-        return ((int) val) >> shift;
-}
-
-long __lshrdi3(long val, int shift)
-{
-        return ((unsigned int) val) >> shift;
-}
-
-#endif
 
 /** @}

uspace/lib/softint/include/comparison.h

@@ -38 +38 @@
 
 /* Signed comparison (a < b => 0, a == b => 1, a > b => 2). */
-extern int __cmpdi2(long, long);
-extern int __cmpti2(long long, long long);
+extern int __cmpdi2(long long, long long);
 
 /* Unsigned comparison (a < b => 0, a == b => 1, a > b => 2). */
-extern int __ucmpdi2(unsigned long, unsigned long);
-extern int __ucmpti2(unsigned long long, unsigned long long);
+extern int __ucmpdi2(unsigned long long, unsigned long long);
 
 #endif

uspace/lib/softint/include/division.h

@@ -38 +38 @@
 
 extern int __divsi3(int, int);
-extern long __divdi3(long, long);
-extern long long __divti3(long long, long long);
+extern long long __divdi3(long long, long long);
 
 extern unsigned int __udivsi3(unsigned int, unsigned int);
-extern unsigned long __udivdi3(unsigned long, unsigned long);
-extern unsigned long long __udivti3(unsigned long long, unsigned long long);
+extern unsigned long long __udivdi3(unsigned long long, unsigned long long);
 
 extern int __modsi3(int, int);
-extern long __moddi3(long, long);
-extern long long __modti3(long long, long long);
+extern long long __moddi3(long long, long long);
 
 extern unsigned int __umodsi3(unsigned int, unsigned int);
-extern unsigned long __umoddi3(unsigned long, unsigned long);
-extern unsigned long long __umodti3(unsigned long long, unsigned long long);
+extern unsigned long long __umoddi3(unsigned long long, unsigned long long);
 
 extern int __divmodsi3(int, int, int *);
-extern long __divmoddi3(long, long, long *);
-extern long long __divmodti3(long long, long long, long long *);
+extern unsigned int __udivmodsi3(unsigned int, unsigned int, unsigned int *);
 
-extern unsigned int __udivmodsi3(unsigned int, unsigned int, unsigned int *);
-extern unsigned long __udivmoddi3(unsigned long, unsigned long,
-    unsigned long *);
-extern unsigned long long __udivmodti3(unsigned long long, unsigned long long,
+extern long long __divmoddi3(long long, long long, long long *);
+extern long long __divmoddi4(long long, long long, long long *);
+extern unsigned long long __udivmoddi3(unsigned long long, unsigned long long,
     unsigned long long *);
-
-extern int __divmodsi4(int, int, int *);
-extern long __divmoddi4(long, long, long *);
-extern long long __divmodti4(long long, long long, long long *);
-
-extern unsigned int __udivmodsi4(unsigned int, unsigned int, unsigned int *);
-extern unsigned long __udivmoddi4(unsigned long, unsigned long,
-    unsigned long *);
-extern unsigned long long __udivmodti4(unsigned long long, unsigned long long,
+extern unsigned long long __udivmoddi4(unsigned long long, unsigned long long,
     unsigned long long *);
 

uspace/lib/softint/include/multiplication.h

@@ -38 +38 @@
 
 /* 64 bit multiplication */
-extern long __muldi3(long, long);
-extern long long __multi3(long long, long long);
+extern long long __muldi3(long long, long long);
 
 #endif

uspace/lib/softint/include/shift.h

@@ -38 +38 @@
 
 /* Arithmetic/logical shift left. */
-extern long __ashldi3(long, int);
-extern long long __ashlti3(long long, int);
+extern long long __ashldi3(long long, int);
 
 /* Arithmetic shift right. */
-extern long __ashrdi3(long, int);
-extern long long __ashrti3(long long, int);
+extern long long __ashrdi3(long long, int);
 
 /* Logical shift right. */
-extern long __lshrdi3(long, int);
-extern long long __lshrti3(long long, int);
+extern long long __lshrdi3(long long, int);