Changeset 11 for trunk/processor/processor.m4

Timestamp:

2006-05-24T09:52:48+02:00 (7 years ago)

Author:

moo

Message:

make it build on windows vc compiler

File:

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

trunk/processor/processor.m4

@@ -365 +365 @@
     DISPATCH(int, op_type)
 
+#ifdef IS_CV
+#   define XCACHE_IS_CV IS_CV
+#else
+/* compatible with zend optimizer */
+#   define XCACHE_IS_CV 16
+#endif
     assert(src->op_type == IS_CONST ||
         src->op_type == IS_VAR ||
-#ifdef IS_CV
-        src->op_type == IS_CV ||
-#else
-        src->op_type == 16 || /* zend optimizer */
-#endif
+        src->op_type == XCACHE_IS_CV ||
         src->op_type == IS_TMP_VAR ||
         src->op_type == IS_UNUSED);
+#undef XCACHE_IS_CV
     dnl dirty dispatch
     DISABLECHECK(`
@@ -463 +466 @@
     do {
     dnl RESTORE is done above!
+    zend_uint ii;
     int i;
 
@@ -481 +485 @@
     /* useless */
     COPY(prototype)
-    STRUCT_ARRAY(num_args, zend_arg_info, arg_info)
+    STRUCT_ARRAY_I(num_args, zend_arg_info, arg_info)
     DISPATCH(zend_uint, num_args)
     DISPATCH(zend_uint, required_num_args)
@@ -490 +494 @@
         IFCOPY(`memcpy(dst->arg_types, src->arg_types, sizeof(src->arg_types[0]) * (src->arg_types[0]+1));')
         IFDASM(`do {
+            zend_uint ii;
             int i;
             zval *zv;
@@ -528 +533 @@
         processor->active_opcodes_src = src->opcodes;
     ')')
-    STRUCT_ARRAY(last, zend_op, opcodes)
+    STRUCT_ARRAY_I(last, zend_op, opcodes)
     popdef(`AFTER_ALLOC')
     DISPATCH(zend_uint, last)
@@ -546 +551 @@
     DISPATCH(zend_uint, T)
 
-    STRUCT_ARRAY(last_brk_cont, zend_brk_cont_element, brk_cont_array)
+    STRUCT_ARRAY_I(last_brk_cont, zend_brk_cont_element, brk_cont_array)
     DISPATCH(zend_uint, last_brk_cont)
     DISPATCH(zend_uint, current_brk_cont)