Changeset e0cc9e0 for libcfa

Timestamp:

Jan 4, 2024, 12:05:02 PM (4 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

e7eb1f0

Parents:

4aae2bd

Message:

first attempt to interpose dl_iterate_phdr with disable/enable interrupt protection

File:

• libcfa/src/interpose.cfa (modified) (6 diffs)

libcfa/src/interpose.cfa

@@ -10 +10 @@
 // Created On       : Wed Mar 29 16:10:31 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Mar 27 21:09:03 2023
-// Update Count     : 196
+// Last Modified On : Thu Jan  4 11:04:06 2024
+// Update Count     : 215
 //
 
@@ -18 +18 @@
 extern "C" {
 #include <dlfcn.h>                                                                              // dlopen, dlsym
+//#include <link.h>                                                                             // dl_iterate_phdr
+struct dl_phdr_info;
+int dl_iterate_phdr( int (*)( struct dl_phdr_info *, size_t, void * ), void * );
 #include <execinfo.h>                                                                   // backtrace, messages
 }
@@ -23 +26 @@
 #include "bits/defs.hfa"
 #include "bits/signal.hfa"                                                              // sigHandler_?
+#include "concurrency/kernel/fwd.hfa"                                   // disable_interrupts, enable_interrupts
 #include "startup.hfa"                                                                  // STARTUP_PRIORITY_CORE
 #include <assert.h>
@@ -87 +91 @@
         void (* exit)( int ) __attribute__(( __noreturn__ ));
         void (* abort)( void ) __attribute__(( __noreturn__ ));
+        int (* dl_iterate_phdr)( int (*)( struct dl_phdr_info *, size_t, void * ), void * );
 } __cabi_libc;
 
@@ -102 +107 @@
                 #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers"
                 INTERPOSE_LIBC( abort, version );
-                INTERPOSE_LIBC( exit , version );
+                INTERPOSE_LIBC( exit, version );
+                INTERPOSE_LIBC( dl_iterate_phdr, version );
                 #pragma GCC diagnostic pop
 
@@ -150 +156 @@
         }
 }
+
+extern "C" int dl_iterate_phdr( int (* callback)( struct dl_phdr_info *, size_t, void * ), void * data ) {
+        // assert( RealRtn::dl_iterate_phdr != nullptr );
+        disable_interrupts();
+        int ret = __cabi_libc.dl_iterate_phdr( callback, data );
+        enable_interrupts( false );
+        return ret;
+} // dl_iterate_phdr
 
 //=============================================================================================