flush

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

diff --git a/src/libffi.c b/src/libffi.c
index b0100f61d96b47763700d1cbf0d06609119899b4..38fa09615a0b79c63a1444802d4f4ce6341c7b6a 100644 (file)
--- a/src/libffi.c
+++ b/src/libffi.c
@@ -60,32 +60,26 @@ static inline ffi_type *psi_ffi_type(token_t t) {
                /* no break */
        case PSI_T_VOID:
                return &ffi_type_void;
-       case PSI_T_SINT8:
+       case PSI_T_INT8:
                return &ffi_type_sint8;
        case PSI_T_UINT8:
                return &ffi_type_uint8;
-       case PSI_T_SINT16:
+       case PSI_T_INT16:
                return &ffi_type_sint16;
        case PSI_T_UINT16:
                return &ffi_type_uint16;
-       case PSI_T_SINT32:
+       case PSI_T_INT32:
                return &ffi_type_sint32;
        case PSI_T_UINT32:
                return &ffi_type_uint32;
-       case PSI_T_SINT64:
+       case PSI_T_INT64:
                return &ffi_type_sint64;
        case PSI_T_UINT64:
                return &ffi_type_uint64;
        case PSI_T_BOOL:
                return &ffi_type_uchar;
-       case PSI_T_CHAR:
-               return &ffi_type_schar;
-       case PSI_T_SHORT:
-               return &ffi_type_sshort;
        case PSI_T_INT:
                return &ffi_type_sint;
-       case PSI_T_LONG:
-               return &ffi_type_slong;
        case PSI_T_FLOAT:
                return &ffi_type_float;
        case PSI_T_DOUBLE:
@@ -263,23 +257,28 @@ static void psi_ffi_dtor(PSI_Context *C)
        PSI_LibffiContextFree((void *) &C->context);
 }
 
-static zend_function_entry *psi_ffi_compile(PSI_Context *C, PSI_Data *D)
+static zend_function_entry *psi_ffi_compile(PSI_Context *C)
 {
        size_t i, j = 0;
-       zend_function_entry *zfe = calloc(D->impls->count + 1, sizeof(*zfe));
+       zend_function_entry *zfe;
        PSI_LibffiContext *ctx = C->context;
 
-       for (i = 0; i < D->impls->count; ++i) {
+       if (!C->impls) {
+               return NULL;
+       }
+
+       zfe = calloc(C->impls->count + 1, sizeof(*zfe));
+       for (i = 0; i < C->impls->count; ++i) {
                zend_function_entry *zf = &zfe[j];
                PSI_LibffiData *data;
 
-               if (!D->impls->list[i]->decl) {
+               if (!C->impls->list[i]->decl) {
                        continue;
                }
 
-               data = PSI_LibffiDataAlloc(ctx, D->impls->list[i]);
-               zf->fname = D->impls->list[i]->func->name + (D->impls->list[i]->func->name[0] == '\\');
-               zf->num_args = D->impls->list[i]->func->args->count;
+               data = PSI_LibffiDataAlloc(ctx, C->impls->list[i]);
+               zf->fname = C->impls->list[i]->func->name + (C->impls->list[i]->func->name[0] == '\\');
+               zf->num_args = C->impls->list[i]->func->args->count;
                zf->handler = data->code;
                zf->arg_info = data->arginfo;
                ++j;