Changeset 626
- Timestamp:
- 2009-07-05T11:15:55+02:00 (4 years ago)
- Location:
- branches/1.3
- Files:
-
- 1 deleted
- 15 edited
-
. (modified) (1 prop)
-
ChangeLog (modified) (2 diffs)
-
NEWS (modified) (1 diff)
-
const_string.c (modified) (1 diff)
-
const_string_opcodes_php4.x.h (modified) (1 diff)
-
const_string_opcodes_php5.1.h (modified) (4 diffs)
-
const_string_opcodes_php5.3.h (deleted)
-
const_string_opcodes_php6.x.h (modified) (1 diff)
-
mkopcode.awk (modified) (1 diff)
-
mkopcode_spec.awk (modified) (1 diff)
-
opcode_spec_def.h (modified) (3 diffs)
-
prepare.devel (modified) (2 diffs)
-
processor/main.m4 (modified) (1 diff)
-
processor/processor.m4 (modified) (1 diff)
-
xcache.c (modified) (3 diffs)
-
xcache.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/1.3
-
branches/1.3/ChangeLog
r625 r626 1 1 1.3.0 2009-??-?? 2 2 == ChangeLog == 3 * PHP 5.3 Supported3 * PHP 5.3 support 4 4 * fixed #138: no segv if cache is not initialized correctly 5 5 * default to 64M for xcache.size in xcache.ini … … 11 11 1.2.2 2007-12-29 12 12 == ChangeLog == 13 * added module dependency14 13 * added module dependency 15 14 * live with wrong system time: allow caching files with mtime in further -
branches/1.3/NEWS
r625 r626 1 1 1.3.0 2009-??-?? 2 2 ======== 3 * PHP 5.3 Supported3 * PHP 5.3 support 4 4 * many cacher/coverager bug fixes 5 5 * improved admin pages 6 6 * admin page is now magic quote gpc aware 7 7 8 8 1.2.2 2007-12-29 9 9 ======== -
branches/1.3/const_string.c
r622 r626 64 64 #if PHP_MAJOR_VERSION >= 6 65 65 # include "const_string_opcodes_php6.x.h" 66 #elif defined(ZEND_ENGINE_2_3)67 # include "const_string_opcodes_php5.3.h"68 66 #elif defined(ZEND_ENGINE_2_1) 69 67 # include "const_string_opcodes_php5.1.h" -
branches/1.3/const_string_opcodes_php4.x.h
r394 r626 1 /* size = 11 2*/1 /* size = 113 */ 2 2 static const char *const xc_opcode_names[] = { 3 3 /* 0 */ "NOP", -
branches/1.3/const_string_opcodes_php5.1.h
r394 r626 1 /* size = 15 0*/1 /* size = 154 */ 2 2 static const char *const xc_opcode_names[] = { 3 3 /* 0 */ "NOP", … … 70 70 /* 67 */ "SEND_REF", 71 71 /* 68 */ "NEW", 72 /* 69 */ " UNDEF",72 /* 69 */ "INIT_NS_FCALL_BY_NAME", 73 73 /* 70 */ "FREE", 74 74 /* 71 */ "INIT_ARRAY", … … 101 101 /* 98 */ "FETCH_DIM_TMP_VAR", 102 102 /* 99 */ "FETCH_CONSTANT", 103 /* 100 */ " UNDEF",103 /* 100 */ "GOTO", 104 104 /* 101 */ "EXT_STMT", 105 105 /* 102 */ "EXT_FCALL_BEGIN", … … 144 144 /* 141 */ "DECLARE_FUNCTION", 145 145 /* 142 */ "RAISE_ABSTRACT_ERROR", 146 /* 143 */ " UNDEF",146 /* 143 */ "DECLARE_CONST", 147 147 /* 144 */ "ADD_INTERFACE", 148 /* 145 */ " UNDEF",148 /* 145 */ "DECLARE_INHERITED_CLASS_DELAYED", 149 149 /* 146 */ "VERIFY_ABSTRACT_CLASS", 150 150 /* 147 */ "ASSIGN_DIM", 151 151 /* 148 */ "ISSET_ISEMPTY_PROP_OBJ", 152 152 /* 149 */ "HANDLE_EXCEPTION", 153 /* 150 */ "USER_OPCODE" 153 /* 150 */ "USER_OPCODE", 154 /* 151 */ "UNDEF", 155 /* 152 */ "JMP_SET", 156 /* 153 */ "DECLARE_LAMBDA_FUNCTION" 154 157 }; -
branches/1.3/const_string_opcodes_php6.x.h
r561 r626 1 /* size = 15 3*/1 /* size = 154 */ 2 2 static const char *const xc_opcode_names[] = { 3 3 /* 0 */ "NOP", -
branches/1.3/mkopcode.awk
r394 r626 54 54 opcodes[112] = "UNDEF"; 55 55 } 56 printf "/* size = %d */\n", max ;56 printf "/* size = %d */\n", max + 1; 57 57 print "static const char *const xc_opcode_names[] = {"; 58 58 for (i = 0; i <= max; i ++) { -
branches/1.3/mkopcode_spec.awk
r623 r626 10 10 /OPDEF/ { 11 11 if (started) { 12 sub(/".*"/, "") 12 name = ""; 13 if (match($0, /"([^"]+)"/, m)) { 14 name = m[1]; 15 } 16 sub(/"[^"]*"/, ""); 13 17 if (!match($0, /EXT_([^ |]+).*OP[1S]_([^ |]+).*OP2_([^ |]+).*RES_([^ |)]+).*/, array)) { 14 18 print "error" $0 15 19 exit 16 20 } 17 comment= "";18 if (match($0, /\/\* (\d+)\*\//, comments)) {19 comment= comments[1];21 id = ""; 22 if (match($0, /\/\* *([0-9]+) *\*\//, comments)) { 23 id = comments[1]; 20 24 } 21 printf "\tOPSPEC(%10s, %10s, %10s, %10s) %s\n", array[1], array[2], array[3], array[4], comment;25 printf "\tOPSPEC(%10s, %10s, %10s, %10s) /* %s %-30s */\n", array[1], array[2], array[3], array[4], id, name; 22 26 next 23 27 } -
branches/1.3/opcode_spec_def.h
r420 r626 1 1 static const xc_opcode_spec_t xc_opcode_spec[] = { 2 OPSPEC( UNUSED, UNUSED, UNUSED, UNUSED) 3 OPSPEC( UNUSED, STD, STD, TMP) 4 OPSPEC( UNUSED, STD, STD, TMP) 5 OPSPEC( UNUSED, STD, STD, TMP) 6 OPSPEC( UNUSED, STD, STD, TMP) 7 OPSPEC( UNUSED, STD, STD, TMP) 8 OPSPEC( UNUSED, STD, STD, TMP) 9 OPSPEC( UNUSED, STD, STD, TMP) 10 OPSPEC( UNUSED, STD, STD, TMP) 11 OPSPEC( UNUSED, STD, STD, TMP) 12 OPSPEC( UNUSED, STD, STD, TMP) 13 OPSPEC( UNUSED, STD, STD, TMP) 14 OPSPEC( UNUSED, STD, UNUSED, TMP) 15 OPSPEC( UNUSED, STD, STD, TMP) 16 OPSPEC( UNUSED, STD, STD, TMP) 17 OPSPEC( UNUSED, STD, STD, TMP) 18 OPSPEC( UNUSED, STD, STD, TMP) 19 OPSPEC( UNUSED, STD, STD, TMP) 20 OPSPEC( UNUSED, STD, STD, TMP) 21 OPSPEC( UNUSED, STD, STD, TMP) 22 OPSPEC( UNUSED, STD, STD, TMP) 23 OPSPEC( CAST, STD, UNUSED, TMP) 24 OPSPEC( UNUSED, STD, UNUSED, TMP) 25 #ifdef ZEND_ENGINE_2 26 OPSPEC( ASSIGN, STD, STD, VAR) 27 OPSPEC( ASSIGN, STD, STD, VAR) 28 OPSPEC( ASSIGN, STD, STD, VAR) 29 OPSPEC( ASSIGN, STD, STD, VAR) 30 OPSPEC( ASSIGN, STD, STD, VAR) 31 OPSPEC( ASSIGN, STD, STD, VAR) 32 OPSPEC( ASSIGN, STD, STD, VAR) 33 OPSPEC( ASSIGN, STD, STD, VAR) 34 OPSPEC( ASSIGN, STD, STD, VAR) 35 OPSPEC( ASSIGN, STD, STD, VAR) 36 OPSPEC( ASSIGN, STD, STD, VAR) 37 #else 38 OPSPEC( UNUSED, VAR, STD, VAR) 39 OPSPEC( UNUSED, VAR, STD, VAR) 40 OPSPEC( UNUSED, VAR, STD, VAR) 41 OPSPEC( UNUSED, VAR, STD, VAR) 42 OPSPEC( UNUSED, VAR, STD, VAR) 43 OPSPEC( UNUSED, VAR, STD, VAR) 44 OPSPEC( UNUSED, VAR, STD, VAR) 45 OPSPEC( UNUSED, VAR, STD, VAR) 46 OPSPEC( UNUSED, VAR, STD, VAR) 47 OPSPEC( UNUSED, VAR, STD, VAR) 48 OPSPEC( UNUSED, VAR, STD, VAR) 49 #endif 50 OPSPEC( UNUSED, VAR, UNUSED, VAR) 51 OPSPEC( UNUSED, VAR, UNUSED, VAR) 52 OPSPEC( UNUSED, VAR, UNUSED, TMP) 53 OPSPEC( UNUSED, VAR, UNUSED, TMP) 54 OPSPEC( UNUSED, VAR, STD, VAR) 55 OPSPEC( UNUSED, VAR, VAR, VAR) 56 OPSPEC( UNUSED, STD, UNUSED, UNUSED) 57 OPSPEC( UNUSED, STD, UNUSED, TMP) 58 #ifdef ZEND_ENGINE_2 59 OPSPEC( UNUSED, JMPADDR, UNUSED, UNUSED) 60 OPSPEC( UNUSED, STD, JMPADDR, UNUSED) 61 OPSPEC( UNUSED, STD, JMPADDR, UNUSED) 2 OPSPEC( UNUSED, UNUSED, UNUSED, UNUSED) /* 0 NOP */ 3 OPSPEC( UNUSED, STD, STD, TMP) /* 1 ADD */ 4 OPSPEC( UNUSED, STD, STD, TMP) /* 2 SUB */ 5 OPSPEC( UNUSED, STD, STD, TMP) /* 3 MUL */ 6 OPSPEC( UNUSED, STD, STD, TMP) /* 4 DIV */ 7 OPSPEC( UNUSED, STD, STD, TMP) /* 5 MOD */ 8 OPSPEC( UNUSED, STD, STD, TMP) /* 6 SL */ 9 OPSPEC( UNUSED, STD, STD, TMP) /* 7 SR */ 10 OPSPEC( UNUSED, STD, STD, TMP) /* 8 CONCAT */ 11 OPSPEC( UNUSED, STD, STD, TMP) /* 9 BW_OR */ 12 OPSPEC( UNUSED, STD, STD, TMP) /* 10 BW_AND */ 13 OPSPEC( UNUSED, STD, STD, TMP) /* 11 BW_XOR */ 14 OPSPEC( UNUSED, STD, UNUSED, TMP) /* 12 BW_NOT */ 15 OPSPEC( UNUSED, STD, STD, TMP) /* 13 BOOL_NOT */ 16 OPSPEC( UNUSED, STD, STD, TMP) /* 14 BOOL_XOR */ 17 OPSPEC( UNUSED, STD, STD, TMP) /* 15 IS_IDENTICAL */ 18 OPSPEC( UNUSED, STD, STD, TMP) /* 16 IS_NOT_IDENTICAL */ 19 OPSPEC( UNUSED, STD, STD, TMP) /* 17 IS_EQUAL */ 20 OPSPEC( UNUSED, STD, STD, TMP) /* 18 IS_NOT_EQUAL */ 21 OPSPEC( UNUSED, STD, STD, TMP) /* 19 IS_SMALLER */ 22 OPSPEC( UNUSED, STD, STD, TMP) /* 20 IS_SMALLER_OR_EQUAL */ 23 OPSPEC( CAST, STD, UNUSED, TMP) /* 21 CAST */ 24 OPSPEC( UNUSED, STD, UNUSED, TMP) /* 22 QM_ASSIGN */ 25 #ifdef ZEND_ENGINE_2 26 OPSPEC( ASSIGN, STD, STD, VAR) /* 23 ASSIGN_ADD */ 27 OPSPEC( ASSIGN, STD, STD, VAR) /* 24 ASSIGN_SUB */ 28 OPSPEC( ASSIGN, STD, STD, VAR) /* 25 ASSIGN_MUL */ 29 OPSPEC( ASSIGN, STD, STD, VAR) /* 26 ASSIGN_DIV */ 30 OPSPEC( ASSIGN, STD, STD, VAR) /* 27 ASSIGN_MOD */ 31 OPSPEC( ASSIGN, STD, STD, VAR) /* 28 ASSIGN_SL */ 32 OPSPEC( ASSIGN, STD, STD, VAR) /* 29 ASSIGN_SR */ 33 OPSPEC( ASSIGN, STD, STD, VAR) /* 30 ASSIGN_CONCAT */ 34 OPSPEC( ASSIGN, STD, STD, VAR) /* 31 ASSIGN_BW_OR */ 35 OPSPEC( ASSIGN, STD, STD, VAR) /* 32 ASSIGN_BW_AND */ 36 OPSPEC( ASSIGN, STD, STD, VAR) /* 33 ASSIGN_BW_XOR */ 37 #else 38 OPSPEC( UNUSED, VAR, STD, VAR) 39 OPSPEC( UNUSED, VAR, STD, VAR) 40 OPSPEC( UNUSED, VAR, STD, VAR) 41 OPSPEC( UNUSED, VAR, STD, VAR) 42 OPSPEC( UNUSED, VAR, STD, VAR) 43 OPSPEC( UNUSED, VAR, STD, VAR) 44 OPSPEC( UNUSED, VAR, STD, VAR) 45 OPSPEC( UNUSED, VAR, STD, VAR) 46 OPSPEC( UNUSED, VAR, STD, VAR) 47 OPSPEC( UNUSED, VAR, STD, VAR) 48 OPSPEC( UNUSED, VAR, STD, VAR) 49 #endif 50 OPSPEC( UNUSED, VAR, UNUSED, VAR) /* 34 PRE_INC */ 51 OPSPEC( UNUSED, VAR, UNUSED, VAR) /* 35 PRE_DEC */ 52 OPSPEC( UNUSED, VAR, UNUSED, TMP) /* 36 POST_INC */ 53 OPSPEC( UNUSED, VAR, UNUSED, TMP) /* 37 POST_DEC */ 54 OPSPEC( UNUSED, VAR, STD, VAR) /* 38 ASSIGN */ 55 OPSPEC( UNUSED, VAR, VAR, VAR) /* 39 ASSIGN_REF */ 56 OPSPEC( UNUSED, STD, UNUSED, UNUSED) /* 40 ECHO */ 57 OPSPEC( UNUSED, STD, UNUSED, TMP) /* 41 PRINT */ 58 #ifdef ZEND_ENGINE_2 59 OPSPEC( UNUSED, JMPADDR, UNUSED, UNUSED) /* 42 JMP */ 60 OPSPEC( UNUSED, STD, JMPADDR, UNUSED) /* 43 JMPZ */ 61 OPSPEC( UNUSED, STD, JMPADDR, UNUSED) /* 44 JMPNZ */ 62 62 #else 63 63 OPSPEC( UNUSED, OPLINE, UNUSED, UNUSED) … … 65 65 OPSPEC( UNUSED, STD, OPLINE, UNUSED) 66 66 #endif 67 OPSPEC( OPLINE, STD, OPLINE, UNUSED) 68 #ifdef ZEND_ENGINE_2 69 OPSPEC( UNUSED, STD, JMPADDR, TMP) 70 OPSPEC( UNUSED, STD, JMPADDR, TMP) 67 OPSPEC( OPLINE, STD, OPLINE, UNUSED) /* 45 JMPZNZ */ 68 #ifdef ZEND_ENGINE_2 69 OPSPEC( UNUSED, STD, JMPADDR, TMP) /* 46 JMPZ_EX */ 70 OPSPEC( UNUSED, STD, JMPADDR, TMP) /* 47 JMPNZ_EX */ 71 71 #else 72 72 OPSPEC( UNUSED, STD, OPLINE, TMP) 73 73 OPSPEC( UNUSED, STD, OPLINE, TMP) 74 74 #endif 75 OPSPEC( UNUSED, STD, STD, TMP) 76 OPSPEC( BIT, STD, UNUSED, UNUSED) 77 OPSPEC( UNUSED, BRK, STD, UNUSED) 78 OPSPEC( UNUSED, CONT, STD, UNUSED) 79 OPSPEC( UNUSED, STD, UNUSED, TMP) 80 OPSPEC( UNUSED, UNUSED, UNUSED, TMP) 81 OPSPEC( UNUSED, STD, STD, TMP) 82 OPSPEC( UNUSED, STD, STD, TMP) 83 OPSPEC( UNUSED, STD, STD, TMP) 84 OPSPEC( UNUSED, UNUSED, UNUSED, TMP) 85 OPSPEC( UNUSED, TMP, UNUSED, UNUSED) 86 OPSPEC(INIT_FCALL, STD, STD, UNUSED) 87 #ifdef ZEND_ENGINE_2 88 OPSPEC( FCALL, STD, OPLINE, VAR) 89 OPSPEC( FCALL, STD, OPLINE, VAR) 75 OPSPEC( UNUSED, STD, STD, TMP) /* 48 CASE */ 76 OPSPEC( BIT, STD, UNUSED, UNUSED) /* 49 SWITCH_FREE */ 77 OPSPEC( UNUSED, BRK, STD, UNUSED) /* 50 BRK */ 78 OPSPEC( UNUSED, CONT, STD, UNUSED) /* 51 CONT */ 79 OPSPEC( UNUSED, STD, UNUSED, TMP) /* 52 BOOL */ 80 OPSPEC( UNUSED, UNUSED, UNUSED, TMP) /* 53 INIT_STRING */ 81 OPSPEC( UNUSED, STD, STD, TMP) /* 54 ADD_CHAR */ 82 OPSPEC( UNUSED, STD, STD, TMP) /* 55 ADD_STRING */ 83 OPSPEC( UNUSED, STD, STD, TMP) /* 56 ADD_VAR */ 84 OPSPEC( UNUSED, UNUSED, UNUSED, TMP) /* 57 BEGIN_SILENCE */ 85 OPSPEC( UNUSED, TMP, UNUSED, UNUSED) /* 58 END_SILENCE */ 86 OPSPEC(INIT_FCALL, STD, STD, UNUSED) /* 59 INIT_FCALL_BY_NAME */ 87 #ifdef ZEND_ENGINE_2 88 OPSPEC( FCALL, STD, OPLINE, VAR) /* 60 DO_FCALL */ 89 OPSPEC( FCALL, STD, OPLINE, VAR) /* 61 DO_FCALL_BY_NAME */ 90 90 #else 91 91 OPSPEC( FCALL, STD, UNUSED, VAR) 92 92 OPSPEC( FCALL, STD, UNUSED, VAR) 93 93 #endif 94 OPSPEC( UNUSED, STD, UNUSED, UNUSED) 95 OPSPEC( UNUSED, ARG, UNUSED, VAR) 96 OPSPEC( UNUSED, ARG, STD, VAR) 97 OPSPEC( SEND, STD, ARG, UNUSED) 98 OPSPEC( SEND, VAR, ARG, UNUSED) 99 OPSPEC( SEND, VAR, ARG, UNUSED) 100 #ifdef ZEND_ENGINE_2 101 OPSPEC( UNUSED, CLASS, UNUSED, VAR) 94 OPSPEC( UNUSED, STD, UNUSED, UNUSED) /* 62 RETURN */ 95 OPSPEC( UNUSED, ARG, UNUSED, VAR) /* 63 RECV */ 96 OPSPEC( UNUSED, ARG, STD, VAR) /* 64 RECV_INIT */ 97 OPSPEC( SEND, STD, ARG, UNUSED) /* 65 SEND_VAL */ 98 OPSPEC( SEND, VAR, ARG, UNUSED) /* 66 SEND_VAR */ 99 OPSPEC( SEND, VAR, ARG, UNUSED) /* 67 SEND_REF */ 100 #ifdef ZEND_ENGINE_2 101 OPSPEC( UNUSED, CLASS, UNUSED, VAR) /* 68 NEW */ 102 102 #else 103 103 OPSPEC( UNUSED, STD, UNUSED, VAR) 104 104 #endif 105 OPSPEC( UNUSED, STD, OPLINE, UNUSED) 106 OPSPEC( UNUSED, TMP, UNUSED, UNUSED) 107 OPSPEC( BIT, STD, STD, TMP) 108 OPSPEC( BIT, STD, STD, TMP) 109 OPSPEC( UNUSED, STD, INCLUDE, VAR) 105 #ifdef ZEND_ENGINE_2_3 106 OPSPEC( STD, STD, STD, STD) /* 69 INIT_NS_FCALL_BY_NAME */ 107 #else 108 OPSPEC( UNUSED, STD, OPLINE, UNUSED) /* 69 JMP_NO_CTOR */ 109 #endif 110 OPSPEC( UNUSED, TMP, UNUSED, UNUSED) /* 70 FREE */ 111 OPSPEC( BIT, STD, STD, TMP) /* 71 INIT_ARRAY */ 112 OPSPEC( BIT, STD, STD, TMP) /* 72 ADD_ARRAY_ELEMENT */ 113 OPSPEC( UNUSED, STD, INCLUDE, VAR) /* 73 INCLUDE_OR_EVAL */ 110 114 #ifdef ZEND_ENGINE_2_1 111 115 /* php 5.1 and up */ 112 OPSPEC( UNUSED, STD, FETCH, UNUSED) 113 OPSPEC( STD, STD, STD, UNUSED) 114 OPSPEC( STD, STD, STD, UNUSED) 115 OPSPEC( BIT, STD, OPLINE, VAR) 116 OPSPEC( UNUSED, STD, FETCH, UNUSED) /* 74 UNSET_VAR */ 117 OPSPEC( STD, STD, STD, UNUSED) /* 75 UNSET_DIM */ 118 OPSPEC( STD, STD, STD, UNUSED) /* 76 UNSET_OBJ */ 119 OPSPEC( BIT, STD, OPLINE, VAR) /* 77 FE_RESET */ 116 120 #else 117 121 /* <= php 5.0 */ … … 122 126 OPSPEC( BIT, STD, UNUSED, VAR) 123 127 #endif 124 OPSPEC( FE, STD, OPLINE, TMP) 125 OPSPEC( UNUSED, STD, UNUSED, UNUSED) 126 OPSPEC( UNUSED, STD, FETCH, VAR) 127 OPSPEC( FETCH, VAR, STD, VAR) 128 OPSPEC( UNUSED, VAR_2, STD, VAR) 129 OPSPEC( UNUSED, STD, FETCH, VAR) 130 OPSPEC( UNUSED, VAR, STD, VAR) 131 OPSPEC( UNUSED, VAR_2, STD, VAR) 132 OPSPEC( UNUSED, STD, FETCH, VAR) 133 OPSPEC( UNUSED, VAR, STD, VAR) 134 OPSPEC( UNUSED, VAR_2, STD, VAR) 135 OPSPEC( UNUSED, STD, FETCH, VAR) 136 OPSPEC( UNUSED, VAR, STD, VAR) 137 OPSPEC( UNUSED, VAR_2, STD, VAR) 138 OPSPEC( ARG, STD, FETCH, VAR) 139 OPSPEC( ARG, VAR, STD, VAR) 140 OPSPEC( ARG, VAR_2, STD, VAR) 141 OPSPEC( UNUSED, STD, FETCH, VAR) 142 OPSPEC( UNUSED, VAR, STD, VAR) 143 OPSPEC( UNUSED, VAR_2, STD, VAR) 144 OPSPEC( UNUSED, STD, STD, VAR) 128 OPSPEC( FE, STD, OPLINE, TMP) /* 78 FE_FETCH */ 129 OPSPEC( UNUSED, STD, UNUSED, UNUSED) /* 79 EXIT */ 130 OPSPEC( UNUSED, STD, FETCH, VAR) /* 80 FETCH_R */ 131 OPSPEC( FETCH, VAR, STD, VAR) /* 81 FETCH_DIM_R */ 132 OPSPEC( UNUSED, VAR_2, STD, VAR) /* 82 FETCH_OBJ_R */ 133 OPSPEC( UNUSED, STD, FETCH, VAR) /* 83 FETCH_W */ 134 OPSPEC( UNUSED, VAR, STD, VAR) /* 84 FETCH_DIM_W */ 135 OPSPEC( UNUSED, VAR_2, STD, VAR) /* 85 FETCH_OBJ_W */ 136 OPSPEC( UNUSED, STD, FETCH, VAR) /* 86 FETCH_RW */ 137 OPSPEC( UNUSED, VAR, STD, VAR) /* 87 FETCH_DIM_RW */ 138 OPSPEC( UNUSED, VAR_2, STD, VAR) /* 88 FETCH_OBJ_RW */ 139 OPSPEC( UNUSED, STD, FETCH, VAR) /* 89 FETCH_IS */ 140 OPSPEC( UNUSED, VAR, STD, VAR) /* 90 FETCH_DIM_IS */ 141 OPSPEC( UNUSED, VAR_2, STD, VAR) /* 91 FETCH_OBJ_IS */ 142 OPSPEC( ARG, STD, FETCH, VAR) /* 92 FETCH_FUNC_ARG */ 143 OPSPEC( ARG, VAR, STD, VAR) /* 93 FETCH_DIM_FUNC_ARG */ 144 OPSPEC( ARG, VAR_2, STD, VAR) /* 94 FETCH_OBJ_FUNC_ARG */ 145 OPSPEC( UNUSED, STD, FETCH, VAR) /* 95 FETCH_UNSET */ 146 OPSPEC( UNUSED, VAR, STD, VAR) /* 96 FETCH_DIM_UNSET */ 147 OPSPEC( UNUSED, VAR_2, STD, VAR) /* 97 FETCH_OBJ_UNSET */ 148 OPSPEC( UNUSED, STD, STD, VAR) /* 98 FETCH_DIM_TMP_VAR */ 145 149 146 150 #ifdef ZEND_ENGINE_2 147 OPSPEC( UNUSED, UCLASS, STD, TMP) 148 #else 149 OPSPEC( UNUSED, STD, UNUSED, TMP) 150 #endif 151 OPSPEC( DECLARE, STD, STD, UNUSED) 152 OPSPEC( STD, STD, STD, STD) 153 OPSPEC( STD, STD, STD, STD) 154 OPSPEC( STD, STD, STD, STD) 155 OPSPEC( UNUSED, UNUSED, UNUSED, UNUSED) 156 OPSPEC( UNUSED, STD, UNUSED, UNUSED) 157 OPSPEC(SEND_NOREF, VAR, ARG, UNUSED) 158 #ifdef ZEND_ENGINE_2 159 OPSPEC( OPLINE, CLASS, STD, UNUSED) 160 OPSPEC( UNUSED, STD, OPLINE, UNUSED) 161 OPSPEC( FCLASS, STD, STD, CLASS) 162 OPSPEC( UNUSED, STD, UNUSED, VAR) 163 OPSPEC( UNUSED, STD, UNUSED, UNUSED) 164 OPSPEC( UNUSED, STD, STD, VAR) 165 OPSPEC( UNUSED, UCLASS, STD, UNUSED) 166 OPSPEC( ISSET, STD, FETCH, TMP) 167 OPSPEC( ISSET, STD, STD, TMP) 168 OPSPEC( UNUSED, CLASS, STD, UNUSED) 169 OPSPEC( UNUSED, CLASS, STD, UNUSED) 170 OPSPEC( UNUSED, CLASS, STD, UNUSED) 171 OPSPEC( STD, STD, STD, STD) 172 OPSPEC( STD, STD, STD, STD) 173 OPSPEC( UNUSED, STD, STD, VAR) 174 OPSPEC( UNUSED, STD, STD, VAR) 175 OPSPEC( UNUSED, STD, STD, VAR) 176 OPSPEC( UNUSED, STD, STD, VAR) 177 OPSPEC( UNUSED, STD, STD, VAR) 178 OPSPEC( UNUSED, STD, STD, VAR) 179 OPSPEC( UNUSED, STD, STD, VAR) 180 OPSPEC( UNUSED, STD, STD, VAR) 181 OPSPEC( UNUSED, STD, STD, VAR) 182 OPSPEC( UNUSED, STD, STD, VAR) 183 OPSPEC( UNUSED, STD, STD, VAR) 184 OPSPEC( UNUSED, STD, STD, VAR) 185 OPSPEC( UNUSED, STD, STD, VAR) 186 OPSPEC( UNUSED, STD, STD, TMP) 187 OPSPEC( UNUSED, STD, STD, TMP) 188 OPSPEC( UNUSED, STD, STD, VAR) 189 OPSPEC( UNUSED, STD, STD, STD) 190 OPSPEC( UNUSED, STD, CLASS, TMP) 191 OPSPEC( UNUSED, STD, STD, CLASS) 192 OPSPEC( CLASS, STD, STD, CLASS) 193 OPSPEC( UNUSED, STD, STD, UNUSED) 194 OPSPEC( UNUSED, UNUSED, UNUSED, UNUSED) 195 OPSPEC( UNUSED, STD, UNUSED, UNUSED) 196 OPSPEC( IFACE, CLASS, CLASS, UNUSED) 197 OPSPEC( UNUSED, CLASS, STD, UNUSED) 198 OPSPEC( UNUSED, CLASS, UNUSED, UNUSED) 199 OPSPEC( UNUSED, STD, STD, VAR) 200 OPSPEC( ISSET, STD, STD, TMP) 201 OPSPEC( STD, UNUSED, UNUSED, STD) 202 # ifdef ZEND_ENGINE_2_1 203 OPSPEC( STD, UNUSED, UNUSED, STD) 204 # endif 151 OPSPEC( UNUSED, UCLASS, STD, TMP) /* 99 FETCH_CONSTANT */ 152 #else 153 OPSPEC( UNUSED, STD, UNUSED, TMP) /* 99 FETCH_CONSTANT */ 154 #endif 155 OPSPEC( DECLARE, STD, STD, UNUSED) /* 100 DECLARE_FUNCTION_OR_CLASS */ 156 OPSPEC( STD, STD, STD, STD) /* 101 EXT_STMT */ 157 OPSPEC( STD, STD, STD, STD) /* 102 EXT_FCALL_BEGIN */ 158 OPSPEC( STD, STD, STD, STD) /* 103 EXT_FCALL_END */ 159 OPSPEC( UNUSED, UNUSED, UNUSED, UNUSED) /* 104 EXT_NOP */ 160 OPSPEC( UNUSED, STD, UNUSED, UNUSED) /* 105 TICKS */ 161 OPSPEC(SEND_NOREF, VAR, ARG, UNUSED) /* 106 SEND_VAR_NO_REF */ 162 #ifdef ZEND_ENGINE_2 163 OPSPEC( OPLINE, CLASS, STD, UNUSED) /* 107 CATCH */ 164 OPSPEC( UNUSED, STD, OPLINE, UNUSED) /* 108 THROW */ 165 OPSPEC( FCLASS, STD, STD, CLASS) /* 109 FETCH_CLASS */ 166 OPSPEC( UNUSED, STD, UNUSED, VAR) /* 110 CLONE */ 167 OPSPEC( UNUSED, STD, UNUSED, UNUSED) /* 111 INIT_CTOR_CALL */ 168 OPSPEC( UNUSED, STD, STD, VAR) /* 112 INIT_METHOD_CALL */ 169 OPSPEC( UNUSED, UCLASS, STD, UNUSED) /* 113 INIT_STATIC_METHOD_CALL */ 170 OPSPEC( ISSET, STD, FETCH, TMP) /* 114 ISSET_ISEMPTY_VAR */ 171 OPSPEC( ISSET, STD, STD, TMP) /* 115 ISSET_ISEMPTY_DIM_OBJ */ 172 OPSPEC( UNUSED, CLASS, STD, UNUSED) /* 116 IMPORT_FUNCTION */ 173 OPSPEC( UNUSED, CLASS, STD, UNUSED) /* 117 IMPORT_CLASS */ 174 OPSPEC( UNUSED, CLASS, STD, UNUSED) /* 118 IMPORT_CONST */ 175 OPSPEC( STD, STD, STD, STD) /* 119 OP_119 */ 176 OPSPEC( STD, STD, STD, STD) /* 120 OP_120 */ 177 OPSPEC( UNUSED, STD, STD, VAR) /* 121 ASSIGN_ADD_OBJ */ 178 OPSPEC( UNUSED, STD, STD, VAR) /* 122 ASSIGN_SUB_OBJ */ 179 OPSPEC( UNUSED, STD, STD, VAR) /* 123 ASSIGN_MUL_OBJ */ 180 OPSPEC( UNUSED, STD, STD, VAR) /* 124 ASSIGN_DIV_OBJ */ 181 OPSPEC( UNUSED, STD, STD, VAR) /* 125 ASSIGN_MOD_OBJ */ 182 OPSPEC( UNUSED, STD, STD, VAR) /* 126 ASSIGN_SL_OBJ */ 183 OPSPEC( UNUSED, STD, STD, VAR) /* 127 ASSIGN_SR_OBJ */ 184 OPSPEC( UNUSED, STD, STD, VAR) /* 128 ASSIGN_CONCAT_OBJ */ 185 OPSPEC( UNUSED, STD, STD, VAR) /* 129 ASSIGN_BW_OR_OBJ */ 186 OPSPEC( UNUSED, STD, STD, VAR) /* 130 ASSIGN_BW_AND_OBJ */ 187 OPSPEC( UNUSED, STD, STD, VAR) /* 131 ASSIGN_BW_XOR_OBJ */ 188 OPSPEC( UNUSED, STD, STD, VAR) /* 132 PRE_INC_OBJ */ 189 OPSPEC( UNUSED, STD, STD, VAR) /* 133 PRE_DEC_OBJ */ 190 OPSPEC( UNUSED, STD, STD, TMP) /* 134 POST_INC_OBJ */ 191 OPSPEC( UNUSED, STD, STD, TMP) /* 135 POST_DEC_OBJ */ 192 OPSPEC( UNUSED, STD, STD, VAR) /* 136 ASSIGN_OBJ */ 193 OPSPEC( UNUSED, STD, STD, STD) /* 137 OP_DATA */ 194 OPSPEC( UNUSED, STD, CLASS, TMP) /* 138 INSTANCEOF */ 195 OPSPEC( UNUSED, STD, STD, CLASS) /* 139 DECLARE_CLASS */ 196 OPSPEC( CLASS, STD, STD, CLASS) /* 140 DECLARE_INHERITED_CLASS */ 197 OPSPEC( UNUSED, STD, STD, UNUSED) /* 141 DECLARE_FUNCTION */ 198 OPSPEC( UNUSED, UNUSED, UNUSED, UNUSED) /* 142 RAISE_ABSTRACT_ERROR */ 199 #ifdef ZEND_ENGINE_2_3 200 OPSPEC( DECLARE, STD, STD, UNUSED) /* 143 DECLARE_CONST */ 201 #else 202 OPSPEC( UNUSED, STD, UNUSED, UNUSED) /* 143 START_NAMESPACE */ 203 #endif 204 OPSPEC( IFACE, CLASS, CLASS, UNUSED) /* 144 ADD_INTERFACE */ 205 OPSPEC( UNUSED, CLASS, STD, UNUSED) /* 145 VERIFY_INSTANCEOF */ 206 OPSPEC( UNUSED, CLASS, UNUSED, UNUSED) /* 146 VERIFY_ABSTRACT_CLASS */ 207 OPSPEC( UNUSED, STD, STD, VAR) /* 147 ASSIGN_DIM */ 208 OPSPEC( ISSET, STD, STD, TMP) /* 148 ISSET_ISEMPTY_PROP_OBJ */ 209 OPSPEC( STD, UNUSED, UNUSED, STD) /* 149 HANDLE_EXCEPTION */ 210 # ifdef ZEND_ENGINE_2_3 211 OPSPEC( STD, UNUSED, UNUSED, STD) /* 150 ZEND_USER_OPCODE */ 212 OPSPEC( UNUSED, UNUSED, UNUSED, UNUSED) /* 151 UNDEF */ 213 OPSPEC( UNUSED, STD, JMPADDR, UNUSED) /* 152 JMP_SET */ 214 OPSPEC( UNUSED, STD, STD, UNUSED) /* 153 DECLARE_LAMBDA_FUNCTION */ 215 # endif 205 216 #endif 206 217 }; -
branches/1.3/prepare.devel
r617 r626 28 28 make_const_string_opcodes_php5.0.h 29 29 make_const_string_opcodes_php5.1.h 30 make_const_string_opcodes_php5.3.h31 30 make_const_string_opcodes_php6.x.h 32 31 } … … 47 46 make_const_string_opcodes_php5.1.h() { 48 47 precheck const_string_opcodes_php5.1.h "${PHP5_1_DIR}/Zend/zend_vm_def.h" && "$AWK" -f ./mkopcode.awk < "$I" > "$O.tmp" && mv "$O.tmp" "$O" 49 }50 51 make_const_string_opcodes_php5.3.h() {52 precheck const_string_opcodes_php5.3.h "${PHP5_3_DIR}/Zend/zend_vm_def.h" && "$AWK" -f ./mkopcode.awk < "$I" > "$O.tmp" && mv "$O.tmp" "$O"53 48 } 54 49 -
branches/1.3/processor/main.m4
r622 r626 111 111 IFSTORE(`$1 = (zend_class_entry *) xc_get_class_num(processor, $2);') 112 112 IFRESTORE(`$1 = xc_get_class(processor, (zend_ulong) $2);') 113 #ifdef IS_UNICODE 113 114 IFDASM(`add_assoc_unicodel_ex(dst, ZEND_STRS("$3"), ZSTR_U($2->name), $2->name_length, 1);') 115 #else 116 IFDASM(`add_assoc_stringl_ex(dst, ZEND_STRS("$3"), $2->name, $2->name_length, 1);') 117 #endif 114 118 } 115 119 else { -
branches/1.3/processor/processor.m4
r625 r626 618 618 COPY(start_op) 619 619 DISPATCH(int, backpatch_count) 620 #ifdef ZEND_ENGINE_2_3 621 DISPATCH(zend_uint, this_var) 622 #endif 620 623 621 624 DISPATCH(zend_bool, done_pass_two) 622 #ifdef ZEND_ENGINE_2 625 /* 5.0 <= ver < 5.3 */ 626 #if defined(ZEND_ENGINE_2) && !defined(ZEND_ENGINE_2_3) 623 627 DISPATCH(zend_bool, uses_this) 624 628 #endif -
branches/1.3/xcache.c
r625 r626 226 226 for (p = xce->cache->entries[xce->hvalue]; p; p = p->next) { 227 227 if (xc_entry_equal_dmz(xce, p)) { 228 if (p->type == XC_TYPE_VAR || /* PHP */ p->data.php->mtime == xce->data.php->mtime ) {228 if (p->type == XC_TYPE_VAR || /* PHP */ p->data.php->mtime == xce->data.php->mtime && p->data.php->sourcesize == xce->data.php->sourcesize) { 229 229 p->hits ++; 230 230 p->atime = XG(request_time); … … 2803 2803 REGISTER_INI_ENTRIES(); 2804 2804 2805 xc_config_long(&xc_php_size, "xcache.size", "0"); 2806 xc_config_hash(&xc_php_hcache, "xcache.count", "1"); 2807 xc_config_hash(&xc_php_hentry, "xcache.slots", "8K"); 2808 2809 xc_config_long(&xc_var_size, "xcache.var_size", "0"); 2810 xc_config_hash(&xc_var_hcache, "xcache.var_count", "1"); 2811 xc_config_hash(&xc_var_hentry, "xcache.var_slots", "8K"); 2812 2805 2813 if (strcmp(sapi_module.name, "cli") == 0) { 2806 2814 if ((env = getenv("XCACHE_TEST")) != NULL) { … … 2808 2816 } 2809 2817 if (!xc_test) { 2810 /* disable cache for cli except for test */2818 /* disable cache for cli except for testing */ 2811 2819 xc_php_size = xc_var_size = 0; 2812 2820 } 2813 2821 } 2814 2815 xc_config_long(&xc_php_size, "xcache.size", "0");2816 xc_config_hash(&xc_php_hcache, "xcache.count", "1");2817 xc_config_hash(&xc_php_hentry, "xcache.slots", "8K");2818 2819 xc_config_long(&xc_var_size, "xcache.var_size", "0");2820 xc_config_hash(&xc_var_hcache, "xcache.var_count", "1");2821 xc_config_hash(&xc_var_hentry, "xcache.var_slots", "8K");2822 2822 2823 2823 if (xc_php_size <= 0) { -
branches/1.3/xcache.h
r625 r626 52 52 #endif 53 53 #ifndef Z_SET_ISREF 54 # define Z_SET_ISREF(z) (z).is_ref = 1 ;54 # define Z_SET_ISREF(z) (z).is_ref = 1 55 55 #endif 56 56 #ifndef Z_UNSET_ISREF 57 # define Z_UNSET_ISREF(z) (z).is_ref = 0 ;57 # define Z_UNSET_ISREF(z) (z).is_ref = 0 58 58 #endif 59 59 #ifndef Z_SET_REFCOUNT 60 # define Z_SET_REFCOUNT(z, rc) (z).refcount = rc ;60 # define Z_SET_REFCOUNT(z, rc) (z).refcount = rc 61 61 #endif 62 62 #ifndef IS_CONSTANT_TYPE_MASK
Note: See TracChangeset
for help on using the changeset viewer.
