com php-src: Improve the names: ext/opcache/Optimizer/block_p ass.c ext/opcache/Optimizer/dfa_pass.c ext/opcache/Op timizer/optimize_func_calls.c
ext/opcache/Optimizer/opt imize_temp_vars_5.c ext/opcache/Optimizer/zend_op timizer.c ext/opcache/Optimizer/zend_optimizer_internal .h
| From: | Xinchen Hui | Date: | Mon, 25 Jan 2016 08:00:10 +0000 |
| Subject: | com php-src: Improve the names: ext/opcache/Optimizer/block_p ass.c ext/opcache/Optimizer/dfa_pass.c ext/opcache/Op timizer/optimize_func_calls.c ext/opcache/Optimizer/opt imize_temp_vars_5.c ext/opcache/Optimizer/zend_op timizer.c ext/opcache/Optimizer/zend_optimizer_internal .h |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-90751@lists.php.net to get a copy of this message | ||
Commit: 63fb2b71187433f404261d30c6eb2b0c97408d4e
Author: Xinchen Hui <laruence@gmail.com> Mon, 25 Jan 2016 16:00:10 +0800
Parents: 506d5fe4df636c7226c0074cc6b08a9ca42b1b26
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=63fb2b71187433f404261d30c6eb2b0c97408d4e
Log:
Improve the names
Changed paths:
M ext/opcache/Optimizer/block_pass.c
M ext/opcache/Optimizer/dfa_pass.c
M ext/opcache/Optimizer/optimize_func_calls.c
M ext/opcache/Optimizer/optimize_temp_vars_5.c
M ext/opcache/Optimizer/zend_optimizer.c
M ext/opcache/Optimizer/zend_optimizer_internal.h
Diff:
diff --git a/ext/opcache/Optimizer/block_pass.c b/ext/opcache/Optimizer/block_pass.c
index 24a9157..9ee28ab 100644
--- a/ext/opcache/Optimizer/block_pass.c
+++ b/ext/opcache/Optimizer/block_pass.c
@@ -1736,7 +1736,7 @@ static void zend_merge_blocks(zend_op_array *op_array, zend_cfg *cfg)
#define PASSES 3
-void optimize_cfg(zend_op_array *op_array, zend_optimizer_ctx *ctx)
+void zend_optimize_cfg(zend_op_array *op_array, zend_optimizer_ctx *ctx)
{
zend_cfg cfg;
zend_basic_block *blocks, *end, *b;
diff --git a/ext/opcache/Optimizer/dfa_pass.c b/ext/opcache/Optimizer/dfa_pass.c
index 7c71e53..3d8b2b6 100644
--- a/ext/opcache/Optimizer/dfa_pass.c
+++ b/ext/opcache/Optimizer/dfa_pass.c
@@ -221,7 +221,7 @@ void zend_dfa_optimize_op_array(zend_op_array *op_array, zend_optimizer_ctx *ctx
}
}
-void optimize_dfa(zend_op_array *op_array, zend_optimizer_ctx *ctx)
+void zend_optimize_dfa(zend_op_array *op_array, zend_optimizer_ctx *ctx)
{
void *checkpoint = zend_arena_checkpoint(ctx->arena);
uint32_t flags = 0;
diff --git a/ext/opcache/Optimizer/optimize_func_calls.c
b/ext/opcache/Optimizer/optimize_func_calls.c
index 2189627..a9fb259 100644
--- a/ext/opcache/Optimizer/optimize_func_calls.c
+++ b/ext/opcache/Optimizer/optimize_func_calls.c
@@ -38,7 +38,7 @@ typedef struct _optimizer_call_info {
zend_op *opline;
} optimizer_call_info;
-void optimize_func_calls(zend_op_array *op_array, zend_optimizer_ctx *ctx)
+void zend_optimize_func_calls(zend_op_array *op_array, zend_optimizer_ctx *ctx)
{
zend_op *opline = op_array->opcodes;
zend_op *end = opline + op_array->last;
diff --git a/ext/opcache/Optimizer/optimize_temp_vars_5.c
b/ext/opcache/Optimizer/optimize_temp_vars_5.c
index eb0e768..31a825e 100644
--- a/ext/opcache/Optimizer/optimize_temp_vars_5.c
+++ b/ext/opcache/Optimizer/optimize_temp_vars_5.c
@@ -39,7 +39,7 @@
max = i; \
}
-void optimize_temporary_variables(zend_op_array *op_array, zend_optimizer_ctx *ctx)
+void zend_optimize_temporary_variables(zend_op_array *op_array, zend_optimizer_ctx *ctx)
{
int T = op_array->T;
int offset = op_array->last_var;
diff --git a/ext/opcache/Optimizer/zend_optimizer.c b/ext/opcache/Optimizer/zend_optimizer.c
index 1a1cebd..47c7620 100644
--- a/ext/opcache/Optimizer/zend_optimizer.c
+++ b/ext/opcache/Optimizer/zend_optimizer.c
@@ -595,7 +595,7 @@ static void zend_optimize(zend_op_array *op_array,
* - INIT_FCALL_BY_NAME -> DO_FCALL
*/
if (ZEND_OPTIMIZER_PASS_4 & ctx->optimization_level) {
- optimize_func_calls(op_array, ctx);
+ zend_optimize_func_calls(op_array, ctx);
if (ctx->debug_level & ZEND_DUMP_AFTER_PASS_4) {
zend_dump_op_array(op_array, 0, "after pass 1", NULL);
}
@@ -605,7 +605,7 @@ static void zend_optimize(zend_op_array *op_array,
* - CFG optimization
*/
if (ZEND_OPTIMIZER_PASS_5 & ctx->optimization_level) {
- optimize_cfg(op_array, ctx);
+ zend_optimize_cfg(op_array, ctx);
if (ctx->debug_level & ZEND_DUMP_AFTER_PASS_5) {
zend_dump_op_array(op_array, 0, "after pass 5", NULL);
}
@@ -617,7 +617,7 @@ static void zend_optimize(zend_op_array *op_array,
*/
if ((ZEND_OPTIMIZER_PASS_6 & ctx->optimization_level) &&
!(ZEND_OPTIMIZER_PASS_7 & ctx->optimization_level)) {
- optimize_dfa(op_array, ctx);
+ zend_optimize_dfa(op_array, ctx);
if (ctx->debug_level & ZEND_DUMP_AFTER_PASS_6) {
zend_dump_op_array(op_array, 0, "after pass 6", NULL);
}
@@ -628,7 +628,7 @@ static void zend_optimize(zend_op_array *op_array,
* - Optimize temp variables usage
*/
if (ZEND_OPTIMIZER_PASS_9 & ctx->optimization_level) {
- optimize_temporary_variables(op_array, ctx);
+ zend_optimize_temporary_variables(op_array, ctx);
if (ctx->debug_level & ZEND_DUMP_AFTER_PASS_9) {
zend_dump_op_array(op_array, 0, "after pass 9", NULL);
}
diff --git a/ext/opcache/Optimizer/zend_optimizer_internal.h
b/ext/opcache/Optimizer/zend_optimizer_internal.h
index 2efb0b2..6483d0b 100644
--- a/ext/opcache/Optimizer/zend_optimizer_internal.h
+++ b/ext/opcache/Optimizer/zend_optimizer_internal.h
@@ -97,12 +97,12 @@ void zend_optimizer_remove_live_range(zend_op_array *op_array, uint32_t var);
void zend_optimizer_pass1(zend_op_array *op_array, zend_optimizer_ctx *ctx);
void zend_optimizer_pass2(zend_op_array *op_array);
void zend_optimizer_pass3(zend_op_array *op_array);
-void optimize_func_calls(zend_op_array *op_array, zend_optimizer_ctx *ctx);
-void optimize_cfg(zend_op_array *op_array, zend_optimizer_ctx *ctx);
-void optimize_dfa(zend_op_array *op_array, zend_optimizer_ctx *ctx);
+void zend_optimize_func_calls(zend_op_array *op_array, zend_optimizer_ctx *ctx);
+void zend_optimize_cfg(zend_op_array *op_array, zend_optimizer_ctx *ctx);
+void zend_optimize_dfa(zend_op_array *op_array, zend_optimizer_ctx *ctx);
int zend_dfa_analyze_op_array(zend_op_array *op_array, zend_optimizer_ctx *ctx, zend_ssa *ssa,
uint32_t *flags);
void zend_dfa_optimize_op_array(zend_op_array *op_array, zend_optimizer_ctx *ctx, zend_ssa *ssa);
-void optimize_temporary_variables(zend_op_array *op_array, zend_optimizer_ctx *ctx);
+void zend_optimize_temporary_variables(zend_op_array *op_array, zend_optimizer_ctx *ctx);
void zend_optimizer_nop_removal(zend_op_array *op_array);
void zend_optimizer_compact_literals(zend_op_array *op_array, zend_optimizer_ctx *ctx);
int zend_optimizer_is_disabled_func(const char *name, size_t len);