com php-src: Merge branch 'PHP-7.0': ext/opcache/Optimizer/zend _optimizer.h

From: Date: Tue, 22 Dec 2015 18:33:07 +0000
Subject: com php-src: Merge branch 'PHP-7.0': ext/opcache/Optimizer/zend _optimizer.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-90403@lists.php.net to get a copy of this message
Commit: 5c1c8f1decfa6206645df2a8a1b56062849d53aa Author: Dmitry Stogov <dmitry@zend.com> Tue, 22 Dec 2015 21:33:07 +0300 Parents: 6e6280a388f142e66e8c2c4fbac1d35df26f5c9a f3bf95eb81a43e9e77277f5548687cdcc767a7ee Branches: master Link: http://git.php.net/?p=php-src..git;a=commitdiff;h=5c1c8f1decfa6206645df2a8a1b56062849d53aa Log: Merge branch 'PHP-7.0' * PHP-7.0: Fixed incorrect setting on 32-bit systems Changed paths: MM ext/opcache/Optimizer/zend_optimizer.h Diff: diff --cc ext/opcache/Optimizer/zend_optimizer.h index 6d05315,d83ec85..5ec7d8f --- a/ext/opcache/Optimizer/zend_optimizer.h +++ b/ext/opcache/Optimizer/zend_optimizer.h @@@ -41,51 -41,8 +41,51 @@@ #define ZEND_OPTIMIZER_PASS_14 (1<<13) #define ZEND_OPTIMIZER_PASS_15 (1<<14) /* Collect constants */ - #define ZEND_OPTIMIZER_ALL_PASSES 0xFFFFFFFF + #define ZEND_OPTIMIZER_ALL_PASSES 0x7FFFFFFF - #define DEFAULT_OPTIMIZATION_LEVEL "0xFFFFBFFF" + #define DEFAULT_OPTIMIZATION_LEVEL "0x7FFFBFFF" + +#define ZEND_DUMP_AFTER_PASS_1 ZEND_OPTIMIZER_PASS_1 +#define ZEND_DUMP_AFTER_PASS_2 ZEND_OPTIMIZER_PASS_2 +#define ZEND_DUMP_AFTER_PASS_3 ZEND_OPTIMIZER_PASS_3 +#define ZEND_DUMP_AFTER_PASS_4 ZEND_OPTIMIZER_PASS_4 +#define ZEND_DUMP_AFTER_PASS_5 ZEND_OPTIMIZER_PASS_5 +#define ZEND_DUMP_AFTER_PASS_6 ZEND_OPTIMIZER_PASS_6 +#define ZEND_DUMP_AFTER_PASS_7 ZEND_OPTIMIZER_PASS_7 +#define ZEND_DUMP_AFTER_PASS_8 ZEND_OPTIMIZER_PASS_8 +#define ZEND_DUMP_AFTER_PASS_9 ZEND_OPTIMIZER_PASS_9 +#define ZEND_DUMP_AFTER_PASS_10 ZEND_OPTIMIZER_PASS_10 +#define ZEND_DUMP_AFTER_PASS_11 ZEND_OPTIMIZER_PASS_11 +#define ZEND_DUMP_AFTER_PASS_12 ZEND_OPTIMIZER_PASS_12 +#define ZEND_DUMP_AFTER_PASS_13 ZEND_OPTIMIZER_PASS_13 +#define ZEND_DUMP_AFTER_PASS_14 ZEND_OPTIMIZER_PASS_14 + +#define ZEND_DUMP_BEFORE_OPTIMIZER (1<<16) +#define ZEND_DUMP_AFTER_OPTIMIZER (1<<17) + +#define ZEND_DUMP_BEFORE_BLOCK_PASS (1<<18) +#define ZEND_DUMP_AFTER_BLOCK_PASS (1<<19) +#define ZEND_DUMP_BLOCK_PASS_VARS (1<<20) + +#define ZEND_DUMP_BEFORE_DFA_PASS (1<<21) +#define ZEND_DUMP_AFTER_DFA_PASS (1<<22) +#define ZEND_DUMP_DFA_CFG (1<<23) +#define ZEND_DUMP_DFA_DOMINATORS (1<<24) +#define ZEND_DUMP_DFA_LIVENESS (1<<25) +#define ZEND_DUMP_DFA_PHI (1<<26) +#define ZEND_DUMP_DFA_SSA (1<<27) +#define ZEND_DUMP_DFA_SSA_VARS (1<<28) + +typedef struct _zend_script { + zend_string *filename; + zend_op_array main_op_array; + HashTable function_table; + HashTable class_table; +} zend_script; + +int zend_optimize_script(zend_script *script, zend_long optimization_level, zend_long debug_level); +int zend_optimizer_startup(void); +int zend_optimizer_shutdown(void); + #endif

« previous php.cvs (#90403) next »