X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fcontext.c;h=b7ae46f3ae68deffce6465b94069416a3949549f;hp=49391305879892bfc33399d34ab0a4c0be77f4ec;hb=3fa287dfd76814b2ec54991c0208a019845a3dc0;hpb=7e5e4c6d2b654cfd3737c37e9e1894be43642721 diff --git a/src/context.c b/src/context.c index 4939130..b7ae46f 100644 --- a/src/context.c +++ b/src/context.c @@ -1,24 +1,203 @@ -#include -#include -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#else +# include "php_config.h" +#endif + +#include "php_psi_stdinc.h" #include "php.h" + +#ifdef HAVE_DIRENT_H +# include +# define NAMLEN(dirent) strlen ((dirent)->d_name) +#else +# define dirent direct +# define NAMLEN(dirent) ((dirent)->d_namlen) +# ifdef HAVE_SYS_NDIR_H +# include +# endif +# ifdef HAVE_SYS_DIR_H +# include +# endif +# ifdef HAVE_NDIR_H +# include +# endif +#endif + +#include + #include "php_scandir.h" -#include "context.h" +#include "php_psi.h" +#include "calc.h" +#include "libjit.h" +#include "libffi.h" + +#include "token.h" #include "parser.h" -#include "validator.h" -PSI_Context *PSI_ContextInit(PSI_Context *C, PSI_ContextOps *ops, PSI_ContextErrorFunc error) +#include "php_psi_types.h" +#include "php_psi_consts.h" +#include "php_psi_decls.h" +#include "php_psi_va_decls.h" +#include "php_psi_fn_decls.h" +#include "php_psi_structs.h" +#include "php_psi_unions.h" + +struct psi_context *psi_context_init(struct psi_context *C, struct psi_context_ops *ops, psi_error_cb error, unsigned flags) { + struct psi_data T; + struct psi_predef_type *predef_type; + struct psi_predef_const *predef_const; + struct psi_predef_struct *predef_struct; + struct psi_predef_union *predef_union; + struct psi_predef_decl *predef_decl; + if (!C) { C = malloc(sizeof(*C)); } memset(C, 0, sizeof(*C)); C->error = error; + C->flags = flags; 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)); + T.error = error; + + for (predef_type = &psi_predef_types[0]; predef_type->type_tag; ++predef_type) { + decl_type *type = init_decl_type(predef_type->type_tag, predef_type->type_name); + decl_var *var = init_decl_var(predef_type->alias, 0, 0); /* FIXME: indirection */ + decl_arg *def = init_decl_arg(type, var); + + T.defs = add_decl_typedef(T.defs, def); + } + for (predef_const = &psi_predef_consts[0]; predef_const->type_tag; ++predef_const) { + impl_def_val *val = init_impl_def_val(predef_const->val_type_tag, predef_const->val_text); + const_type *type = init_const_type(predef_const->type_tag, predef_const->type_name); + constant *constant = init_constant(type, predef_const->var_name, val); + + T.consts = add_constant(T.consts, constant); + } + for (predef_struct = &psi_predef_structs[0]; predef_struct->type_tag; ++predef_struct) { + struct psi_predef_struct *member; + decl_args *dargs = init_decl_args(NULL); + decl_struct *dstruct = init_decl_struct(predef_struct->var_name, dargs); + + dstruct->size = predef_struct->size; + dstruct->align = predef_struct->offset; + for (member = &predef_struct[1]; member->type_tag; ++member) { + decl_type *type; + decl_var *dvar; + decl_arg *darg; + + type = init_decl_type(member->type_tag, member->type_name); + dvar = init_decl_var(member->var_name, member->pointer_level, member->array_size); + darg = init_decl_arg(type, dvar); + darg->layout = init_decl_struct_layout(member->offset, member->size); + dargs = add_decl_arg(dargs, darg); + } + + T.structs = add_decl_struct(T.structs, dstruct); + predef_struct = member; + } + for (predef_union = &psi_predef_unions[0]; predef_union->type_tag; ++predef_union) { + struct psi_predef_union *member; + decl_args *dargs = init_decl_args(NULL); + decl_union *dunion = init_decl_union(predef_union->var_name, dargs); + + dunion->size = predef_union->size; + dunion->align = predef_union->offset; + for (member = &predef_union[1]; member->type_tag; ++member) { + decl_type *type; + decl_var *dvar; + decl_arg *darg; + + type = init_decl_type(member->type_tag, member->type_name); + dvar = init_decl_var(member->var_name, member->pointer_level, member->array_size); + darg = init_decl_arg(type, dvar); + darg->layout = init_decl_struct_layout(member->offset, member->size); + dargs = add_decl_arg(dargs, darg); + } + + T.unions = add_decl_union(T.unions, dunion); + predef_union = member; + } + for (predef_decl = &psi_predef_decls[0]; predef_decl->type_tag; ++predef_decl) { + struct psi_predef_decl *farg; + decl_type *ftype = init_decl_type(predef_decl->type_tag, predef_decl->type_name); + decl_var *fname = init_decl_var(predef_decl->var_name, predef_decl->pointer_level, predef_decl->array_size); + decl_arg *func = init_decl_arg(ftype, fname); + decl_args *args = init_decl_args(NULL); + decl *decl = init_decl(init_decl_abi("default"), func, args); + + for (farg = &predef_decl[1]; farg->type_tag; ++farg) { + decl_type *arg_type = init_decl_type(farg->type_tag, farg->type_name); + decl_var *arg_var = init_decl_var(farg->var_name, farg->pointer_level, farg->array_size); + decl_arg *darg = init_decl_arg(arg_type, arg_var); + args = add_decl_arg(args, darg); + } + + T.decls = add_decl(T.decls, decl); + predef_decl = farg; + } + + for (predef_decl = &psi_predef_vararg_decls[0]; predef_decl->type_tag; ++predef_decl) { + struct psi_predef_decl *farg; + decl_type *ftype = init_decl_type(predef_decl->type_tag, predef_decl->type_name); + decl_var *fname = init_decl_var(predef_decl->var_name, predef_decl->pointer_level, predef_decl->array_size); + decl_arg *func = init_decl_arg(ftype, fname); + decl_args *args = init_decl_args(NULL); + decl *decl = init_decl(init_decl_abi("default"), func, args); + + for (farg = &predef_decl[1]; farg->type_tag; ++farg) { + decl_type *arg_type = init_decl_type(farg->type_tag, farg->type_name); + decl_var *arg_var = init_decl_var(farg->var_name, farg->pointer_level, farg->array_size); + decl_arg *darg = init_decl_arg(arg_type, arg_var); + args = add_decl_arg(args, darg); + } + args->varargs = 1; + + T.decls = add_decl(T.decls, decl); + predef_decl = farg; + } + + for (predef_decl = &psi_predef_functor_decls[0]; predef_decl->type_tag; ++predef_decl) { + struct psi_predef_decl *farg; + decl_type *dtype, *ftype = init_decl_type(predef_decl->type_tag, predef_decl->type_name); + decl_var *fname = init_decl_var(predef_decl->var_name, predef_decl->pointer_level, predef_decl->array_size); + decl_arg *tdef, *func = init_decl_arg(ftype, fname); + decl_args *args = init_decl_args(NULL); + decl *decl = init_decl(init_decl_abi("default"), func, args); + + for (farg = &predef_decl[1]; farg->type_tag; ++farg) { + decl_type *arg_type = init_decl_type(farg->type_tag, farg->type_name); + decl_var *arg_var = init_decl_var(farg->var_name, farg->pointer_level, farg->array_size); + decl_arg *darg = init_decl_arg(arg_type, arg_var); + args = add_decl_arg(args, darg); + } + + dtype = init_decl_type(PSI_T_FUNCTION, fname->name); + dtype->real.func = decl; + tdef = init_decl_arg(dtype, copy_decl_var(fname)); + T.defs = add_decl_typedef(T.defs, tdef); + + predef_decl = farg; + } + + psi_context_validate_data(PSI_DATA(C), &T); + + C->count = 1; + C->data = malloc(sizeof(*C->data)); + psi_data_exchange(C->data, &T); return C; } @@ -31,74 +210,80 @@ static int psi_select_dirent(const struct dirent *entry) return 0 == fnmatch("*.psi", entry->d_name, FNM_CASEFOLD); } - -void PSI_ContextBuild(PSI_Context *C, const char *path) +void psi_context_build(struct psi_context *C, const char *paths) { int i, n; - struct dirent **entries = NULL; - - n = php_scandir(path, &entries, psi_select_dirent, alphasort); + char *sep = NULL, *cpy = strdup(paths), *ptr = cpy; + struct dirent **entries; - if (n < 0) { - return; - } else for (i = 0; i < n; ++i) { - char psi[MAXPATHLEN]; - PSI_Parser P; - PSI_Validator V; + do { + sep = strchr(ptr, ':'); - if (MAXPATHLEN <= slprintf(psi, MAXPATHLEN, "%s/%s", path, entries[i]->d_name)) { - C->error(PSI_WARNING, "Path to PSI file too long: %s/%s", - path, entries[i]->d_name); - } - if (!PSI_ParserInit(&P, psi, C->error, 0)) { - C->error(PSI_WARNING, "Failed to init PSI parser (%s): %s", - psi, strerror(errno)); - continue; + if (sep) { + *sep = 0; } - while (-1 != PSI_ParserScan(&P)) { - PSI_ParserParse(&P, PSI_TokenAlloc(&P)); - }; - PSI_ParserParse(&P, NULL); + entries = NULL; + n = php_scandir(ptr, &entries, psi_select_dirent, alphasort); - if (!PSI_ValidatorInit(&V, &P)) { - C->error(PSI_WARNING, "Failed to init PSI validator"); - break; - } - PSI_ParserDtor(&P); + if (n > 0) { + for (i = 0; i < n; ++i) { + char psi[MAXPATHLEN]; + struct psi_parser P; + + if (MAXPATHLEN <= slprintf(psi, MAXPATHLEN, "%s/%s", ptr, entries[i]->d_name)) { + C->error(C, NULL, PSI_WARNING, "Path to PSI file too long: %s/%s", + ptr, entries[i]->d_name); + } + if (!psi_parser_init(&P, psi, C->error, C->flags)) { + C->error(C, NULL, PSI_WARNING, "Failed to init PSI parser (%s): %s", + psi, strerror(errno)); + continue; + } - if (PSI_ValidatorValidate(&V)) { - zend_function_entry *closures; + while (0 < psi_parser_scan(&P)) { + psi_parser_parse(&P, psi_token_alloc(&P)); + if (P.num == PSI_T_EOF) { + break; + } + } - closures = PSI_ContextCompile(C, (PSI_Data *) &V); - if (closures && SUCCESS != zend_register_functions(NULL, closures, NULL, MODULE_PERSISTENT)) { - C->error(PSI_WARNING, "Failed to register functions!"); + psi_parser_parse(&P, NULL); + psi_context_validate(C, &P); + psi_parser_dtor(&P); } } - PSI_ValidatorDtor(&V); - } - if (entries) { - for (i = 0; i < n; ++i) { - free(entries[i]); + + if (entries) { + for (i = 0; i < n; ++i) { + free(entries[i]); + } + free(entries); } - free(entries); + + ptr = sep + 1; + } while (sep); + + + if (psi_context_compile(C) && SUCCESS != zend_register_functions(NULL, C->closures, NULL, MODULE_PERSISTENT)) { + C->error(C, NULL, PSI_WARNING, "Failed to register functions!"); } + free(cpy); + } -zend_function_entry *PSI_ContextCompile(PSI_Context *C, PSI_Data *D) +zend_function_entry *psi_context_compile(struct psi_context *C) { - size_t i, count = C->count++; - zend_function_entry *zfe; + size_t i; + zend_constant zc; - if (D->consts) { - zend_constant zc; + zc.flags = CONST_PERSISTENT|CONST_CS; + zc.module_number = EG(current_module)->module_number; - zc.flags = CONST_PERSISTENT|CONST_CS; - zc.module_number = EG(current_module)->module_number; - - for (i = 0; i < D->consts->count; ++i) { - constant *c = D->consts->list[i]; + if (C->consts) { + for (i = 0; i < C->consts->count; ++i) { + constant *c = C->consts->list[i]; zc.name = zend_string_init(c->name + (c->name[0] == '\\'), strlen(c->name) - (c->name[0] == '\\'), 1); ZVAL_NEW_STR(&zc.value, zend_string_init(c->val->text, strlen(c->val->text), 1)); @@ -113,46 +298,380 @@ zend_function_entry *PSI_ContextCompile(PSI_Context *C, PSI_Data *D) case PSI_T_FLOAT: convert_to_double(&zc.value); break; + case PSI_T_STRING: + case PSI_T_QUOTED_STRING: + break; + default: + assert(0); } zend_register_constant(&zc); } } + if (C->enums) { + for (i = 0; i < C->enums->count; ++i) { + decl_enum *e = C->enums->list[i]; + size_t j; - C->data = realloc(C->data, C->count * sizeof(*C->data)); - PSI_DataExchange(&C->data[count], D); + for (j = 0; j < e->items->count; ++j) { + decl_enum_item *i = e->items->list[j]; + zend_string *name = strpprintf(0, "psi\\%s\\%s", e->name, i->name); + + zc.name = zend_string_dup(name, 1); + ZVAL_LONG(&zc.value, psi_long_num_exp(i->num, NULL)); + zend_register_constant(&zc); + zend_string_release(name); + } + } + } - zfe = C->ops->compile(C, &C->data[count]); + return C->closures = C->ops->compile(C); +} - C->closures = realloc(C->closures, C->count * sizeof(*C->closures)); - C->closures[count] = zfe; - return zfe; +void psi_context_call(struct psi_context *C, struct decl_callinfo *decl_call, struct impl_vararg *va) +{ + C->ops->call(C, decl_call, va); } -void PSI_ContextDtor(PSI_Context *C) + +void psi_context_dtor(struct psi_context *C) { size_t i; + zend_function_entry *zfe; + + if (C->ops->dtor) { + C->ops->dtor(C); + } - C->ops->dtor(C); + free_decl_libs(&C->psi.libs); - for (i = 0; i < C->count; ++i) { - PSI_DataDtor(&C->data[i]); - if (C->closures[i]){ - free(C->closures[i]); + if (C->data) { + for (i = 0; i < C->count; ++i) { + psi_data_dtor(&C->data[i]); } + free(C->data); + } + + 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) { + free(C->consts->list); + } + free(C->consts); + } + if (C->defs) { + if (C->defs->list) { + free(C->defs->list); + } + free(C->defs); + } + if (C->structs) { + if (C->structs->list) { + free(C->structs->list); + } + free(C->structs); + } + if (C->unions) { + if (C->unions->list) { + free(C->unions->list); + } + free(C->unions); + } + if (C->enums) { + if (C->enums->list) { + free(C->enums->list); + } + free(C->enums); + } + if (C->decls) { + if (C->decls->list) { + free(C->decls->list); + } + free(C->decls); + } + if (C->impls) { + if (C->impls->list) { + free(C->impls->list); + } + free(C->impls); } - free(C->data); - free(C->closures); memset(C, 0, sizeof(*C)); } -void PSI_ContextFree(PSI_Context **C) +void psi_context_free(struct psi_context **C) { if (*C) { - PSI_ContextDtor(*C); + psi_context_dtor(*C); free(*C); *C = NULL; } } +int psi_context_validate(struct psi_context *C, struct psi_parser *P) +{ + struct psi_data *D; + void *dlopened = NULL; + size_t i, count = C->count++, check_round, check_count; + decl_typedefs *check_defs = P->defs; + decl_structs *check_structs = P->structs; + decl_unions *check_unions = P->unions; + decl_enums *check_enums = P->enums; + unsigned flags = C->flags; + + C->data = realloc(C->data, C->count * sizeof(*C->data)); + D = psi_data_exchange(&C->data[count], PSI_DATA(P)); + +#define REVALIDATE(what) do { \ + if (check_round && check_ ##what) { \ + free(check_ ##what->list); \ + free(check_ ##what); \ + } \ + check_ ##what = recheck_ ##what; \ +} while (0) +#define CHECK_TOTAL (CHECK_COUNT(defs) + CHECK_COUNT(structs) + CHECK_COUNT(enums)) +#define CHECK_COUNT(of) (check_ ##of ? check_ ##of->count : 0) + + if (!(flags & PSI_PARSER_SILENT)) { + /* no warnings on first round */ + C->flags |= PSI_PARSER_SILENT; + } + for (check_round = 0, check_count = 0; CHECK_TOTAL && check_count != CHECK_TOTAL; ++check_round) { + decl_typedefs *recheck_defs = NULL; + decl_structs *recheck_structs = NULL; + decl_unions *recheck_unions = NULL; + decl_enums *recheck_enums = NULL; + + check_count = CHECK_TOTAL; + + for (i = 0; i < CHECK_COUNT(defs); ++i) { + if (validate_decl_typedef(PSI_DATA(C), check_defs->list[i])) { + C->defs = add_decl_typedef(C->defs, check_defs->list[i]); + } else { + recheck_defs = add_decl_typedef(recheck_defs, check_defs->list[i]); + } + } + for (i = 0; i < CHECK_COUNT(structs); ++i) { + if (validate_decl_struct(PSI_DATA(C), check_structs->list[i])) { + C->structs = add_decl_struct(C->structs, check_structs->list[i]); + } else { + recheck_structs = add_decl_struct(recheck_structs, check_structs->list[i]); + } + } + for (i = 0; i < CHECK_COUNT(unions); ++i) { + if (validate_decl_union(PSI_DATA(C), check_unions->list[i])) { + C->unions = add_decl_union(C->unions, check_unions->list[i]); + } else { + recheck_unions = add_decl_union(recheck_unions, check_unions->list[i]); + } + } + for (i = 0; i < CHECK_COUNT(enums); ++i) { + if (validate_decl_enum(PSI_DATA(C), check_enums->list[i])) { + C->enums = add_decl_enum(C->enums, check_enums->list[i]); + } else { + recheck_enums = add_decl_enum(recheck_enums, check_enums->list[i]); + } + } + + REVALIDATE(defs); + REVALIDATE(structs); + REVALIDATE(unions); + REVALIDATE(enums); + + if (check_round == 0 && !(flags & PSI_PARSER_SILENT)) { + C->flags ^= PSI_PARSER_SILENT; + } + } + + C->flags = flags; + + if (D->consts) { + for (i = 0; i < D->consts->count; ++i) { + if (validate_constant(PSI_DATA(C), D->consts->list[i])) { + C->consts = add_constant(C->consts, D->consts->list[i]); + } + } + } + + if (!validate_file(D, &dlopened)) { + return 0; + } + + add_decl_lib(&C->psi.libs, dlopened); + + if (D->decls) { + for (i = 0; i < D->decls->count; ++i) { + if (validate_decl(PSI_DATA(C), dlopened, D->decls->list[i])) { + C->decls = add_decl(C->decls, D->decls->list[i]); + } + } + } + if (D->impls) { + for (i = 0; i < D->impls->count; ++i) { + if (validate_impl(PSI_DATA(C), D->impls->list[i])) { + C->impls = add_impl(C->impls, D->impls->list[i]); + } + } + } + + return 1; +} + +int psi_context_validate_data(struct psi_data *dest, struct psi_data *source) +{ + size_t i; + int errors = 0; + + if (source->defs) for (i = 0; i < source->defs->count; ++i) { + decl_arg *def = source->defs->list[i]; + + if (validate_decl_typedef(source, def)) { + if (dest) { + dest->defs = add_decl_typedef(dest->defs, def); + } + } else { + ++errors; + } + } + + if (source->consts) for (i = 0; i < source->consts->count; ++i) { + constant *constant = source->consts->list[i]; + + if (validate_constant(source, constant)) { + if (dest) { + dest->consts = add_constant(dest->consts, constant); + } + } else { + ++errors; + } + } + + if (source->structs) for (i = 0; i < source->structs->count; ++i) { + decl_struct *dstruct = source->structs->list[i]; + + if (validate_decl_struct(source, dstruct)) { + if (dest) { + dest->structs = add_decl_struct(dest->structs, dstruct); + } + } else { + ++errors; + } + } + + if (source->unions) for (i = 0; i < source->unions->count; ++i) { + decl_union *dunion = source->unions->list[i]; + + if (validate_decl_union(source, dunion)) { + if (dest) { + dest->unions = add_decl_union(dest->unions, dunion); + } + } else { + ++errors; + } + } + + if (source->enums) for (i = 0; i < source->enums->count; ++i) { + decl_enum *denum = source->enums->list[i]; + + if (validate_decl_enum(source, denum)) { + if (dest) { + dest->enums = add_decl_enum(dest->enums, denum); + } + } else { + ++errors; + } + } + + if (source->decls) for (i = 0; i < source->decls->count; ++i) { + decl *decl = source->decls->list[i]; + + if (validate_decl(source, NULL, decl)) { + if (dest) { + dest->decls = add_decl(dest->decls, decl); + } + } else { + ++errors; + } + } + + if (source->impls) for (i = 0; i < source->impls->count; ++i) { + impl *impl = source->impls->list[i]; + + if (validate_impl(source, impl)) { + if (dest) { + dest->impls = add_impl(dest->impls, impl); + } + } else { + ++errors; + } + } + + return errors; +} + +static inline void dump_data(int fd, struct psi_data *D) { + if (D->psi.file.fn) { + dprintf(fd, "// psi.filename=%s\n", D->psi.file.fn); + if (D->psi.file.ln) { + dprintf(fd, "lib \"%s\";\n", D->psi.file.ln); + } + } else { + dprintf(fd, "// builtin predef\n"); + } + if (D->defs) { + dump_decl_typedefs(fd, D->defs); + dprintf(fd, "\n"); + } + if (D->unions) { + dump_decl_unions(fd, D->unions); + dprintf(fd, "\n"); + } + if (D->structs) { + dump_decl_structs(fd, D->structs); + dprintf(fd, "\n"); + } + if (D->enums) { + dump_decl_enums(fd, D->enums); + dprintf(fd, "\n"); + } + if (D->consts) { + dump_constants(fd, D->consts); + dprintf(fd, "\n"); + } + if (D->decls) { + dump_decls(fd, D->decls); + dprintf(fd, "\n"); + } + if (D->impls) { + dump_impls(fd, D->impls); + dprintf(fd, "\n"); + } +} + +void psi_context_dump(struct psi_context *C, int fd) +{ + size_t i; + +#ifdef HAVE_LIBJIT + if (C->ops == psi_libjit_ops()) { + dprintf(fd, "// psi.engine=jit\n"); + } +#endif +#ifdef HAVE_LIBFFI + if (C->ops == psi_libffi_ops()) { + dprintf(fd, "// psi.engine=ffi\n"); + } +#endif + dprintf(fd, "\n"); + + for (i = 0; i < C->count; ++i) { + dump_data(fd, &C->data[i]); + } + +}