Changeset 485 for trunk/processor

Timestamp:

12/28/2007 10:16:12 AM (13 months ago)

Author:

moo

Message:

5.3 support

Files:

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

trunk/processor/processor.m4

@@ -81 +81 @@
         ZVAL_REFCOUNT(dst) = 1;
         DONE(value)
+        DONE(type)
+#ifdef ZEND_ENGINE_2_3
+        DONE(is_ref__gc)
+        DONE(refcount__gc)
+#else
+        DONE(is_ref)
         DONE(refcount)
-        DONE(type)
-        DONE(is_ref)
-#ifdef ZEND_ENGINE_2_3
-        COPY(idx_type)
 #endif
     } while(0);
@@ -149 +151 @@
         DONE(value)
         DISPATCH(zval_data_type, type)
+#ifdef ZEND_ENGINE_2_3
+        DISPATCH(zend_uchar, is_ref__gc)
+#else
         DISPATCH(zend_uchar, is_ref)
-#ifdef ZEND_ENGINE_2
+#endif
+
+#ifdef ZEND_ENGINE_2_3
+        DISPATCH(zend_uint, refcount__gc)
+#elif defined(ZEND_ENGINE_2)
         DISPATCH(zend_uint, refcount)
 #else
         DISPATCH(zend_ushort, refcount)
-#endif
-#ifdef ZEND_ENGINE_2_3
-        DISPATCH(zend_uchar, idx_type)
 #endif
     ')dnl IFDASM
@@ -479 +485 @@
             case ZEND_JMPZ_EX:
             case ZEND_JMPNZ_EX:
+#ifdef ZEND_JMP_SET
+            case ZEND_JMP_SET:
+#endif
                 dst->op2.u.jmp_addr = processor->active_opcodes_dst + (src->op2.u.jmp_addr - processor->active_opcodes_src);
                 break;