X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fcontext.c;h=bc3fb4506bdd125012885e9e1274c824ccae1137;hp=f10f4c49e76e288c38c3c1384c99939231750a33;hb=ad370ff72bd28ebbcb1087138c926ef93eab394b;hpb=91f2f40eee4e1d1dd62ad5de06517f9b27b4aaee

diff --git a/src/context.c b/src/context.c
index f10f4c4..bc3fb45 100644
--- a/src/context.c
+++ b/src/context.c
@@ -146,7 +146,7 @@ struct psi_context *psi_context_init(struct psi_context *C, struct psi_context_o
 			type = psi_decl_type_init(member->type_tag, member->type_name);
 			dvar = psi_decl_var_init(member->var_name, member->pointer_level, member->array_size);
 			darg = psi_decl_arg_init(type, dvar);
-			darg->layout = psi_layout_init(member->offset, member->size);
+			darg->layout = psi_layout_init(member->offset, member->size, NULL);
 
 			switch (predef_composite->type_tag) {
 			case PSI_T_STRUCT:
@@ -178,7 +178,7 @@ struct psi_context *psi_context_init(struct psi_context *C, struct psi_context_o
 		struct psi_decl_var *fname = psi_decl_var_init(predef_decl->var_name, predef_decl->pointer_level, predef_decl->array_size);
 		struct psi_decl_arg *tdef, *func = psi_decl_arg_init(ftype, fname);
 		struct psi_plist *args = psi_plist_init((psi_plist_dtor) psi_decl_arg_free);
-		struct psi_decl *decl = psi_decl_init(psi_decl_abi_init("default"), func, args);
+		struct psi_decl *decl = psi_decl_init(func, args);
 
 		for (farg = &predef_decl[1]; farg->type_tag; ++farg) {
 			struct psi_decl_type *arg_type = psi_decl_type_init(farg->type_tag, farg->type_name);
@@ -240,6 +240,7 @@ 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(PSI_DATA(C), NULL, PSI_WARNING, "Path to PSI file too long: %s/%s",
@@ -250,22 +251,15 @@ void psi_context_build(struct psi_context *C, const char *paths)
 						psi, strerror(errno));
 					continue;
 				}
-				if (!psi_parser_open_file(&P, psi)) {
+				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;
 				}
-
-				while (0 < psi_parser_scan(&P)) {
-					psi_parser_parse(&P, psi_token_alloc(&P));
-					if (P.num == PSI_T_EOF) {
-						break;
-					}
-				}
-
-				psi_parser_parse(&P, NULL);
+				psi_parser_parse(&P, I);
 				psi_context_add_data(C, PSI_DATA(&P));
 				psi_parser_dtor(&P);
+				free(I);
 			}
 		}
 
@@ -338,10 +332,21 @@ zend_function_entry *psi_context_compile(struct psi_context *C)
 			struct psi_decl_enum_item *item;
 
 			while (psi_plist_get(e->items, j++, &item)) {
-				zend_string *name = strpprintf(0, "psi\\%s\\%s", e->name, item->name);
+				zend_string *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(item->num, NULL));
+				ZVAL_LONG(&zc.value, psi_long_num_exp(item->num, NULL, NULL));
 				zend_register_constant(&zc);
 				zend_string_release(name);
 			}
@@ -373,7 +378,22 @@ ZEND_RESULT_CODE psi_context_call(struct psi_context *C, zend_execute_data *exec
 		return FAILURE;
 	}
 
-	psi_call_frame_do_call(frame);
+	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);