X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fcontext.c;h=218da24abb541a0a45d012650f51fa46550822e0;hp=de72810e5403a076cd9bc4aa4c0d1d944042729c;hb=d3171526ab7658114cac4ebe1098af4b038e576e;hpb=52815a5aac85e8c69ffba76c25a51de3b6ae1365 diff --git a/src/context.c b/src/context.c index de72810..218da24 100644 --- a/src/context.c +++ b/src/context.c @@ -26,7 +26,7 @@ #include "php.h" #include "php_scandir.h" #include "php_psi.h" - +#include "calc.h" #include "libjit.h" #include "libffi.h" @@ -35,14 +35,15 @@ #include "php_psi_decls.h" #include "php_psi_va_decls.h" #include "php_psi_structs.h" +#include "php_psi_unions.h" - -PSI_Context *PSI_ContextInit(PSI_Context *C, PSI_ContextOps *ops, PSI_ContextErrorFunc error) +PSI_Context *PSI_ContextInit(PSI_Context *C, PSI_ContextOps *ops, PSI_ContextErrorFunc error, unsigned flags) { 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) { @@ -51,6 +52,7 @@ PSI_Context *PSI_ContextInit(PSI_Context *C, PSI_ContextOps *ops, PSI_ContextErr memset(C, 0, sizeof(*C)); C->error = error; + C->flags = flags; C->ops = ops; if (ops->init) { @@ -66,7 +68,8 @@ PSI_Context *PSI_ContextInit(PSI_Context *C, PSI_ContextOps *ops, PSI_ContextErr 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_typedef *def = init_decl_typedef(predef_type->alias, type); + 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); } @@ -83,6 +86,7 @@ PSI_Context *PSI_ContextInit(PSI_Context *C, PSI_ContextOps *ops, PSI_ContextErr 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; @@ -98,6 +102,28 @@ PSI_Context *PSI_ContextInit(PSI_Context *C, PSI_ContextOps *ops, PSI_ContextErr 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); @@ -156,11 +182,10 @@ static int psi_select_dirent(const struct dirent *entry) void PSI_ContextBuild(PSI_Context *C, const char *paths) { - int i, n, flags = psi_check_env("PSI_DEBUG") ? PSI_PARSER_DEBUG : 0; + int i, n; char *sep = NULL, *cpy = strdup(paths), *ptr = cpy; struct dirent **entries = NULL; - do { sep = strchr(ptr, ':'); @@ -176,11 +201,11 @@ void PSI_ContextBuild(PSI_Context *C, const char *paths) PSI_Parser P; if (MAXPATHLEN <= slprintf(psi, MAXPATHLEN, "%s/%s", ptr, entries[i]->d_name)) { - C->error(NULL, PSI_WARNING, "Path to PSI file too long: %s/%s", + C->error(C, NULL, PSI_WARNING, "Path to PSI file too long: %s/%s", ptr, entries[i]->d_name); } - if (!PSI_ParserInit(&P, psi, C->error, flags)) { - C->error(NULL, PSI_WARNING, "Failed to init PSI parser (%s): %s", + if (!PSI_ParserInit(&P, psi, C->error, C->flags)) { + C->error(C, NULL, PSI_WARNING, "Failed to init PSI parser (%s): %s", psi, strerror(errno)); continue; } @@ -210,7 +235,7 @@ void PSI_ContextBuild(PSI_Context *C, const char *paths) if (PSI_ContextCompile(C) && SUCCESS != zend_register_functions(NULL, C->closures, NULL, MODULE_PERSISTENT)) { - C->error(NULL, PSI_WARNING, "Failed to register functions!"); + C->error(C, NULL, PSI_WARNING, "Failed to register functions!"); } free(cpy); @@ -220,13 +245,12 @@ void PSI_ContextBuild(PSI_Context *C, const char *paths) zend_function_entry *PSI_ContextCompile(PSI_Context *C) { size_t i; + zend_constant zc; - if (C->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; + if (C->consts) { for (i = 0; i < C->consts->count; ++i) { constant *c = C->consts->list[i]; @@ -247,6 +271,22 @@ zend_function_entry *PSI_ContextCompile(PSI_Context *C) 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; + + 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); + } + } + } return C->closures = C->ops->compile(C); } @@ -301,6 +341,12 @@ void PSI_ContextDtor(PSI_Context *C) } free(C->structs); } + 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);