struct psi_decl *psi_decl_init(struct psi_decl_arg *func, struct psi_plist *args)
{
- struct psi_decl *d = calloc(1, sizeof(*d));
+ struct psi_decl *d = pecalloc(1, sizeof(*d), 1);
d->func = func;
d->args = args;
}
}
-void psi_decl_dump(int fd, struct psi_decl *decl)
+void psi_decl_dump(struct psi_dump *dump, struct psi_decl *decl)
{
if (decl->abi) {
- psi_decl_abi_dump(fd, decl->abi);
+ psi_decl_abi_dump(dump, decl->abi);
}
- dprintf(fd, " ");
+ PSI_DUMP(dump, " ");
/* FIXME: functions returning arrays */
- psi_decl_arg_dump(fd, decl->func, 0);
- dprintf(fd, "(");
+ psi_decl_arg_dump(dump, decl->func, 0);
+ PSI_DUMP(dump, "(");
if (decl->args) {
size_t i;
struct psi_decl_arg *arg;
for (i = 0; psi_plist_get(decl->args, i, &arg); ++i) {
if (i) {
- dprintf(fd, ", ");
+ PSI_DUMP(dump, ", ");
}
- psi_decl_arg_dump(fd, arg, 0);
+ psi_decl_arg_dump(dump, arg, 0);
}
if (decl->varargs) {
- dprintf(fd, ", ...");
+ PSI_DUMP(dump, ", ...");
}
}
if (decl->func->var->array_size) {
- dprintf(fd, ")[%u]", decl->func->var->array_size);
+ PSI_DUMP(dump, ")[%u]", decl->func->var->array_size);
}
if (decl->redir) {
- dprintf(fd, ") __asm__ (\"%s\");", decl->redir->val);
+ PSI_DUMP(dump, ") __asm__ (\"%s\");", decl->redir->val);
} else {
- dprintf(fd, ");");
+ PSI_DUMP(dump, ");");
}
}
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) {
- 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) {
-#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;
}
struct psi_validate_scope *scope)
{
if (!decl->abi) {
- decl->abi = psi_decl_abi_init(zend_string_init(ZEND_STRL("default"), 1));
+ decl->abi = psi_decl_abi_init(NULL);
} else if (!psi_decl_abi_validate(data, decl->abi)) {
data->error(data, decl->abi->token, PSI_WARNING,
- "Invalid calling convention: '%s'", decl->abi->token->text->val);
+ "Invalid calling convention: '%s'",
+ decl->abi->token->text->val);
return false;
}
if (!psi_decl_arg_validate(data, decl->func, scope)) {
return psi_decl_arg_get_by_var(var, decl->args, decl->func);
}
-