Changeset a24df004 in mainline

Timestamp:

2018-03-18T13:05:53Z (6 years ago)

Author:

GitHub <noreply@…>

Parents:

973be387 (diff), c6a1768 (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.

git-author:

Jakub Jermář <jakub@…> (2018-03-18 13:05:53)

git-committer:

GitHub <noreply@…> (2018-03-18 13:05:53)

Message:

Merge c6a17685590f909689510889f37768281dff86e6 into 973be38782462a672111ff6833f8dbb40d2a44bf

Files:

• boot/Makefile.common (modified) (1 diff)
• uspace/lib/pcut/include/pcut/asserts.h (modified) (1 diff)
• uspace/lib/softint/Makefile (modified) (1 diff)
• uspace/lib/softint/generic/multiplication.c (modified) (1 diff)
• uspace/lib/softint/include/multiplication.h (modified) (1 diff)
• uspace/lib/softint/test/main.c (added)
• uspace/lib/softint/test/multiplication.c (added)

boot/Makefile.common

@@ -238 +238 @@
         $(USPACE_PATH)/lib/label/test-liblabel \
         $(USPACE_PATH)/lib/posix/test-libposix \
+        $(USPACE_PATH)/lib/softint/test-libsoftint \
         $(USPACE_PATH)/lib/uri/test-liburi \
         $(USPACE_PATH)/drv/bus/usb/xhci/test-xhci \

uspace/lib/pcut/include/pcut/asserts.h

@@ -186 +186 @@
 #define PCUT_ASSERT_INT_EQUALS(expected, actual) \
         do {\
-                long pcut_expected_eval = (expected); \
-                long pcut_actual_eval = (actual); \
+                long long pcut_expected_eval = (expected); \
+                long long pcut_actual_eval = (actual); \
                 if (pcut_expected_eval != pcut_actual_eval) { \
-                        PCUT_ASSERTION_FAILED("Expected <%ld> but got <%ld> (%s != %s)", \
+                        PCUT_ASSERTION_FAILED("Expected <%lld> but got <%lld> (%s != %s)", \
                                 pcut_expected_eval, pcut_actual_eval, \
                                 #expected, #actual); \

uspace/lib/softint/Makefile

@@ -39 +39 @@
         generic/shift.c
 
+TEST_SOURCES = \
+        test/main.c \
+        test/multiplication.c
+
 include $(USPACE_PREFIX)/Makefile.common

uspace/lib/softint/generic/multiplication.c

@@ -64 +64 @@
 }
 
+long __muldi3(long a, long b)
+{
+        return (long) __multi3(a, b);
+}
+
 /** Emulate multiplication of two 64-bit long long integers.
  *
  */
-long long __muldi3 (long long a, long long b)
+long long __multi3(long long a, long long b)
 {
         char neg = 0;

uspace/lib/softint/include/multiplication.h

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