Changeset 721 for trunk/processor/processor.m4

Timestamp:

2011-04-09T13:05:07+02:00 (2 years ago)

Author:

moo

Message:

PHP_6: prepared in literal way for FILE DIR fix up

File:

• trunk/processor/processor.m4 (modified) (6 diffs)

trunk/processor/processor.m4

@@ -85 +85 @@
 #endif
     } while(0);
-    return;
     ', `
         dnl IFDASM else
@@ -323 +322 @@
 #endif
 
+#ifdef ZEND_ENGINE_2
+    STRUCT(HashTable, properties_info, HashTable_zend_property_info)
+#endif
+
 #ifdef ZEND_ENGINE_2_4
     DISPATCH(int, default_properties_count)
@@ -334 +337 @@
     DONE(builtin_functions)
     STRUCT(HashTable, default_properties, HashTable_zval_ptr)
-#   ifdef ZEND_ENGINE_2
-    STRUCT(HashTable, properties_info, HashTable_zend_property_info)
-#       ifdef ZEND_ENGINE_2_1
+#   ifdef ZEND_ENGINE_2_1
     STRUCT(HashTable, default_static_members, HashTable_zval_ptr)
     IFCOPY(`dst->static_members = &dst->default_static_members;')
     DONE(static_members)
-#       else
+#   elif defined(ZEND_ENGINE_2)
     STRUCT_P(HashTable, static_members, HashTable_zval_ptr)
-#       endif
 #   endif
 #endif /* ZEND_ENGINE_2_4 */
@@ -486 +486 @@
 undefine(`UNION_znode_op')
 define(`UNION_znode_op', `dnl {{{
-    assert(src->$1_type == IS_CONST ||
-        src->$1_type == IS_VAR ||
-        src->$1_type == IS_CV ||
-        src->$1_type == IS_TMP_VAR ||
-        src->$1_type == IS_UNUSED);
+    switch ((src->$1_type & ~EXT_TYPE_UNUSED)) {
+    case IS_CONST:
+    case IS_VAR:
+    case IS_CV:
+    case IS_TMP_VAR:
+    case IS_UNUSED:
+        break;
+
+    default:
+        assert(0);
+    }
+
     dnl dirty dispatch
     DISABLECHECK(`
-    switch (src->$1_type) {
+    switch ((src->$1_type & ~EXT_TYPE_UNUSED)) {
         case IS_CONST:
             dnl TODO: fix me, use literals
@@ -659 +666 @@
 #endif
         IFRESTORE(`dst->filename = processor->entry_src->filepath;')
+#ifndef ZEND_ENGINE_2_4
         if (op_array_info->oplineinfo_cnt) {
             gc_opcodes = 1;
             COPY_N_EX(last, zend_op, opcodes)
         }
+#endif
         if (gc_arg_info || gc_opcodes) {
             xc_gc_op_array_t gc_op_array;
@@ -889 +898 @@
 #endif
 DEF_STRUCT_P_FUNC(`xc_op_array_info_t', , `dnl {{{
+#ifdef ZEND_ENGINE_2_4
+    DISPATCH(zend_uint, literalinfo_cnt)
+    DISPATCH_ARRAY(literalinfo_cnt, int, literalinfos)
+#else
     DISPATCH(zend_uint, oplineinfo_cnt)
     DISPATCH_ARRAY(oplineinfo_cnt, int, oplineinfos)
+#endif
 ')
 dnl }}}