X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fcontext.c;h=d1f808cb19512d076f90b4b024325d64ca25a9a8;hp=805309d268753bc159e3bc759a884da80bbf0b3c;hb=c9384515a81cb64d345b299908b2852f51bb8e6e;hpb=5359ad5c181e5772f350fe1cba060cbed3a05b91

diff --git a/src/context.c b/src/context.c
index 805309d..d1f808c 100644
--- a/src/context.c
+++ b/src/context.c
@@ -1,6 +1,27 @@
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+/*******************************************************************************
+ Copyright (c) 2016, Michael Wallner <mike@php.net>.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+     * Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
+     * Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*******************************************************************************/
 
 #include "php_psi_stdinc.h"
 
@@ -28,150 +49,31 @@
 #include "php_scandir.h"
 #include "php_psi.h"
 #include "calc.h"
+#include "call.h"
 #include "libjit.h"
 #include "libffi.h"
 
 #include "token.h"
 #include "parser.h"
 
-#include "php_psi_types.h"
-#include "php_psi_consts.h"
-#include "php_psi_decls.h"
-#include "php_psi_va_decls.h"
-#include "php_psi_structs.h"
-#include "php_psi_unions.h"
+#include "php_psi_posix.h"
 
-struct psi_context *psi_context_init(struct psi_context *C, struct psi_context_ops *ops, psi_context_error_func error, unsigned flags)
+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;
+	psi_data_ctor(PSI_DATA(C), error, flags);
 	C->ops = ops;
 
 	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;
-	}
-
-	psi_context_validate_data(PSI_DATA(C), &T);
-
-	C->count = 1;
-	C->data = malloc(sizeof(*C->data));
-	psi_data_exchange(C->data, &T);
+	assert(ops->call != NULL);
+	assert(ops->compile != NULL);
 
 	return C;
 }
@@ -179,11 +81,28 @@ struct psi_context *psi_context_init(struct psi_context *C, struct psi_context_o
 static int psi_select_dirent(const struct dirent *entry)
 {
 #ifndef FNM_CASEFOLD
-#define FNM_CASEFOLD 0
+# define FNM_CASEFOLD 0
 #endif
 	return 0 == fnmatch("*.psi", entry->d_name, FNM_CASEFOLD);
 }
 
+static bool psi_context_add(struct psi_context *C, struct psi_parser *P)
+{
+	bool valid;
+	struct psi_data *D;
+	struct psi_validate_scope scope = {0};
+
+	C->data = realloc(C->data, (C->count + 1) * sizeof(*C->data));
+	D = psi_data_exchange(&C->data[C->count++], PSI_DATA(P));
+
+	psi_validate_scope_ctor(&scope);
+	scope.defs = &P->preproc->defs;
+	valid = psi_validate(&scope, PSI_DATA(C), D);
+	psi_validate_scope_dtor(&scope);
+
+	return valid;
+}
+
 void psi_context_build(struct psi_context *C, const char *paths)
 {
 	int i, n;
@@ -204,27 +123,26 @@ void psi_context_build(struct psi_context *C, const char *paths)
 			for (i = 0; i < n; ++i) {
 				char psi[MAXPATHLEN];
 				struct psi_parser P;
+				struct psi_parser_input *I;
 
 				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",
+					C->error(PSI_DATA(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",
+				if (!psi_parser_init(&P, C->error, C->flags)) {
+					C->error(PSI_DATA(C), NULL, PSI_WARNING, "Failed to init PSI parser (%s): %s",
 						psi, strerror(errno));
 					continue;
 				}
-
-				while (0 < psi_parser_scan(&P)) {
-					psi_parser_parse(&P, psi_token_alloc(&P));
-					if (P.num == PSI_T_EOF) {
-						break;
-					}
+				if (!(I = psi_parser_open_file(&P, psi, true))) {
+					C->error(PSI_DATA(C), NULL, PSI_WARNING, "Failed to open PSI file (%s): %s",
+						psi, strerror(errno));
+					continue;
 				}
-
-				psi_parser_parse(&P, NULL);
-				psi_context_validate(C, &P);
+				psi_parser_parse(&P, I);
+				psi_context_add(C, &P);
 				psi_parser_dtor(&P);
+				free(I);
 			}
 		}
 
@@ -240,53 +158,79 @@ void psi_context_build(struct psi_context *C, const char *paths)
 
 
 	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!");
+		C->error(PSI_DATA(C), NULL, PSI_WARNING, "Failed to register functions!");
 	}
 
 	free(cpy);
-
 }
 
 zend_function_entry *psi_context_compile(struct psi_context *C)
 {
-	size_t i;
 	zend_constant zc;
 
 	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];
+		size_t i = 0;
+		struct psi_const *c;
+
+		while (psi_plist_get(C->consts, i++, &c)) {
 
-			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));
+			if (zend_get_constant_str(c->name, strlen(c->name))) {
+				continue;
+			}
+
+			zc.name = zend_string_init(c->name, strlen(c->name), 1);
 
 			switch (c->type->type) {
 			case PSI_T_BOOL:
-				convert_to_boolean(&zc.value);
+				ZVAL_BOOL(&zc.value, c->val->ival.zend.bval);
 				break;
 			case PSI_T_INT:
-				convert_to_long(&zc.value);
+				ZVAL_LONG(&zc.value, c->val->ival.zend.lval);
 				break;
 			case PSI_T_FLOAT:
-				convert_to_double(&zc.value);
+			case PSI_T_DOUBLE:
+				ZVAL_DOUBLE(&zc.value, c->val->ival.dval);
+				break;
+			case PSI_T_STRING:
+			case PSI_T_QUOTED_STRING:
+				ZVAL_NEW_STR(&zc.value, zend_string_copy(c->val->ival.zend.str));
+				break;
+			default:
+				assert(0);
 				break;
 			}
+
 			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;
+		size_t i = 0;
+		struct psi_decl_enum *e;
+
+		while (psi_plist_get(C->enums, i++, &e)) {
+			size_t j = 0;
+			struct psi_decl_enum_item *item;
+
+			while (psi_plist_get(e->items, j++, &item)) {
+				zend_string *name;
 
-			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);
+				if (psi_decl_type_is_anon(e->name, "enum")) {
+					name = strpprintf(0, "psi\\%s", item->name);
+				} else {
+					name = strpprintf(0, "psi\\%s\\%s", e->name, item->name);
+				}
+
+				if (zend_get_constant(name)) {
+					zend_string_release(name);
+					continue;
+				}
 
 				zc.name = zend_string_dup(name, 1);
-				ZVAL_LONG(&zc.value, psi_long_num_exp(i->num, NULL));
+				ZVAL_LONG(&zc.value, psi_num_exp_get_long(item->num, NULL, NULL));
 				zend_register_constant(&zc);
 				zend_string_release(name);
 			}
@@ -297,9 +241,49 @@ zend_function_entry *psi_context_compile(struct psi_context *C)
 }
 
 
