#include "php.h"
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-# endif
-#endif
-#ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-# include <memory.h>
-# endif
-# include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
-#ifdef HAVE_ERRNO_H
-# include <errno.h>
-#endif
-#ifdef HAVE_GLOB_H
-# include <glob.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-# include <arpa/nameser.h>
-#endif
-#ifdef HAVE_NETDB_H
-# include <netdb.h>
-#endif
-#ifdef HAVE_RESOLV_H
-# include <resolv.h>
-#endif
-#ifdef HAVE_SYS_SELECT_H
-# include <sys/select.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-# include <sys/socket.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
-#ifdef HAVE_SYS_TIMES_H
-# include <sys/times.h>
-#endif
-#ifdef HAVE_SYS_UIO_H
-# include <sys/uio.h>
-#endif
-#ifdef HAVE_SYS_UTSNAME_H
-# include <sys/utsname.h>
-#endif
-#ifdef HAVE_TIME_H
-# include <time.h>
-#endif
-#ifdef HAVE_WCHAR_H
-# include <wchar.h>
-#endif
+#include "php_psi_stdinc.h"
#ifdef HAVE_DIRENT_H
# include <dirent.h>
#include "php.h"
#include "php_scandir.h"
#include "php_psi.h"
-#include "context.h"
-#include "parser.h"
#include "libjit.h"
#include "libffi.h"
{0}
};
-static struct psi_predef_type {
- token_t type_tag;
- const char *type_name;
- const char *alias;
-} psi_predef_types[] = {
- PSI_TYPES
- {0}
-};
-
-static struct psi_predef_const {
- token_t type_tag;
- const char *type_name;
- const char *var_name;
- const char *val_text;
- token_t val_type_tag;
-} psi_predef_consts[] = {
- PSI_CONSTS
- {0}
-};
-
-PSI_MACROS
-
-size_t psi_fread(void *ptr, size_t size, size_t nmemb, FILE *stream)
-{
- size_t rv = fread(ptr, size, nmemb, stream);
- return rv;
-}
-
-FILE *psi_fopen(const char *path, const char *mode)
-{
- FILE *f = fopen(path, mode);
- return f;
-}
-
-static struct psi_func_redir {
- const char *name;
- void (*func)(void);
-} psi_func_redirs[] = {
- {"fopen", (void (*)(void)) psi_fopen},
- {"fread", (void (*)(void)) psi_fread},
- PSI_REDIRS
- {0}
-};
-
-static struct psi_predef_decl {
- token_t type_tag;
- const char *type_name;
- const char *var_name;
- size_t pointer_level;
- size_t array_size;
-} psi_predef_decls[] = {
- PSI_DECLS
- {0}
-};
-
-static struct psi_predef_struct {
- token_t type_tag;
- const char *type_name;
- const char *var_name;
- size_t offset;
- size_t size;
- size_t pointer_level;
- size_t array_size;
-} psi_predef_structs[] = {
- PSI_STRUCTS
- {0}
-};
+#include "php_psi_types.h"
+#include "php_psi_consts.h"
+#include "php_psi_macros.h"
+#include "php_psi_redirs.h"
+#include "php_psi_decls.h"
+#include "php_psi_va_decls.h"
+#include "php_psi_structs.h"
static int validate_lib(PSI_Data *data, void **dlopened) {
char lib[MAXPATHLEN];
} else if (!strchr(ptr, '/')) {
len = snprintf(lib, MAXPATHLEN, "lib%s.%s", ptr, PHP_PSI_SHLIB_SUFFIX);
if (MAXPATHLEN == len) {
- data->error(PSI_WARNING, "Library name too long: '%s'", ptr);
+ data->error(NULL, PSI_WARNING, "Library name too long: '%s'", ptr);
}
lib[len] = 0;
ptr = lib;
}
if (!(*dlopened = dlopen(ptr, RTLD_LAZY|RTLD_LOCAL))) {
- data->error(PSI_WARNING, "Could not open library '%s': %s.",
+ data->error(NULL, PSI_WARNING, "Could not open library '%s': %s.",
data->psi.file.ln, dlerror());
return 0;
}
}
static inline int validate_decl_typedef(PSI_Data *data, decl_typedef *def) {
if (!validate_decl_type(data, def->type)) {
- data->error(PSI_WARNING, "Type '%s' cannot be aliased to %s'%s'",
+ data->error(def->token, PSI_WARNING,
+ "Type '%s' cannot be aliased to %s'%s'",
def->type->name, def->type->type == PSI_T_STRUCT?"struct ":"",def->alias);
return 0;
}
static inline int validate_decl_arg(PSI_Data *data, decl_arg *arg) {
if (!validate_decl_type(data, arg->type)) {
- data->error(PSI_WARNING, "Cannot use '%s'(%d) as type for '%s'",
+ data->error(arg->type->token, PSI_WARNING,
+ "Cannot use '%s'(%d) as type for decl var '%s'",
arg->type->name, arg->type->type, arg->var->name);
return 0;
}
"default", /* \ */
"extern", /* > - all the same */
"cdecl", /* / */
+ "mscdecl",
"stdcall",
"fastcall",
};
return 1;
}
}
- data->error(PSI_WARNING, "Invalid calling convention: '%s'", abi->convention);
return 0;
}
static inline int validate_decl_func(PSI_Data *data, void *dl, decl *decl, decl_arg *func)
struct psi_func_redir *redir;
if (!strcmp(func->var->name, "dlsym")) {
- data->error(PSI_WARNING, "Cannot dlsym dlsym (sic!)");
+ data->error(func->token, PSI_WARNING, "Cannot dlsym dlsym (sic!)");
return 0;
}
#endif
decl->call.sym = dlsym(dl ?: RTLD_NEXT, func->var->name);
if (!decl->call.sym) {
- data->error(PSI_WARNING, "Failed to locate symbol '%s': %s",
+ data->error(func->token, PSI_WARNING,
+ "Failed to locate symbol '%s': %s",
func->var->name, dlerror());
}
}
static inline int validate_decl(PSI_Data *data, void *dl, decl *decl) {
if (!validate_decl_abi(data, decl->abi)) {
+ data->error(decl->abi->token, PSI_WARNING,
+ "Invalid calling convention: '%s'", decl->abi->token->text);
return 0;
}
if (!validate_decl_func(data, dl, decl, decl->func)) {
switch (exp->t) {
case PSI_T_NAME:
if (!locate_decl_var_arg(exp->u.dvar, dargs, func)) {
- data->error(PSI_WARNING, "Unknown variable '%s' in numeric expression",
+ data->error(exp->token, PSI_WARNING, "Unknown variable '%s' in numeric expression",
exp->u.dvar->name);
return 0;
}
return 1;
case PSI_T_NSNAME:
if (!locate_num_exp_constant(exp, data->consts)) {
- data->error(PSI_WARNING, "Unknown constant '%s' in numeric expression",
+ data->error(exp->token, PSI_WARNING, "Unknown constant '%s' in numeric expression",
exp->u.numb);
return 0;
}
case PSI_T_VOID:
set->func->handler = psi_to_void;
break;
+ case PSI_T_ELLIPSIS:
+ if (set->outer.set && set->outer.set->func->type == PSI_T_TO_ARRAY) {
+ set->func->handler = psi_to_recursive;
+ set->inner = set->outer.set->inner;
+ set->count = set->outer.set->count;
+ break;
+ }
+ /* no break */
default:
return 0;
}
decl_var *set_var = set->vars->vars[0];
if (!validate_set_value_handler(set)) {
- data->error(PSI_WARNING, "Invalid cast '%s'", set->func->name);
+ data->error(set->func->token, PSI_WARNING, "Invalid cast '%s' in `set` statement", set->func->name);
return 0;
}
for (i = 0; i < set->vars->count; ++i) {
- if (!locate_decl_var_arg(set->vars->vars[i], ref_list, NULL)) {
- data->error(PSI_WARNING, "Unknown variable '%s'", set->vars->vars[i]->name);
+ decl_var *svar = set->vars->vars[i];
+ if (!svar->arg && !locate_decl_var_arg(svar, ref_list, NULL)) {
+ data->error(svar->token, PSI_WARNING, "Unknown variable '%s' in `set` statement", svar->name);
return 0;
}
}
int is_pointer_to_struct = (ref_type->type == PSI_T_STRUCT && ref->var->pointer_level);
if (!is_to_array && !is_pointer_to_struct) {
- data->error(E_WARNING, "Inner `set` statement casts only work with "
+ data->error(set->func->token, E_WARNING, "Inner `set` statement casts only work with "
"to_array() casts on structs or pointers: %s(%s...", set->func->name, set->vars->vars[0]->name);
return 0;
}
if (ref_type->type == PSI_T_STRUCT) {
/* to_array(struct, to_...) */
- for (i = 0; i < set->count; ++i) {
- decl_var *sub_var = set->inner[i]->vars->vars[0];
- decl_arg *sub_ref = locate_struct_member(ref_type->strct, sub_var);
+ if (!set->outer.set || set->outer.set->inner != set->inner) {
+ for (i = 0; i < set->count; ++i) {
+ decl_var *sub_var = set->inner[i]->vars->vars[0];
+ decl_arg *sub_ref = locate_struct_member(ref_type->strct, sub_var);
- set->inner[i]->outer.set = set;
- if (sub_ref) {
- if (!validate_set_value_ex(data, set->inner[i], sub_ref, ref_type->strct->args)) {
- return 0;
+ if (sub_ref) {
+ if (!validate_set_value_ex(data, set->inner[i], sub_ref, ref_type->strct->args)) {
+ return 0;
+ }
}
}
}
decl_var *sub_var = set->inner[0]->vars->vars[0];
decl_arg *sub_ref = locate_decl_var_arg(sub_var, ref_list, ref);
- set->inner[0]->outer.set = set;
if (sub_ref) {
if (strcmp(sub_var->name, set_var->name)) {
- data->error(E_WARNING, "Inner `set` statement casts on pointers must reference the same variable");
+ data->error(sub_var->token, E_WARNING, "Inner `set` statement casts on pointers must reference the same variable");
return 0;
}
if (!validate_set_value_ex(data, set->inner[0], sub_ref, ref_list)) {
}
}
} else if (set->count > 1) {
- data->error(E_WARNING, "Inner `set` statement casts on pointers may only occur once");
+ data->error(set->func->token, E_WARNING, "Inner `set` statement casts on pointers may only occur once");
return 0;
}
/* and which type cast to apply */
if (impl->stmts->ret.count != 1) {
if (impl->stmts->ret.count > 1) {
- data->error(PSI_WARNING, "Too many `return` statements for implmentation %s;"
+ data->error(impl->stmts->ret.list[1]->token, PSI_WARNING,
+ "Too many `return` statements for implmentation %s;"
" found %zu, exactly one is needed",
impl->func->name, impl->stmts->ret.count);
} else {
- data->error(PSI_WARNING, "Missing `return` statement for implementation %s",
+ data->error(impl->func->token, PSI_WARNING,
+ "Missing `return` statement for implementation %s",
impl->func->name);
}
return 0;
ret = impl->stmts->ret.list[0];
if (!(impl->decl = locate_impl_decl(data->decls, ret))) {
- data->error(PSI_WARNING, "Missing declaration for implementation %s",
- impl->func->name);
+ data->error(ret->token, PSI_WARNING,
+ "Missing declaration '%s' for `return` statment for implementation %s",
+ ret->set->vars->vars[0]->name, impl->func->name);
return 0;
}
static inline int validate_impl_let_stmts(PSI_Data *data, impl *impl) {
size_t i, j;
/* we can have multiple let stmts */
+
/* check that we have a decl arg for every let stmt */
for (i = 0; i < impl->stmts->let.count; ++i) {
let_stmt *let = impl->stmts->let.list[i];
+ decl_var *let_var;
+ int check = 0;
- if (!locate_decl_var_arg(let->var, impl->decl->args, impl->decl->func)) {
- data->error(PSI_WARNING, "Unknown variable '%s' in `let` statement"
- " of implementation '%s'", let->var->name, impl->func->name);
+ if (let->val && let->val->kind == PSI_LET_TMP) {
+ let_var = let->val->data.var;
+ } else {
+ let_var = let->var;
+ }
+
+ if (!locate_decl_var_arg(let_var, impl->decl->args, impl->decl->func)) {
+ data->error(let_var->token, PSI_WARNING, "Unknown variable '%s' in `let` statement"
+ " of implementation '%s'", let_var->name, impl->func->name);
return 0;
}
+
+ switch (let->val->kind) {
+ case PSI_LET_NULL:
+ break;
+ case PSI_LET_TMP:
+ /* e.g. let bar = &strval($bar); // decl_arg(char **bar) */
+ /* e.g. let foo = *bar; */
+ let->var->pointer_level = let->val->data.var->pointer_level;
+ let->var->arg = init_decl_arg(
+ init_decl_type(
+ real_decl_type(let->val->data.var->arg->type)->type,
+ real_decl_type(let->val->data.var->arg->type)->name),
+ init_decl_var(
+ let->var->name,
+ let->var->pointer_level,
+ let->var->array_size));
+ break;
+ case PSI_LET_NUMEXP:
+ if (!validate_num_exp(data, impl->decl->args, impl->decl->func, let->val->data.num)) {
+ return 0;
+ }
+ break;
+ case PSI_LET_CALLOC:
+ if (!validate_num_exp(data, impl->decl->args, impl->decl->func, let->val->data.alloc->nmemb)) {
+ return 0;
+ }
+ if (!validate_num_exp(data, impl->decl->args, impl->decl->func, let->val->data.alloc->size)) {
+ return 0;
+ }
+ break;
+ case PSI_LET_FUNC:
+ 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->data.func->var->name, iarg->var->name)) {
+ let->val->data.func->arg = iarg;
+ check = 1;
+ break;
+ }
+ }
+ }
+ if (!check) {
+ data->error(let->var->token, PSI_WARNING, "Unknown value '$%s' of `let` statement"
+ " for variable '%s' of implementation '%s'",
+ let->val->data.func->var->name, let->var->name, impl->func->name);
+ return 0;
+ }
+ break;
+ }
}
/* check that we have a let stmt for every decl arg */
}
}
if (!check) {
- data->error(PSI_WARNING, "Missing `let` statement for arg '%s %.*s%s'"
+ data->error(impl->func->token, PSI_WARNING,
+ "Missing `let` statement for arg '%s %.*s%s'"
" of declaration '%s' for implementation '%s'",
darg->type->name, (int) darg->var->pointer_level, "*****",
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 < 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_num_exp(data, impl->decl->args, impl->decl->func, let->val->func->alloc->nmemb)) {
- return 0;
- }
- if (!validate_num_exp(data, impl->decl->args, impl->decl->func, let->val->func->alloc->size)) {
- return 0;
- }
- }
- if (let->val && let->val->var) {
- 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)) {
- let->arg = iarg;
- check = 1;
- break;
- }
- }
- if (!check) {
- data->error(PSI_WARNING, "Unknown value '$%s' of `let` statement"
- " for variable '%s' of implementation '%s'",
- let->val->var->name, let->var->name, impl->func->name);
- return 0;
- }
- }
- }
return 1;
}
static inline int validate_impl_set_stmts(PSI_Data *data, impl *impl) {
}
}
if (!check) {
- data->error(PSI_WARNING, "Unknown variable '$%s' of `set` statement"
+ data->error(set->var->token, PSI_WARNING, "Unknown variable '$%s' of `set` statement"
" of implementation '%s'",
set->var->name, impl->func->name);
return 0;
decl_var *set_var = set->val->vars->vars[j];
check = 0;
- if (impl->decl->args) for (k = 0; k < impl->decl->args->count; ++k) {
- decl_arg *set_arg = impl->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;
- set_var->arg = set_arg;
- if (!validate_set_value(data, set->val, 1, &set_arg, 1, &impl->decl->func, impl->decl->args->count, impl->decl->args->args, 0)) {
- return 0;
+ if (!strcmp(set_var->name, set_arg->var->name)) {
+ check = 1;
+ set_var->arg = set_arg;
+ if (!validate_set_value(data, set->val, 1, &set_arg, 1, &impl->decl->func, impl->decl->args->count, impl->decl->args->args, 0)) {
+ return 0;
+ }
+ break;
+ }
+ }
+ }
+ if (!check) {
+ for (k = 0; k < impl->stmts->let.count; ++k) {
+ let_stmt *let = impl->stmts->let.list[k];
+
+ /* check temp vars */
+ if (let->val && let->val->kind == PSI_LET_TMP) {
+ if (!strcmp(set_var->name, let->var->name)) {
+ check = 1;
+ set_var->arg = let->var->arg;
+ if (!validate_set_value(data, set->val, 1, &set_var->arg, 1, &impl->decl->func, impl->decl->args->count, impl->decl->args->args, 0)) {
+ return 0;
+ }
+ break;
+ }
}
- break;
}
}
if (!check) {
- data->error(PSI_WARNING, "Unknown value '%s' of `set` statement"
+ data->error(set_var->token, PSI_WARNING, "Unknown value '%s' of `set` statement"
" for variable '$%s' of implementation '%s'",
set_var->name, set->arg->var->name, impl->func->name);
return 0;
/* first find the decl of the free func */
if (!locate_free_decl(data->decls, free_call)) {
- data->error(PSI_WARNING, "Unknown function '%s' in `free` statement"
- " of implementation '%s'", free_call->func, impl->func->name);
+ data->error(free_call->token, PSI_WARNING,
+ "Missing declaration '%s' in `free` statement"
+ " of implementation '%s'",
+ free_call->func, impl->func->name);
return 0;
}
- if (!impl->decl->args) {
- data->error(PSI_WARNING, "Declaration '%s' of implementation '%s'"
- " does not have any arguments to free",
- impl->decl->func->var->name, impl->func->name);
- }
+
+
/* now check for known vars */
for (l = 0; l < free_call->vars->count; ++l) {
int check = 0;
decl_var *free_var = free_call->vars->vars[l];
- 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;
- free_var->arg = free_arg;
- break;
+ if (!strcmp(free_var->name, impl->decl->func->var->name)) {
+ check = 1;
+ free_var->arg = impl->decl->func;
+ } else 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;
+ free_var->arg = free_arg;
+ break;
+ }
}
}
if (!check) {
- data->error(PSI_WARNING, "Unknown variable '%s' of `free` statement"
+ data->error(free_var->token, PSI_WARNING,
+ "Unknown variable '%s' of `free` statement"
" of implementation '%s'",
free_var->name, impl->func->name);
return 0;
}
static inline int validate_impl_stmts(PSI_Data *data, impl *impl) {
if (!impl->stmts) {
- data->error(PSI_WARNING, "Missing body for implementation %s!",
+ data->error(impl->func->token, PSI_WARNING,
+ "Missing body for implementation %s!",
impl->func->name);
return 0;
}
return 1;
}
+static inline int validate_impl_args(PSI_Data *data, impl *impl) {
+ int def = 0;
+ size_t i;
+
+ for (i = 0; i < impl->func->args->count; ++i) {
+ impl_arg *iarg = impl->func->args->args[i];
+
+ if (iarg->def) {
+ def = 1;
+ } else if (def) {
+ data->error(impl->func->token, PSI_WARNING,
+ "Non-optional argument %zu '$%s' of implementation '%s'"
+ " follows optional argument",
+ i+1, iarg->var->name, impl->func->name);
+ return 0;
+ }
+ }
+
+ return 1;
+}
+static inline int validate_impl(PSI_Data *data, impl *impl) {
+ if (!validate_impl_args(data, impl)) {
+ return 0;
+ }
+ return validate_impl_stmts(data, impl);
+}
+
PSI_Context *PSI_ContextInit(PSI_Context *C, PSI_ContextOps *ops, PSI_ContextErrorFunc error)
{
size_t i;
decl_args *args = init_decl_args(NULL);
decl *decl = init_decl(init_decl_abi("default"), func, args);
+ for (farg = &predef_decl[1]; farg->type_tag; ++farg) {
+ decl_type *arg_type = init_decl_type(farg->type_tag, farg->type_name);
+ decl_var *arg_var = init_decl_var(farg->var_name, farg->pointer_level, farg->array_size);
+ decl_arg *darg = init_decl_arg(arg_type, arg_var);
+ args = add_decl_arg(args, darg);
+ }
+
+ T.decls = add_decl(T.decls, decl);
+ predef_decl = farg;
+ }
+
+ for (predef_decl = &psi_predef_vararg_decls[0]; predef_decl->type_tag; ++predef_decl) {
+ struct psi_predef_decl *farg;
+ decl_type *ftype = init_decl_type(predef_decl->type_tag, predef_decl->type_name);
+ decl_var *fname = init_decl_var(predef_decl->var_name, predef_decl->pointer_level, predef_decl->array_size);
+ decl_arg *func = init_decl_arg(ftype, fname);
+ decl_args *args = init_decl_args(NULL);
+ decl *decl = init_decl(init_decl_abi("default"), func, args);
for (farg = &predef_decl[1]; farg->type_tag; ++farg) {
decl_type *arg_type = init_decl_type(farg->type_tag, farg->type_name);
decl_arg *darg = init_decl_arg(arg_type, arg_var);
args = add_decl_arg(args, darg);
}
+ args->varargs = 1;
T.decls = add_decl(T.decls, decl);
predef_decl = farg;
size_t i;
for (i = 0; i < D->impls->count; ++i) {
- if (validate_impl_stmts(PSI_DATA(C), D->impls->list[i])) {
+ if (validate_impl(PSI_DATA(C), D->impls->list[i])) {
C->impls = add_impl(C->impls, D->impls->list[i]);
}
}
PSI_Parser P;
if (MAXPATHLEN <= slprintf(psi, MAXPATHLEN, "%s/%s", ptr, entries[i]->d_name)) {
- C->error(PSI_WARNING, "Path to PSI file too long: %s/%s",
+ C->error(NULL, PSI_WARNING, "Path to PSI file too long: %s/%s",
ptr, entries[i]->d_name);
}
if (!PSI_ParserInit(&P, psi, C->error, flags)) {
- C->error(PSI_WARNING, "Failed to init PSI parser (%s): %s",
+ C->error(NULL, PSI_WARNING, "Failed to init PSI parser (%s): %s",
psi, strerror(errno));
continue;
}
if (PSI_ContextCompile(C) && SUCCESS != zend_register_functions(NULL, C->closures, NULL, MODULE_PERSISTENT)) {
- C->error(PSI_WARNING, "Failed to register functions!");
+ C->error(NULL, PSI_WARNING, "Failed to register functions!");
}
free(cpy);
}
-void PSI_ContextCall(PSI_Context *C, impl_val *ret_val, decl *decl)
+void PSI_ContextCall(PSI_Context *C, decl_callinfo *decl_call, impl_vararg *va)
{
- C->ops->call(C, ret_val, decl);
+ C->ops->call(C, decl_call, va);
}
static inline void dump_decl_type(int fd, decl_type *t) {
exp = exp->operand;
}
}
+
static inline void dump_impl_set_value(int fd, set_value *set, unsigned level) {
size_t i;
/* only if not directly after `set ...` */
dump_level(fd, level);
}
- dprintf(fd, "%s(", set->func->name);
+
+ if (set->func->type == PSI_T_ELLIPSIS) {
+ dprintf(fd, "%s(", set->outer.set->func->name);
+ } else {
+ dprintf(fd, "%s(", set->func->name);
+ }
for (i = 0; i < set->vars->count; ++i) {
decl_var *svar = set->vars->vars[i];
}
dump_decl_var(fd, svar);
}
+
+ if (set->func->type == PSI_T_ELLIPSIS) {
+ dprintf(fd, ", ...");
+ }
if (set->num) {
dprintf(fd, ", ");
dump_num_exp(fd, set->num);
dprintf(fd, "%s ", decl->abi->convention);
dump_decl_arg(fd, decl->func);
dprintf(fd, "(");
- if (decl->args) for (j = 0; j < decl->args->count; ++j) {
- if (j) {
- dprintf(fd, ", ");
+ if (decl->args) {
+ for (j = 0; j < decl->args->count; ++j) {
+ if (j) {
+ dprintf(fd, ", ");
+ }
+ dump_decl_arg(fd, decl->args->args[j]);
+ }
+ if (decl->args->varargs) {
+ dprintf(fd, ", ...");
}
- dump_decl_arg(fd, decl->args->args[j]);
}
dprintf(fd, ");\n");
}
impl *impl = C->impls->list[i];
dprintf(fd, "function %s(", impl->func->name);
- if (impl->func->args) for (j = 0; j < impl->func->args->count; ++j) {
- impl_arg *iarg = impl->func->args->args[j];
-
- dprintf(fd, "%s%s %s$%s",
- j ? ", " : "",
- iarg->type->name,
- iarg->var->reference ? "&" : "",
- iarg->var->name);
- if (iarg->def) {
- dprintf(fd, " = %s", iarg->def->text);
+ if (impl->func->args) {
+ for (j = 0; j < impl->func->args->count; ++j) {
+ impl_arg *iarg = impl->func->args->args[j];
+
+ dprintf(fd, "%s%s %s$%s",
+ j ? ", " : "",
+ iarg->type->name,
+ iarg->var->reference ? "&" : "",
+ iarg->var->name);
+ if (iarg->def) {
+ dprintf(fd, " = %s", iarg->def->text);
+ }
+ }
+ if (impl->func->args->vararg.name) {
+ impl_arg *vararg = impl->func->args->vararg.name;
+
+ dprintf(fd, ", %s %s...$%s",
+ vararg->type->name,
+ vararg->var->reference ? "&" : "",
+ vararg->var->name);
}
}
dprintf(fd, ") : %s%s {\n",
dprintf(fd, "\tlet %s", let->var->name);
if (let->val) {
- dprintf(fd, " = %s", let->val->is_reference ? "&" : "");
- if (let->val->func) {
- dprintf(fd, "%s(", let->val->func->name);
- if (let->val->func->alloc) {
- dump_num_exp(fd, let->val->func->alloc->nmemb);
- dprintf(fd, ", ");
- dump_num_exp(fd, let->val->func->alloc->size);
- } else {
- dprintf(fd, "$%s", let->val->var->name);
- }
- dprintf(fd, ");\n");
- } else {
- dprintf(fd, "NULL;\n");
+ dprintf(fd, " = %s", let->val->flags.one.is_reference ? "&" : "");
+ switch (let->val->kind) {
+ case PSI_LET_NULL:
+ dprintf(fd, "NULL");
+ break;
+ case PSI_LET_TMP:
+ dump_decl_var(fd, let->val->data.var);
+ break;
+ case PSI_LET_CALLOC:
+ dprintf(fd, "calloc(");
+ dump_num_exp(fd, let->val->data.alloc->nmemb);
+ dprintf(fd, ", ");
+ dump_num_exp(fd, let->val->data.alloc->size);
+ dprintf(fd, ")");
+ break;
+ case PSI_LET_FUNC:
+ dprintf(fd, "%s($%s)", let->val->data.func->name,
+ let->val->data.func->var->name);
+ break;
+
+ EMPTY_SWITCH_DEFAULT_CASE();
}
+ dprintf(fd, ";\n");
}
}
for (j = 0; j < impl->stmts->ret.count; ++j) {
projects / m6w6 / ext-psi / blobdiff