#include "context.h"
#include "parser.h"
+#include "libjit.h"
+#include "libffi.h"
+
#define psi_predef_count(of) ((sizeof(psi_predef ##of## s)/sizeof(psi_predef ##of))-1)
typedef struct psi_predef_type {
token_t type_tag;
#ifndef RTLD_NEXT
# define RTLD_NEXT ((void *) -1l)
#endif
- decl->dlptr = dlsym(dl ?: RTLD_NEXT, func->var->name);
- if (!decl->dlptr) {
+ decl->call.sym = dlsym(dl ?: RTLD_NEXT, func->var->name);
+ if (!decl->call.sym) {
size_t i;
for (i = 0; i < psi_predef_func_count(); ++i) {
psi_predef_func *pre = &psi_predef_funcs[i];
if (!strcmp(func->var->name, pre->name)) {
- decl->dlptr = pre->func;
+ decl->call.sym = pre->func;
break;
}
}
- if (!decl->dlptr) {
+ if (!decl->call.sym) {
data->error(PSI_WARNING, "Failed to locate symbol '%s': %s",
func->var->name, dlerror());
}
}
return 1;
}
-
-static inline decl_arg *locate_struct_member(decl_struct *s, decl_var *var) {
+static inline decl_arg *locate_decl_var_arg(decl_var *var, decl_args *args) {
size_t i;
- ZEND_ASSERT(s);
- for (i = 0; i < s->args->count; ++i) {
- decl_arg *darg = s->args->args[i];
+ for (i = 0; i < args->count; ++i) {
+ decl_arg *arg = args->args[i];
- if (!strcmp(var->name, darg->var->name)) {
- return var->arg = darg;
+ if (!strcmp(var->name, arg->var->name)) {
+ return var->arg = arg;
}
}
return NULL;
}
-static inline int validate_set_value(PSI_Data *data, set_value *set, decl_arg *ref) {
+static inline decl_arg *locate_struct_member(decl_struct *s, decl_var *var) {
+ if (s->args) {
+ return locate_decl_var_arg(var, s->args);
+ }
+
+ return NULL;
+}
+static inline int validate_set_value(PSI_Data *data, set_value *set, decl_arg *ref, decl_args *ref_list) {
size_t i;
decl_type *ref_type = real_decl_type(ref->type);
decl_var *set_var = set->vars->vars[0];
EMPTY_SWITCH_DEFAULT_CASE();
}
- if (strcmp(set_var->name, ref->var->name)) {
- return 0;
+ for (i = 1; i < set->vars->count; ++i) {
+ if (!locate_decl_var_arg(set->vars->vars[i], ref_list)) {
+ return 0;
+ }
}
+ set_var->arg = ref;
- if (set->count && (set->func->type != PSI_T_TO_ARRAY || ref_type->type != PSI_T_STRUCT)) {
- data->error(E_WARNING, "Inner `set` statement casts only work with to_array() casts on structs");
+ if (set->count && (set->func->type != PSI_T_TO_ARRAY || (ref_type->type != PSI_T_STRUCT && !ref->var->arg->var->pointer_level))) {
+ data->error(E_WARNING, "Inner `set` statement casts only work with to_array() casts on structs or pointers");
return 0;
}
- for (i = 0; i < set->count; ++i) {
- decl_var *sub_var = set->inner[i]->vars->vars[0];
- decl_arg *sub_ref = locate_struct_member(ref_type->strct, sub_var);
+
+ if (ref_type->type == PSI_T_STRUCT) {
+ /* to_array(struct, to_...) */
+ for (i = 0; i < set->count; ++i) {
+ decl_var *sub_var = set->inner[i]->vars->vars[0];
+ decl_arg *sub_ref = locate_struct_member(ref_type->strct, sub_var);
+
+ if (sub_ref) {
+ if (!validate_set_value(data, set->inner[i], sub_ref, ref_type->strct->args)) {
+ return 0;
+ }
+ set->inner[i]->outer.set = set;
+ }
+ }
+ } else if (set->count == 1) {
+ /* to_array(ptr, to_string(*ptr)) */
+ decl_var *sub_var = set->inner[0]->vars->vars[0];
+ decl_arg *sub_ref = locate_decl_var_arg(sub_var, ref_list);
if (sub_ref) {
- if (!validate_set_value(data, set->inner[i], sub_ref)) {
+ if (strcmp(sub_var->name, set_var->name)) {
+ data->error(E_WARNING, "Inner `set` statement casts on pointers must reference the same variable");
+ return 0;
+ }
+ if (!validate_set_value(data, set->inner[0], sub_ref, ref_list)) {
return 0;
}
+ set->inner[0]->outer.set = set;
}
+ } else if (set->count > 1) {
+ data->error(E_WARNING, "Inner `set` statement casts on pointers may only occur once");
+ return 0;
}
return 1;
}
static inline decl *locate_impl_decl(decls *decls, return_stmt *ret) {
- size_t i;
+ if (decls) {
+ size_t i;
- for (i = 0; i < decls->count; ++i) {
- if (!strcmp(decls->list[i]->func->var->name, ret->set->vars->vars[0]->name)) {
- ret->decl = decls->list[i]->func;
- return decls->list[i];
+ for (i = 0; i < decls->count; ++i) {
+ if (!strcmp(decls->list[i]->func->var->name, ret->set->vars->vars[0]->name)) {
+ ret->decl = decls->list[i]->func;
+ return decls->list[i];
+ }
}
}
+
return NULL;
}
static inline int validate_impl_ret_stmt(PSI_Data *data, impl *impl) {
impl->func->name);
return 0;
}
- if (!validate_set_value(data, ret->set, ret->decl)) {
+
+ if (!validate_set_value(data, ret->set, ret->decl, impl->decl->args)) {
return 0;
}
+ impl->decl->impl = impl;
+
return 1;
}
static inline int validate_impl_let_stmts(PSI_Data *data, impl *impl) {
if (!strcmp(set_var->name, set_arg->var->name)) {
check = 1;
- if (!validate_set_value(data, set->val, set_arg)) {
+ if (!validate_set_value(data, set->val, set_arg, impl->decl->args)) {
return 0;
}
set_var->arg = set_arg;
return 1;
}
static inline decl *locate_free_decl(decls *decls, free_call *f) {
- size_t i;
+ if (decls) {
+ size_t i;
- for (i = 0; i < decls->count; ++i) {
- if (!strcmp(decls->list[i]->func->var->name, f->func)) {
- f->decl = decls->list[i];
- return decls->list[i];
+ for (i = 0; i < decls->count; ++i) {
+ if (!strcmp(decls->list[i]->func->var->name, f->func)) {
+ f->decl = decls->list[i];
+ return decls->list[i];
+ }
}
}
+
return NULL;
}
static inline int validate_impl_free_stmts(PSI_Data *data, impl *impl) {
C->error = error;
C->ops = ops;
- ops->init(C);
+
+ if (ops->init) {
+ ops->init(C);
+ }
+
+ ZEND_ASSERT(ops->call != NULL);
+ ZEND_ASSERT(ops->compile != NULL);
/* build up predefs in a temporary PSI_Data for validation */
memset(&T, 0, sizeof(T));
void PSI_ContextBuild(PSI_Context *C, const char *paths)
{
- int i, n;
+ int i, n, flags = getenv("PSI_DEBUG") ? PSI_PARSER_DEBUG : 0;
char *sep = NULL, *cpy = strdup(paths), *ptr = cpy;
struct dirent **entries = NULL;
C->error(PSI_WARNING, "Path to PSI file too long: %s/%s",
ptr, entries[i]->d_name);
}
- if (!PSI_ParserInit(&P, psi, C->error, 0)) {
+ if (!PSI_ParserInit(&P, psi, C->error, flags)) {
C->error(PSI_WARNING, "Failed to init PSI parser (%s): %s",
psi, strerror(errno));
continue;
}
}
-
return C->closures = C->ops->compile(C);
}
-void PSI_ContextCall(PSI_Context *C, impl_val *ret_val, decl *decl, impl_val **args)
+void PSI_ContextCall(PSI_Context *C, impl_val *ret_val, decl *decl)
+{
+ C->ops->call(C, ret_val, decl);
+}
+
+static inline void dump_decl_type(int fd, decl_type *t) {
+ const char *pre;
+
+ switch (t->type) {
+ case PSI_T_STRUCT:
+ pre = "struct ";
+ break;
+ default:
+ pre = "";
+ }
+ dprintf(fd, "%s%s", pre, t->name);
+}
+static inline void dump_decl_var(int fd, decl_var *v) {
+ dprintf(fd, "%.*s%s", v->pointer_level-!!v->array_size, "**********", v->name);
+ if (v->array_size) {
+ dprintf(fd, "[%u]", v->array_size);
+ }
+}
+static inline void dump_decl_arg(int fd, decl_arg *a) {
+ dump_decl_type(fd, a->type);
+ dprintf(fd, " ");
+ dump_decl_var(fd, a->var);
+}
+void PSI_ContextDump(PSI_Context *C, int fd)
{
- C->ops->call(C, ret_val, decl, args);
+ size_t i, j;
+
+#ifdef HAVE_LIBJIT
+ if (C->ops == PSI_Libjit()) {
+ dprintf(fd, "#PSI(libjit)\n");
+ }
+#endif
+#ifdef HAVE_LIBFFI
+ if (C->ops == PSI_Libffi()) {
+ dprintf(fd, "#PSI(libffi)\n");
+ }
+#endif
+
+ if (C->defs) for (i = 0; i < C->defs->count; ++i) {
+ decl_typedef *tdef = C->defs->list[i];
+
+ dprintf(fd, "typedef ");
+ dump_decl_type(fd, tdef->type);
+ dprintf(fd, " %s;\n", tdef->alias);
+ }
+ if (C->structs) for (i = 0; i < C->structs->count; ++i) {
+ decl_struct *strct = C->structs->list[i];
+ decl_arg *sarg = NULL;
+
+ dprintf(fd, "struct %s::(%zu) {\n", strct->name, strct->size);
+ for (j = 0; j < strct->args->count; ++j) {
+ sarg = strct->args->args[j];
+ dprintf(fd, "\t");
+ dump_decl_arg(fd, sarg);
+ dprintf(fd, "::(%zu, %zu);\n", sarg->layout->pos, sarg->layout->len);
+ }
+ dprintf(fd, "}\n");
+ }
+
+ dprintf(fd, "\n");
}
void PSI_ContextDtor(PSI_Context *C)
{
size_t i;
+ zend_function_entry *zfe;
- C->ops->dtor(C);
+ if (C->ops->dtor) {
+ C->ops->dtor(C);
+ }
free_decl_libs(&C->psi.libs);
- for (i = 0; i < C->count; ++i) {
- PSI_DataDtor(&C->data[i]);
+ if (C->data) {
+ for (i = 0; i < C->count; ++i) {
+ PSI_DataDtor(&C->data[i]);
+ }
+ free(C->data);
}
- free(C->data);
- free(C->closures);
+ if (C->closures) {
+ for (zfe = C->closures; zfe->fname; ++zfe) {
+ free((void *) zfe->arg_info);
+ }
+ free(C->closures);
+ }
if (C->consts) {
if (C->consts->list) {
projects / m6w6 / ext-psi / blobdiff