X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fvalidator.c;h=128b2acb07e513639f29d0e62fac05a4a3c7973a;hp=19956b73f475079183c1697632062b39933abf47;hb=7474b3e23338ea03bcd65551959e2582cc455f9f;hpb=4aa8ade5313ba77e903223d44fa81898350b677f

diff --git a/src/validator.c b/src/validator.c
index 19956b7..128b2ac 100644
--- a/src/validator.c
+++ b/src/validator.c
@@ -6,6 +6,8 @@
 
 #include <jit/jit.h>
 
+#include "php.h"
+#include "php_psi.h"
 #include "validator.h"
 
 PSI_Validator *PSI_ValidatorInit(PSI_Validator *V, PSI_Parser *P)
@@ -90,21 +92,15 @@ static inline int locate_decl_type_struct(decl_structs *structs, decl_type *type
 	}
 	return 0;
 }
-static inline int validate_decl_type(PSI_Validator *V, decl_arg *arg, decl_type *type) {
+static inline int validate_decl_type(PSI_Validator *V, decl_type *type) {
 	switch (type->type) {
 	case PSI_T_NAME:
 		if (!V->defs || !locate_decl_type_alias(V->defs, type)) {
-			V->error(PSI_WARNING, "Cannot use '%s' as type for '%s';"
-				" Use 'typedef <type> <alias>;' statement",
-				type->name, arg->var->name);
 			return 0;
 		}
-		return validate_decl_type(V, arg, type->real);
+		return validate_decl_type(V, type->real);
 	case PSI_T_STRUCT:
 		if (!V->structs || !locate_decl_type_struct(V->structs, type)) {
-			V->error(PSI_WARNING, "Cannot use '%s' as type for '%s';"
-				" Use 'typedef struct <name> <alias>;' statement",
-				type->name, arg->var->name);
 			return 0;
 		}
 		break;
@@ -131,24 +127,6 @@ static inline int validate_typedefs(PSI_Validator *V) {
 
 	return 1;
 }
-static inline int validate_decl_func(PSI_Validator *V, decl *decl, decl_arg *func)
-{
-	if (!strcmp(func->var->name, "dlsym")) {
-		V->error(PSI_WARNING, "Cannot dlsym dlsym (sic!)");
-		return 0;
-	}
-
-	if (!validate_decl_type(V, func, func->type)) {
-		return 0;
-	}
-
-	decl->dlptr = dlsym(V->dlopened ?: RTLD_NEXT, func->var->name);
-	if (!decl->dlptr) {
-		V->error(PSI_WARNING, "Failed to located symbol '%s': %s",
-			func->var->name, dlerror());
-	}
-	return 1;
-}
 static const char * const abi_ccs[] = {
 		"default", /* \                 */
 		"extern",  /*  > - all the same */
@@ -159,7 +137,7 @@ static const char * const abi_ccs[] = {
 static inline int validate_decl_abi(PSI_Validator *V, decl_abi *abi) {
 	size_t i;
 
-	for (i = 0; i < sizeof(abi_ccs)/sizeof(char*); ++ i) {
+	for (i = 0; i < sizeof(abi_ccs)/sizeof(char*); ++i) {
 		if (strcasecmp(abi->convention, abi_ccs[i])) {
 			return 1;
 		}
@@ -168,7 +146,9 @@ static inline int validate_decl_abi(PSI_Validator *V, decl_abi *abi) {
 	return 0;
 }
 static inline int validate_decl_arg(PSI_Validator *V, decl_arg *arg) {
-	if (!validate_decl_type(V, arg, arg->type)) {
+	if (!validate_decl_type(V, arg->type)) {
+		V->error(PSI_WARNING, "Cannot use '%s' as type for '%s'",
+			arg->type->name, arg->var->name);
 		return 0;
 	}
 	return 1;
@@ -183,6 +163,26 @@ static inline int validate_decl_args(PSI_Validator *V, decl_args *args) {
 	}
 	return 1;
 }
+static inline int validate_decl_func(PSI_Validator *V, decl *decl, decl_arg *func)
+{
+	if (!strcmp(func->var->name, "dlsym")) {
+		V->error(PSI_WARNING, "Cannot dlsym dlsym (sic!)");
+		return 0;
+	}
+
+	if (!validate_decl_arg(V, func)) {
+		return 0;
+	}
+#ifndef RTLD_NEXT
+# define RTLD_NEXT ((void *) -1l)
+#endif
+	decl->dlptr = dlsym(V->dlopened ?: RTLD_NEXT, func->var->name);
+	if (!decl->dlptr) {
+		V->error(PSI_WARNING, "Failed to located symbol '%s': %s",
+			func->var->name, dlerror());
+	}
+	return 1;
+}
 static inline int validate_decl(PSI_Validator *V, decl *decl) {
 	if (!validate_decl_abi(V, decl->abi)) {
 		return 0;
@@ -214,15 +214,24 @@ static inline int validate_struct(PSI_Validator *V, decl_struct *s) {
 
 	s->layout = calloc(s->args->count, sizeof(*s->layout));
 	for (i = 0; i < s->args->count; ++i) {
-		decl_type *t = real_decl_type(s->args->args[i]->type);
+		decl_arg *darg = s->args->args[i];
+		token_t t;
+
+		if (!validate_decl_arg(V, darg)) {
+			return 0;
+		}
+
+		t = darg->var->pointer_level
+				? PSI_T_POINTER
+				: real_decl_type(darg->type)->type;
 
 		if (i) {
 			decl_struct_layout *l = &s->layout[i-1];
-			s->layout[i].pos = psi_t_align(t->type, l->pos + l->size);
+			s->layout[i].pos = psi_t_align(t, l->pos + l->len);
 		} else {
 			s->layout[i].pos = 0;
 		}
-		s->layout[i].len = psi_t_size(t->type);
+		s->layout[i].len = psi_t_size(t);
 	}
 	return 1;
 }
@@ -230,7 +239,7 @@ static inline int validate_structs(PSI_Validator *V) {
 	size_t i;
 
 	for (i = 0; i < V->structs->count; ++i) {
-		if (!validate_struct(V->structs->list[i])) {
+		if (!validate_struct(V, V->structs->list[i])) {
 			return 0;
 		}
 	}
@@ -264,60 +273,50 @@ static inline int validate_impl_func(PSI_Validator *V, impl *impl, impl_func *fu
 	}
 	return 1;
 }
+
 static inline decl *locate_impl_decl(decls *decls, return_stmt *ret) {
 	size_t i;
 
 	for (i = 0; i < decls->count; ++i) {
 		if (!strcmp(decls->list[i]->func->var->name, ret->decl->name)) {
+			ret->decl->arg = decls->list[i]->func;
 			return decls->list[i];
 		}
 	}
 	return NULL;
 }
-
-static inline int validate_impl_stmts(PSI_Validator *V, impl *impl, impl_stmts *stmts) {
-	/* okay,
-	 * - we must have exactly one ret stmt delcaring the native func to call and which type cast to apply
-	 * - we can have multiple let stmts; every arg of the ret stmts var (the function to call) must have one
-	 * - we can have any count of set stmts; processing out vars
-	 * - we can have any count of free stmts; freeing any out vars
-	 */
-	size_t i, j, k;
-	return_stmt *ret;
-	decl *decl;
-
-	 if (!stmts) {
- 		V->error(PSI_WARNING, "Missing body for implementation %s!",
- 				impl->func->name);
- 		return 0;
- 	}
-	if (stmts->ret.count != 1) {
-		if (stmts->ret.count > 1) {
-			V->error(PSI_WARNING, "Too many `ret` statements for implmentation %s;"
-					"found %zu, exactly one is needed",
-					impl->func->name, stmts->ret.count);
+static inline int validate_impl_ret_stmt(PSI_Validator *V, impl *impl) {
+	/* we must have exactly one ret stmt delcaring the native func to call */
+	/* and which type cast to apply */
+	if (impl->stmts->ret.count != 1) {
+		if (impl->stmts->ret.count > 1) {
+			V->error(PSI_WARNING, "Too many `return` statements for implmentation %s;"
+					" found %zu, exactly one is needed",
+					impl->func->name, impl->stmts->ret.count);
 		} else {
-			V->error(PSI_WARNING, "Missing `ret` statement for implementation %s",
+			V->error(PSI_WARNING, "Missing `return` statement for implementation %s",
 					impl->func->name);
 		}
 		return 0;
 	}
-
-	ret = stmts->ret.list[0];
-	decl = locate_impl_decl(V->decls, ret);
-	if (!decl) {
+	if (!(impl->decl = locate_impl_decl(V->decls, impl->stmts->ret.list[0]))) {
 		V->error(PSI_WARNING, "Missing declaration for implementation %s",
 				impl->func->name);
 		return 0;
 	}
 
+	return 1;
+}
+static inline int validate_impl_let_stmts(PSI_Validator *V, impl *impl) {
+	size_t i, j;
+	/* we can have multiple let stmts */
 	/* check that we have a let stmt for every decl arg */
-	for (i = 0; i < decl->args->count; ++i) {
-		decl_arg *darg = decl->args->args[i];
+	if (impl->decl->args) for (i = 0; i < impl->decl->args->count; ++i) {
+		decl_arg *darg = impl->decl->args->args[i];
 		int check = 0;
 
-		for (j = 0; j < stmts->let.count; ++j) {
-			let_stmt *let = stmts->let.list[j];
+		for (j = 0; j < impl->stmts->let.count; ++j) {
+			let_stmt *let = impl->stmts->let.list[j];
 
 			if (!strcmp(let->var->name, darg->var->name)) {
 				darg->let = let;
@@ -327,19 +326,26 @@ static inline int validate_impl_stmts(PSI_Validator *V, impl *impl, impl_stmts *
 		}
 		if (!check) {
 			V->error(PSI_WARNING, "Missing `let` statement for arg '%s %.*s%s'"
-					"of declaration '%s' for implementation '%s'",
+					" of declaration '%s' for implementation '%s'",
 					darg->type->name, (int) darg->var->pointer_level, "*****",
-					darg->var->name, decl->func->var->name, impl->func->name);
+					darg->var->name, impl->decl->func->var->name, impl->func->name);
 			return 0;
 		}
 	}
 	/* check that the let_value references a known variable or NULL */
-	for (i = 0; i < stmts->let.count; ++i) {
-		let_stmt *let = stmts->let.list[i];
+	for (i = 0; i < impl->stmts->let.count; ++i) {
+		let_stmt *let = impl->stmts->let.list[i];
 		int check = 0;
 
+		if (let->val && let->val->func && let->val->func->alloc) {
+			if (!validate_decl_type(V, let->val->func->alloc->type)) {
+				V->error(PSI_WARNING, "Cannot use '%s' as type for calloc in `let` statement",
+					let->val->func->alloc->type->name);
+				return 0;
+			}
+		}
 		if (let->val && let->val->var) {
-			for (j = 0; j < impl->func->args->count; ++j) {
+			if (impl->func->args) for (j = 0; j < impl->func->args->count; ++j) {
 				impl_arg *iarg = impl->func->args->args[j];
 
 				if (!strcmp(let->val->var->name, iarg->var->name)) {
@@ -356,12 +362,17 @@ static inline int validate_impl_stmts(PSI_Validator *V, impl *impl, impl_stmts *
 			}
 		}
 	}
+	return 1;
+}
+static inline int validate_impl_set_stmts(PSI_Validator *V, impl *impl) {
+	size_t i, j, k;
+	/* we can have any count of set stmts; processing out vars */
 	/* check that set stmts reference known variables */
-	for (i = 0; i < stmts->set.count; ++i) {
-		set_stmt *set = stmts->set.list[i];
+	for (i = 0; i < impl->stmts->set.count; ++i) {
+		set_stmt *set = impl->stmts->set.list[i];
 		int check = 0;
 
-		for (j = 0; j < impl->func->args->count; ++j) {
+		if (impl->func->args) for (j = 0; j < impl->func->args->count; ++j) {
 			impl_arg *iarg = impl->func->args->args[j];
 
 			if (!strcmp(set->var->name, iarg->var->name)) {
@@ -381,8 +392,8 @@ static inline int validate_impl_stmts(PSI_Validator *V, impl *impl, impl_stmts *
 			decl_var *set_var = set->val->vars->vars[j];
 
 			check = 0;
-			for (k = 0; k < decl->args->count; ++k) {
-				decl_arg *set_arg = decl->args->args[k];
+			if (impl->decl->args) for (k = 0; k < impl->decl->args->count; ++k) {
+				decl_arg *set_arg = impl->decl->args->args[k];
 
 				if (!strcmp(set_var->name, set_arg->var->name)) {
 					check = 1;
@@ -399,19 +410,23 @@ static inline int validate_impl_stmts(PSI_Validator *V, impl *impl, impl_stmts *
 			}
 		}
 	}
-	/* check free stmts */
-	for (i = 0; i < stmts->fre.count; ++i) {
-		free_stmt *fre = stmts->fre.list[i];
+	return 1;
+}
+static inline int validate_impl_free_stmts(PSI_Validator *V, impl *impl) {
+	size_t i, j, k;
+	/* we can have any count of free stmts; freeing any out vars */
+	for (i = 0; i < impl->stmts->fre.count; ++i) {
+		free_stmt *fre = impl->stmts->fre.list[i];
 
 		for (j = 0; j < fre->vars->count; ++j) {
 			decl_var *free_var = fre->vars->vars[j];
 			int check = 0;
 
-			if (!strcmp(free_var->name, decl->func->var->name)) {
+			if (!strcmp(free_var->name, impl->decl->func->var->name)) {
 				continue;
 			}
-			for (k = 0; k < decl->args->count; ++k) {
-				decl_arg *free_arg = decl->args->args[k];
+			if (impl->decl->args) for (k = 0; k < impl->decl->args->count; ++k) {
+				decl_arg *free_arg = impl->decl->args->args[k];
 
 				if (!strcmp(free_var->name, free_arg->var->name)) {
 					check = 1;
@@ -428,8 +443,28 @@ static inline int validate_impl_stmts(PSI_Validator *V, impl *impl, impl_stmts *
 			}
 		}
 	}
+	return 1;
+}
+static inline int validate_impl_stmts(PSI_Validator *V, impl *impl) {
+	if (!impl->stmts) {
+ 		V->error(PSI_WARNING, "Missing body for implementation %s!",
+ 				impl->func->name);
+ 		return 0;
+ 	}
+
+	if (!validate_impl_ret_stmt(V, impl)) {
+		return 0;
+	}
 
-	impl->decl = decl;
+	if (!validate_impl_let_stmts(V, impl)) {
+		return 0;
+	}
+	if (!validate_impl_set_stmts(V, impl)) {
+		return 0;
+	}
+	if (!validate_impl_free_stmts(V, impl)) {
+		return 0;
+	}
 
 	return 1;
 }
@@ -438,7 +473,7 @@ static inline int validate_impl(PSI_Validator *V, impl *impl) {
 	if (!validate_impl_func(V, impl, impl->func)) {
 		return 0;
 	}
-	if (!validate_impl_stmts(V, impl, impl->stmts)) {
+	if (!validate_impl_stmts(V, impl)) {
 		return 0;
 	}
 	return 1;