Merge branch 'slimconfigure'

[m6w6/ext-psi] / src / types / decl.c

diff --git a/src/types/decl.c b/src/types/decl.c
index 51dd733350b49073fbf4befc921426e1718c5633..85d93d40cd63243cb93c6e3a15c240f27a8b314c 100644 (file)
--- a/src/types/decl.c
+++ b/src/types/decl.c
@@ -25,7 +25,11 @@
 
 #include "php_psi_stdinc.h"
 
+#include "php_psi.h"
+
 #include <dlfcn.h>
+#include <fnmatch.h>
+
 #include "data.h"
 
 #define PSI_FUNC_REDIRS
@@ -53,6 +57,9 @@ void psi_decl_free(struct psi_decl **d_ptr)
                if (d->args) {
                        psi_plist_free(d->args);
                }
+               if (d->redir) {
+                       free(d->redir);
+               }
                free(d);
        }
 }
@@ -61,6 +68,7 @@ void psi_decl_dump(int fd, struct psi_decl *decl)
 {
        psi_decl_abi_dump(fd, decl->abi);
        dprintf(fd, " ");
+       /* FIXME: functions returning arrays */
        psi_decl_arg_dump(fd, decl->func, 0);
        dprintf(fd, "(");
        if (decl->args) {
@@ -77,7 +85,11 @@ void psi_decl_dump(int fd, struct psi_decl *decl)
                        dprintf(fd, ", ...");
                }
        }
-       dprintf(fd, ");");
+       if (decl->redir) {
+               dprintf(fd, ") __asm__ (\"%s\");", decl->redir);
+       } else {
+               dprintf(fd, ");");
+       }
 }
 
 static inline bool psi_decl_validate_func(struct psi_data *data,
@@ -86,12 +98,7 @@ static inline bool psi_decl_validate_func(struct psi_data *data,
        struct psi_func_redir *redir;
 
        if (!func->var->name) {
-               data->error(data, func->token, PSI_WARNING, "Anonymous decl!");
-               return false;
-       }
-       if (!strcmp(func->var->name, "dlsym")) {
-               data->error(data, func->token, PSI_WARNING,
-                               "Cannot dlsym dlsym (sic!)");
+               data->error(data, func->token, PSI_WARNING, "Cannot load anonymous decl");
                return false;
        }
 
@@ -107,10 +114,11 @@ static inline bool psi_decl_validate_func(struct psi_data *data,
 #ifndef RTLD_DEFAULT
 # define RTLD_DEFAULT ((void *) 0)
 #endif
-               decl->sym = dlsym(dl ?: RTLD_DEFAULT, func->var->name);
+               decl->sym = dlsym(dl ?: RTLD_DEFAULT, decl->redir ?: func->var->name);
                if (!decl->sym) {
                        data->error(data, func->token, PSI_WARNING,
-                                       "Failed to locate symbol '%s': %s", func->var->name,
+                                       "Failed to locate symbol '%s(%s)': %s",
+                                       func->var->name, decl->redir ?: "",
                                        dlerror() ?: "not found");
                        return false;
                }
@@ -118,13 +126,13 @@ static inline bool psi_decl_validate_func(struct psi_data *data,
        return true;
 }
 
-bool psi_decl_validate(struct psi_data *data, struct psi_decl *decl, void *dl,
-               struct psi_validate_stack *type_stack)
+bool psi_decl_validate(struct psi_data *data, struct psi_decl *decl,
+               struct psi_validate_scope *scope)
 {
-       if (!psi_decl_validate_nodl(data, decl, type_stack)) {
+       if (!psi_decl_validate_nodl(data, decl, scope)) {
                return false;
        }
-       if (!psi_decl_validate_func(data, decl, decl->func, dl)) {
+       if (!psi_decl_validate_func(data, decl, decl->func, scope->dlopened)) {
                return false;
        }
 
@@ -132,7 +140,7 @@ bool psi_decl_validate(struct psi_data *data, struct psi_decl *decl, void *dl,
 }
 
 bool psi_decl_validate_nodl(struct psi_data *data, struct psi_decl *decl,
-               struct psi_validate_stack *type_stack)
+               struct psi_validate_scope *scope)
 {
        if (!decl->abi) {
                decl->abi = psi_decl_abi_init("default");
@@ -141,7 +149,7 @@ bool psi_decl_validate_nodl(struct psi_data *data, struct psi_decl *decl,
                                "Invalid calling convention: '%s'", decl->abi->token->text);
                return false;
        }
-       if (!psi_decl_arg_validate(data, decl->func, type_stack)) {
+       if (!psi_decl_arg_validate(data, decl->func, scope)) {
                return false;
        }
        if (decl->args) {
@@ -154,7 +162,7 @@ bool psi_decl_validate_nodl(struct psi_data *data, struct psi_decl *decl,
                                snprintf(arg->var->name, 6, "arg%zu", i);
                                arg->var->fqn = strdup(arg->var->name);
                        }
-                       if (!psi_decl_arg_validate(data, arg, type_stack)) {
+                       if (!psi_decl_arg_validate(data, arg, scope)) {
                                return false;
                        }
                }
@@ -162,3 +170,32 @@ bool psi_decl_validate_nodl(struct psi_data *data, struct psi_decl *decl,
 
        return true;
 }
+
+bool psi_decl_is_blacklisted(const char *name)
+{
+       char *blacklisted;
+       size_t i = 0;
+
+       while (psi_plist_get(PSI_G(blacklist).decls, i++, &blacklisted)) {
+               if (!fnmatch(blacklisted, name, 0)) {
+                       return true;
+               }
+       }
+       return false;
+}
+
+struct psi_decl_arg *psi_decl_get_arg(struct psi_decl *decl, struct psi_decl_var *var) {
+       if (var->arg) {
+               size_t i = 0;
+               struct psi_decl_arg *arg = decl->func;
+
+               do {
+                       if (var->arg == arg) {
+                               return arg;
+                       }
+               } while (psi_plist_get(decl->args, i++, &arg));
+       }
+
+       return psi_decl_arg_get_by_var(var, decl->args, decl->func);
+}
+