Changeset 146

Timestamp:

01/12/06 14:57:37 (3 years ago)

Author:

hrak

Message:

First batch of PHP-5.1 related changes

Files:

• eaccelerator/branches/PHP_5_1/AUTHORS (modified) (1 diff)
• eaccelerator/branches/PHP_5_1/ChangeLog (modified) (1 diff)
• eaccelerator/branches/PHP_5_1/content.c (modified) (1 diff)
• eaccelerator/branches/PHP_5_1/ea_restore.c (modified) (11 diffs)
• eaccelerator/branches/PHP_5_1/ea_restore.h (modified) (1 diff)
• eaccelerator/branches/PHP_5_1/ea_store.c (modified) (7 diffs)
• eaccelerator/branches/PHP_5_1/eaccelerator.c (modified) (5 diffs)
• eaccelerator/branches/PHP_5_1/eaccelerator.h (modified) (4 diffs)
• eaccelerator/branches/PHP_5_1/loader.c (modified) (1 diff)
• eaccelerator/branches/PHP_5_1/opcodes.c (modified) (8 diffs)
• eaccelerator/branches/PHP_5_1/optimize.c (modified) (13 diffs)
• eaccelerator/branches/PHP_5_1/webui.c (modified) (12 diffs)
• eaccelerator/branches/PHP_5_1/win32/eAccelerator.dsp (modified) (1 diff)
• eaccelerator/branches/PHP_5_1/win32/eLoader.dsp (modified) (4 diffs)

eaccelerator/branches/PHP_5_1/AUTHORS

@@ -4 +4 @@
-- Bart Vanbrabant <zoeloelip at users.sourceforge.net>
-- Shin Seung Woo <segv74 at users.sourceforge.net>
+- Hans Rakers <hrak at users.sourceforge.net>
-
-Inactive member(s) :

eaccelerator/branches/PHP_5_1/ChangeLog

@@ +1 @@
+2006-01-12  Hans Rakers <hans at parse dot nl>
+
+        * First batch of PHP-5.1 related changes committed to the newly created
+          PHP_5_1 branch. This is a work in progress, so YMMV.
+
-2006-01-10 Bart Vanbrabant <bart.vanbrabant at zoeloelip.be>
-

eaccelerator/branches/PHP_5_1/content.c

