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));
+ decl_type *t = calloc(1, sizeof(*t));
t->type = type;
t->name = strdup(name);
- t->real = NULL;
return t;
}
} decl_typedef;
static inline decl_typedef *init_decl_typedef(char *name, decl_type *type) {
- decl_typedef *t = malloc(sizeof(*t));
+ decl_typedef *t = calloc(1, sizeof(*t));
t->alias = strdup(name);
t->type = type;
return t;
} decl_var;
static inline decl_var *init_decl_var(char *name, unsigned pl, unsigned as) {
- decl_var *v = malloc(sizeof(*v));
+ decl_var *v = calloc(1, sizeof(*v));
v->name = (char *) strdup((const char *) name);
v->pointer_level = pl;
v->array_size = as;
} 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;
} decl_vars;
static inline decl_vars *init_decl_vars(decl_var *var) {
- decl_vars *vars = malloc(sizeof(*vars));
+ decl_vars *vars = calloc(1, sizeof(*vars));
vars->count = 1;
- vars->vars = malloc(sizeof(*vars->vars));
+ 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));
+ decl_args *args = calloc(1, sizeof(*args));
args->count = 1;
- args->args = malloc(sizeof(*args->args));
+ args->args = calloc(1, sizeof(*args->args));
args->args[0] = arg;
return args;
}
} decl_abi;
static inline decl_abi *init_decl_abi(char *convention) {
- decl_abi *abi = malloc(sizeof(*abi));
+ 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_layout {
+ size_t pos;
+ size_t len;
+} decl_struct_layout;
+
+typedef struct decl_struct {
+ char *name;
+ decl_args *args;
+ decl_struct_layout *layout;
+} decl_struct;
+
+static inline decl_struct *init_decl_struct(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);
+ }
+ if (s->layout) {
+ free(s->layout);
+ }
+ free(s->name);
+ free(s);
+}
+
+static inline size_t decl_struct_size(decl_struct *s) {
+ size_t c = s->args->count - 1;
+ decl_type *type = real_decl_type(s->args->args[c]->type);
+ return s->layout[c].pos + psi_t_alignment(type->type);
+}
+
+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;
}
} impl_type;
static inline impl_type *init_impl_type(token_t type, char *name) {
- impl_type *t = malloc(sizeof(*t));
+ impl_type *t = calloc(1, sizeof(*t));
t->type = type;
t->name = (char *) strdup((const char *) name);
} impl_var;
static inline impl_var *init_impl_var(char *name, int is_reference) {
- impl_var *var = malloc(sizeof(*var));
+ impl_var *var = calloc(1, sizeof(*var));
var->name = (char *) strdup((const char *) name);
var->reference = is_reference;
return var;
} impl_def_val;
static inline impl_def_val *init_impl_def_val(PSI_Token *T) {
- impl_def_val *def = malloc(sizeof(*def));
+ impl_def_val *def = calloc(1, sizeof(*def));
def->type = T->type;
def->text = strdup(T->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));
+ args->args = calloc(1, sizeof(*args->args));
if (arg) {
args->count = 1;
args->args[0] = arg;
} 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, 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;
static inline void free_let_stmt(let_stmt *stmt) {
free_decl_var(stmt->var);
- free_let_value(stmt->val);
+ if (stmt->val) {
+ free_let_value(stmt->val);
+ }
free(stmt);
}
} set_func;
static inline set_func *init_set_func(token_t type, char *name) {
- set_func *func = malloc(sizeof(*func));
+ set_func *func = calloc(1, sizeof(*func));
func->type = type;
func->name = (char *) strdup((const char *) name);
return func;
} 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;
} 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;
} return_stmt;
static inline return_stmt *init_return_stmt(set_func *func, decl_var *decl) {
- return_stmt *ret = malloc(sizeof(*ret));
+ return_stmt *ret = calloc(1, sizeof(*ret));
ret->func = func;
ret->decl = decl;
return 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;
} constant;
static inline constant *init_constant(const_type *type, char *name, impl_def_val *val) {
- constant *c = malloc(sizeof(*c));
+ constant *c = calloc(1, sizeof(*c));
c->type = type;
c->name = strdup(name);
c->val = val;
#define PSI_DATA_MEMBERS \
constants *consts; \
decl_typedefs *defs; \
+ decl_structs *structs; \
decls *decls; \
impls *impls; \
char *lib; \
if (data->defs) {
free_decl_typedefs(data->defs);
}
+ if (data->structs) {
+ free_decl_structs(data->structs);
+ }
if (data->decls) {
free_decls(data->decls);
}
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;
void PSI_ParserFree(PSI_Parser **P);
#endif
+
projects / m6w6 / ext-psi / blobdiff