basic support for builtins

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

diff --git a/src/types/decl.c b/src/types/decl.c
index 5872a32504eacc915137c266ba9a9eb08bd017d9..780b924566d90c8d57ac8296e5ea5ffe844f7df0 100644 (file)
--- a/src/types/decl.c
+++ b/src/types/decl.c
@@ -111,32 +111,20 @@ static inline bool psi_decl_validate_func(struct psi_data *data,
        for (redir = &psi_func_redirs[0]; redir->name; ++redir) {
                if (!strcmp(func->var->name->val, redir->name)) {
                        decl->sym = redir->func;
        for (redir = &psi_func_redirs[0]; redir->name; ++redir) {
                if (!strcmp(func->var->name->val, redir->name)) {
                        decl->sym = redir->func;

+                       break;

                }
        }
        if (!decl->sym) {
                }
        }
        if (!decl->sym) {

-               size_t i = 0;
-               void *dl;
-
-               while (!decl->sym && psi_plist_get(data->file.dlopened, i++, &dl)) {
-                       decl->sym = dlsym(dl, decl->redir ? decl->redir->val : func->var->name->val);
-               }
+               decl->sym = psi_dlsym(data->file.dlopened, func->var->name->val,
+                       decl->redir ? decl->redir->val : NULL);

        }
        if (!decl->sym) {
        }
        if (!decl->sym) {

-#ifndef RTLD_NEXT
-# define RTLD_NEXT ((void *) -1l)
-#endif
-#ifndef RTLD_DEFAULT
-# define RTLD_DEFAULT ((void *) 0)
-#endif
-               decl->sym = dlsym(RTLD_DEFAULT, decl->redir ? decl->redir->val : func->var->name->val);
-               if (!decl->sym) {
-                       data->error(data, func->token, PSI_WARNING,
-                                       "Failed to locate symbol '%s(%s)': %s",
-                                       func->var->name->val,
-                                       decl->redir ? decl->redir->val : "",
-                                       dlerror() ?: "not found");
-                       return false;
-               }
+               data->error(data, func->token, PSI_WARNING,
+                               "Failed to locate symbol '%s(%s)': %s",
+                               func->var->name->val,
+                               decl->redir ? decl->redir->val : "",
+                               dlerror() ?: "not found");
+               return false;

        }
        return true;
 }
        }
        return true;
 }


@@ -218,4 +206,3 @@ struct psi_decl_arg *psi_decl_get_arg(struct psi_decl *decl, struct psi_decl_var
 
        return psi_decl_arg_get_by_var(var, decl->args, decl->func);
 }
 
        return psi_decl_arg_get_by_var(var, decl->args, decl->func);
 }

-