X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fcontext.c;h=73422be98df3b03de2d35595e511f06179bd1654;hp=d1eb05e35323aed7137f258c808b24420cb402e6;hb=97c640850205296e225180b847716f9e55f0c622;hpb=c5b2de8ed1d92dd42f910d4347d9175f27e3acbb

diff --git a/src/context.c b/src/context.c
index d1eb05e..73422be 100644
--- a/src/context.c
+++ b/src/context.c
@@ -85,7 +85,7 @@ struct psi_context *psi_context_init(struct psi_context *C, struct psi_context_o
 	assert(ops->call != NULL);
 	assert(ops->compile != NULL);
 
-	/* build up predefs in a temporary PSI_Data for validation */
+	/* build up predefs in a temporary psi_data for validation */
 	memset(&T, 0, sizeof(T));
 	psi_data_ctor_with_dtors(&T, error, flags);
 
@@ -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:
@@ -332,7 +332,18 @@ 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, NULL));
@@ -374,7 +385,7 @@ ZEND_RESULT_CODE psi_context_call(struct psi_context *C, zend_execute_data *exec
 		return FAILURE;
 	}
 
-	psi_call_frame_do_call(frame);
+	C->ops->call(frame);
 
 	if (SUCCESS != psi_call_frame_do_assert(frame, PSI_ASSERT_POST)) {
 		psi_call_frame_do_return(frame, return_value);