@@ -594 +594 @@
-        eaccelerator_content_cache_place != eaccelerator_none) {
-
+#ifndef ZEND_ENGINE_2_1
+/* No worko on php >= 5.1.0 */
-      /* clean garbage */
-      while (EG(garbage_ptr)) {
-        zval_ptr_dtor(&EG(garbage)[--EG(garbage_ptr)]);
-      }
+#endif
-
-      eaccelerator_put(key, key_len, return_value, ttl, eaccelerator_content_cache_place TSRMLS_CC);

eaccelerator/branches/PHP_5_1/ea_restore.c

@@ -40 +40 @@
-#include "zend_API.h"
-#include "zend_extensions.h"
+#ifdef ZEND_ENGINE_2_1
+#include "zend_vm.h"
+#endif
-
-#ifndef INCOMPLETE_CLASS
@@ -70 +73 @@
-
-        zend_hash_destroy(&dummy_class_entry.default_properties);
+        zend_hash_destroy(&dummy_class_entry.function_table);
+#ifdef ZEND_ENGINE_2
+        zend_hash_destroy(&dummy_class_entry.constants_table);
-        zend_hash_destroy(&dummy_class_entry.properties_info);
+#endif
+#if defined(ZEND_ENGINE_2) && !defined(ZEND_ENGINE_2_1)
-        zend_hash_destroy(dummy_class_entry.static_members);
-
-
-
+
+
+
+
+
-
-        return property_dtor;
@@ -93 +103 @@
-{
-        FIXUP(from->name);
+#ifdef ZEND_ENGINE_2_1
+        FIXUP(from->doc_comment);
+#endif
-}
-#endif
@@ -222 +235 @@
-                                break;
-                        }
+#  ifdef ZEND_ENGINE_2_1
+                        ZEND_VM_SET_OPCODE_HANDLER(opline);
+#  else
-                        opline->handler = get_opcode_handler(opline->opcode TSRMLS_CC);
+#  endif
+
-#endif
-                }
@@ -235 +253 @@
-                fixup_zval_hash(from->static_variables);
-        }
+#ifdef ZEND_ENGINE_2_1
+        if (from->vars != NULL) {
+                zend_uint i;
+                FIXUP(from->vars);
+                for (i = 0; i < from->last_var; i++) {
+                        FIXUP(from->vars[i].name);
+                }
+        }
+#endif
-        FIXUP(from->filename);
-#ifdef ZEND_ENGINE_2
@@ -571 +598 @@
-        to->brk_cont_array = from->brk_cont_array;
-        to->last_brk_cont = from->last_brk_cont;
-/*
+
-           to->current_brk_cont = -1;
-           to->static_variables = from->static_variables;
-
+
-           to->backpatch_count  = 0;
- */
+
-        to->return_reference = from->return_reference;
-        to->done_pass_two = 1;
@@ -613 +640 @@
-        }
-
+#ifdef ZEND_ENGINE_2_1
+        to->vars             = from->vars;
+        to->last_var         = from->last_var;
+        to->size_var         = 0;
+        if (to->vars) {         
+                zend_uint i;
+                to->vars = (zend_compiled_variable*)emalloc(from->last_var*sizeof(zend_compiled_variable));             
+                memcpy(to->vars, from->vars, sizeof(zend_compiled_variable) * from->last_var);
+                for (i = 0; i < from->last_var; i ++) {
+                        to->vars[i].name = estrndup(from->vars[i].name, from->vars[i].name_len);
+                }
+        }
+#endif
+
-        /* disable deletion in destroy_op_array */
-        ++EAG(refcount_helper);
@@ -634 +675 @@
-        to->name = emalloc(from->name_length + 1);
-        memcpy(to->name, from->name, from->name_length + 1);
+#ifdef ZEND_ENGINE_2_1
+        if (from->doc_comment != NULL) {
+                to->doc_comment = emalloc(from->doc_comment_len+1);
+                memcpy(to->doc_comment, from->doc_comment, from->doc_comment_len+1);
+        }
+#endif
-        return to;
-}
@@ -661 +708 @@
-                to->__get = to->parent->__get;
-                to->__set = to->parent->__set;
+#  ifdef ZEND_ENGINE_2_1
+                to->__unset = to->parent->__unset;
+                to->__isset = to->parent->__isset;
+#  endif
-                to->__call = to->parent->__call;
-                to->create_object = to->parent->create_object;
@@ -709 +760 @@
-                                         memcmp(fname_lc, ZEND_SET_FUNC_NAME, sizeof(ZEND_SET_FUNC_NAME)) == 0)
-                                to->__set = f;
+#  ifdef ZEND_ENGINE_2_1
+                        else if (fname_len == sizeof(ZEND_UNSET_FUNC_NAME) - 1 &&
+                                        memcmp(fname_lc, ZEND_UNSET_FUNC_NAME, sizeof(ZEND_UNSET_FUNC_NAME)) == 0)
+                                to->__unset = f;
+                        else if (fname_len == sizeof(ZEND_ISSET_FUNC_NAME) - 1 &&
+                                        memcmp(fname_lc, ZEND_ISSET_FUNC_NAME, sizeof(ZEND_ISSET_FUNC_NAME)) == 0)
+                                to->__isset = f;
+#  endif
-                        else if (fname_len == sizeof(ZEND_CALL_FUNC_NAME) - 1 &&
-                                         memcmp(fname_lc, ZEND_CALL_FUNC_NAME, sizeof(ZEND_CALL_FUNC_NAME)) == 0)
@@ -814 +873 @@
-        to->properties_info.pDestructor = properties_info_dtor;
-
+#ifdef ZEND_ENGINE_2_1
+        /* restore default_static_members */
+        restore_zval_hash(&to->default_static_members, &from->default_static_members);
+        to->default_static_members.pDestructor = ZVAL_PTR_DTOR;
+#endif
+        
-        if (from->static_members != NULL) {
-                ALLOC_HASHTABLE(to->static_members);

eaccelerator/branches/PHP_5_1/ea_restore.h

@@ -35 +35 @@
-void fixup_class_entry (eaccelerator_class_entry * from TSRMLS_DC);
-
+void restore_zval(zval * zv TSRMLS_DC);
-void restore_class(mm_fc_entry *p TSRMLS_DC);
-void restore_function(mm_fc_entry *p TSRMLS_DC);

eaccelerator/branches/PHP_5_1/ea_store.c

@@ -83 +83 @@
-        EAG(mem) += sizeof(zend_property_info);
-        calc_string(from->name, from->name_length + 1 TSRMLS_CC);
+#ifdef ZEND_ENGINE_2_1
+        if (from->doc_comment != NULL) {
+                calc_string(from->doc_comment, from->doc_comment_len + 1 TSRMLS_CC);
+        }
+#endif
-}
-
@@ -247 +252 @@
-                calc_zval_hash(from->static_variables);
-        }
+#ifdef ZEND_ENGINE_2_1
+        if (from->vars != NULL) {
+                zend_uint i;
+                EACCELERATOR_ALIGN(EAG(mem));
+                EAG(mem) += sizeof(zend_compiled_variable) * from->last_var;
+                for (i = 0; i < from->last_var; i ++) {
+                        calc_string(from->vars[i].name, from->vars[i].name_len+1 TSRMLS_CC);
+                }
+        }
+#endif
-        if (from->filename != NULL)
-                calc_string(from->filename, strlen(from->filename) + 1 TSRMLS_CC);
@@ -286 +301 @@
-        calc_zval_hash(&from->constants_table);
-        calc_zval_hash(&from->default_properties);
+
+#ifdef ZEND_ENGINE_2_1
+        calc_zval_hash(&from->default_static_members);
+#endif
+        
-        calc_hash(&from->properties_info, (calc_bucket_t) calc_property_info);
-        if (from->static_members != NULL) {
@@ -611 +631 @@
-#endif
-        to->static_variables = from->static_variables;
+#ifdef ZEND_ENGINE_2_1
+        to->vars             = from->vars;
+        to->last_var         = from->last_var;
+#endif
-        to->return_reference = from->return_reference;
-        to->filename = from->filename;
@@ -672 +696 @@
-                store_zval_hash(to->static_variables, from->static_variables);
-        }
+#ifdef ZEND_ENGINE_2_1
+        if (from->vars != NULL) {
+                zend_uint i;
+                EACCELERATOR_ALIGN(EAG(mem));
+                to->last_var = from->last_var;
+                to->vars = (zend_compiled_variable*)EAG(mem);
+                EAG(mem) += sizeof(zend_compiled_variable) * from->last_var;
+                        memcpy(to->vars, from->vars, sizeof(zend_compiled_variable) * from->last_var);
+                for (i = 0; i < from->last_var; i ++) {
+                        to->vars[i].name = store_string(from->vars[i].name, from->vars[i].name_len+1 TSRMLS_CC);
+                }
+        } else {
+                to->last_var = 0;
+                to->vars = NULL;
+        }
+#endif
-        if (from->filename != NULL) {
-to
+from
-        }
-#ifdef ZEND_ENGINE_2
@@ -694 +734 @@
-        memcpy(to, from, sizeof(zend_property_info));
-        to->name = store_string(from->name, from->name_length + 1 TSRMLS_CC);
+#ifdef ZEND_ENGINE_2_1
+        to->doc_comment_len = from->doc_comment_len;
+        if (from->doc_comment != NULL) {
+                to->doc_comment = store_string(from->doc_comment, from->doc_comment_len + 1 TSRMLS_CC);
+        }
+#endif
-        return to;
-}
@@ -772 +818 @@
-        store_zval_hash(&to->default_properties, &from->default_properties);
-#endif
+
+#ifdef ZEND_ENGINE_2_1
+        store_zval_hash(&to->default_static_members, &from->default_static_members); //LYLE
+#endif
+
-        store_hash(&to->function_table, &from->function_table, (store_bucket_t) store_op_array);
-

