dmitry Thu, 05 May 2011 16:02:11 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=310791
Log: Fixed direct threaded executor (php zend_vm_gen.php --with-vm-kind=GOTO) Changed paths: U php/php-src/trunk/Zend/zend_vm_def.h U php/php-src/trunk/Zend/zend_vm_execute.h Modified: php/php-src/trunk/Zend/zend_vm_def.h =================================================================== --- php/php-src/trunk/Zend/zend_vm_def.h 2011-05-05 14:57:50 UTC (rev 310790) +++ php/php-src/trunk/Zend/zend_vm_def.h 2011-05-05 16:02:11 UTC (rev 310791) @@ -4764,10 +4764,11 @@ ZEND_VM_HANDLER(154, ZEND_ADD_TRAIT, ANY, ANY) { - zend_op *opline = EX(opline); + USE_OPLINE zend_class_entry *ce = EX_T(opline->op1.var).class_entry; zend_class_entry *trait; + SAVE_OPLINE(); if (CACHED_PTR(opline->op2.literal->cache_slot)) { trait = CACHED_PTR(opline->op2.literal->cache_slot); } else { @@ -4793,11 +4794,12 @@ ZEND_VM_HANDLER(155, ZEND_BIND_TRAITS, ANY, ANY) { - zend_op *opline = EX(opline); + USE_OPLINE zend_class_entry *ce = EX_T(opline->op1.var).class_entry; + SAVE_OPLINE(); zend_do_bind_traits(ce TSRMLS_CC); - + CHECK_EXCEPTION(); ZEND_VM_NEXT_OPCODE(); } Modified: php/php-src/trunk/Zend/zend_vm_execute.h =================================================================== --- php/php-src/trunk/Zend/zend_vm_execute.h 2011-05-05 14:57:50 UTC (rev 310790) +++ php/php-src/trunk/Zend/zend_vm_execute.h 2011-05-05 16:02:11 UTC (rev 310791) @@ -990,10 +990,11 @@ static int ZEND_FASTCALL ZEND_ADD_TRAIT_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS) { - zend_op *opline = EX(opline); + USE_OPLINE zend_class_entry *ce = EX_T(opline->op1.var).class_entry; zend_class_entry *trait; + SAVE_OPLINE(); if (CACHED_PTR(opline->op2.literal->cache_slot)) { trait = CACHED_PTR(opline->op2.literal->cache_slot); } else { @@ -1019,11 +1020,12 @@ static int ZEND_FASTCALL ZEND_BIND_TRAITS_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS) { - zend_op *opline = EX(opline); + USE_OPLINE zend_class_entry *ce = EX_T(opline->op1.var).class_entry; + SAVE_OPLINE(); zend_do_bind_traits(ce TSRMLS_CC); - + CHECK_EXCEPTION(); ZEND_VM_NEXT_OPCODE(); }
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php