zval passthru

[m6w6/ext-psi] / src / context.c

diff --git a/src/context.c b/src/context.c
index 8bd2deef155d1b20da822b217b65e686ed49cde0..c86a595d8c79be86b07db026024c476080d3adcf 100644 (file)
--- a/src/context.c
+++ b/src/context.c
@@ -35,7 +35,7 @@
 #include "php_psi_decls.h"
 #include "php_psi_va_decls.h"
 #include "php_psi_structs.h"
-
+#include "php_psi_unions.h"
 
 PSI_Context *PSI_ContextInit(PSI_Context *C, PSI_ContextOps *ops, PSI_ContextErrorFunc error, unsigned flags)
 {
@@ -43,6 +43,7 @@ PSI_Context *PSI_ContextInit(PSI_Context *C, PSI_ContextOps *ops, PSI_ContextErr
        struct psi_predef_type *predef_type;
        struct psi_predef_const *predef_const;
        struct psi_predef_struct *predef_struct;
+       struct psi_predef_union *predef_union;
        struct psi_predef_decl *predef_decl;
 
        if (!C) {
@@ -85,6 +86,7 @@ PSI_Context *PSI_ContextInit(PSI_Context *C, PSI_ContextOps *ops, PSI_ContextErr
                decl_struct *dstruct = init_decl_struct(predef_struct->var_name, dargs);
 
                dstruct->size = predef_struct->size;
+               dstruct->align = predef_struct->offset;
                for (member = &predef_struct[1]; member->type_tag; ++member) {
                        decl_type *type;
                        decl_var *dvar;
@@ -100,6 +102,28 @@ PSI_Context *PSI_ContextInit(PSI_Context *C, PSI_ContextOps *ops, PSI_ContextErr
                T.structs = add_decl_struct(T.structs, dstruct);
                predef_struct = member;
        }
+       for (predef_union = &psi_predef_unions[0]; predef_union->type_tag; ++predef_union) {
+               struct psi_predef_union *member;
+               decl_args *dargs = init_decl_args(NULL);
+               decl_union *dunion = init_decl_union(predef_union->var_name, dargs);
+
+               dunion->size = predef_union->size;
+               dunion->align = predef_union->offset;
+               for (member = &predef_union[1]; member->type_tag; ++member) {
+                       decl_type *type;
+                       decl_var *dvar;
+                       decl_arg *darg;
+
+                       type = init_decl_type(member->type_tag, member->type_name);
+                       dvar = init_decl_var(member->var_name, member->pointer_level, member->array_size);
+                       darg = init_decl_arg(type, dvar);
+                       darg->layout = init_decl_struct_layout(member->offset, member->size);
+                       dargs = add_decl_arg(dargs, darg);
+               }
+
+               T.unions = add_decl_union(T.unions, dunion);
+               predef_union = member;
+       }
        for (predef_decl = &psi_predef_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);
@@ -160,7 +184,7 @@ void PSI_ContextBuild(PSI_Context *C, const char *paths)
 {
        int i, n;
        char *sep = NULL, *cpy = strdup(paths), *ptr = cpy;
-       struct dirent **entries = NULL;
+       struct dirent **entries;
 
        do {
                sep = strchr(ptr, ':');
@@ -169,6 +193,7 @@ void PSI_ContextBuild(PSI_Context *C, const char *paths)
                        *sep = 0;
                }
 
+               entries = NULL;
                n = php_scandir(ptr, &entries, psi_select_dirent, alphasort);
 
                if (n > 0) {
@@ -317,6 +342,12 @@ void PSI_ContextDtor(PSI_Context *C)
                }
                free(C->structs);
        }
+       if (C->unions) {
+               if (C->unions->list) {
+                       free(C->unions->list);
+               }
+               free(C->unions);
+       }
        if (C->enums) {
                if (C->enums->list) {
                        free(C->enums->list);