eaccelerator/branches/PHP_5_1/eaccelerator.c

@@ -110 +110 @@
-/* saved original functions */
-static zend_op_array *(*mm_saved_zend_compile_file)(zend_file_handle *file_handle, int type TSRMLS_DC);
+
+#ifdef DEBUG
+static void (*mm_saved_zend_execute)(zend_op_array *op_array TSRMLS_DC);
+#endif
-
-/* external declarations */
@@ -843 +847 @@
-  while (q != NULL) {
-#ifdef ZEND_ENGINE_2
-
+  // hra: exactly the same?!
-#else
-      q->fc = store_class_entry ((zend_class_entry *) q->fc TSRMLS_CC);
@@ -1562 +1566 @@
-  for (i=0;i<EAG(profile_level);i++)
-    ea_debug_put(EA_PROFILE_OPCODES, "  ");
-
+ profile_execute
-  ea_debug_start_time(&tv_start);
-  EAG(self_time)[EAG(profile_level)] = 0;
-  EAG(profile_level)++;
+  ea_debug_printf(EA_PROFILE_OPCODES, "About to enter zend_execute...\n");
-  mm_saved_zend_execute(op_array TSRMLS_CC);
+  ea_debug_printf(EA_PROFILE_OPCODES, "Finished zend_execute...\n");
-  usec = ea_debug_elapsed_time(&tv_start);
-  EAG(profile_level)--;
@@ -1573 +1579 @@
-  for (i=0;i<EAG(profile_level);i++)
-    ea_debug_put(EA_PROFILE_OPCODES, "  ");
-
+ profile_execute
-}
-
@@ -1590 +1596 @@
-  for (i=0;i<EAG(profile_level);i++)
-    ea_debug_put(EA_PROFILE_OPCODES, "  ");
-
+zend_op_array 
-  return t;
-}

