-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+/*******************************************************************************
+ Copyright (c) 2016, Michael Wallner <mike@php.net>.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*******************************************************************************/
+
+#include "php_psi_stdinc.h"
#include "php.h"
#include "php_ini.h"
#include "ext/standard/info.h"
+#include "zend_constants.h"
+#include "zend_operators.h"
#include "php_psi.h"
+#include "token.h"
#include "parser.h"
+#include "cpp.h"
#if HAVE_LIBJIT
# include "libjit.h"
ZEND_DECLARE_MODULE_GLOBALS(psi);
-PHP_INI_BEGIN()
- STD_PHP_INI_ENTRY("psi.engine", PSI_ENGINE, PHP_INI_SYSTEM, OnUpdateString, engine, zend_psi_globals, psi_globals)
- STD_PHP_INI_ENTRY("psi.directory", "psi.d", PHP_INI_SYSTEM, OnUpdateString, directory, zend_psi_globals, psi_globals)
-PHP_INI_END();
+//#define ZEND_INI_MH(name) int name(zend_ini_entry *entry, zend_string *new_value, void *mh_arg1, void *mh_arg2, void *mh_arg3, int stage)
-void psi_error(int type, const char *msg, ...)
+static void OnUpdateBlacklist(const char *str, void (*cb)(const char*, size_t))
{
- char buf[0x1000];
- va_list argv;
+ const char *end;
- va_start(argv, msg);
- vslprintf(buf, 0x1000, msg, argv);
- va_end(argv);
+ do {
+ size_t len;
- php_error(type, buf);
-}
-
-size_t psi_t_alignment(token_t t)
-{
- size_t align;
-#define PSI_TAS_D(T) struct PSI_TAS_ ##T { \
- char c; \
- T x; \
-}
-#define PSI_TAS_P(T) struct PSI_TAS_ ## T ## _pointer { \
- char c; \
- T *x; \
-}
-#define PSI_TAS_C(T) align = offsetof(struct PSI_TAS_ ##T, x)
-#define PSI_TAS_CASE(T) { \
- PSI_TAS_D(T); \
- PSI_TAS_C(T); \
-}
- switch (t) {
- case PSI_T_INT8:
- PSI_TAS_CASE(int8_t);
- break;
- case PSI_T_UINT8:
- PSI_TAS_CASE(uint8_t);
- break;
- case PSI_T_INT16:
- PSI_TAS_CASE(int16_t);
- break;
- case PSI_T_UINT16:
- PSI_TAS_CASE(uint16_t);
- break;
- case PSI_T_INT32:
- PSI_TAS_CASE(int32_t);
- break;
- case PSI_T_UINT32:
- PSI_TAS_CASE(uint32_t);
- break;
- case PSI_T_INT64:
- PSI_TAS_CASE(int64_t);
- break;
- case PSI_T_UINT64:
- PSI_TAS_CASE(uint64_t);
- break;
- case PSI_T_FLOAT:
- PSI_TAS_CASE(float);
- break;
- case PSI_T_DOUBLE:
- PSI_TAS_CASE(double);
- break;
- case PSI_T_POINTER:
- {
- PSI_TAS_P(char);
- PSI_TAS_C(char_pointer);
+ end = strchr(str, ',');
+ if (end) {
+ len = end - str;
+ } else {
+ len = strlen(str);
+ }
+ if (len) {
+ cb(str, len);
}
- break;
- EMPTY_SWITCH_DEFAULT_CASE();
- }
- return align;
+ str = end + 1;
+ } while (end);
}
-size_t psi_t_size(token_t t)
+static void psi_blacklist_add_decl(const char *pattern, size_t len);
+static ZEND_INI_MH(OnUpdateBlacklistedDecls)
{
- size_t size;
-
- switch (t) {
- case PSI_T_INT8:
- case PSI_T_UINT8:
- size = 1;
- break;
- case PSI_T_INT16:
- case PSI_T_UINT16:
- size = 2;
- break;
- case PSI_T_INT:
- size = sizeof(int);
- break;
- case PSI_T_INT32:
- case PSI_T_UINT32:
- size = 4;
- break;
- case PSI_T_INT64:
- case PSI_T_UINT64:
- size = 8;
- break;
- case PSI_T_FLOAT:
- size = sizeof(float);
- break;
- case PSI_T_DOUBLE:
- size = sizeof(double);
- break;
- case PSI_T_POINTER:
- size = sizeof(char *);
- break;
- EMPTY_SWITCH_DEFAULT_CASE();
- }
- return size;
+ OnUpdateBlacklist(new_value->val, psi_blacklist_add_decl);
+ return SUCCESS;
}
-size_t psi_t_align(token_t t, size_t s)
+static void psi_blacklist_add_var(const char *pattern, size_t len);
+static ZEND_INI_MH(OnUpdateBlacklistedVars)
{
- size_t a = psi_t_alignment(t);
- return ((s - 1) | (a - 1)) + 1;
+ OnUpdateBlacklist(new_value->val, psi_blacklist_add_var);
+ return SUCCESS;
}
-int psi_internal_type(impl_type *type)
+static void OnDisplayBlacklist(struct psi_plist *bl)
{
- switch (type->type) {
- case PSI_T_BOOL:
- return _IS_BOOL;
- case PSI_T_INT:
- return IS_LONG;
- case PSI_T_FLOAT:
- case PSI_T_DOUBLE:
- return IS_DOUBLE;
- case PSI_T_STRING:
- return IS_STRING;
- case PSI_T_ARRAY:
- return IS_ARRAY;
- default:
- return 0;
+ size_t i = 0;
+ char *item;
+
+ while (psi_plist_get(bl, i++, &item)) {
+ if (i > 1) {
+ PUTS(",");
+ }
+ PUTS(item);
}
}
-
-zend_internal_arg_info *psi_internal_arginfo(impl *impl)
+static ZEND_INI_DISP(OnDisplayBlacklistedDecls)
{
- size_t i;
- zend_internal_arg_info *aip;
- zend_internal_function_info *fi;
-
- aip = calloc(impl->func->args->count + 1, sizeof(*aip));
-
- fi = (zend_internal_function_info *) &aip[0];
- fi->required_num_args = psi_num_min_args(impl);
- fi->return_reference = impl->func->return_reference;
- fi->type_hint = psi_internal_type(impl->func->return_type);
+ OnDisplayBlacklist(PSI_G(blacklist).decls);
+}
+static ZEND_INI_DISP(OnDisplayBlacklistedVars)
+{
+ OnDisplayBlacklist(PSI_G(blacklist).vars);
+}
- for (i = 0; i < impl->func->args->count; ++i) {
- impl_arg *iarg = impl->func->args->args[i];
- zend_internal_arg_info *ai = &aip[i+1];
+PHP_INI_BEGIN()
+ STD_PHP_INI_ENTRY("psi.engine", PSI_ENGINE, PHP_INI_SYSTEM, OnUpdateString, engine, zend_psi_globals, psi_globals)
+ STD_PHP_INI_ENTRY("psi.directory", "psi.d", PHP_INI_SYSTEM, OnUpdateString, directory, zend_psi_globals, psi_globals)
+ PHP_INI_ENTRY_EX("psi.blacklist.decls", "", PHP_INI_SYSTEM, OnUpdateBlacklistedDecls, OnDisplayBlacklistedDecls)
+ PHP_INI_ENTRY_EX("psi.blacklist.vars", "", PHP_INI_SYSTEM, OnUpdateBlacklistedVars, OnDisplayBlacklistedVars)
+PHP_INI_END();
- ai->name = iarg->var->name;
- ai->type_hint = psi_internal_type(iarg->type);
- if (iarg->var->reference) {
- ai->pass_by_reference = 1;
- }
- if (iarg->var->reference || (iarg->def && iarg->def->type == PSI_T_NULL)) {
- ai->allow_null = 1;
- }
- }
+static zend_object_handlers psi_object_handlers;
+static zend_class_entry *psi_class_entry;
- return aip;
+zend_class_entry *psi_object_get_class_entry()
+{
+ return psi_class_entry;
}
-size_t psi_num_min_args(impl *impl)
+static void psi_object_free(zend_object *o)
{
- size_t i, n = impl->func->args->count;
+ psi_object *obj = PSI_OBJ(NULL, o);
- for (i = 0; i < impl->func->args->count; ++i) {
- if (impl->func->args->args[i]->def) {
- --n;
+ if (obj->data) {
+ if (obj->dtor) {
+ obj->dtor(obj->data);
}
+ obj->data = NULL;
}
- return n;
+ zend_object_std_dtor(o);
}
-void psi_to_bool(zval *return_value, set_value *set, impl_val *ret_val)
+zend_object *psi_object_init_ex(zend_class_entry *ce, void *data, void (*dtor)(void *))
{
- psi_to_int(return_value, set, ret_val);
- convert_to_boolean(return_value);
-}
+ psi_object *o;
-void psi_to_int(zval *return_value, set_value *set, impl_val *ret_val)
-{
- decl_var *var = set->vars->vars[0];
- token_t t = real_decl_type(var->arg->type)->type;
- impl_val *v = deref_impl_val(ret_val, var);
-
- switch (t) {
- case PSI_T_FLOAT:
- RETVAL_DOUBLE((double) v->fval);
- convert_to_long(return_value);
- break;
- case PSI_T_DOUBLE:
- RETVAL_DOUBLE(v->dval);
- convert_to_long(return_value);
- break;
- case PSI_T_INT8:
- RETVAL_LONG(v->i8);
- break;
- case PSI_T_UINT8:
- RETVAL_LONG(v->u8);
- break;
- case PSI_T_INT16:
- RETVAL_LONG(v->i16);
- break;
- case PSI_T_UINT16:
- RETVAL_LONG(v->u16);
- break;
- case PSI_T_INT32:
- RETVAL_LONG(v->i32);
- break;
- case PSI_T_UINT32:
-#if UINT32_MAX >= ZEND_LONG_MAX
- if (v->u32 > ZEND_LONG_MAX) {
- char d[12] = {0};
-
- RETVAL_STRING(zend_print_ulong_to_buf(&d[10], v->u32));
- } else {
-#endif
- RETVAL_LONG(v->u32);
-#if UINT32_MAX >= ZEND_LONG_MAX
- }
-#endif
- break;
- case PSI_T_INT64:
- RETVAL_LONG(v->i64);
- break;
- case PSI_T_UINT64:
- if (v->u64 > ZEND_LONG_MAX) {
- char d[24] = {0};
-
- RETVAL_STRING(zend_print_ulong_to_buf(&d[22], v->u64));
- } else {
- RETVAL_LONG(v->u64);
- }
- break;
- EMPTY_SWITCH_DEFAULT_CASE();
+ if (!ce) {
+ ce = psi_class_entry;
}
+
+ o = ecalloc(1, sizeof(*o) + zend_object_properties_size(ce));
+
+ o->data = data;
+ o->dtor = dtor;
+
+ zend_object_std_init(&o->std, ce);
+ object_properties_init(&o->std, ce);
+ o->std.handlers = &psi_object_handlers;
+ return &o->std;
}
-void psi_to_double(zval *return_value, set_value *set, impl_val *ret_val)
+zend_object *psi_object_init(zend_class_entry *ce)
{
- decl_var *var = set->vars->vars[0];
- token_t t = real_decl_type(var->arg->type)->type;
- impl_val *v = deref_impl_val(ret_val, var);
-
- switch (t) {
- case PSI_T_FLOAT:
- RETVAL_DOUBLE((double) v->fval);
- break;
- case PSI_T_DOUBLE:
- RETVAL_DOUBLE(v->dval);
- break;
- default:
- RETVAL_DOUBLE((double) v->lval);
- break;
- }
+ return psi_object_init_ex(ce, NULL, NULL);
}
-void psi_to_string(zval *return_value, set_value *set, impl_val *ret_val)
+ZEND_BEGIN_ARG_INFO_EX(ai_psi_dump, 0, 0, 0)
+ ZEND_ARG_INFO(0, stream)
+ZEND_END_ARG_INFO();
+static PHP_FUNCTION(psi_dump)
{
- decl_var *var = set->vars->vars[0];
- token_t t = real_decl_type(var->arg->type)->type;
-
- switch (t) {
- case PSI_T_INT8:
- case PSI_T_UINT8:
- if (!var->arg->var->pointer_level) {
- RETVAL_STRINGL(&ret_val->cval, 1);
- } else {
- ret_val = deref_impl_val(ret_val, var);
- if (ret_val && ret_val->ptr) {
- RETVAL_STRING(ret_val->ptr);
- } else {
- RETVAL_EMPTY_STRING();
- }
- }
+ php_stream *s;
+ zval *r = NULL;
+ int fd = STDOUT_FILENO;
+
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "|r!", &r)) {
return;
- case PSI_T_FLOAT:
- RETVAL_DOUBLE((double) deref_impl_val(ret_val, var)->fval);
- break;
- case PSI_T_DOUBLE:
- RETVAL_DOUBLE(deref_impl_val(ret_val, var)->dval);
- break;
- default:
- RETVAL_LONG(deref_impl_val(ret_val, var)->lval);
- break;
}
- convert_to_string(return_value);
-}
-
+ if (r) {
+ php_stream_from_zval(s, r);
-static impl_val *iterate(impl_val *val, size_t size, unsigned i, impl_val *tmp)
-{
- memset(tmp, 0, sizeof(*tmp));
- memcpy(tmp, ((void*) val->ptr) + size * i, size);
- return tmp;
-}
-
-void psi_from_zval(impl_val *mem, decl_arg *spec, zval *zv, void **tmp)
-{
- decl_type *type = real_decl_type(spec->type);
-
- switch (type->type) {
- case PSI_T_FLOAT:
- mem->fval = (float) zval_get_double(zv);
- break;
- case PSI_T_DOUBLE:
- mem->dval = zval_get_double(zv);
- break;
- case PSI_T_INT8:
- case PSI_T_UINT8:
- if (spec->var->pointer_level) {
- zend_string *zs = zval_get_string(zv);
- *tmp = mem->ptr = estrndup(zs->val, zs->len);
- zend_string_release(zs);
- break;
+ if (SUCCESS != php_stream_cast(s, PHP_STREAM_AS_FD | PHP_STREAM_CAST_INTERNAL, (void **)&fd, 1)) {
+ RETURN_FALSE;
}
- /* no break */
- default:
- mem->zend.lval = zval_get_long(zv);
- break;
}
+ psi_context_dump(PSI_G(context), fd);
}
-void *psi_array_to_struct(decl_struct *s, HashTable *arr)
+ZEND_BEGIN_ARG_INFO_EX(ai_psi_validate, 0, 0, 1)
+ ZEND_ARG_INFO(0, file)
+ ZEND_ARG_INFO(0, flags)
+ ZEND_ARG_INFO(1, errcnt)
+ZEND_END_ARG_INFO();
+static PHP_FUNCTION(psi_validate)
{
- size_t i, j = 0;
- char *mem = ecalloc(1, s->size + s->args->count * sizeof(void *));
-
- if (arr) for (i = 0; i < s->args->count; ++i) {
- decl_arg *darg = s->args->args[i];
- zval *entry = zend_hash_str_find_ind(arr, darg->var->name, strlen(darg->var->name));
-
- if (entry) {
- impl_val val;
- void *tmp = NULL;
-
- memset(&tmp, 0, sizeof(tmp));
- psi_from_zval(&val, darg, entry, &tmp);
- memcpy(mem + darg->layout->pos, &val, darg->layout->len);
- if (tmp) {
- ((void **)(mem + s->size))[j++] = tmp;
- }
- }
+ zend_string *file;
+ struct psi_parser_input *I;
+ struct psi_parser P;
+ struct psi_data D = {0};
+ struct psi_validate_scope S = {0};
+ zend_long flags = 0;
+ zval *errcnt = NULL;
+
+#if PHP_DEBUG
+ if (psi_check_env("PSI_DEBUG")) {
+ flags |= PSI_DEBUG;
}
- return mem;
-}
-
-static inline impl_val *struct_member_ref(decl_arg *set_arg, impl_val *struct_ptr, impl_val **to_free) {
- void *ptr = (char *) struct_ptr->ptr + set_arg->layout->pos;
- impl_val *val = enref_impl_val(ptr, set_arg->var);
+#endif
- if (val != ptr) {
- *to_free = val;
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "P|lz", &file, &flags, &errcnt)) {
+ return;
}
- return val;
-}
-void psi_to_array(zval *return_value, set_value *set, impl_val *r_val)
-{
- size_t i;
- decl_var *var = set->vars->vars[0];
- token_t t = real_decl_type(var->arg->type)->type;
- impl_val tmp, *ret_val = deref_impl_val(r_val, var);
-
- array_init(return_value);
+ if (!psi_parser_init(&P, psi_error_wrapper, flags)) {
+ RETURN_FALSE;
+ }
+ if (!(I = psi_parser_open_file(&P, file->val, true))) {
+ psi_parser_dtor(&P);
+ RETURN_FALSE;
+ }
- if (t == PSI_T_STRUCT) {
- // decl_struct *s = real_decl_type(var->arg->type)->strct;
+ psi_parser_parse(&P, I);
+ psi_data_ctor(&D, P.error, P.flags);
+ psi_validate_scope_ctor(&S);
+ S.defs = &P.preproc->defs;
- if (set->count) {
- /* explicit member casts */
- for (i = 0; i < set->count; ++i) {
- set_value *sub_set = set->inner[i];
- decl_var *sub_var = sub_set->vars->vars[0];
+ RETVAL_BOOL(psi_validate(&S, &D, PSI_DATA(&P)));
- sub_set->outer.val = r_val;
+ if (errcnt) {
+ ZVAL_DEREF(errcnt);
+ convert_to_long(errcnt);
+ ZVAL_LONG(errcnt, P.errors);
+ }
- if (sub_var->arg) {
- impl_val *tmp = NULL, *val;
- zval ztmp;
+ psi_validate_scope_dtor(&S);
+ psi_data_dtor(&D);
+ psi_parser_dtor(&P);
+ psi_parser_input_free(&I);
+}
- val = deref_impl_val(struct_member_ref(sub_var->arg, ret_val, &tmp), sub_var);
- sub_set->func->handler(&ztmp, sub_set, val);
- add_assoc_zval(return_value, sub_var->name, &ztmp);
+ZEND_BEGIN_ARG_INFO_EX(ai_psi_validate_string, 0, 0, 1)
+ ZEND_ARG_INFO(0, string)
+ ZEND_ARG_INFO(0, flags)
+ ZEND_ARG_INFO(1, errcnt)
+ZEND_END_ARG_INFO();
+static PHP_FUNCTION(psi_validate_string)
+{
+ zend_string *string;
+ struct psi_parser_input *I;
+ struct psi_parser P;
+ struct psi_data D = {0};
+ struct psi_validate_scope S = {0};
+ zend_long flags = 0;
+ zval *errcnt = NULL;
+
+#if PHP_DEBUG
+ if (psi_check_env("PSI_DEBUG")) {
+ flags |= PSI_DEBUG;
+ }
+#endif
- if (tmp) {
- free(tmp);
- }
- }
- }
- }
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "S|lz", &string, &flags, &errcnt)) {
return;
}
- if (var->arg->var->array_size) {
- /* to_array(foo[NUMBER]) */
- for (i = 0; i < var->arg->var->array_size; ++i) {
- size_t size = psi_t_size(var->arg->var->pointer_level > 1 ? PSI_T_POINTER : t);
- impl_val *ptr = iterate(ret_val, size, i, &tmp);
- zval ele;
-
- switch (t) {
- case PSI_T_FLOAT:
- ZVAL_DOUBLE(&ele, (double) ptr->fval);
- break;
- case PSI_T_DOUBLE:
- ZVAL_DOUBLE(&ele, ptr->dval);
- break;
- default:
- ZVAL_LONG(&ele, ptr->lval);
- break;
- }
-
- add_next_index_zval(return_value, &ele);
- }
- return;
- } else if (set->vars->count > 1) {
- /* to_array(arr_var, cnt_var[, cnt_var...], to_int(*arr_var))
- * check for length in second var
- */
- size_t count = 0;
- zval ele;
-
- if (set->outer.set) {
- /* struct */
- for (i = 1; i < set->vars->count; ++i) {
- impl_val *tmp = NULL, *cnt_val;
- decl_var *cnt_var = set->vars->vars[i];
-
- cnt_val = struct_member_ref(cnt_var->arg, set->outer.val, &tmp);
- count += deref_impl_val(cnt_val, cnt_var)->lval;
-
- if (tmp) {
- free(tmp);
- }
- }
- } else {
- ZEND_ASSERT(0);
- }
+ if (!psi_parser_init(&P, psi_error_wrapper, flags)) {
+ RETURN_FALSE;
+ }
+ if (!(I = psi_parser_open_string(&P, string->val, string->len))) {
+ psi_parser_dtor(&P);
+ RETURN_FALSE;
+ }
- for (i = 0; i < count; ++i) {
- size_t size = psi_t_size(var->arg->var->pointer_level ? PSI_T_POINTER : t);
- impl_val *ptr = iterate(ret_val, size, i, &tmp);
+ psi_parser_parse(&P, I);
+ psi_data_ctor(&D, P.error, P.flags);
+ psi_validate_scope_ctor(&S);
+ S.defs = &P.preproc->defs;
- set->inner[0]->func->handler(&ele, set->inner[0], ptr);
- add_next_index_zval(return_value, &ele);
- }
- } else {
- ZEND_ASSERT(0);
+ RETVAL_BOOL(psi_validate(&S, &D, PSI_DATA(&P)));
+
+ if (errcnt) {
+ ZVAL_DEREF(errcnt);
+ convert_to_long(errcnt);
+ ZVAL_LONG(errcnt, P.errors);
}
+ psi_validate_scope_dtor(&S);
+ psi_data_dtor(&D);
+ psi_parser_dtor(&P);
+ psi_parser_input_free(&I);
}
-static inline ZEND_RESULT_CODE psi_parse_args(zend_execute_data *execute_data, impl *impl)
+PHP_MINIT_FUNCTION(psi_cpp);
+PHP_MINIT_FUNCTION(psi_context);
+static PHP_MINIT_FUNCTION(psi)
{
- impl_arg *iarg;
+ zend_class_entry ce = {0};
- if (!impl->func->args->count) {
- return zend_parse_parameters_none();
- }
-
- ZEND_PARSE_PARAMETERS_START(psi_num_min_args(impl), impl->func->args->count)
- nextarg:
- iarg = impl->func->args->args[_i];
- if (iarg->def) {
- Z_PARAM_OPTIONAL;
- }
- if (PSI_T_BOOL == iarg->type->type) {
- if (iarg->def) {
- iarg->val.zend.bval = iarg->def->type == PSI_T_TRUE ? 1 : 0;
- }
- Z_PARAM_BOOL(iarg->val.zend.bval);
- } else if (PSI_T_INT == iarg->type->type) {
- if (iarg->def) {
- iarg->val.zend.lval = zend_atol(iarg->def->text, strlen(iarg->def->text));
- }
- Z_PARAM_LONG(iarg->val.zend.lval);
- } else if (PSI_T_FLOAT == iarg->type->type || PSI_T_DOUBLE == iarg->type->type) {
- if (iarg->def) {
- iarg->val.dval = zend_strtod(iarg->def->text, NULL);
- }
- Z_PARAM_DOUBLE(iarg->val.dval);
- } else if (PSI_T_STRING == iarg->type->type) {
- struct {char *val; size_t len;} str;
- if (iarg->def) {
- /* FIXME */
- str.len = strlen(iarg->def->text) - 2;
- str.val = &iarg->def->text[1];
- }
- Z_PARAM_STR_EX(iarg->val.zend.str, 1, 0);
- if (iarg->val.zend.str) {
- zend_string_addref(iarg->val.zend.str);
- } else if (iarg->def) {
- iarg->val.zend.str = zend_string_init(str.val, str.len, 0);
- }
- } else if (PSI_T_ARRAY == iarg->type->type) {
- /* handled as _zv in let or set */
- Z_PARAM_PROLOGUE(0);
- } else {
- error_code = ZPP_ERROR_FAILURE;
- break;
- }
- iarg->_zv = _arg;
- if (_i < _max_num_args) {
- goto nextarg;
- }
- ZEND_PARSE_PARAMETERS_END_EX(return FAILURE);
+ REGISTER_INI_ENTRIES();
- return SUCCESS;
-}
+ zend_register_long_constant(ZEND_STRL("PSI_DEBUG"), PSI_DEBUG, CONST_CS|CONST_PERSISTENT, module_number);
+ zend_register_long_constant(ZEND_STRL("PSI_SILENT"), PSI_SILENT, CONST_CS|CONST_PERSISTENT, module_number);
-static inline void *psi_do_calloc(let_calloc *alloc)
-{
- decl_type *type = real_decl_type(alloc->type);
- size_t size;
-
- if (type->type == PSI_T_STRUCT) {
- /* psi_do_clean expects at least one NULL pointer after the struct */
- size = type->strct->size + sizeof(void *);
- } else {
- size = psi_t_size(type->type);
- }
+ INIT_NS_CLASS_ENTRY(ce, "psi", "object", NULL);
+ psi_class_entry = zend_register_internal_class_ex(&ce, NULL);
+ psi_class_entry->create_object = psi_object_init;
- return ecalloc(alloc->n, size);
-}
+ memcpy(&psi_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
+ psi_object_handlers.offset = XtOffsetOf(psi_object, std);
+ psi_object_handlers.free_obj = psi_object_free;
+ psi_object_handlers.clone_obj = NULL;
-static inline void *psi_do_let(decl_arg *darg)
-{
- impl_arg *iarg = darg->let->arg;
- impl_val *arg_val;
-
- darg->let->ptr = &darg->let->out;
- arg_val = darg->let->ptr;
-
- if (!iarg) {
- /* let foo = calloc(1, long);
- * let foo = NULL;
- * let foo;
- */
- if (darg->let->val->func && darg->let->val->func->type == PSI_T_CALLOC) {
- arg_val->ptr = psi_do_calloc(darg->let->val->func->alloc);
- darg->let->mem = arg_val->ptr;
- } else if (darg->var->array_size) {
- arg_val->ptr = ecalloc(darg->var->array_size, sizeof(*arg_val));
- darg->let->mem = arg_val->ptr;
- } else {
- memset(arg_val, 0, sizeof(*arg_val));
- }
- } else {
-
- switch (darg->let->val->func->type) {
- case PSI_T_BOOLVAL:
- if (iarg->type->type == PSI_T_BOOL) {
- arg_val->cval = iarg->val.zend.bval;
- } else {
- arg_val->cval = zend_is_true(iarg->_zv);
- }
- break;
- case PSI_T_INTVAL:
- if (iarg->type->type == PSI_T_INT) {
- arg_val->lval = iarg->val.zend.lval;
- } else {
- arg_val->lval = zval_get_long(iarg->_zv);
- }
- break;
- case PSI_T_STRVAL:
- if (iarg->type->type == PSI_T_STRING) {
- arg_val->ptr = estrdup(iarg->val.zend.str->val);
- darg->let->mem = arg_val->ptr;
- zend_string_release(iarg->val.zend.str);
- } else {
- zend_string *zs = zval_get_string(iarg->_zv);
- arg_val->ptr = estrdup(zs->val);
- darg->let->mem = arg_val->ptr;
- zend_string_release(zs);
- }
- break;
- case PSI_T_STRLEN:
- if (iarg->type->type == PSI_T_STRING) {
- arg_val->lval = iarg->val.zend.str->len;
- zend_string_release(iarg->val.zend.str);
- } else {
- zend_string *zs = zval_get_string(iarg->_zv);
- arg_val->lval = zs->len;
- zend_string_release(zs);
- }
- break;
- case PSI_T_ARRVAL:
- if (iarg->type->type == PSI_T_ARRAY) {
- decl_type *type = real_decl_type(darg->type);
-
- switch (type->type) {
- case PSI_T_STRUCT:
- arg_val->ptr = psi_array_to_struct(type->strct, HASH_OF(iarg->_zv));
- darg->let->mem = arg_val->ptr;
- break;
- }
- }
- break;
- EMPTY_SWITCH_DEFAULT_CASE();
- }
+ if (SUCCESS != PHP_MINIT(psi_cpp)(type, module_number)) {
+ return FAILURE;
}
-
- if (darg->let->val && darg->let->val->is_reference) {
- return &darg->let->ptr;
- } else {
- return darg->let->ptr;
+ if (SUCCESS != PHP_MINIT(psi_context)(type, module_number)) {
+ return FAILURE;
}
+
+ return SUCCESS;
}
-static inline void psi_do_set(zval *return_value, set_value *set)
+PHP_MSHUTDOWN_FUNCTION(psi_cpp);
+PHP_MSHUTDOWN_FUNCTION(psi_context);
+static PHP_MSHUTDOWN_FUNCTION(psi)
{
- ZVAL_DEREF(return_value);
- zval_dtor(return_value);
+ PHP_MSHUTDOWN(psi_context)(type, module_number);
+ PHP_MSHUTDOWN(psi_cpp)(type, module_number);
+
+ UNREGISTER_INI_ENTRIES();
- set->func->handler(return_value, set, set->vars->vars[0]->arg->let->ptr);
+ return SUCCESS;
}
-static inline void psi_do_return(zval *return_value, return_stmt *ret, impl_val *ret_val)
+#if defined(COMPILE_DL_PSI) && defined(ZTS)
+static PHP_RINIT_FUNCTION(psi)
{
- ret->set->func->handler(return_value, ret->set, ret_val);
+ ZEND_TSRMLS_CACHE_UPDATE();
+ return SUCCESS;
}
+#endif
-static inline void psi_do_free(free_stmt *fre)
+static PHP_MINFO_FUNCTION(psi)
{
- size_t i, j;
- impl_val dummy;
-
- for (i = 0; i < fre->calls->count; ++i) {
- free_call *f = fre->calls->list[i];
-
- for (j = 0; j < f->vars->count; ++j) {
- decl_var *dvar = f->vars->vars[j];
- decl_arg *darg = dvar->arg;
+ php_info_print_table_start();
+ php_info_print_table_header(2, "PSI Support", "enabled");
+ php_info_print_table_row(2, "Extension Version", PHP_PSI_VERSION);
+ php_info_print_table_row(2, "Search Path", PSI_G(search_path));
+ php_info_print_table_end();
- f->decl->call.args[j] = &darg->let->out;
- }
+ php_info_print_table_start();
+ php_info_print_table_header(3, "Used Library", "Compiled", "Linked");
+ php_info_print_table_row(3, "libffi",
+#ifndef PHP_PSI_LIBFFI_VERSION
+# define PHP_PSI_LIBFFI_VERSION "unknown"
+#endif
+#ifdef HAVE_LIBFFI
+ PHP_PSI_LIBFFI_VERSION, "unknown"
+#else
+ "disabled", "disabled"
+#endif
+ );
+ php_info_print_table_row(3, "libjit",
+#ifdef HAVE_LIBJIT
+ "unknown", "unknown"
+#else
+ "disabled", "disabled"
+#endif
+ );
- /* FIXME: check in validate_* that free functions return scalar */
- PSI_ContextCall(&PSI_G(context), &dummy, f->decl);
- }
+ DISPLAY_INI_ENTRIES();
}
-static inline void psi_do_clean(impl *impl)
+static void ptr_free(void *ptr)
{
- size_t i;
-
- for (i = 0; i < impl->func->args->count; ++i ) {
- impl_arg *iarg = impl->func->args->args[i];
-
- switch (iarg->type->type) {
- case PSI_T_STRING:
- if (iarg->val.zend.str) {
- zend_string_release(iarg->val.zend.str);
- }
- break;
- }
- }
-
- if (impl->decl->args) for (i = 0; i < impl->decl->args->count; ++i) {
- decl_arg *darg = impl->decl->args->args[i];
-
- if (darg->let && darg->let->mem) {
- decl_type *type = real_decl_type(darg->type);
-
- if (type->type == PSI_T_STRUCT) {
- void **ptr = (void **) ((char *) darg->let->mem + type->strct->size);
-
- while (*ptr) {
- efree(*ptr++);
- }
- }
- efree(darg->let->mem);
- darg->let->mem = NULL;
- }
- }
+ free(*(void **) ptr);
}
-void psi_call(zend_execute_data *execute_data, zval *return_value, impl *impl)
+static void psi_blacklist_add_decl(const char *pattern, size_t len)
{
- impl_val ret_val;
- size_t i;
-
- if (SUCCESS != psi_parse_args(execute_data, impl)) {
- return;
- }
-
- if (impl->decl->args) {
- for (i = 0; i < impl->decl->args->count; ++i) {
- decl_arg *darg = impl->decl->args->args[i];
-
- impl->decl->call.args[i] = psi_do_let(darg);
- }
- }
-
- memset(&ret_val, 0, sizeof(ret_val));
- PSI_ContextCall(&PSI_G(context), &ret_val, impl->decl);
-
- psi_do_return(return_value, impl->stmts->ret.list[0], &ret_val);
-
- for (i = 0; i < impl->stmts->set.count; ++i) {
- set_stmt *set = impl->stmts->set.list[i];
-
- if (set->arg->_zv) {
- psi_do_set(set->arg->_zv, set->val);
- }
- }
+ char *tmp = strndup(pattern, len);
+ struct psi_plist **decls = &PSI_G(blacklist).decls;
- for (i = 0; i < impl->stmts->fre.count; ++i) {
- free_stmt *fre = impl->stmts->fre.list[i];
+ *decls = psi_plist_add(*decls, &tmp);
+}
- psi_do_free(fre);
- }
+static void psi_blacklist_add_var(const char *pattern, size_t len)
+{
+ char *tmp = strndup(pattern, len);
+ struct psi_plist **vars = &PSI_G(blacklist).vars;
- psi_do_clean(impl);
+ *vars = psi_plist_add(*vars, &tmp);
}
-PHP_MINIT_FUNCTION(psi)
+static PHP_GINIT_FUNCTION(psi)
{
- PSI_ContextOps *ops = NULL;
+ char *tmp;
+ struct psi_plist **bl_decls = &psi_globals->blacklist.decls;
+ struct psi_plist **bl_vars = &psi_globals->blacklist.vars;
- REGISTER_INI_ENTRIES();
+ *bl_decls = psi_plist_init(ptr_free);
+ *bl_vars = psi_plist_init(ptr_free);
-#ifdef HAVE_LIBJIT
- if (!strcasecmp(PSI_G(engine), "jit")) {
- ops = PSI_Libjit();
- } else
-#endif
-#ifdef HAVE_LIBFFI
- ops = PSI_Libffi();
-#endif
+#define BL_ADD(D, d) \
+ tmp = strdup(d); \
+ *D = psi_plist_add(*D, &tmp)
+#define BL_DECL_ADD(d) BL_ADD(bl_decls, d)
+#define BL_VAR_ADD(d) BL_ADD(bl_vars, d)
- if (!ops) {
- php_error(E_WARNING, "No PSI engine found");
- return FAILURE;
- }
+ BL_DECL_ADD("dlsym");
+ BL_DECL_ADD("alloca");
+ BL_DECL_ADD("atexit");
+ BL_DECL_ADD("at_quick_exit");
- PSI_ContextInit(&PSI_G(context), ops, psi_error);
- PSI_ContextBuild(&PSI_G(context), PSI_G(directory));
+ /* missing */
+ BL_DECL_ADD("_IO_cookie_init");
+ BL_DECL_ADD("bindresvport6");
- if (getenv("PSI_DUMP")) {
- PSI_ContextDump(&PSI_G(context), STDOUT_FILENO);
- }
+ /* va_list as arg */
+ BL_DECL_ADD("*v*printf");
+ BL_DECL_ADD("*v*scanf");
+ BL_DECL_ADD("vsyslog");
- return SUCCESS;
-}
-PHP_MSHUTDOWN_FUNCTION(psi)
-{
- PSI_ContextDtor(&PSI_G(context));
+ /* LFS/LFO for 32bit */
+ BL_DECL_ADD("*stat*64");
+ BL_DECL_ADD("*glob*64");
+ /* Hurd only */
+ BL_DECL_ADD("getumask");
- UNREGISTER_INI_ENTRIES();
-
- return SUCCESS;
+ /* using hidden structs */
+ BL_VAR_ADD("_IO_2_*");
}
-/* Remove if there's nothing to do at request start */
-/* {{{ PHP_RINIT_FUNCTION
- */
-PHP_RINIT_FUNCTION(psi)
-{
-#if defined(COMPILE_DL_PSI) && defined(ZTS)
- ZEND_TSRMLS_CACHE_UPDATE();
-#endif
- return SUCCESS;
-}
-/* }}} */
-
-/* Remove if there's nothing to do at request end */
-/* {{{ PHP_RSHUTDOWN_FUNCTION
- */
-PHP_RSHUTDOWN_FUNCTION(psi)
+static PHP_GSHUTDOWN_FUNCTION(psi)
{
- return SUCCESS;
+ psi_plist_free(psi_globals->blacklist.decls);
}
-/* }}} */
-
-PHP_MINFO_FUNCTION(psi)
-{
- php_info_print_table_start();
- php_info_print_table_header(2, "psi support", "enabled");
- php_info_print_table_end();
- DISPLAY_INI_ENTRIES();
-}
-const zend_function_entry psi_functions[] = {
+static const zend_function_entry psi_functions[] = {
+ PHP_FE(psi_dump, ai_psi_dump)
+ PHP_FE(psi_validate, ai_psi_validate)
+ PHP_FE(psi_validate_string, ai_psi_validate_string)
PHP_FE_END
};
+static const zend_module_dep psi_deps[] = {
+ ZEND_MOD_REQUIRED("standard")
+ {0}
+};
+
zend_module_entry psi_module_entry = {
- STANDARD_MODULE_HEADER,
+ STANDARD_MODULE_HEADER_EX,
+ NULL,
+ psi_deps,
"psi",
psi_functions,
PHP_MINIT(psi),
PHP_MSHUTDOWN(psi),
+#if defined(COMPILE_DL_PSI) && defined(ZTS)
PHP_RINIT(psi), /* Replace with NULL if there's nothing to do at request start */
- PHP_RSHUTDOWN(psi), /* Replace with NULL if there's nothing to do at request end */
+#else
+ NULL,
+#endif
+ NULL,
PHP_MINFO(psi),
PHP_PSI_VERSION,
- STANDARD_MODULE_PROPERTIES
+ ZEND_MODULE_GLOBALS(psi),
+ PHP_GINIT(psi),
+ PHP_GSHUTDOWN(psi),
+ NULL, /* post-deactivate */
+ STANDARD_MODULE_PROPERTIES_EX
};
#ifdef COMPILE_DL_PSI
projects / m6w6 / ext-psi / blobdiff