Changeset 718

Timestamp:

2011-04-09T12:18:29+02:00 (2 years ago)

Author:

moo

Message:

fix assertion failure for PHP4

Location:

trunk

Files:

• opcode_spec.c (modified) (1 diff)
• opcode_spec_def.h (modified) (1 diff)

trunk/opcode_spec.c

@@ -20 +20 @@
 const xc_opcode_spec_t *xc_get_opcode_spec(zend_uchar opcode)
 {
+#ifndef NDEBUG
+    if (xc_get_opcode_count() != xc_get_opcode_spec_count()) {
+        fprintf(stderr, "count mismatch: xc_get_opcode_count=%d, xc_get_opcode_spec_count=%d\n", xc_get_opcode_count(), xc_get_opcode_spec_count());
+    }
+#endif
     assert(xc_get_opcode_count() == xc_get_opcode_spec_count());
     assert(opcode < xc_get_opcode_spec_count());

trunk/opcode_spec_def.h

@@ -233 +233 @@
     OPSPEC(    UNUSED,     UNUSED,     UNUSED,     UNUSED) /* 153 UNDEF                          */
 # endif
+#else
+    OPSPEC(    UNUSED,     UNUSED,     UNUSED,     UNUSED) /* 107 UNDEF                          */
+    OPSPEC(    UNUSED,     UNUSED,     UNUSED,     UNUSED) /* 108 UNDEF                          */
+    OPSPEC(    UNUSED,     UNUSED,     UNUSED,     UNUSED) /* 109 UNDEF                          */
+    OPSPEC(     FCALL,        STD,     OPLINE,        VAR) /* 61 DO_FCALL_BY_FUNC                */
+    OPSPEC(INIT_FCALL,        STD,        STD,     UNUSED) /* 111 INIT_FCALL_BY_FUNC             */
+    OPSPEC(    UNUSED,     UNUSED,     UNUSED,     UNUSED) /* 112 UNDEF                          */
 #endif
 };