-void psi_context_call(struct psi_context *C, struct decl_callinfo *decl_call, struct impl_vararg *va)
+ZEND_RESULT_CODE psi_context_call(struct psi_context *C, zend_execute_data *execute_data, zval *return_value, struct psi_impl *impl)
 {
-	C->ops->call(C, decl_call, va);
+	struct psi_call_frame *frame;
+
+	frame = psi_call_frame_init(C, impl->decl, impl);
+
+	if (SUCCESS != psi_call_frame_parse_args(frame, execute_data)) {
+		psi_call_frame_free(frame);
+
+		return FAILURE;
+	}
+
+	psi_call_frame_enter(frame);
+
+	if (SUCCESS != psi_call_frame_do_let(frame)) {
+		psi_call_frame_do_return(frame, return_value);
+		psi_call_frame_free(frame);
+
+		return FAILURE;
+	}
+
+	if (SUCCESS != psi_call_frame_do_assert(frame, PSI_ASSERT_PRE)) {
+		psi_call_frame_do_return(frame, return_value);
+		psi_call_frame_free(frame);
+
+		return FAILURE;
+	}
+
+	C->ops->call(frame);
+
+	if (SUCCESS != psi_call_frame_do_assert(frame, PSI_ASSERT_POST)) {
+		psi_call_frame_do_return(frame, return_value);
+		psi_call_frame_free(frame);
+
+		return FAILURE;
+	}
+
+	psi_call_frame_do_return(frame, return_value);
+	psi_call_frame_do_set(frame);
+	psi_call_frame_do_free(frame);
+	psi_call_frame_free(frame);
+
+	return SUCCESS;
 }
 
 
@@ -312,7 +296,7 @@ void psi_context_dtor(struct psi_context *C)
 		C->ops->dtor(C);
 	}
 
-	free_decl_libs(&C->psi.libs);
+	psi_data_dtor(PSI_DATA(C));
 
 	if (C->data) {
 		for (i = 0; i < C->count; ++i) {
@@ -327,51 +311,6 @@ void psi_context_dtor(struct psi_context *C)
 		}
 		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);
-	}
-
-	memset(C, 0, sizeof(*C));
 }
 
 void psi_context_free(struct psi_context **C)
@@ -382,3 +321,11 @@ void psi_context_free(struct psi_context **C)
 		*C = NULL;
 	}
 }
+
+void psi_context_dump(struct psi_context *C, int fd)
+{
+	dprintf(fd, "// psi.engine=%s\n",
+			(char *) C->ops->query(C, PSI_CONTEXT_QUERY_SELF, NULL));
+
+	psi_data_dump(fd, PSI_DATA(C));
+}