Changeset b192915a in mainline

Timestamp:

2024-05-29T18:11:25Z (5 weeks ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

c576800

Parents:

9b95b964

Message:

Add test case for public variable initialized with a relocated value

Location:

uspace

Files:

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

uspace/app/dltest/dltest.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2016 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -571 +571 @@
 #ifdef DLTEST_LINKED
 
+/** Test if we can read the correct value of a public pointer variable.
+ *
+ * dl_public_ptr_var is initialized in libdltest to point to dl_public_var.
+ * This is done using a relocation. The main program (unless compiled with
+ * PIC or PIE) will contain a copy of dl_public_ptr_var. This needs
+ * to be copied using a COPY relocation. The relocations in the main
+ * program need to be processed after the relocations in the shared
+ * libraries (so that we copy the correct value).
+ */
+static bool test_public_ptr_var(void)
+{
+        int *ptr;
+
+        printf("Read dl_public_ptr_var directly...\n");
+        ptr = dl_public_ptr_var;
+
+        if (ptr != &dl_public_var) {
+                printf("FAILED\n");
+                return false;
+        }
+
+        printf("Passed\n");
+        return true;
+}
+
 /** Test directly calling function that returns a constant */
 static bool test_lnk_dl_get_constant(void)
@@ -920 +945 @@
 
 #ifndef STATIC_EXE
+
         if (!test_dlfcn_dl_get_private_fib_var())
                 return 1;
@@ -974 +1000 @@
 
         if (!test_lnk_read_public_uvar())
+                return 1;
+
+        if (!test_public_ptr_var())
                 return 1;
 

uspace/lib/dltest/dltest.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2016 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -43 +43 @@
 /** Public initialized variable */
 int dl_public_var = dl_public_var_val;
+/** Public variable initialized with the address of a symbol */
+int *dl_public_ptr_var = &dl_public_var;
 /** Public uninitialized variable */
 int dl_public_uvar;

uspace/lib/dltest/libdltest.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2016 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -67 +67 @@
 extern int dl_public_var;
 extern int dl_public_uvar;
+extern int *dl_public_ptr_var;
 extern fibril_local int dl_public_fib_var;
 extern fibril_local int dl_public_fib_uvar;