Commit:    f627be52540738e124da7cb1566d7f60a2b6a48b
Author:    Nikita Popov <ni...@php.net>         Sat, 26 May 2012 17:53:13 +0200
Parents:   ececcbce0e37a306afc1a039f52188b6c243fecc
Branches:  master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=f627be52540738e124da7cb1566d7f60a2b6a48b

Log:
Add support for executing a zend_execute_data

This adds another function execute_ex(), which accepts a zend_execute_data
struct to run (contrary to execute(), which accepts a zend_op_array from
which it initialized the execute_data).

This needs a bit more cleanup.

Changed paths:
  M  Zend/zend_execute.h
  M  Zend/zend_generators.c
  M  Zend/zend_generators.h
  M  Zend/zend_vm_execute.h
  M  Zend/zend_vm_execute.skl
  M  Zend/zend_vm_gen.php

diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h
index 7d42738..75a7eaa 100644
--- a/Zend/zend_execute.h
+++ b/Zend/zend_execute.h
@@ -56,6 +56,7 @@ void init_executor(TSRMLS_D);
 void shutdown_executor(TSRMLS_D);
 void shutdown_destructors(TSRMLS_D);
 ZEND_API void execute(zend_op_array *op_array TSRMLS_DC);
+ZEND_API void execute_ex(zend_execute_data *execute_data TSRMLS_DC);
 ZEND_API void execute_internal(zend_execute_data *execute_data_ptr, int 
return_value_used TSRMLS_DC);
 ZEND_API int zend_is_true(zval *op);
 #define safe_free_zval_ptr(p) safe_free_zval_ptr_rel(p ZEND_FILE_LINE_CC 
ZEND_FILE_LINE_EMPTY_CC)
diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c
index 00af655..de1271f 100644
--- a/Zend/zend_generators.c
+++ b/Zend/zend_generators.c
@@ -86,13 +86,34 @@ static zend_function *zend_generator_get_constructor(zval 
*object TSRMLS_DC) /*
 }
 /* }}} */
 
+static void zend_generator_resume(zend_generator *generator TSRMLS_DC) /* {{{ 
*/
+{
+       generator->execute_data->opline++;
+       execute_ex(generator->execute_data TSRMLS_CC);
+}
+/* }}} */
+
+static void zend_generator_ensure_initialized(zend_generator *generator 
TSRMLS_DC) /* {{{ */
+{
+       if (!generator->value) {
+               zend_generator_resume(generator TSRMLS_CC);
+       }
+}
+/* }}} */
+
 /* {{{ proto void Generator::rewind()
  * Rewind the generator */
 ZEND_METHOD(Generator, rewind)
 {
+       zend_generator *generator;
+
        if (zend_parse_parameters_none() == FAILURE) {
                return;
        }
+
+       generator = (zend_generator *) zend_object_store_get_object(getThis() 
TSRMLS_CC);
+
+       zend_generator_ensure_initialized(generator TSRMLS_CC);
 }
 /* }}} */
 
@@ -100,9 +121,15 @@ ZEND_METHOD(Generator, rewind)
  * Check whether the generator is valid */
 ZEND_METHOD(Generator, valid)
 {
+       zend_generator *generator;
+
        if (zend_parse_parameters_none() == FAILURE) {
                return;
        }
+
+       generator = (zend_generator *) zend_object_store_get_object(getThis() 
TSRMLS_CC);
+
+       zend_generator_ensure_initialized(generator TSRMLS_CC);
 }
 /* }}} */
 
@@ -110,9 +137,15 @@ ZEND_METHOD(Generator, valid)
  * Get the current value */
 ZEND_METHOD(Generator, current)
 {
+       zend_generator *generator;
+
        if (zend_parse_parameters_none() == FAILURE) {
                return;
        }
+
+       generator = (zend_generator *) zend_object_store_get_object(getThis() 
TSRMLS_CC);
+
+       zend_generator_ensure_initialized(generator TSRMLS_CC);
 }
 /* }}} */
 
@@ -120,9 +153,15 @@ ZEND_METHOD(Generator, current)
  * Get the current key */
 ZEND_METHOD(Generator, key)
 {
+       zend_generator *generator;
+
        if (zend_parse_parameters_none() == FAILURE) {
                return;
        }
+
+       generator = (zend_generator *) zend_object_store_get_object(getThis() 
TSRMLS_CC);
+
+       zend_generator_ensure_initialized(generator TSRMLS_CC);
 }
 /* }}} */
 
