#include "marshal.h"
#include "engine.h"
-static int validate_lib(PSI_Data *data, void **dlopened) {
+static int validate_lib(struct psi_data *data, void **dlopened) {
char lib[MAXPATHLEN];
const char *ptr = data->psi.file.ln;
size_t len;
size_t i;
struct psi_std_type *stdtyp;
- if (type->real) {
+ if (type->real.def) {
return 1;
}
if (defs) for (i = 0; i < defs->count; ++i) {
decl_arg *def = defs->list[i];
if (def->type->type != type->type && !strcmp(def->var->name, type->name)) {
- type->real = def->type;
+ type->real.def = def;
return 1;
}
}
static inline int locate_decl_type_struct(decl_structs *structs, decl_type *type) {
size_t i;
- if (type->strct) {
+ if (type->real.strct) {
return 1;
}
if (structs) for (i = 0; i < structs->count; ++i) {
if (!strcmp(structs->list[i]->name, type->name)) {
- type->strct = structs->list[i];
+ type->real.strct = structs->list[i];
return 1;
}
}
static inline int locate_decl_type_union(decl_unions *unions, decl_type *type) {
size_t i;
- if (type->unn) {
+ if (type->real.unn) {
return 1;
}
if (unions) for (i = 0; i < unions->count; ++i) {
if (!strcmp(unions->list[i]->name, type->name)) {
- type->unn = unions->list[i];
+ type->real.unn = unions->list[i];
return 1;
}
}
static inline int locate_decl_type_enum(decl_enums *enums, decl_type *type) {
size_t i;
- if (type->enm) {
+ if (type->real.enm) {
return 1;
}
if (enums) for (i = 0; i < enums->count; ++i) {
if (!strcmp(enums->list[i]->name, type->name)) {
- type->enm = enums->list[i];
+ type->real.enm = enums->list[i];
return 1;
}
}
static inline int locate_decl_type_decl(decls *decls, decl_type *type) {
size_t i;
- if (type->func) {
+ if (type->real.func) {
return 1;
}
if (decls) for (i = 0; i < decls->count; ++i) {
if (!strcmp(decls->list[i]->func->var->name, type->name)) {
- type->func = decls->list[i];
+ type->real.func = decls->list[i];
return 1;
}
}
return 0;
}
-static inline int validate_decl_struct(PSI_Data *data, decl_struct *s);
-static inline int validate_decl_union(PSI_Data *data, decl_union *u);
-static inline int validate_decl_enum(PSI_Data *data, decl_enum *e);
+static inline int validate_decl_nodl(struct psi_data *data, decl *decl);
+static inline int validate_decl_struct(struct psi_data *data, decl_struct *s);
+static inline int validate_decl_union(struct psi_data *data, decl_union *u);
+static inline int validate_decl_enum(struct psi_data *data, decl_enum *e);
-static inline int validate_decl_type(PSI_Data *data, decl_type *type) {
- switch (type->type) {
- case PSI_T_CHAR:
- case PSI_T_SHORT:
- case PSI_T_INT:
- case PSI_T_LONG:
- case PSI_T_NAME:
+static inline int validate_decl_type(struct psi_data *data, decl_type *type, decl_arg *def) {
+ if (weak_decl_type(type)) {
if (!locate_decl_type_alias(data->defs, type)) {
return 0;
}
- if (type->real) {
- return validate_decl_type(data, type->real);
+ if (type->real.def) {
+ return validate_decl_type(data, type->real.def->type, type->real.def);
}
return 1;
+ }
+
+ switch (type->type) {
case PSI_T_STRUCT:
if (!locate_decl_type_struct(data->structs, type)) {
return 0;
if (!locate_decl_type_decl(data->decls, type)) {
return 0;
}
+ if (!validate_decl_nodl(data, type->real.func)) {
+ return 0;
+ }
break;
}
return 1;
}
-static inline int validate_decl_typedef(PSI_Data *data, decl_arg *def) {
- if (!validate_decl_type(data, def->type)) {
+static inline int validate_decl_typedef(struct psi_data *data, decl_arg *def) {
+ if (!validate_decl_type(data, def->type, def)) {
+ const char *pre;
+
+ switch (def->type->type) {
+ case PSI_T_STRUCT: pre = "struct "; break;
+ case PSI_T_UNION: pre = "union "; break;
+ case PSI_T_ENUM: pre = "enum "; break;
+ default: pre = ""; break;
+ }
data->error(data, def->token, PSI_WARNING,
"Type '%s' cannot be aliased to %s'%s'",
- def->type->name, def->type->type == PSI_T_STRUCT?"struct ":"",
- def->var->name);
+ def->var->name, pre, def->type->name);
return 0;
}
- if (def->type->type == PSI_T_VOID && def->var->pointer_level) {
- def->type->type = PSI_T_POINTER;
+ if (def->type->type == PSI_T_VOID) {
+ if (def->var->pointer_level) {
+ def->type->type = PSI_T_POINTER;
+ } else {
+ data->error(data, def->token, PSI_WARNING,
+ "Type '%s' cannot be aliased to 'void'",
+ def->type->name);
+ return 0;
+ }
}
return 1;
}
-static inline int validate_constant(PSI_Data *data, constant *c) {
+static inline int validate_constant(struct psi_data *data, constant *c) {
/* FIXME */
return 1;
}
-static inline int validate_decl_arg(PSI_Data *data, decl_arg *arg) {
- if (!validate_decl_type(data, arg->type)) {
+static inline int validate_decl_arg(struct psi_data *data, decl_arg *arg) {
+ if (!validate_decl_type(data, arg->type, NULL)) {
data->error(data, arg->type->token, PSI_WARNING,
"Cannot use '%s' as type for '%s'",
arg->type->name, arg->var->name);
psi_sort_struct_arg_cmp, psi_sort_struct_arg_swp);
}
-static inline int validate_decl_struct_darg(PSI_Data *data, decl_arg *darg, void *current) {
+static inline int validate_decl_struct_darg(struct psi_data *data, decl_arg *darg, void *current) {
decl_type *real = real_decl_type(darg->type);
/* pre-validate any structs/unions/enums */
switch (real->type) {
case PSI_T_STRUCT:
- if (current && current == real->strct) {
+ if (current && current == real->real.strct) {
return 1;
}
- if (!validate_decl_struct(data, real->strct)) {
+ if (!locate_decl_type_struct(data->structs, real)) {
+ return 0;
+ }
+ if (!validate_decl_struct(data, real->real.strct)) {
return 0;
}
break;
case PSI_T_UNION:
- if (current && current == real->unn) {
+ if (current && current == real->real.unn) {
return 1;
}
- if (!validate_decl_union(data, real->unn)) {
+ if (!locate_decl_type_union(data->unions, real)) {
+ return 0;
+ }
+ if (!validate_decl_union(data, real->real.unn)) {
return 0;
}
break;
case PSI_T_ENUM:
- if (current && current == real->enm) {
+ if (current && current == real->real.enm) {
return 1;
}
- if (!validate_decl_enum(data, real->enm)) {
+ if (!locate_decl_type_enum(data->enums, real)) {
+ return 0;
+ }
+ if (!validate_decl_enum(data, real->real.enm)) {
return 0;
}
break;
} else {
switch (real->type) {
case PSI_T_UNION:
- size = real->unn->size;
+ size = real->real.unn->size;
break;
case PSI_T_STRUCT:
- size = real->strct->size;
+ size = real->real.strct->size;
break;
case PSI_T_ENUM:
default:
switch (real->type) {
case PSI_T_STRUCT:
- align = alignof_decl_struct(real->strct);
+ align = alignof_decl_struct(real->real.strct);
break;
case PSI_T_UNION:
- align = alignof_decl_union(real->unn);
+ align = alignof_decl_union(real->real.unn);
break;
case PSI_T_ENUM:
default:
return align;
}
-static inline int validate_decl_struct(PSI_Data *data, decl_struct *s) {
+static inline int validate_decl_struct(struct psi_data *data, decl_struct *s) {
size_t i, pos, len, size, align;
if (!s->size && !s->args->count) {
data->error(data, s->token, PSI_WARNING,
- "Cannot compute size of empty struct %s",
+ "Cannot compute size of empty struct '%s'",
s->name);
return 0;
}
return 1;
}
-static inline int validate_decl_union(PSI_Data *data, decl_union *u) {
+static inline int validate_decl_union(struct psi_data *data, decl_union *u) {
size_t i, pos, len, size = 0, align;
if (!u->size && !u->args->count) {
"stdcall",
"fastcall",
};
-static inline int validate_decl_abi(PSI_Data *data, decl_abi *abi) {
+static inline int validate_decl_abi(struct psi_data *data, decl_abi *abi) {
size_t i;
for (i = 0; i < sizeof(abi_ccs)/sizeof(char*); ++i) {
}
return 0;
}
-static inline int validate_decl_func(PSI_Data *data, void *dl, decl *decl, decl_arg *func)
+static inline int validate_decl_func(struct psi_data *data, void *dl, decl *decl, decl_arg *func)
{
struct psi_func_redir *redir;
return 0;
}
- if (!validate_decl_arg(data, func)) {
- return 0;
- }
for (redir = &psi_func_redirs[0]; redir->name; ++redir) {
if (!strcmp(func->var->name, redir->name)) {
decl->call.sym = redir->func;
}
return 1;
}
-
-static inline int validate_decl(PSI_Data *data, void *dl, decl *decl) {
+static inline int validate_decl_nodl(struct psi_data *data, decl *decl) {
if (!validate_decl_abi(data, decl->abi)) {
data->error(data, decl->abi->token, PSI_WARNING,
"Invalid calling convention: '%s'", decl->abi->token->text);
return 0;
}
- if (!validate_decl_func(data, dl, decl, decl->func)) {
+ if (!validate_decl_arg(data, decl->func)) {
return 0;
}
if (decl->args) {
}
return 1;
}
+static inline int validate_decl(struct psi_data *data, void *dl, decl *decl) {
+ if (!validate_decl_nodl(data, decl)) {
+ return 0;
+ }
+ if (!validate_decl_func(data, dl, decl, decl->func)) {
+ return 0;
+ }
+ return 1;
+}
static inline decl_arg *locate_decl_var_arg(decl_var *var, decl_args *args, decl_arg *func) {
size_t i;
}
return NULL;
}
-static inline int validate_num_exp(PSI_Data *data, num_exp *exp, decl_args *dargs, decl_arg *func, decl_enum *enm) {
+static inline int validate_num_exp(struct psi_data *data, num_exp *exp, decl_args *dargs, decl_arg *func, decl_enum *enm) {
if (exp->operand) {
switch (exp->operator) {
case PSI_T_PLUS:
}
}
-static inline int validate_decl_enum(PSI_Data *data, decl_enum *e) {
+static inline int validate_decl_enum(struct psi_data *data, decl_enum *e) {
size_t j;
if (!e->items || !e->items->count) {
static inline int validate_set_value_handler(set_value *set) {
switch (set->func->type) {
- case PSI_T_TO_BOOL:
- set->func->handler = psi_to_bool;
- break;
- case PSI_T_TO_INT:
- set->func->handler = psi_to_int;
- break;
- case PSI_T_TO_FLOAT:
- set->func->handler = psi_to_double;
- break;
- case PSI_T_TO_STRING:
- set->func->handler = psi_to_string;
- break;
- case PSI_T_TO_ARRAY:
- set->func->handler = psi_to_array;
- break;
- case PSI_T_TO_OBJECT:
- set->func->handler = psi_to_object;
- break;
- case PSI_T_VOID:
- set->func->handler = psi_to_void;
- break;
+ case PSI_T_TO_BOOL: set->func->handler = psi_to_bool; break;
+ case PSI_T_TO_INT: set->func->handler = psi_to_int; break;
+ case PSI_T_TO_FLOAT: set->func->handler = psi_to_double; break;
+ case PSI_T_TO_STRING: set->func->handler = psi_to_string; break;
+ case PSI_T_TO_ARRAY: set->func->handler = psi_to_array; break;
+ case PSI_T_TO_OBJECT: set->func->handler = psi_to_object; break;
+ case PSI_T_VOID: set->func->handler = psi_to_void; break;
+ case PSI_T_ZVAL: set->func->handler = psi_to_zval; break;
case PSI_T_ELLIPSIS:
if (set->outer.set && set->outer.set->func->type == PSI_T_TO_ARRAY) {
set->func->handler = psi_to_recursive;
}
}
}
-static inline int validate_set_value_ex(PSI_Data *data, set_value *set, decl_arg *ref, decl_args *ref_list) {
+static inline int validate_set_value_ex(struct psi_data *data, set_value *set, decl_arg *ref, decl_args *ref_list) {
size_t i;
decl_type *ref_type;
decl_var *set_var = set->vars->vars[0];
if (!set->outer.set || set->outer.set->inner->vals != set->inner->vals) {
for (i = 0; i < set->inner->count; ++i) {
decl_var *sub_var = set->inner->vals[i]->vars->vars[0];
- decl_arg *sub_ref = locate_struct_member(ref_type->strct, sub_var);
+ decl_arg *sub_ref = locate_struct_member(ref_type->real.strct, sub_var);
if (sub_ref) {
- if (!validate_set_value_ex(data, set->inner->vals[i], sub_ref, ref_type->strct->args)) {
+ if (!validate_set_value_ex(data, set->inner->vals[i], sub_ref, ref_type->real.strct->args)) {
return 0;
}
}
return 1;
}
-static inline int validate_set_value(PSI_Data *data, set_value *set, ...) {
+static inline int validate_set_value(struct psi_data *data, set_value *set, ...) {
va_list argp;
decl_args args = {0};
int check;
return NULL;
}
-static inline int validate_impl_ret_stmt(PSI_Data *data, impl *impl) {
+static inline int validate_impl_ret_stmt(struct psi_data *data, impl *impl) {
return_stmt *ret;
/* we must have exactly one ret stmt delcaring the native func to call */
return NULL;
}
-static inline int validate_let_func(PSI_Data *data, let_func *func, impl *impl) {
+static inline int validate_let_func(struct psi_data *data, let_func *func, impl *impl) {
if (impl->func->args) {
if (!locate_impl_var_arg(func->var, impl->func->args)) {
data->error(data, func->var->token, PSI_WARNING,
case PSI_T_PATHVAL: func->handler = psi_let_pathval; break;
case PSI_T_ARRVAL: func->handler = psi_let_arrval; break;
case PSI_T_OBJVAL: func->handler = psi_let_objval; break;
+ case PSI_T_ZVAL: func->handler = psi_let_zval; break;
EMPTY_SWITCH_DEFAULT_CASE();
}
return 1;
}
-static inline int validate_let_callback(PSI_Data *data, decl_var *cb_var, let_callback *cb, impl *impl) {
+static inline int validate_let_callback(struct psi_data *data, decl_var *cb_var, let_callback *cb, impl *impl) {
size_t i;
decl *cb_func;
decl_type *cb_type = real_decl_type(cb_var->arg->type);
data->error(data, cb_var->token, PSI_WARNING, "Not a function: %s", cb_var->name);
return 0;
}
- cb_func = cb_type->func;
+ cb_func = cb_type->real.func;
for (i = 0; i < cb->args->count; ++i) {
if (!validate_set_value(data, cb->args->vals[i], cb_func->args->count, cb_func->args->args, 0)) {
return 0;
}
}
- if (!validate_decl(data, NULL, cb_func)) {
+ if (!validate_decl_nodl(data, cb_func)) {
return 0;
}
return 1;
}
-static inline int validate_impl_let_stmts(PSI_Data *data, impl *impl) {
+static inline int validate_impl_let_stmts(struct psi_data *data, impl *impl) {
size_t i, j;
/* we can have multiple let stmts */
let_stmt *let = impl->stmts->let.list[j];
if (!strcmp(let->var->name, darg->var->name)) {
- darg->let = let;
check = 1;
break;
}
return 1;
}
-static inline int validate_impl_set_stmts(PSI_Data *data, impl *impl) {
+static inline int validate_impl_set_stmts(struct psi_data *data, 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 */
return NULL;
}
-static inline int validate_impl_free_stmts(PSI_Data *data, impl *impl) {
+static inline int validate_impl_free_stmts(struct psi_data *data, impl *impl) {
size_t i, j, k, l;
/* we can have any count of free stmts; freeing any out vars */
for (i = 0; i < impl->stmts->fre.count; ++i) {
}
return 1;
}
-static inline int validate_impl_stmts(PSI_Data *data, impl *impl) {
+static inline int validate_impl_stmts(struct psi_data *data, impl *impl) {
if (!impl->stmts) {
data->error(data, impl->func->token, PSI_WARNING,
"Missing body for implementation %s!",
return 1;
}
-static inline int validate_impl_args(PSI_Data *data, impl *impl) {
+static inline int validate_impl_args(struct psi_data *data, impl *impl) {
int def = 0;
size_t i;
return 1;
}
-static inline int validate_impl(PSI_Data *data, impl *impl) {
+static inline int validate_impl(struct psi_data *data, impl *impl) {
if (!validate_impl_args(data, impl)) {
return 0;
}
}
-int PSI_ContextValidate(PSI_Context *C, PSI_Parser *P)
+int psi_context_validate(struct psi_context *C, struct psi_parser *P)
{
- PSI_Data *D;
+ struct psi_data *D;
void *dlopened = NULL;
size_t i, count = C->count++, check_round, check_count;
decl_typedefs *check_defs = P->defs;
unsigned silent = C->flags & PSI_PARSER_SILENT;
C->data = realloc(C->data, C->count * sizeof(*C->data));
- D = PSI_DataExchange(&C->data[count], PSI_DATA(P));
+ D = psi_data_exchange(&C->data[count], PSI_DATA(P));
#define REVALIDATE(what) do { \
if (check_round && check_ ##what) { \
return 1;
}
-int PSI_ContextValidateData(PSI_Data *dest, PSI_Data *source)
+int psi_context_validate_data(struct psi_data *dest, struct psi_data *source)
{
size_t i;
int errors = 0;
projects / m6w6 / ext-psi / blobdiff