eaccelerator/branches/PHP_5_1/eaccelerator.h

@@ -43 +43 @@
-#    include "php_config.h"
-#  endif
+#endif
+
+#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 1
+#   define ZEND_ENGINE_2_1
-#endif
-
@@ -200 +204 @@
-        zend_op *opcodes;
-        zend_uint last;
+#ifdef ZEND_ENGINE_2_1
+        zend_compiled_variable *vars;
+    int last_var;
+#endif
-        zend_uint T;
-        zend_brk_cont_element *brk_cont_array;
@@ -225 +233 @@
-        HashTable function_table;
-        HashTable default_properties;
+#ifdef ZEND_ENGINE_2_1
+        HashTable default_static_members;
+#endif
-#ifdef ZEND_ENGINE_2
-        zend_uint ce_flags;
@@ -231 +242 @@
-        HashTable constants_table;
-        zend_uint num_interfaces;
+
-        char **interfaces;
-        zend_class_iterator_funcs iterator_funcs;

eaccelerator/branches/PHP_5_1/loader.c

@@ -40 +40 @@
-#include "ea_restore.h"
-#include <math.h>
+
+#ifdef HAVE_EACCELERATOR_STANDALONE_LOADER
+zend_extension* ZendOptimizer = NULL;
+#endif
-
-typedef struct loader_data {

eaccelerator/branches/PHP_5_1/opcodes.c

@@ -44 +44 @@
-#endif
-
-
-
-
-
-
+
-
-static const opcode_dsc opcodes[] = {
@@ -159 +155 @@
-  OPDEF("ADD_ARRAY_ELEMENT",         EXT_BIT    | OP1_STD    | OP2_STD    | RES_TMP), /* 72 */
-  OPDEF("INCLUDE_OR_EVAL",           EXT_UNUSED | OP1_STD    | OP2_INCLUDE| RES_VAR), /* 73 */
-
+
+
-  OPDEF("UNSET_VAR",                 EXT_UNUSED | OP1_STD    | OP2_FETCH  | RES_UNUSED), /* 74 */
-
-
-
+
+
+
+
+
+
-  OPDEF("UNSET_VAR",                 EXT_UNUSED | OP1_STD    | OP2_UNUSED | RES_UNUSED), /* 74 */
-  OPDEF("UNSET_DIM_OBJ",             EXT_UNUSED | OP1_VAR    | OP2_STD    | RES_UNUSED), /* 75 */
-  OPDEF("ISSET_ISEMPTY",             EXT_UNUSED | OP1_VAR    | OP2_ISSET  | RES_TMP), /* 76 */
-#endif
-  OPDEF("FE_RESET",                  EXT_BIT    | OP1_STD    | OP2_UNUSED | RES_VAR), /* 77 */
+#endif
-  OPDEF("FE_FETCH",                  EXT_FE     | OP1_STD    | OP2_OPLINE | RES_TMP), /* 78 */
-  OPDEF("EXIT",                      EXT_UNUSED | OP1_STD    | OP2_UNUSED | RES_UNUSED), /* 79 */
@@ -235 +235 @@
-  OPDEF("POST_DEC_OBJ",              EXT_UNUSED | OP1_STD    | OP2_STD    | RES_TMP), /* 135 */
-  OPDEF("ASSIGN_OBJ",                EXT_UNUSED | OP1_STD    | OP2_STD    | RES_VAR), /* 136 */
-UNUSE
+ST
-  OPDEF("INSTANCEOF",                EXT_UNUSED | OP1_STD    | OP2_CLASS  | RES_TMP), /* 138 */
-  OPDEF("DECLARE_CLASS",             EXT_UNUSED | OP1_STD    | OP2_STD    | RES_CLASS), /* 139 */
@@ -246 +246 @@
-  OPDEF("VERIFY_ABSTRACT_CLASS",     EXT_UNUSED | OP1_CLASS  | OP2_UNUSED | RES_UNUSED), /* 146 */
-  OPDEF("ASSIGN_DIM",                EXT_UNUSED | OP1_STD    | OP2_STD    | RES_VAR),  /* 147 */
-
-  OPDEF("ISSET_ISEMPTY_PROP_OBJ",    EXT_ISSET  | OP1_STD    | OP2_STD    | RES_TMP), /* 148 */
-  OPDEF("HANDLE_EXCEPTION",          EXT_STD    | OP1_UNUSED | OP2_UNUSED | RES_STD)  /* 149 */
+# ifdef ZEND_ENGINE_2_1
+  ,
+  OPDEF("USER_OPCODE",               EXT_STD    | OP1_UNUSED | OP2_UNUSED | RES_STD)  /* 150 */
+# endif    
-#endif
-};
-
-const opcode_dsc* get_opcode_dsc(unsigned int n) {
-=
+
-    return &opcodes[n];
-  } else {
@@ -262 +265 @@
-
-#ifdef ZEND_ENGINE_2
-+1
+
-static int handlers_retrived = 0;
-
@@ -268 +271 @@
-  unsigned char i;
-  efree(op_array->opcodes);
-+1
-+1
-+1
+
+
+
-  op_array->T    = 0;
-=
+
-    op_array->opcodes[i].opcode = i;
-    op_array->opcodes[i].op1.op_type = IS_UNUSED;
@@ -299 +302 @@
-    p = compile_string(&str, empty_string TSRMLS_CC);
-    ext->op_array_handler = old;
-LAST_OPCODE+1
+(LAST_OPCODE - 1)
-      int i = 0;
-=
+
-         eaccelerator_opcode_handlers[p->opcodes[i].opcode] = p->opcodes[i].handler;
-         ++i;
@@ -319 +322 @@
-    }
-  }
-=
+
-    return eaccelerator_opcode_handlers[opcode];
-  } else {

eaccelerator/branches/PHP_5_1/optimize.c

@@ -65 +65 @@
-} BBlink;
-
-#if 0
-static void dump_bb(BB* bb, zend_op_array *op_array) {
-  BB* p = bb;
@@ -131 +130 @@
-  fflush(stdout);
-}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-#define SET_TO_NOP(op) \
@@ -251 +288 @@
-               break;
-             case ZEND_UNSET_VAR:
+#ifndef ZEND_ENGINE_2_1
+/* Pre-PHP 5.1 only */
-             case ZEND_UNSET_DIM_OBJ:
-               end->result.op_type = IS_UNUSED;
-               break;
+#else
+             case ZEND_UNSET_DIM:
+             case ZEND_UNSET_OBJ:
+               end->result.op_type = IS_UNUSED;
+               break;
+#endif
-             case ZEND_RECV:
-             case ZEND_RECV_INIT:
-             /*case ZEND_ADD_ARRAY_ELEMENT:*/
-             case ZEND_INCLUDE_OR_EVAL:
+#ifndef ZEND_ENGINE_2_1
+/* Pre-PHP 5.1 only */
-             case ZEND_JMP_NO_CTOR:
+#else
+             case ZEND_NEW:
+#endif
-             case ZEND_FE_FETCH:
-#ifdef ZEND_ENGINE_2
@@ -1280 +1330 @@
-            }
-            goto jmp_2;
+#ifndef ZEND_ENGINE_2_1
+/* Pre-PHP 5.1 only */
-          case ZEND_JMP_NO_CTOR:
+#else
+          case ZEND_NEW:
+#endif
-          case ZEND_FE_FETCH:
-jmp_2:
@@ -1715 +1770 @@
-    } else 
-#endif
+
-    if ((op->opcode == ZEND_ADD ||
-                op->opcode == ZEND_SUB ||
@@ -2444 +2500 @@
-          op->opcode == ZEND_POST_INC ||
-          op->opcode == ZEND_POST_DEC ||
+#ifndef ZEND_ENGINE_2_1
+/* Pre-PHP 5.1 only */
-          op->opcode == ZEND_UNSET_DIM_OBJ ||
+#else
+          op->opcode == ZEND_UNSET_DIM ||
+          op->opcode == ZEND_UNSET_OBJ ||
+#endif
-          op->opcode == ZEND_INCLUDE_OR_EVAL
-#ifdef ZEND_ENGINE_2
@@ -2722 +2784 @@
-                        case ZEND_JMPZ_EX:
-                        case ZEND_JMPNZ_EX:
+#ifndef ZEND_ENGINE_2_1
+/* Pre-PHP 5.1 only */
-                        case ZEND_JMP_NO_CTOR:
+#else
+                        case ZEND_NEW:
+                        case ZEND_FE_RESET:
+#endif
-                        case ZEND_FE_FETCH:
-                                bb[line_num+1].start = op+1;
@@ -2841 +2909 @@
-#endif
-                        case ZEND_UNSET_VAR:
+#ifndef ZEND_ENGINE_2_1
+/* Pre-PHP 5.1 only */
-                        case ZEND_UNSET_DIM_OBJ:
-                                op->result.op_type = IS_UNUSED;
-                                break;
+#else
+                        case ZEND_UNSET_DIM:
+                                op->result.op_type = IS_UNUSED;
+                                break;
+                        case ZEND_UNSET_OBJ:
+                                op->result.op_type = IS_UNUSED;
+                                break;
+#endif
-                        default:
-                                break;
@@ -2895 +2973 @@
-                                case ZEND_JMPZ_EX:
-                                case ZEND_JMPNZ_EX:
+#ifndef ZEND_ENGINE_2_1
+/* Pre-PHP 5.1 only */
-                                case ZEND_JMP_NO_CTOR:
+#else
+                                case ZEND_NEW:
+                                case ZEND_FE_RESET:
+#endif
-                                case ZEND_FE_FETCH:
-                                        p->jmp_2 = &bb[op->op2.u.opline_num];
@@ -3110 +3194 @@
-      while (start < op) {
-        --op;
+        /* zend_printf("op=%d\n", op-op_array->opcodes); */
-#ifdef ZEND_ENGINE_2
-        op_data = NULL;
@@ -3151 +3236 @@
-          GET_REG(r);
-          op->extended_value = VAR_VAL(assigned[r]);
-        }
-        if (op->opcode == ZEND_OP_DATA) {
-          op_data = op;
-          --op;
-          if (op->op1.op_type == IS_VAR || op->op1.op_type == IS_TMP_VAR) {
-            int r = VAR_NUM(op->op1.u.var);
-            GET_REG(r);
-            op->op1.u.var = VAR_VAL(assigned[r]);
-          }
-          if (op->op2.op_type == IS_VAR || op->op2.op_type == IS_TMP_VAR) {
-            int r = VAR_NUM(op->op2.u.var);
-            GET_REG(r);
-            op->op2.u.var = VAR_VAL(assigned[r]);
-          }
-        }
-#endif
@@ -3193 +3264 @@
-          }
-        }
-#ifdef ZEND_ENGINE_2
-        if (op_data != NULL && op_data->op2.op_type == IS_VAR) {
-          FREE_REG(VAR_NUM(op_data->op2.u.var));
-        }
-#endif
-      }
-    }
@@ -3280 +3346 @@
-    emit_cfg(op_array, bb);
-    reassign_registers(op_array, bb, global);
+    /* dump_bb(bb, op_array); */
-
-    free_alloca(global);

