com php-src: Improve the conditions(save one comparison): Zend/zend_vm_execute.h Zend/zend_vm_gen.php
| From: | Xinchen Hui | Date: | Wed, 15 Jul 2015 02:55:41 +0000 |
| Subject: | com php-src: Improve the conditions(save one comparison): Zend/zend_vm_execute.h Zend/zend_vm_gen.php | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-87995@lists.php.net to get a copy of this message | ||
Commit: d0bea17d2ed97d889f919e92b93f922b4dff8e9e
Author: Xinchen Hui <laruence@php.net> Wed, 15 Jul 2015 10:55:41 +0800
Parents: 32a4507abc2331712ae4a2d921467f5afbab701c
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d0bea17d2ed97d889f919e92b93f922b4dff8e9e
Log:
Improve the conditions(save one comparison)
Changed paths:
M Zend/zend_vm_execute.h
M Zend/zend_vm_gen.php
Diff:
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 8419dcc..a229ba8 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -49553,10 +49553,7 @@ ZEND_API int zend_vm_call_opcode_handler(zend_execute_data* ex)
LOAD_OPLINE();
#if defined(ZEND_VM_FP_GLOBAL_REG) && defined(ZEND_VM_IP_GLOBAL_REG)
((opcode_handler_t)OPLINE->handler)(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
- ret = (opline) ? execute_data != ex : -1;
- if (ret == 1 && execute_data->prev_execute_data != ex) {
- ret = 2;;
- }
+ ret = opline? ((execute_data != ex)? (int)(execute_data->prev_execute_data != ex) + 1 : 0) :
-1;
#else
ret = ((opcode_handler_t)OPLINE->handler)(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
#endif
diff --git a/Zend/zend_vm_gen.php b/Zend/zend_vm_gen.php
index ce4a321..ed19448 100644
--- a/Zend/zend_vm_gen.php
+++ b/Zend/zend_vm_gen.php
@@ -1606,10 +1606,7 @@ function gen_vm($def, $skel) {
out($f, "\tLOAD_OPLINE();\n");
out($f,"#if defined(ZEND_VM_FP_GLOBAL_REG) &&
defined(ZEND_VM_IP_GLOBAL_REG)\n");
out($f,
"\t((opcode_handler_t)OPLINE->handler)(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);\n");
- out($f, "\tret = (opline) ? execute_data != ex : -1;\n");
- out($f, "\tif (ret == 1 && execute_data->prev_execute_data != ex) {\n");
- out($f, "\t\tret = 2;;\n");
- out($f, "\t}\n");
+ out($f, "\tret = opline? ((execute_data != ex)? (int)(execute_data->prev_execute_data !=
ex) + 1 : 0) : -1;\n");
out($f, "#else\n");
out($f, "\tret =
((opcode_handler_t)OPLINE->handler)(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);\n");
out($f, "#endif\n");