@@ -130,9 +169,15 @@ ZEND_METHOD(Generator, key)
  * Advances the generator */
 ZEND_METHOD(Generator, next)
 {
+       zend_generator *generator;
+
        if (zend_parse_parameters_none() == FAILURE) {
                return;
        }
+
+       generator = (zend_generator *) zend_object_store_get_object(getThis() 
TSRMLS_CC);
+
+       zend_generator_ensure_initialized(generator TSRMLS_CC);
 }
 /* }}} */
 
diff --git a/Zend/zend_generators.h b/Zend/zend_generators.h
index c3b8f45..1422b71 100644
--- a/Zend/zend_generators.h
+++ b/Zend/zend_generators.h
@@ -32,6 +32,8 @@ typedef struct _zend_generator {
 
        /* The suspended execution context. */
        zend_execute_data *execute_data;
+       /* Current value */
+       zval *value;
 } zend_generator;
 
 END_EXTERN_C()
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 8316a0a..c83a4db 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -339,25 +339,9 @@ static opcode_handler_t 
zend_vm_get_opcode_handler(zend_uchar opcode, zend_op* o
 #define EX_Ts() EX(Ts)
 
 
-ZEND_API void execute(zend_op_array *op_array TSRMLS_DC)
-{
-       DCL_OPLINE
-
+static zend_execute_data *zend_create_execute_data_from_op_array(zend_op_array 
*op_array, zend_bool nested TSRMLS_DC) {
        zend_execute_data *execute_data;
-       size_t execute_data_size;
-
-       zend_bool nested = 0;
-       zend_bool original_in_execution = EG(in_execution);
-
-
-
-       if (EG(exception)) {
-               return;
-       }
-
-       EG(in_execution) = 1;
 
-zend_vm_enter:
        /*
         * When allocating the execute_data, memory for compiled variables and
         * temporary variables is also allocated after the actual 
zend_execute_data
@@ -367,11 +351,10 @@ zend_vm_enter:
         * In that case the first half contains zval**s and the second half the
         * actual zval*s (which would otherwise be in the symbol table).
         */
-       execute_data_size =
-               ZEND_MM_ALIGNED_SIZE(sizeof(zend_execute_data)) +
-               ZEND_MM_ALIGNED_SIZE(sizeof(zval **) * op_array->last_var * 
(EG(active_symbol_table) ? 1 : 2)) +
-               ZEND_MM_ALIGNED_SIZE(sizeof(temp_variable)) * op_array->T
-       ;
+       size_t execute_data_size = 
ZEND_MM_ALIGNED_SIZE(sizeof(zend_execute_data));
+       size_t CVs_size = ZEND_MM_ALIGNED_SIZE(sizeof(zval **) * 
op_array->last_var * (EG(active_symbol_table) ? 1 : 2));
+       size_t Ts_size = ZEND_MM_ALIGNED_SIZE(sizeof(temp_variable)) * 
op_array->T;
+       size_t total_size = execute_data_size + CVs_size + Ts_size;
 
        /*
         * Normally the execute_data is allocated on the VM stack (because it 
does
@@ -383,14 +366,16 @@ zend_vm_enter:
         * by replacing a pointer.
         */
        if (op_array->fn_flags & ZEND_ACC_GENERATOR) {
-               execute_data = emalloc(execute_data_size);
+               execute_data = emalloc(total_size);
        } else {
-               execute_data = zend_vm_stack_alloc(execute_data_size TSRMLS_CC);
+               execute_data = zend_vm_stack_alloc(total_size TSRMLS_CC);
        }
 
-       EX(CVs) = (zval***)((char*)execute_data + 
ZEND_MM_ALIGNED_SIZE(sizeof(zend_execute_data)));
-       memset(EX(CVs), 0, sizeof(zval**) * op_array->last_var);
-       EX(Ts) = (temp_variable *)(((char*)EX(CVs)) + 
ZEND_MM_ALIGNED_SIZE(sizeof(zval**) * op_array->last_var * 
(EG(active_symbol_table) ? 1 : 2)));
+       EX(CVs) = (zval ***) ((char *) execute_data + execute_data_size);
+       memset(EX(CVs), 0, sizeof(zval **) * op_array->last_var);
+
+       EX(Ts) = (temp_variable *) ((char *) EX(CVs) + CVs_size);
+
        EX(fbc) = NULL;
        EX(called_scope) = NULL;
        EX(object) = NULL;
@@ -400,9 +385,6 @@ zend_vm_enter:
        EX(prev_execute_data) = EG(current_execute_data);
        EG(current_execute_data) = execute_data;
        EX(nested) = nested;
-       nested = 1;
-
-       LOAD_REGS();
 
        if (!op_array->run_time_cache && op_array->last_cache_slot) {
                op_array->run_time_cache = ecalloc(op_array->last_cache_slot, 
sizeof(void*));
@@ -422,11 +404,31 @@ zend_vm_enter:
 
        EX(opline) = UNEXPECTED((op_array->fn_flags & ZEND_ACC_INTERACTIVE) != 
0) && EG(start_op) ? EG(start_op) : op_array->opcodes;
        EG(opline_ptr) = &EX(opline);
-       LOAD_OPLINE();
 
        EX(function_state).function = (zend_function *) op_array;
        EX(function_state).arguments = NULL;
 
+       return execute_data;
+}
+
+ZEND_API void execute_ex(zend_execute_data *execute_data TSRMLS_DC)
+{
+       DCL_OPLINE
+
+       zend_bool original_in_execution = EG(in_execution);
+
+
+
+       if (EG(exception)) {
+               return;
+       }
+
+       EG(in_execution) = 1;
+
+zend_vm_enter:
+       LOAD_REGS();
+       LOAD_OPLINE();
+
        while (1) {
        int ret;
 #ifdef ZEND_WIN32
@@ -441,8 +443,7 @@ zend_vm_enter:
                                        EG(in_execution) = 
original_in_execution;
                                        return;
                                case 2:
-                                       op_array = EG(active_op_array);
-                                       goto zend_vm_enter;
+                                       execute_data = 
zend_create_execute_data_from_op_array(EG(active_op_array), 1 TSRMLS_CC);
                                case 3:
                                        execute_data = EG(current_execute_data);
                                default:
@@ -454,6 +455,13 @@ zend_vm_enter:
        zend_error_noreturn(E_ERROR, "Arrived at end of main loop which 
shouldn't happen");
 }
 
+ZEND_API void execute(zend_op_array *op_array TSRMLS_DC)
+{
+       zend_execute_data *execute_data = 
zend_create_execute_data_from_op_array(op_array, 0 TSRMLS_CC);
+
+       execute_ex(execute_data TSRMLS_CC);
+}
+
 static int ZEND_FASTCALL  ZEND_JMP_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
diff --git a/Zend/zend_vm_execute.skl b/Zend/zend_vm_execute.skl
index 359e052..d251e55 100644
--- a/Zend/zend_vm_execute.skl
+++ b/Zend/zend_vm_execute.skl
@@ -1,26 +1,8 @@
 {%DEFINES%}
 
-ZEND_API void {%EXECUTOR_NAME%}(zend_op_array *op_array TSRMLS_DC)
-{
-       DCL_OPLINE
-
+static zend_execute_data *zend_create_execute_data_from_op_array(zend_op_array 
*op_array, zend_bool nested TSRMLS_DC) {
        zend_execute_data *execute_data;
-       size_t execute_data_size;
-
-       zend_bool nested = 0;
-       zend_bool original_in_execution = EG(in_execution);
-
-       {%HELPER_VARS%}
-
-       {%INTERNAL_LABELS%}
-
-       if (EG(exception)) {
-               return;
-       }
-
-       EG(in_execution) = 1;
 
-zend_vm_enter:
        /*
         * When allocating the execute_data, memory for compiled variables and
         * temporary variables is also allocated after the actual 
zend_execute_data
@@ -30,11 +12,10 @@ zend_vm_enter:
         * In that case the first half contains zval**s and the second half the
         * actual zval*s (which would otherwise be in the symbol table).
         */
-       execute_data_size =
-               ZEND_MM_ALIGNED_SIZE(sizeof(zend_execute_data)) +
-               ZEND_MM_ALIGNED_SIZE(sizeof(zval **) * op_array->last_var * 
(EG(active_symbol_table) ? 1 : 2)) +
-               ZEND_MM_ALIGNED_SIZE(sizeof(temp_variable)) * op_array->T
-       ;
+       size_t execute_data_size = 
ZEND_MM_ALIGNED_SIZE(sizeof(zend_execute_data));
+       size_t CVs_size = ZEND_MM_ALIGNED_SIZE(sizeof(zval **) * 
op_array->last_var * (EG(active_symbol_table) ? 1 : 2));
+       size_t Ts_size = ZEND_MM_ALIGNED_SIZE(sizeof(temp_variable)) * 
op_array->T;
+       size_t total_size = execute_data_size + CVs_size + Ts_size;
 
        /*
         * Normally the execute_data is allocated on the VM stack (because it 
does
@@ -46,14 +27,16 @@ zend_vm_enter:
         * by replacing a pointer.
         */
        if (op_array->fn_flags & ZEND_ACC_GENERATOR) {
-               execute_data = emalloc(execute_data_size);
+               execute_data = emalloc(total_size);
        } else {
-               execute_data = zend_vm_stack_alloc(execute_data_size TSRMLS_CC);
+               execute_data = zend_vm_stack_alloc(total_size TSRMLS_CC);
        }
 
-       EX(CVs) = (zval***)((char*)execute_data + 
ZEND_MM_ALIGNED_SIZE(sizeof(zend_execute_data)));
-       memset(EX(CVs), 0, sizeof(zval**) * op_array->last_var);
-       EX(Ts) = (temp_variable *)(((char*)EX(CVs)) + 
ZEND_MM_ALIGNED_SIZE(sizeof(zval**) * op_array->last_var * 
(EG(active_symbol_table) ? 1 : 2)));
+       EX(CVs) = (zval ***) ((char *) execute_data + execute_data_size);
+       memset(EX(CVs), 0, sizeof(zval **) * op_array->last_var);
+
+       EX(Ts) = (temp_variable *) ((char *) EX(CVs) + CVs_size);
+
        EX(fbc) = NULL;
        EX(called_scope) = NULL;
        EX(object) = NULL;
@@ -63,9 +46,6 @@ zend_vm_enter:
        EX(prev_execute_data) = EG(current_execute_data);
        EG(current_execute_data) = execute_data;
        EX(nested) = nested;
-       nested = 1;
-
-       LOAD_REGS();
 
        if (!op_array->run_time_cache && op_array->last_cache_slot) {
                op_array->run_time_cache = ecalloc(op_array->last_cache_slot, 
sizeof(void*));
@@ -85,11 +65,33 @@ zend_vm_enter:
 
        EX(opline) = UNEXPECTED((op_array->fn_flags & ZEND_ACC_INTERACTIVE) != 
0) && EG(start_op) ? EG(start_op) : op_array->opcodes;
        EG(opline_ptr) = &EX(opline);
-       LOAD_OPLINE();
 
        EX(function_state).function = (zend_function *) op_array;
        EX(function_state).arguments = NULL;
 
+       return execute_data;
+}
+
+ZEND_API void {%EXECUTOR_NAME%}_ex(zend_execute_data *execute_data TSRMLS_DC)
+{
+       DCL_OPLINE
+
+       zend_bool original_in_execution = EG(in_execution);
+
+       {%HELPER_VARS%}
+
+       {%INTERNAL_LABELS%}
+
+       if (EG(exception)) {
+               return;
+       }
+
+       EG(in_execution) = 1;
+
+zend_vm_enter:
+       LOAD_REGS();
+       LOAD_OPLINE();
+
        while (1) {
     {%ZEND_VM_CONTINUE_LABEL%}
 #ifdef ZEND_WIN32
@@ -106,6 +108,13 @@ zend_vm_enter:
        zend_error_noreturn(E_ERROR, "Arrived at end of main loop which 
shouldn't happen");
 }
 
+ZEND_API void {%EXECUTOR_NAME%}(zend_op_array *op_array TSRMLS_DC)
+{
+       zend_execute_data *execute_data = 
zend_create_execute_data_from_op_array(op_array, 0 TSRMLS_CC);
+
+       {%EXECUTOR_NAME%}_ex(execute_data TSRMLS_CC);
+}
+
 {%EXTERNAL_EXECUTOR%}
 
 void {%INITIALIZER_NAME%}(void)
diff --git a/Zend/zend_vm_gen.php b/Zend/zend_vm_gen.php
index a6314ed..b7fd874 100644
--- a/Zend/zend_vm_gen.php
+++ b/Zend/zend_vm_gen.php
@@ -976,8 +976,7 @@ function gen_executor($f, $skl, $spec, $kind, 
$executor_name, $initializer_name,
                                                        
$m[1]."\t\tEG(in_execution) = original_in_execution;\n".
                                                        $m[1]."\t\treturn;\n".
                                                        $m[1]."\tcase 2:\n" . 
-                                                       $m[1]."\t\top_array = 
EG(active_op_array);\n".
-                                                       $m[1]."\t\tgoto 
zend_vm_enter;\n".
+                                                       $m[1]."\t\texecute_data 
= zend_create_execute_data_from_op_array(EG(active_op_array), 1 TSRMLS_CC);\n".
                                                        $m[1]."\tcase 3:\n" . 
                                                        $m[1]."\t\texecute_data 
= EG(current_execute_data);\n".
                                                        $m[1]."\tdefault:\n".
-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to