[xdebug-dev] svn: /xdebug/trunk/ xdebug.c xdebug_code_coverage.c

derick Fri, 01 Jan 2010 22:35:57 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=3189

Log:
- Get rid of two < PHP 5.1 thingies.

Changed paths:
    U xdebug/trunk/xdebug.c
    U xdebug/trunk/xdebug_code_coverage.c

Modified: xdebug/trunk/xdebug.c
===================================================================
--- xdebug/trunk/xdebug.c 2010-01-01 17:28:36 UTC (rev 3188)
+++ xdebug/trunk/xdebug.c 2010-01-01 22:35:57 UTC (rev 3189)
@@ -718,13 +718,7 @@

         ZEND_INIT_MODULE_GLOBALS(xdebug, php_xdebug_init_globals, php_xdebug_shutdown_globals);
         REGISTER_INI_ENTRIES();
-#if 0
-#ifdef ZEND_ENGINE_2
-# if PHP_MINOR_VERSION >= 1
- zend_vm_use_old_executor();
-# endif
-#endif
-#endif
+
         /* initialize aggregate call information hash */
         zend_hash_init_ex(&XG(aggr_calls), 50, NULL, (dtor_func_t) xdebug_profile_aggr_call_entry_dtor, 1, 0);

Modified: xdebug/trunk/xdebug_code_coverage.c
===================================================================
--- xdebug/trunk/xdebug_code_coverage.c 2010-01-01 17:28:36 UTC (rev 3188)
+++ xdebug/trunk/xdebug_code_coverage.c 2010-01-01 22:35:57 UTC (rev 3189)
@@ -118,11 +118,7 @@

         zend_op opcode = opa->opcodes[position];
         if (opcode.opcode == ZEND_JMP) {
-#ifdef ZEND_ENGINE_2
                 *jmp1 = ((long) opcode.op1.u.jmp_addr - (long) base_address) / sizeof(zend_op);
-#else
- *jmp1 = opcode.op1.u.opline_num;
-#endif
                 return 1;
         } else if (
                 opcode.opcode == ZEND_JMPZ ||
@@ -131,11 +127,7 @@
                 opcode.opcode == ZEND_JMPNZ_EX
         ) {
                 *jmp1 = position + 1;
-#ifdef ZEND_ENGINE_2
                 *jmp2 = ((long) opcode.op2.u.jmp_addr - (long) base_address) / sizeof(zend_op);
-#else
- *jmp2 = opcode.op1.u.opline_num;
-#endif
                 return 1;
         } else if (opcode.opcode == ZEND_JMPZNZ) {
                 *jmp1 = opcode.op2.u.opline_num;
Received on Fri Jan 01 2010 - 22:35:57 GMT