zend_vm_def.h zend_vm_execute.h

Dmitry Stogov Mon, 19 Jul 2010 08:05:10 -0700

dmitry                                   Mon, 19 Jul 2010 15:04:51 +0000

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


Log:
Use proper fetch types

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        2010-07-19 14:34:34 UTC (rev 
301402)
+++ php/php-src/trunk/Zend/zend_vm_def.h        2010-07-19 15:04:51 UTC (rev 
301403)
@@ -335,7 +335,7 @@
 {
        USE_OPLINE
        zend_free_op free_op1, free_op2, free_op_data1;
-       zval **object_ptr = GET_OP1_OBJ_ZVAL_PTR_PTR(BP_VAR_W);
+       zval **object_ptr = GET_OP1_OBJ_ZVAL_PTR_PTR(BP_VAR_RW);
        zval *object;
        zval *property = GET_OP2_ZVAL_PTR(BP_VAR_R);
        zval *value = get_zval_ptr((opline+1)->op1_type, &(opline+1)->op1, 
EX_Ts(), &free_op_data1, BP_VAR_R);
@@ -599,7 +599,7 @@
        int have_get_ptr = 0;

        SAVE_OPLINE();
-       object_ptr = GET_OP1_OBJ_ZVAL_PTR_PTR(BP_VAR_W);
+       object_ptr = GET_OP1_OBJ_ZVAL_PTR_PTR(BP_VAR_RW);
        property = GET_OP2_ZVAL_PTR(BP_VAR_R);
        retval = &EX_T(opline->result.var).var.ptr;

@@ -703,7 +703,7 @@
        int have_get_ptr = 0;

        SAVE_OPLINE();
-       object_ptr = GET_OP1_OBJ_ZVAL_PTR_PTR(BP_VAR_W);
+       object_ptr = GET_OP1_OBJ_ZVAL_PTR_PTR(BP_VAR_RW);
        property = GET_OP2_ZVAL_PTR(BP_VAR_R);
        retval = &EX_T(opline->result.var).tmp_var;

@@ -1537,7 +1537,7 @@
        zval *property;

        SAVE_OPLINE();
-       container = GET_OP1_OBJ_ZVAL_PTR_PTR(BP_VAR_R);
+       container = GET_OP1_OBJ_ZVAL_PTR_PTR(BP_VAR_UNSET);
        property = GET_OP2_ZVAL_PTR(BP_VAR_R);

        if (OP1_TYPE == IS_CV) {

Modified: php/php-src/trunk/Zend/zend_vm_execute.h
===================================================================
--- php/php-src/trunk/Zend/zend_vm_execute.h    2010-07-19 14:34:34 UTC (rev 
301402)
+++ php/php-src/trunk/Zend/zend_vm_execute.h    2010-07-19 15:04:51 UTC (rev 
301403)
@@ -26872,7 +26872,7 @@
 {
        USE_OPLINE
        zend_free_op free_op_data1;
-       zval **object_ptr = _get_zval_ptr_ptr_cv_BP_VAR_W(EX_CVs(), 
opline->op1.var TSRMLS_CC);
+       zval **object_ptr = _get_zval_ptr_ptr_cv_BP_VAR_RW(EX_CVs(), 
opline->op1.var TSRMLS_CC);
        zval *object;
        zval *property = opline->op2.zv;
        zval *value = get_zval_ptr((opline+1)->op1_type, &(opline+1)->op1, 
EX_Ts(), &free_op_data1, BP_VAR_R);
@@ -27134,7 +27134,7 @@
        int have_get_ptr = 0;

        SAVE_OPLINE();
-       object_ptr = _get_zval_ptr_ptr_cv_BP_VAR_W(EX_CVs(), opline->op1.var 
TSRMLS_CC);
+       object_ptr = _get_zval_ptr_ptr_cv_BP_VAR_RW(EX_CVs(), opline->op1.var 
TSRMLS_CC);
        property = opline->op2.zv;
        retval = &EX_T(opline->result.var).var.ptr;

@@ -27238,7 +27238,7 @@
        int have_get_ptr = 0;

        SAVE_OPLINE();
-       object_ptr = _get_zval_ptr_ptr_cv_BP_VAR_W(EX_CVs(), opline->op1.var 
TSRMLS_CC);
+       object_ptr = _get_zval_ptr_ptr_cv_BP_VAR_RW(EX_CVs(), opline->op1.var 
TSRMLS_CC);
        property = opline->op2.zv;
        retval = &EX_T(opline->result.var).tmp_var;

@@ -27854,7 +27854,7 @@
        zval *property;

        SAVE_OPLINE();
-       container = _get_zval_ptr_ptr_cv_BP_VAR_R(EX_CVs(), opline->op1.var 
TSRMLS_CC);
+       container = _get_zval_ptr_ptr_cv_BP_VAR_UNSET(EX_CVs(), opline->op1.var 
TSRMLS_CC);
        property = opline->op2.zv;

        if (IS_CV == IS_CV) {
@@ -28938,7 +28938,7 @@
 {
        USE_OPLINE
        zend_free_op free_op2, free_op_data1;
-       zval **object_ptr = _get_zval_ptr_ptr_cv_BP_VAR_W(EX_CVs(), 
opline->op1.var TSRMLS_CC);
+       zval **object_ptr = _get_zval_ptr_ptr_cv_BP_VAR_RW(EX_CVs(), 
opline->op1.var TSRMLS_CC);
        zval *object;
        zval *property = _get_zval_ptr_tmp(opline->op2.var, EX_Ts(), &free_op2 
TSRMLS_CC);
        zval *value = get_zval_ptr((opline+1)->op1_type, &(opline+1)->op1, 
EX_Ts(), &free_op_data1, BP_VAR_R);
@@ -29201,7 +29201,7 @@
        int have_get_ptr = 0;

        SAVE_OPLINE();
-       object_ptr = _get_zval_ptr_ptr_cv_BP_VAR_W(EX_CVs(), opline->op1.var 
TSRMLS_CC);
+       object_ptr = _get_zval_ptr_ptr_cv_BP_VAR_RW(EX_CVs(), opline->op1.var 
TSRMLS_CC);
        property = _get_zval_ptr_tmp(opline->op2.var, EX_Ts(), &free_op2 
TSRMLS_CC);
        retval = &EX_T(opline->result.var).var.ptr;

@@ -29305,7 +29305,7 @@
        int have_get_ptr = 0;

        SAVE_OPLINE();
-       object_ptr = _get_zval_ptr_ptr_cv_BP_VAR_W(EX_CVs(), opline->op1.var 
TSRMLS_CC);
+       object_ptr = _get_zval_ptr_ptr_cv_BP_VAR_RW(EX_CVs(), opline->op1.var 
TSRMLS_CC);
        property = _get_zval_ptr_tmp(opline->op2.var, EX_Ts(), &free_op2 
TSRMLS_CC);
        retval = &EX_T(opline->result.var).tmp_var;

@@ -29767,7 +29767,7 @@
        zval *property;

        SAVE_OPLINE();
-       container = _get_zval_ptr_ptr_cv_BP_VAR_R(EX_CVs(), opline->op1.var 
TSRMLS_CC);
+       container = _get_zval_ptr_ptr_cv_BP_VAR_UNSET(EX_CVs(), opline->op1.var 
TSRMLS_CC);
        property = _get_zval_ptr_tmp(opline->op2.var, EX_Ts(), &free_op2 
TSRMLS_CC);

        if (IS_CV == IS_CV) {
@@ -30711,7 +30711,7 @@
 {
        USE_OPLINE
        zend_free_op free_op2, free_op_data1;
-       zval **object_ptr = _get_zval_ptr_ptr_cv_BP_VAR_W(EX_CVs(), 
opline->op1.var TSRMLS_CC);
+       zval **object_ptr = _get_zval_ptr_ptr_cv_BP_VAR_RW(EX_CVs(), 
opline->op1.var TSRMLS_CC);
        zval *object;
        zval *property = _get_zval_ptr_var(opline->op2.var, EX_Ts(), &free_op2 
TSRMLS_CC);
        zval *value = get_zval_ptr((opline+1)->op1_type, &(opline+1)->op1, 
EX_Ts(), &free_op_data1, BP_VAR_R);
@@ -30974,7 +30974,7 @@
        int have_get_ptr = 0;

        SAVE_OPLINE();
-       object_ptr = _get_zval_ptr_ptr_cv_BP_VAR_W(EX_CVs(), opline->op1.var 
TSRMLS_CC);
+       object_ptr = _get_zval_ptr_ptr_cv_BP_VAR_RW(EX_CVs(), opline->op1.var 
TSRMLS_CC);
        property = _get_zval_ptr_var(opline->op2.var, EX_Ts(), &free_op2 
TSRMLS_CC);
        retval = &EX_T(opline->result.var).var.ptr;

@@ -31078,7 +31078,7 @@
        int have_get_ptr = 0;

        SAVE_OPLINE();
-       object_ptr = _get_zval_ptr_ptr_cv_BP_VAR_W(EX_CVs(), opline->op1.var 
TSRMLS_CC);
+       object_ptr = _get_zval_ptr_ptr_cv_BP_VAR_RW(EX_CVs(), opline->op1.var 
TSRMLS_CC);
        property = _get_zval_ptr_var(opline->op2.var, EX_Ts(), &free_op2 
TSRMLS_CC);
        retval = &EX_T(opline->result.var).tmp_var;

@@ -31694,7 +31694,7 @@
        zval *property;

        SAVE_OPLINE();
-       container = _get_zval_ptr_ptr_cv_BP_VAR_R(EX_CVs(), opline->op1.var 
TSRMLS_CC);
+       container = _get_zval_ptr_ptr_cv_BP_VAR_UNSET(EX_CVs(), opline->op1.var 
TSRMLS_CC);
        property = _get_zval_ptr_var(opline->op2.var, EX_Ts(), &free_op2 
TSRMLS_CC);

        if (IS_CV == IS_CV) {
@@ -32555,7 +32555,7 @@
 {
        USE_OPLINE
        zend_free_op free_op_data1;
-       zval **object_ptr = _get_zval_ptr_ptr_cv_BP_VAR_W(EX_CVs(), 
opline->op1.var TSRMLS_CC);
+       zval **object_ptr = _get_zval_ptr_ptr_cv_BP_VAR_RW(EX_CVs(), 
opline->op1.var TSRMLS_CC);
        zval *object;
        zval *property = NULL;
        zval *value = get_zval_ptr((opline+1)->op1_type, &(opline+1)->op1, 
EX_Ts(), &free_op_data1, BP_VAR_R);
@@ -33648,7 +33648,7 @@
 {
        USE_OPLINE
        zend_free_op free_op_data1;
-       zval **object_ptr = _get_zval_ptr_ptr_cv_BP_VAR_W(EX_CVs(), 
opline->op1.var TSRMLS_CC);
+       zval **object_ptr = _get_zval_ptr_ptr_cv_BP_VAR_RW(EX_CVs(), 
opline->op1.var TSRMLS_CC);
        zval *object;
        zval *property = _get_zval_ptr_cv_BP_VAR_R(EX_CVs(), opline->op2.var 
TSRMLS_CC);
        zval *value = get_zval_ptr((opline+1)->op1_type, &(opline+1)->op1, 
EX_Ts(), &free_op_data1, BP_VAR_R);
@@ -33910,7 +33910,7 @@
        int have_get_ptr = 0;

        SAVE_OPLINE();
-       object_ptr = _get_zval_ptr_ptr_cv_BP_VAR_W(EX_CVs(), opline->op1.var 
TSRMLS_CC);
+       object_ptr = _get_zval_ptr_ptr_cv_BP_VAR_RW(EX_CVs(), opline->op1.var 
TSRMLS_CC);
        property = _get_zval_ptr_cv_BP_VAR_R(EX_CVs(), opline->op2.var 
TSRMLS_CC);
        retval = &EX_T(opline->result.var).var.ptr;

@@ -34014,7 +34014,7 @@
        int have_get_ptr = 0;

        SAVE_OPLINE();
-       object_ptr = _get_zval_ptr_ptr_cv_BP_VAR_W(EX_CVs(), opline->op1.var 
TSRMLS_CC);
+       object_ptr = _get_zval_ptr_ptr_cv_BP_VAR_RW(EX_CVs(), opline->op1.var 
TSRMLS_CC);
        property = _get_zval_ptr_cv_BP_VAR_R(EX_CVs(), opline->op2.var 
TSRMLS_CC);
        retval = &EX_T(opline->result.var).tmp_var;

@@ -34476,7 +34476,7 @@
        zval *property;

        SAVE_OPLINE();
-       container = _get_zval_ptr_ptr_cv_BP_VAR_R(EX_CVs(), opline->op1.var 
TSRMLS_CC);
+       container = _get_zval_ptr_ptr_cv_BP_VAR_UNSET(EX_CVs(), opline->op1.var 
TSRMLS_CC);
        property = _get_zval_ptr_cv_BP_VAR_R(EX_CVs(), opline->op2.var 
TSRMLS_CC);

        if (IS_CV == IS_CV) {

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/trunk/Zend/ zend_vm_def.h zend_vm_execute.h

Reply via email to