diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-08-25 02:38:06 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-08-25 02:38:06 +0300 |
| commit | 2482325b3d9c45603d4fc5f7c6f7baef0e958a58 (patch) | |
| tree | aa085bd39a49d8701d40369ecf8e9ca5ea340b3e | |
| parent | a8d38674b1d75de54bb1d3d1436da759ef8e64d7 (diff) | |
| download | php-git-2482325b3d9c45603d4fc5f7c6f7baef0e958a58.tar.gz | |
Assign CPU registers for GOTO and SWITCH executor as well
| -rw-r--r-- | Zend/zend_vm_gen.php | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/Zend/zend_vm_gen.php b/Zend/zend_vm_gen.php index b163739428..3a80705b6a 100644 --- a/Zend/zend_vm_gen.php +++ b/Zend/zend_vm_gen.php @@ -1111,7 +1111,11 @@ function gen_executor($f, $skl, $spec, $kind, $executor_name, $initializer_name) out($f,"#undef LOAD_NEXT_OPLINE\n"); out($f,"#undef SAVE_OPLINE\n"); out($f,"#define OPLINE opline\n"); - out($f,"#define DCL_OPLINE const zend_op *opline;\n"); + out($f,"#ifdef ZEND_VM_IP_GLOBAL_REG\n"); + out($f,"# define DCL_OPLINE register const zend_op *opline __asm__(ZEND_VM_IP_GLOBAL_REG);\n"); + out($f,"#else\n"); + out($f,"# define DCL_OPLINE const zend_op *opline;\n"); + out($f,"#endif\n"); out($f,"#define USE_OPLINE\n"); out($f,"#define LOAD_OPLINE() opline = EX(opline)\n"); out($f,"#define LOAD_NEXT_OPLINE() opline = EX(opline) + 1\n"); @@ -1136,7 +1140,11 @@ function gen_executor($f, $skl, $spec, $kind, $executor_name, $initializer_name) out($f,"#undef LOAD_NEXT_OPLINE\n"); out($f,"#undef SAVE_OPLINE\n"); out($f,"#define OPLINE opline\n"); - out($f,"#define DCL_OPLINE const zend_op *opline;\n"); + out($f,"#ifdef ZEND_VM_IP_GLOBAL_REG\n"); + out($f,"# define DCL_OPLINE register const zend_op *opline __asm__(ZEND_VM_IP_GLOBAL_REG);\n"); + out($f,"#else\n"); + out($f,"# define DCL_OPLINE const zend_op *opline;\n"); + out($f,"#endif\n"); out($f,"#define USE_OPLINE\n"); out($f,"#define LOAD_OPLINE() opline = EX(opline)\n"); out($f,"#define LOAD_NEXT_OPLINE() opline = EX(opline) + 1\n"); @@ -1171,7 +1179,11 @@ function gen_executor($f, $skl, $spec, $kind, $executor_name, $initializer_name) foreach ($params as $param => $x) { out($f,$m[1].$param.";\n"); } + out($f,"#ifdef ZEND_VM_FP_GLOBAL_REG\n"); + out($f,$m[1]."register zend_execute_data *execute_data __asm__(ZEND_VM_FP_GLOBAL_REG) = ex;\n"); + out($f,"#else\n"); out($f,$m[1]."zend_execute_data *execute_data = ex;\n"); + out($f,"#endif\n"); } else { out($f,"#ifdef ZEND_VM_IP_GLOBAL_REG\n"); out($f,$m[1]."const zend_op *orig_opline = opline;\n"); |