diff options
| author | Rasmus Lerdorf <rasmus@php.net> | 2014-10-16 21:28:40 -0700 |
|---|---|---|
| committer | Rasmus Lerdorf <rasmus@php.net> | 2014-10-16 21:28:40 -0700 |
| commit | a9d6556971a435f71eabf142d8fb814382f3b6ac (patch) | |
| tree | 4fecce88bbc1bc3259856eb0314d780184de85eb /Zend/zend_vm_opcodes.c | |
| parent | 86674b5837bffe4486714f9661620020ee498f3b (diff) | |
| parent | 176b8d7ca3aef3a172d8e429627c98e0328d02d8 (diff) | |
| download | php-git-a9d6556971a435f71eabf142d8fb814382f3b6ac.tar.gz | |
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src: (1132 commits)
Micro optimizations for isset/empty
Micro optimization for zend_hash_next_index_insert_new()
Fix array_keys() on $GLOBALS
Fix procedural finfo calls in methods
Fix allocator for 64bit zend_long with 32bit long
Use intptr_t for zend_intptr_t typedef
Fix format strings in zend_alloc
Drop zend_long64 in favor of int64_t
Removed deprecated fields
NEWS
cleanup NEWS
removing the NEWS entry as we had to revert this fix for now
Revert "Merge branch 'PHP-5.5' into PHP-5.6"
Revert "fix TS build"
Revert "Merge branch 'PHP-5.4' into PHP-5.5"
Revert "Bug #67965: Fix blocking behavior in non-blocking crypto streams"
Revert "Bug #41631: Fix regression from first attempt (6569db8)"
NEWS
Fixed Bug #65171 imagescale() fails
Fixed bug #68234
...
Diffstat (limited to 'Zend/zend_vm_opcodes.c')
| -rw-r--r-- | Zend/zend_vm_opcodes.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/Zend/zend_vm_opcodes.c b/Zend/zend_vm_opcodes.c index 729f922963..067fd362e6 100644 --- a/Zend/zend_vm_opcodes.c +++ b/Zend/zend_vm_opcodes.c @@ -21,7 +21,7 @@ #include <stdio.h> #include <zend.h> -const char *zend_vm_opcodes_map[169] = { +const char *zend_vm_opcodes_map[170] = { "ZEND_NOP", "ZEND_ADD", "ZEND_SUB", @@ -71,11 +71,11 @@ const char *zend_vm_opcodes_map[169] = { "ZEND_JMPZ_EX", "ZEND_JMPNZ_EX", "ZEND_CASE", - "ZEND_SWITCH_FREE", + NULL, "ZEND_BRK", "ZEND_CONT", "ZEND_BOOL", - "ZEND_INIT_STRING", + NULL, "ZEND_ADD_CHAR", "ZEND_ADD_STRING", "ZEND_ADD_VAR", @@ -120,7 +120,7 @@ const char *zend_vm_opcodes_map[169] = { "ZEND_FETCH_UNSET", "ZEND_FETCH_DIM_UNSET", "ZEND_FETCH_OBJ_UNSET", - "ZEND_FETCH_DIM_TMP_VAR", + "ZEND_FETCH_LIST", "ZEND_FETCH_CONSTANT", "ZEND_GOTO", "ZEND_EXT_STMT", @@ -164,7 +164,7 @@ const char *zend_vm_opcodes_map[169] = { "ZEND_DECLARE_CLASS", "ZEND_DECLARE_INHERITED_CLASS", "ZEND_DECLARE_FUNCTION", - "ZEND_RAISE_ABSTRACT_ERROR", + NULL, "ZEND_DECLARE_CONST", "ZEND_ADD_INTERFACE", "ZEND_DECLARE_INHERITED_CLASS_DELAYED", @@ -179,8 +179,8 @@ const char *zend_vm_opcodes_map[169] = { "ZEND_ADD_TRAIT", "ZEND_BIND_TRAITS", "ZEND_SEPARATE", - "ZEND_QM_ASSIGN_VAR", - "ZEND_JMP_SET_VAR", + NULL, + NULL, "ZEND_DISCARD_EXCEPTION", "ZEND_YIELD", "ZEND_GENERATOR_RETURN", @@ -191,6 +191,7 @@ const char *zend_vm_opcodes_map[169] = { "ZEND_POW", "ZEND_ASSIGN_POW", "ZEND_BIND_GLOBAL", + "ZEND_COALESCE", }; ZEND_API const char* zend_get_opcode_name(zend_uchar opcode) { |