Changeset aec41c8 in mainline

Timestamp:

2018-01-16T19:00:48Z (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:

d39c46e0

Parents:

8348846

Message:

libsoftint, take two

Location:

uspace/lib/softint/generic

Files:

• comparison.c (modified) (1 diff)
• multiplication.c (modified) (1 diff)
• shift.c (modified) (2 diffs)

uspace/lib/softint/generic/comparison.c

@@ -91 +91 @@
 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/multiplication.c

@@ -123 +123 @@
 #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

@@ -126 +126 @@
 long long __aeabi_llsl(long long val, int shift)
 {
-        return __ashldi3(val, shift);
+        return __ashlti3(val, shift);
 }
 
 long long __aeabi_llsr(long long val, int shift)
 {
-        return __lshrdi3(val, shift);
+        return __lshrti3(val, shift);
 }
 
@@ -138 +138 @@
 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