eaccelerator/branches/PHP_5_1/webui.c

@@ -264 +264 @@
-                goto string_dump;
-        case IS_CONSTANT_ARRAY:
-t
+
-                goto array_dump;
-        default:
@@ -272 +272 @@
-
-static const char *color_list[] = {
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-};
-
-har const
+onst char
-{
-        return color_list[num % (sizeof (color_list) / sizeof (char *))];
@@ -323 +328 @@
-                if (*p == '\n') {
-                        line--;
+        } else if (*p == '\r') {
+            line--;
+            if (p[1] == '\n') {
+                p++;
+            }
-                } else if (line == 1) {
-                        if (*p == '<')
@@ -344 +354 @@
-
-#ifdef ZEND_ENGINE_2
+#ifdef ZEND_ENGINE_2_1
+    zend_printf ("last_var = %u, ", p->last_var);
+#endif
-        zend_printf ("T = %u, size = %u\n, brk_count = %u, file = %s<br>\n",
-                                 p->T, p->last, p->last_brk_cont, p->filename);
@@ -368 +381 @@
-                        q = q->pListNext;
-                }
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        if (p->opcodes) {
-                int n = 0;
@@ -378 +407 @@
-                filebuf = get_file_contents (p->filename);
-
-
-
-
-
-
-
+
+
+
+
-                for (; opline < end; opline++) {
-                        const opcode_dsc *op = get_opcode_dsc (opline->opcode);
-
-
-
-
-
-
+
+
+
+
+
+
+
-                                zend_printf ("</font></pre></td></tr>\n");
-                        }
@@ -460 +489 @@
-                                                ZEND_PUTS ("<td>&nbsp; </td>");
-                                        }
+#ifndef ZEND_ENGINE_2_1
-                                } else if (opline->opcode == ZEND_UNSET_DIM_OBJ) {
-                                        if (opline->extended_value == ZEND_UNSET_DIM) {
@@ -469 +499 @@
-                                        }
-#endif
+#endif
-                                } else if (opline->extended_value != 0) {
-                                        zend_printf ("<td>%ld </td>", opline->extended_value);
@@ -480 +511 @@
-                                op = get_opcode_dsc (0);
-                        }
-
+
+
+
+
+
+
+
-                        if ((op->ops & OP1_MASK) == OP1_OPLINE) {
-                                zend_printf
@@ -587 +624 @@
-                                }
-                        }
-
+
+
+
+
+
+
+
-                        if ((op->ops & OP2_MASK) == OP2_OPLINE) {
-                                zend_printf
@@ -675 +718 @@
-                                }
-                        }
-
+
+
+
+
+
+
+
+
-                        switch (op->ops & RES_MASK) {
-                        case RES_STD:
@@ -1834 +1884 @@
-
-        {
-
+'a'
-                zend_printf ("<nobr>%s</nobr>\n", s);
-                efree (s);