Changeset 67db067

Timestamp:

May 4, 2018, 5:22:07 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, with_gc

Children:

c02f761

Parents:

7c45c42

Message:

clean up

File:

• src/libcfa/interpose.c (modified) (4 diffs)

src/libcfa/interpose.c

@@ -10 +10 @@
 // Created On       : Wed Mar 29 16:10:31 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May  1 15:05:35 2018
-// Update Count     : 83
+// Last Modified On : Fri May  4 14:35:13 2018
+// Update Count     : 97
 //
 
 #include <stdarg.h>
 #include <stddef.h>
-
-extern "C" {
 #include <stdio.h>
 #include <string.h>
-#include <dlfcn.h>
 #include <unistd.h>
 #define __USE_GNU
 #include <signal.h>
 #undef __USE_GNU
+extern "C" {
+#include <dlfcn.h>
 #include <execinfo.h>
 }
@@ -37 +36 @@
 //=============================================================================================
 
-typedef void (*generic_fptr_t)(void);
-generic_fptr_t interpose_symbol( const char* symbol, const char *version ) {
+typedef void (* generic_fptr_t)(void);
+generic_fptr_t interpose_symbol( const char * symbol, const char * version ) {
         const char * error;
 
@@ -55 +54 @@
         } // if
 
-        union { generic_fptr_t fptr; void* ptr; } originalFunc;
+        union { generic_fptr_t fptr; void * ptr; } originalFunc;
 
         #if defined( _GNU_SOURCE )
@@ -73 +72 @@
 }
 
-forall(dtype T)
-static inline void ptr_from_symbol( T** symbol_ptr, const char * symbol_name, const char * version) {
-        union {
-                generic_fptr_t gp;
-                T* tp;
-        } u;
-
-        u.gp = interpose_symbol( symbol_name, version );
-
-        *symbol_ptr = u.tp;
-}
-
-#define INTERPOSE_LIBC( x, ver ) ptr_from_symbol( (void**)&__cabi_libc.x, #x, ver)
-
-//=============================================================================================
-// Terminating Signals logic
+#define INTERPOSE_LIBC( x, ver ) __cabi_libc.x = (typeof(__cabi_libc.x))interpose_symbol( #x, ver )
+
+//=============================================================================================
+// Interposition Startup logic
 //=============================================================================================