typedef int token_t;
+/* in php_psi.h */
+size_t psi_t_alignment(token_t);
+size_t psi_t_size(token_t);
+
typedef struct PSI_Token {
token_t type;
unsigned line;
char *name;
token_t type;
struct decl_type *real;
+ struct decl_struct *strct;
} decl_type;
-static inline decl_type *init_decl_type(token_t type, char *name) {
- decl_type *t = malloc(sizeof(*t));
+static inline decl_type *init_decl_type(token_t type, const char *name) {
+ decl_type *t = calloc(1, sizeof(*t));
t->type = type;
t->name = strdup(name);
- t->real = NULL;
return t;
}
decl_type *type;
} decl_typedef;
-static inline decl_typedef *init_decl_typedef(char *name, decl_type *type) {
- decl_typedef *t = malloc(sizeof(*t));
+static inline decl_typedef *init_decl_typedef(const char *name, decl_type *type) {
+ decl_typedef *t = calloc(1, sizeof(*t));
t->alias = strdup(name);
t->type = type;
return t;
struct decl_arg *arg;
} decl_var;
-static inline decl_var *init_decl_var(char *name, unsigned pl, unsigned as) {
- decl_var *v = malloc(sizeof(*v));
+static inline decl_var *init_decl_var(const char *name, unsigned pl, unsigned as) {
+ decl_var *v = calloc(1, sizeof(*v));
v->name = (char *) strdup((const char *) name);
v->pointer_level = pl;
v->array_size = as;
free(var);
}
+typedef struct decl_struct_layout {
+ size_t pos;
+ size_t len;
+} decl_struct_layout;
+
+static inline decl_struct_layout *init_decl_struct_layout(size_t pos, size_t len) {
+ decl_struct_layout *l = calloc(1, sizeof(*l));
+
+ l->pos = pos;
+ l->len = len;
+ return l;
+}
+
+static inline void free_decl_struct_layout(decl_struct_layout *l) {
+ free(l);
+}
+
typedef struct decl_arg {
decl_type *type;
decl_var *var;
+ decl_struct_layout *layout;
struct let_stmt *let;
} decl_arg;
static inline decl_arg *init_decl_arg(decl_type *type, decl_var *var) {
- decl_arg *arg = malloc(sizeof(*arg));
+ decl_arg *arg = calloc(1, sizeof(*arg));
arg->type = type;
arg->var = var;
- arg->let = NULL;
return arg;
}
static inline void free_decl_arg(decl_arg *arg) {
free_decl_type(arg->type);
free_decl_var(arg->var);
+ if (arg->layout) {
+ free_decl_struct_layout(arg->layout);
+ }
free(arg);
}
} decl_vars;
static inline decl_vars *init_decl_vars(decl_var *var) {
- decl_vars *vars = malloc(sizeof(*vars));
- vars->count = 1;
- vars->vars = malloc(sizeof(*vars->vars));
- vars->vars[0] = var;
+ decl_vars *vars = calloc(1, sizeof(*vars));
+ if (var) {
+ vars->count = 1;
+ vars->vars = calloc(1, sizeof(*vars->vars));
+ vars->vars[0] = var;
+ }
return vars;
}
} decl_args;
static inline decl_args *init_decl_args(decl_arg *arg) {
- decl_args *args = malloc(sizeof(*args));
- args->count = 1;
- args->args = malloc(sizeof(*args->args));
- args->args[0] = arg;
+ decl_args *args = calloc(1, sizeof(*args));
+ if (arg) {
+ args->count = 1;
+ args->args = calloc(1, sizeof(*args->args));
+ args->args[0] = arg;
+ }
return args;
}
char *convention;
} decl_abi;
-static inline decl_abi *init_decl_abi(char *convention) {
- decl_abi *abi = malloc(sizeof(*abi));
+static inline decl_abi *init_decl_abi(const char *convention) {
+ decl_abi *abi = calloc(1, sizeof(*abi));
abi->convention = strdup(convention);
return abi;
}
} decl;
static inline decl* init_decl(decl_abi *abi, decl_arg *func, decl_args *args) {
- decl *d = malloc(sizeof(*d));
+ decl *d = calloc(1, sizeof(*d));
d->abi = abi;
d->func = func;
d->args = args;
static inline void free_decl(decl *d) {
free_decl_abi(d->abi);
free_decl_arg(d->func);
- free_decl_args(d->args);
+ if (d->args) {
+ free_decl_args(d->args);
+ }
free(d);
}
free(decls);
}
+typedef struct decl_struct {
+ char *name;
+ decl_args *args;
+ size_t size;
+} decl_struct;
+
+static inline decl_struct *init_decl_struct(const char *name, decl_args *args) {
+ decl_struct *s = calloc(1, sizeof(*s));
+ s->name = strdup(name);
+ s->args = args;
+ return s;
+}
+
+static inline void free_decl_struct(decl_struct *s) {
+ if (s->args) {
+ free_decl_args(s->args);
+ }
+ free(s->name);
+ free(s);
+}
+
+typedef struct decl_structs {
+ size_t count;
+ decl_struct **list;
+} decl_structs;
+
+static inline decl_structs *add_decl_struct(decl_structs *ss, decl_struct *s) {
+ if (!ss) {
+ ss = calloc(1, sizeof(*ss));
+ }
+ ss->list = realloc(ss->list, ++ss->count * sizeof(*ss->list));
+ ss->list[ss->count-1] = s;
+ return ss;
+}
+
+static inline void free_decl_structs(decl_structs *ss) {
+ size_t i;
+
+ for (i = 0; i < ss->count; ++i) {
+ free_decl_struct(ss->list[i]);
+ }
+ free(ss->list);
+ free(ss);
+}
+
typedef union impl_val {
- unsigned char bval;
char cval;
+ int8_t i8;
short sval;
+ int16_t i16;
int ival;
+ int32_t i32;
+ long lval;
+ int64_t i64;
+ float fval;
double dval;
- zend_long lval;
- zend_string *str;
+ union {
+ zend_bool bval;
+ zend_long lval;
+ zend_string *str;
+ } zend;
void *ptr;
+ uint8_t _dbg[sizeof(void *)];
} impl_val;
-static inline impl_val *deref_impl_val(unsigned level, impl_val *ret_val, decl_arg *darg) {
+static inline impl_val *deref_impl_val(impl_val *ret_val, decl_var *var) {
unsigned i;
- for (i = level; i < darg->var->pointer_level && ret_val->ptr; ++i) {
- ret_val = *(void **)ret_val;
+ if (var->arg->var != var) for (i = 0; i < var->pointer_level; ++i) {
+ ret_val = *(void **) ret_val;
}
return ret_val;
}
token_t type;
} impl_type;
-static inline impl_type *init_impl_type(token_t type, char *name) {
- impl_type *t = malloc(sizeof(*t));
+static inline impl_type *init_impl_type(token_t type, const char *name) {
+ impl_type *t = calloc(1, sizeof(*t));
t->type = type;
- t->name = (char *) strdup((const char *) name);
+ t->name = strdup(name);
return t;
}
unsigned reference:1;
} impl_var;
-static inline impl_var *init_impl_var(char *name, int is_reference) {
- impl_var *var = malloc(sizeof(*var));
- var->name = (char *) strdup((const char *) name);
+static inline impl_var *init_impl_var(const char *name, int is_reference) {
+ impl_var *var = calloc(1, sizeof(*var));
+ var->name = strdup(name);
var->reference = is_reference;
return var;
}
char *text;
} impl_def_val;
-static inline impl_def_val *init_impl_def_val(PSI_Token *T) {
- impl_def_val *def = malloc(sizeof(*def));
- def->type = T->type;
- def->text = strdup(T->text);
+static inline impl_def_val *init_impl_def_val(token_t t, const char *text) {
+ impl_def_val *def = calloc(1, sizeof(*def));
+ def->type = t;
+ def->text = strdup(text);
return def;
}
} impl_arg;
static inline impl_arg *init_impl_arg(impl_type *type, impl_var *var, impl_def_val *def) {
- impl_arg *arg = malloc(sizeof(*arg));
+ impl_arg *arg = calloc(1, sizeof(*arg));
arg->type = type;
arg->var = var;
arg->def = def;
} impl_args;
static inline impl_args *init_impl_args(impl_arg *arg) {
- impl_args *args = malloc(sizeof(*args));
- args->args = malloc(sizeof(*args->args));
+ impl_args *args = calloc(1, sizeof(*args));
if (arg) {
args->count = 1;
+ args->args = calloc(1, sizeof(*args->args));
args->args[0] = arg;
- } else {
- args->count = 0;
- args->args = NULL;
}
return args;
}
} impl_func;
static inline impl_func *init_impl_func(char *name, impl_args *args, impl_type *type, int ret_reference) {
- impl_func *func = malloc(sizeof(*func));
+ impl_func *func = calloc(1, sizeof(*func));
func->name = strdup(name);
func->args = args ? args : init_impl_args(NULL);
func->return_type = type;
free(f);
}
+typedef struct let_calloc {
+ size_t n;
+ decl_type *type;
+} let_calloc;
+
+static inline let_calloc *init_let_calloc(long n, decl_type *type) {
+ let_calloc *alloc = calloc(1, sizeof(*alloc));
+ alloc->n = n;
+ alloc->type = type;
+ return alloc;
+}
+
+static inline void free_let_calloc(let_calloc *alloc) {
+ free_decl_type(alloc->type);
+ free(alloc);
+}
+
typedef struct let_func {
token_t type;
char *name;
+ let_calloc *alloc;
} let_func;
-static inline let_func *init_let_func(token_t type, char *name) {
- let_func *func = malloc(sizeof(*func));
+static inline let_func *init_let_func(token_t type, const char *name, let_calloc *alloc) {
+ let_func *func = calloc(1, sizeof(*func));
func->type = type;
- func->name = (char *) strdup((const char *) name);
+ func->name = strdup(name);
+ func->alloc = alloc;
return func;
}
static inline void free_let_func(let_func *func) {
+ if (func->alloc) {
+ free_let_calloc(func->alloc);
+ }
free(func->name);
free(func);
}
} let_value;
static inline let_value *init_let_value(let_func *func, impl_var *var, int is_reference) {
- let_value *val = malloc(sizeof(*val));
+ let_value *val = calloc(1, sizeof(*val));
val->is_reference = is_reference;
val->func = func;
val->var = var;
char *name;
} set_func;
-static inline set_func *init_set_func(token_t type, char *name) {
- set_func *func = malloc(sizeof(*func));
+static inline set_func *init_set_func(token_t type, const char *name) {
+ set_func *func = calloc(1, sizeof(*func));
func->type = type;
- func->name = (char *) strdup((const char *) name);
+ func->name = strdup(name);
return func;
}
typedef struct set_value {
set_func *func;
decl_vars *vars;
+ struct set_value **inner;
+ size_t count;
} set_value;
static inline set_value *init_set_value(set_func *func, decl_vars *vars) {
- set_value *val = malloc(sizeof(*val));
+ set_value *val = calloc(1, sizeof(*val));
val->func = func;
val->vars = vars;
return val;
}
+static inline set_value *add_inner_set_value(set_value *val, set_value *inner) {
+ val->inner = realloc(val->inner, ++val->count * sizeof(*val->inner));
+ val->inner[val->count-1] = inner;
+ return val;
+}
static inline void free_set_value(set_value *val) {
free_set_func(val->func);
free_decl_vars(val->vars);
+ if (val->inner) {
+ size_t i;
+ for (i = 0; i < val->count; ++i) {
+ free_set_value(val->inner[i]);
+ }
+ }
free(val);
}
} set_stmt;
static inline set_stmt *init_set_stmt(impl_var *var, set_value *val) {
- set_stmt *set = malloc(sizeof(*set));
+ set_stmt *set = calloc(1, sizeof(*set));
set->var = var;
set->val = val;
return set;
}
typedef struct return_stmt {
- set_func *func;
+ set_value *set;
decl_var *decl;
} return_stmt;
-static inline return_stmt *init_return_stmt(set_func *func, decl_var *decl) {
- return_stmt *ret = malloc(sizeof(*ret));
- ret->func = func;
- ret->decl = decl;
+static inline return_stmt *init_return_stmt(set_value *val) {
+ return_stmt *ret = calloc(1, sizeof(*ret));
+ ret->set = val;
+ ret->decl = val->vars->vars[0];
return ret;
}
static inline void free_return_stmt(return_stmt *ret) {
- free_set_func(ret->func);
- free_decl_var(ret->decl);
+ //free_set_func(ret->func);
+ //free_decl_var(ret->decl);
+ free_set_value(ret->set);
free(ret);
}
} free_stmt;
static inline free_stmt *init_free_stmt(decl_vars *vars) {
- free_stmt *free_ = malloc(sizeof(*free_));
+ free_stmt *free_ = calloc(1, sizeof(*free_));
free_->vars = vars;
return free_;
}
} impl_stmt;
static inline impl_stmt *init_impl_stmt(token_t type, void *ptr) {
- impl_stmt *stmt = malloc(sizeof(*stmt));
+ impl_stmt *stmt = calloc(1, sizeof(*stmt));
stmt->type = type;
stmt->s.ptr = ptr;
return stmt;
} impl;
static inline impl *init_impl(impl_func *func, impl_stmts *stmts) {
- impl *i = malloc(sizeof(*i));
+ impl *i = calloc(1, sizeof(*i));
i->func = func;
i->stmts = stmts;
return i;
} const_type;
static inline const_type *init_const_type(token_t type, const char *name) {
- const_type *ct = malloc(sizeof(*ct));
+ const_type *ct = calloc(1, sizeof(*ct));
ct->type = type;
ct->name = strdup(name);
return ct;
impl_def_val *val;
} constant;
-static inline constant *init_constant(const_type *type, char *name, impl_def_val *val) {
- constant *c = malloc(sizeof(*c));
+static inline constant *init_constant(const_type *type, const char *name, impl_def_val *val) {
+ constant *c = calloc(1, sizeof(*c));
c->type = type;
c->name = strdup(name);
c->val = val;
#define PSI_WARNING 32
typedef void (*psi_error_cb)(int type, const char *msg, ...);
+typedef struct decl_file {
+ char *ln;
+ char *fn;
+} decl_file;
+
+static inline void free_decl_file(decl_file *file) {
+ if (file->ln) {
+ free(file->ln);
+ }
+ if (file->fn) {
+ free(file->fn);
+ }
+ memset(file, 0, sizeof(*file));
+}
+
+typedef struct decl_libs {
+ void **dl;
+ size_t count;
+} decl_libs;
+
+static inline void free_decl_libs(decl_libs *libs) {
+ if (libs->dl) {
+ size_t i;
+ for (i = 0; i < libs->count; ++i) {
+ if (libs->dl[i]) {
+ dlclose(libs->dl[i]);
+ }
+ }
+ free(libs->dl);
+ }
+ memset(libs, 0, sizeof(*libs));
+}
+
+static inline void add_decl_lib(decl_libs *libs, void *dlopened) {
+ libs->dl = realloc(libs->dl, ++libs->count * sizeof(*libs->dl));
+ libs->dl[libs->count-1] = dlopened;
+}
+
+#define PSI_DATA(D) ((PSI_Data *) (D))
#define PSI_DATA_MEMBERS \
constants *consts; \
decl_typedefs *defs; \
+ decl_structs *structs; \
decls *decls; \
impls *impls; \
- char *lib; \
- char *fn; \
+ union { \
+ decl_file file; \
+ decl_libs libs; \
+ } psi; \
psi_error_cb error
typedef struct PSI_Data {
PSI_DATA_MEMBERS;
} PSI_Data;
-static inline void PSI_DataExchange(PSI_Data *dest, PSI_Data *src) {
+static inline PSI_Data *PSI_DataExchange(PSI_Data *dest, PSI_Data *src) {
+ if (!dest) {
+ dest = malloc(sizeof(*dest));
+ }
memcpy(dest, src, sizeof(*dest));
memset(src, 0, sizeof(*src));
+ return dest;
}
static inline void PSI_DataDtor(PSI_Data *data) {
if (data->defs) {
free_decl_typedefs(data->defs);
}
+ if (data->structs) {
+ free_decl_structs(data->structs);
+ }
if (data->decls) {
free_decls(data->decls);
}
if (data->impls) {
free_impls(data->impls);
}
- if (data->lib) {
- free(data->lib);
- }
- if (data->fn) {
- free(data->fn);
- }
+ free_decl_file(&data->psi.file);
}
typedef struct PSI_Parser {
token_len = P->cur - P->tok;
- T = malloc(sizeof(*T) + token_len);
+ T = calloc(1, sizeof(*T) + token_len);
T->type = P->num;
T->line = P->line;
T->size = token_len;
projects / m6w6 / ext-psi / blobdiff