Changeset 8e3bc063 in mainline

Timestamp:

2019-01-14T14:38:18Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

1c3c287

Parents:

e0e5e6f5

git-author:

Jiri Svoboda <jiri@…> (2018-01-13 18:38:00)

git-committer:

Jiri Svoboda <jiri@…> (2019-01-14 14:38:18)

Message:

dltest needs test that calls a function

During bringup of dynamic linking on a platform it is difficult to test
dynamic function calls (via PLT) if the binaries (including dltest)
are statically linked. We can do that by adding a function to libdltest
that calls another function. Since we don't use -Bsymbolic, the call
will be made via PLT.

Location:

uspace

Files:

• app/dltest/dltest.c (modified) (4 diffs)
• lib/dltest/dltest.c (modified) (1 diff)
• lib/dltest/libdltest.h (modified) (1 diff)

uspace/app/dltest/dltest.c

@@ -91 +91 @@
 }
 
+/** Test calling function that calls a function that returns a constant */
+static bool test_dlfcn_dl_get_constant_via_call(void)
+{
+        int (*p_dl_get_constant)(void);
+        int val;
+
+        printf("Call dlsym/dl_get_constant_via_call...\n");
+
+        p_dl_get_constant = dlsym(handle, "dl_get_constant_via_call");
+        if (p_dl_get_constant == NULL) {
+                printf("FAILED\n");
+                return false;
+        }
+
+        val = p_dl_get_constant();
+
+        printf("Got %d, expected %d... ", val, dl_constant);
+        if (val != dl_constant) {
+                printf("FAILED\n");
+                return false;
+        }
+
+        printf("Passed\n");
+        return true;
+}
+
 /** Test calling a function that returns contents of a private initialized
  * variable.
@@ -564 +590 @@
 }
 
+/** Test directly calling function that calls a function that returns a constant */
+static bool test_lnk_dl_get_constant_via_call(void)
+{
+        int val;
+
+        printf("Call linked dl_get_constant_via_call...\n");
+
+        val = dl_get_constant_via_call();
+
+        printf("Got %d, expected %d... ", val, dl_constant);
+        if (val != dl_constant) {
+                printf("FAILED\n");
+                return false;
+        }
+
+        printf("Passed\n");
+        return true;
+}
+
 /** Test dircetly calling a function that returns contents of a private
  * initialized variable.
@@ -853 +898 @@
                 return 1;
 
+        if (!test_dlfcn_dl_get_constant_via_call())
+                return 1;
+
         if (!test_dlfcn_dl_get_private_var())
                 return 1;
@@ -905 +953 @@
 {
         if (!test_lnk_dl_get_constant())
+                return 1;
+
+        if (!test_lnk_dl_get_constant_via_call())
                 return 1;
 

uspace/lib/dltest/dltest.c

@@ -60 +60 @@
 {
         return dl_constant;
+}
+
+/** Return constant value by calling another function.
+ *
+ * This can be used to test dynamically linked call (via PLT) even in case
+ * binaries are statically linked.
+ */
+int dl_get_constant_via_call(void)
+{
+        return dl_get_constant();
 }
 

uspace/lib/dltest/libdltest.h

@@ -47 +47 @@
 
 extern int dl_get_constant(void);
+extern int dl_get_constant_via_call(void);
 extern int dl_get_private_var(void);
 extern int *dl_get_private_var_addr(void);