Changeset 2467b41 in mainline for uspace/lib/softint/generic/shift.c

Timestamp:

2018-01-17T16:58:41Z (6 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.

File:

• uspace/lib/softint/generic/shift.c (modified) (4 diffs)

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
 
 /** @}