com php-src: Merge branch 'PHP-5.6' of https://github.com/php/php-src into PHP-5.6: Zend/zend_vm_opcodes.c
| From: | Joe Watkins | Date: | Sun, 22 Dec 2013 13:17:21 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6' of https://github.com/php/php-src into PHP-5.6: Zend/zend_vm_opcodes.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-75396@lists.php.net to get a copy of this message | ||
Commit: df9f2ad2e96e431232b30688d119eb23f38b7c76
Author: krakjoe <joe.watkins@live.co.uk> Sun, 22 Dec 2013 13:17:21 +0000
Parents: 2a1b60569fda7b9ca949f557c617d2555014e9fd 9f1075bb29a2d27c67c2b74141e59bbfc259ae28
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=df9f2ad2e96e431232b30688d119eb23f38b7c76
Log:
Merge branch 'PHP-5.6' of https://github.com/php/php-src into PHP-5.6
Changed paths:
MM Zend/zend_vm_opcodes.c
Diff:
diff --cc Zend/zend_vm_opcodes.c
index 22fc7cb,04af26c..177c3fd
--- a/Zend/zend_vm_opcodes.c
+++ b/Zend/zend_vm_opcodes.c
@@@ -19,9 -19,8 +19,9 @@@
*/
#include <stdio.h>
+#include <zend.h>
- const char *zend_vm_opcodes_map[164] = {
+ const char *zend_vm_opcodes_map[165] = {
"ZEND_NOP",
"ZEND_ADD",
"ZEND_SUB",
@@@ -186,8 -185,5 +186,9 @@@
"ZEND_GENERATOR_RETURN",
"ZEND_FAST_CALL",
"ZEND_FAST_RET",
+ "ZEND_RECV_VARIADIC",
};
+
+ZEND_API const char* zend_get_opcode_name(zend_uchar opcode) {
+ return zend_vm_opcodes_map[opcode];
+}