void psi_decl_dump(int fd, struct psi_decl *decl)
{
- psi_decl_abi_dump(fd, decl->abi);
+ if (decl->abi) {
+ 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->func->var->array_size) {
+ dprintf(fd, ")[%zu]", decl->func->var->array_size);
+ }
if (decl->redir) {
dprintf(fd, ") __asm__ (\"%s\");", decl->redir);
} else {
}
static inline bool psi_decl_validate_func(struct psi_data *data,
- struct psi_decl *decl, struct psi_decl_arg *func, void *dl)
+ struct psi_decl *decl, struct psi_decl_arg *func)
{
struct psi_func_redir *redir;
decl->sym = redir->func;
}
}
+ 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 ?: func->var->name);
+ }
+ }
if (!decl->sym) {
#ifndef RTLD_NEXT
# define RTLD_NEXT ((void *) -1l)
#ifndef RTLD_DEFAULT
# define RTLD_DEFAULT ((void *) 0)
#endif
- decl->sym = dlsym(dl ?: RTLD_DEFAULT, decl->redir ?: func->var->name);
+ decl->sym = dlsym(RTLD_DEFAULT, decl->redir ?: func->var->name);
if (!decl->sym) {
data->error(data, func->token, PSI_WARNING,
"Failed to locate symbol '%s(%s)': %s",
if (!psi_decl_validate_nodl(data, decl, scope)) {
return false;
}
- if (!psi_decl_validate_func(data, decl, decl->func, scope->dlopened)) {
+ if (!psi_decl_validate_func(data, decl, decl->func)) {
return false;
}