From: Zeev Suraski Date: Mon, 10 Feb 2003 11:49:21 +0000 (+0000) Subject: whitespace X-Git-Tag: RELEASE_0_5~1153 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=778ce2495d672d395eeaef7882d592c085ff2dd6;p=php whitespace --- diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 8e4ba13a36..cdb7fa6844 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -1238,6 +1238,7 @@ int zend_add_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_sub_handler(ZEND_OPCODE_HANDLER_ARGS) { sub_function(&EX_T(EX(opline)->result.u.var).tmp_var, @@ -1248,6 +1249,7 @@ int zend_sub_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_mul_handler(ZEND_OPCODE_HANDLER_ARGS) { mul_function(&EX_T(EX(opline)->result.u.var).tmp_var, @@ -1258,6 +1260,7 @@ int zend_mul_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_div_handler(ZEND_OPCODE_HANDLER_ARGS) { div_function(&EX_T(EX(opline)->result.u.var).tmp_var, @@ -1268,6 +1271,7 @@ int zend_div_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_mod_handler(ZEND_OPCODE_HANDLER_ARGS) { mod_function(&EX_T(EX(opline)->result.u.var).tmp_var, @@ -1278,6 +1282,7 @@ int zend_mod_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_sl_handler(ZEND_OPCODE_HANDLER_ARGS) { shift_left_function(&EX_T(EX(opline)->result.u.var).tmp_var, @@ -1288,6 +1293,7 @@ int zend_sl_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_sr_handler(ZEND_OPCODE_HANDLER_ARGS) { shift_right_function(&EX_T(EX(opline)->result.u.var).tmp_var, @@ -1298,6 +1304,7 @@ int zend_sr_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_concat_handler(ZEND_OPCODE_HANDLER_ARGS) { concat_function(&EX_T(EX(opline)->result.u.var).tmp_var, @@ -1308,6 +1315,7 @@ int zend_concat_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_is_identical_handler(ZEND_OPCODE_HANDLER_ARGS) { is_identical_function(&EX_T(EX(opline)->result.u.var).tmp_var, @@ -1318,6 +1326,7 @@ int zend_is_identical_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_is_not_identical_handler(ZEND_OPCODE_HANDLER_ARGS) { is_not_identical_function(&EX_T(EX(opline)->result.u.var).tmp_var, @@ -1328,6 +1337,7 @@ int zend_is_not_identical_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_is_equal_handler(ZEND_OPCODE_HANDLER_ARGS) { is_equal_function(&EX_T(EX(opline)->result.u.var).tmp_var, @@ -1338,6 +1348,7 @@ int zend_is_equal_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_is_not_equal_handler(ZEND_OPCODE_HANDLER_ARGS) { is_not_equal_function(&EX_T(EX(opline)->result.u.var).tmp_var, @@ -1348,6 +1359,7 @@ int zend_is_not_equal_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_is_smaller_handler(ZEND_OPCODE_HANDLER_ARGS) { is_smaller_function(&EX_T(EX(opline)->result.u.var).tmp_var, @@ -1358,6 +1370,7 @@ int zend_is_smaller_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_is_smaller_or_equal_handler(ZEND_OPCODE_HANDLER_ARGS) { is_smaller_or_equal_function(&EX_T(EX(opline)->result.u.var).tmp_var, @@ -1368,6 +1381,7 @@ int zend_is_smaller_or_equal_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_bw_or_handler(ZEND_OPCODE_HANDLER_ARGS) { bitwise_or_function(&EX_T(EX(opline)->result.u.var).tmp_var, @@ -1378,6 +1392,7 @@ int zend_bw_or_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_bw_and_handler(ZEND_OPCODE_HANDLER_ARGS) { bitwise_and_function(&EX_T(EX(opline)->result.u.var).tmp_var, @@ -1388,6 +1403,7 @@ int zend_bw_and_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_bw_xor_handler(ZEND_OPCODE_HANDLER_ARGS) { bitwise_xor_function(&EX_T(EX(opline)->result.u.var).tmp_var, @@ -1398,6 +1414,7 @@ int zend_bw_xor_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_bool_xor_handler(ZEND_OPCODE_HANDLER_ARGS) { boolean_xor_function(&EX_T(EX(opline)->result.u.var).tmp_var, @@ -1408,6 +1425,7 @@ int zend_bool_xor_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_bw_not_handler(ZEND_OPCODE_HANDLER_ARGS) { bitwise_not_function(&EX_T(EX(opline)->result.u.var).tmp_var, @@ -1416,6 +1434,7 @@ int zend_bw_not_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_bool_not_handler(ZEND_OPCODE_HANDLER_ARGS) { boolean_not_function(&EX_T(EX(opline)->result.u.var).tmp_var, @@ -1424,6 +1443,7 @@ int zend_bool_not_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + inline int zend_binary_assign_op_helper(void *binary_op_arg, ZEND_OPCODE_HANDLER_ARGS) { zval **var_ptr = get_zval_ptr_ptr(&EX(opline)->op1, EX(Ts), BP_VAR_RW); @@ -1451,61 +1471,73 @@ inline int zend_binary_assign_op_helper(void *binary_op_arg, ZEND_OPCODE_HANDLER NEXT_OPCODE(); } + int zend_assign_add_handler(ZEND_OPCODE_HANDLER_ARGS) { return zend_binary_assign_op_helper(add_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); } + int zend_assign_sub_handler(ZEND_OPCODE_HANDLER_ARGS) { return zend_binary_assign_op_helper(sub_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); } + int zend_assign_mul_handler(ZEND_OPCODE_HANDLER_ARGS) { return zend_binary_assign_op_helper(mul_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); } + int zend_assign_div_handler(ZEND_OPCODE_HANDLER_ARGS) { return zend_binary_assign_op_helper(div_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); } + int zend_assign_mod_handler(ZEND_OPCODE_HANDLER_ARGS) { return zend_binary_assign_op_helper(mod_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); } + int zend_assign_sl_handler(ZEND_OPCODE_HANDLER_ARGS) { return zend_binary_assign_op_helper(shift_left_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); } + int zend_assign_sr_handler(ZEND_OPCODE_HANDLER_ARGS) { return zend_binary_assign_op_helper(shift_right_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); } + int zend_assign_concat_handler(ZEND_OPCODE_HANDLER_ARGS) { return zend_binary_assign_op_helper(concat_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); } + int zend_assign_bw_or_handler(ZEND_OPCODE_HANDLER_ARGS) { return zend_binary_assign_op_helper(bitwise_or_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); } + int zend_assign_bw_and_handler(ZEND_OPCODE_HANDLER_ARGS) { return zend_binary_assign_op_helper(bitwise_and_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); } + int zend_assign_bw_xor_handler(ZEND_OPCODE_HANDLER_ARGS) { return zend_binary_assign_op_helper(bitwise_xor_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); } + int zend_assign_add_obj_handler(ZEND_OPCODE_HANDLER_ARGS) { zend_op *op_data = EX(opline)+1; @@ -1515,6 +1547,7 @@ int zend_assign_add_obj_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_assign_sub_obj_handler(ZEND_OPCODE_HANDLER_ARGS) { zend_op *op_data = EX(opline)+1; @@ -1524,6 +1557,7 @@ int zend_assign_sub_obj_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_assign_mul_obj_handler(ZEND_OPCODE_HANDLER_ARGS) { zend_op *op_data = EX(opline)+1; @@ -1533,6 +1567,7 @@ int zend_assign_mul_obj_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_assign_div_obj_handler(ZEND_OPCODE_HANDLER_ARGS) { zend_op *op_data = EX(opline)+1; @@ -1542,6 +1577,7 @@ int zend_assign_div_obj_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_assign_mod_obj_handler(ZEND_OPCODE_HANDLER_ARGS) { zend_op *op_data = EX(opline)+1; @@ -1551,6 +1587,7 @@ int zend_assign_mod_obj_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_assign_sl_obj_handler(ZEND_OPCODE_HANDLER_ARGS) { zend_op *op_data = EX(opline)+1; @@ -1560,6 +1597,7 @@ int zend_assign_sl_obj_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_assign_sr_obj_handler(ZEND_OPCODE_HANDLER_ARGS) { zend_op *op_data = EX(opline)+1; @@ -1569,6 +1607,7 @@ int zend_assign_sr_obj_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_assign_concat_obj_handler(ZEND_OPCODE_HANDLER_ARGS) { zend_op *op_data = EX(opline)+1; @@ -1578,6 +1617,7 @@ int zend_assign_concat_obj_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_assign_bw_or_obj_handler(ZEND_OPCODE_HANDLER_ARGS) { zend_op *op_data = EX(opline)+1; @@ -1587,6 +1627,7 @@ int zend_assign_bw_or_obj_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_assign_bw_and_obj_handler(ZEND_OPCODE_HANDLER_ARGS) { zend_op *op_data = EX(opline)+1; @@ -1596,6 +1637,7 @@ int zend_assign_bw_and_obj_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_assign_bw_xor_obj_handler(ZEND_OPCODE_HANDLER_ARGS) { zend_op *op_data = EX(opline)+1; @@ -1605,30 +1647,35 @@ int zend_assign_bw_xor_obj_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_pre_inc_obj_handler(ZEND_OPCODE_HANDLER_ARGS) { zend_pre_incdec_property(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts), increment_function TSRMLS_CC); NEXT_OPCODE(); } + int zend_pre_dec_obj_handler(ZEND_OPCODE_HANDLER_ARGS) { zend_pre_incdec_property(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts), decrement_function TSRMLS_CC); NEXT_OPCODE(); } + int zend_post_inc_obj_handler(ZEND_OPCODE_HANDLER_ARGS) { zend_post_incdec_property(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts), increment_function TSRMLS_CC); NEXT_OPCODE(); } + int zend_post_dec_obj_handler(ZEND_OPCODE_HANDLER_ARGS) { zend_post_incdec_property(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts), decrement_function TSRMLS_CC); NEXT_OPCODE(); } + inline int zend_incdec_op_helper(void *incdec_op_arg, ZEND_OPCODE_HANDLER_ARGS) { zval **var_ptr = get_zval_ptr_ptr(&EX(opline)->op1, EX(Ts), BP_VAR_RW); @@ -1667,26 +1714,31 @@ inline int zend_incdec_op_helper(void *incdec_op_arg, ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_pre_inc_handler(ZEND_OPCODE_HANDLER_ARGS) { return zend_incdec_op_helper(increment_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); } + int zend_pre_dec_handler(ZEND_OPCODE_HANDLER_ARGS) { return zend_incdec_op_helper(decrement_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); } + int zend_post_inc_handler(ZEND_OPCODE_HANDLER_ARGS) { return zend_incdec_op_helper(increment_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); } + int zend_post_dec_handler(ZEND_OPCODE_HANDLER_ARGS) { return zend_incdec_op_helper(decrement_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); } + int zend_print_handler(ZEND_OPCODE_HANDLER_ARGS) { zend_print_variable(get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R)); @@ -1696,6 +1748,7 @@ int zend_print_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_echo_handler(ZEND_OPCODE_HANDLER_ARGS) { zend_print_variable(get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R)); @@ -1703,6 +1756,7 @@ int zend_echo_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_fetch_r_handler(ZEND_OPCODE_HANDLER_ARGS) { zend_fetch_var_address(EX(opline), EX(Ts), BP_VAR_R TSRMLS_CC); @@ -1710,18 +1764,21 @@ int zend_fetch_r_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_fetch_w_handler(ZEND_OPCODE_HANDLER_ARGS) { zend_fetch_var_address(EX(opline), EX(Ts), BP_VAR_W TSRMLS_CC); NEXT_OPCODE(); } + int zend_fetch_rw_handler(ZEND_OPCODE_HANDLER_ARGS) { zend_fetch_var_address(EX(opline), EX(Ts), BP_VAR_RW TSRMLS_CC); NEXT_OPCODE(); } + int zend_fetch_func_arg_handler(ZEND_OPCODE_HANDLER_ARGS) { if (ARG_SHOULD_BE_SENT_BY_REF(EX(opline)->extended_value, EX(fbc), EX(fbc)->common.arg_types)) { @@ -1735,6 +1792,7 @@ int zend_fetch_func_arg_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_fetch_unset_handler(ZEND_OPCODE_HANDLER_ARGS) { zend_fetch_var_address(EX(opline), EX(Ts), BP_VAR_R TSRMLS_CC); @@ -1746,6 +1804,7 @@ int zend_fetch_unset_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_fetch_is_handler(ZEND_OPCODE_HANDLER_ARGS) { zend_fetch_var_address(EX(opline), EX(Ts), BP_VAR_IS TSRMLS_CC); @@ -1753,6 +1812,7 @@ int zend_fetch_is_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_fetch_dim_r_handler(ZEND_OPCODE_HANDLER_ARGS) { if (EX(opline)->extended_value == ZEND_FETCH_ADD_LOCK) { @@ -1763,18 +1823,21 @@ int zend_fetch_dim_r_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_fetch_dim_w_handler(ZEND_OPCODE_HANDLER_ARGS) { zend_fetch_dimension_address(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts), BP_VAR_W TSRMLS_CC); NEXT_OPCODE(); } + int zend_fetch_dim_rw_handler(ZEND_OPCODE_HANDLER_ARGS) { zend_fetch_dimension_address(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts), BP_VAR_RW TSRMLS_CC); NEXT_OPCODE(); } + int zend_fetch_dim_is_handler(ZEND_OPCODE_HANDLER_ARGS) { zend_fetch_dimension_address(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts), BP_VAR_IS TSRMLS_CC); @@ -1782,6 +1845,7 @@ int zend_fetch_dim_is_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_fetch_dim_func_arg_handler(ZEND_OPCODE_HANDLER_ARGS) { if (ARG_SHOULD_BE_SENT_BY_REF(EX(opline)->extended_value, EX(fbc), EX(fbc)->common.arg_types)) { @@ -1795,6 +1859,7 @@ int zend_fetch_dim_func_arg_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_fetch_dim_unset_handler(ZEND_OPCODE_HANDLER_ARGS) { /* Not needed in DIM_UNSET @@ -1811,6 +1876,7 @@ int zend_fetch_dim_unset_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_fetch_obj_r_handler(ZEND_OPCODE_HANDLER_ARGS) { zend_fetch_property_address_read(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts), BP_VAR_R TSRMLS_CC); @@ -1818,18 +1884,21 @@ int zend_fetch_obj_r_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_fetch_obj_w_handler(ZEND_OPCODE_HANDLER_ARGS) { zend_fetch_property_address(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts), BP_VAR_W TSRMLS_CC); NEXT_OPCODE(); } + int zend_fetch_obj_rw_handler(ZEND_OPCODE_HANDLER_ARGS) { zend_fetch_property_address(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts), BP_VAR_RW TSRMLS_CC); NEXT_OPCODE(); } + int zend_fetch_obj_is_handler(ZEND_OPCODE_HANDLER_ARGS) { zend_fetch_property_address_read(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts), BP_VAR_IS TSRMLS_CC); @@ -1837,6 +1906,7 @@ int zend_fetch_obj_is_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_fetch_obj_func_arg_handler(ZEND_OPCODE_HANDLER_ARGS) { if (ARG_SHOULD_BE_SENT_BY_REF(EX(opline)->extended_value, EX(fbc), EX(fbc)->common.arg_types)) { @@ -1849,6 +1919,7 @@ int zend_fetch_obj_func_arg_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_fetch_obj_unset_handler(ZEND_OPCODE_HANDLER_ARGS) { zend_fetch_property_address(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts), BP_VAR_R TSRMLS_CC); @@ -1861,6 +1932,7 @@ int zend_fetch_obj_unset_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_fetch_dim_tmp_var_handler(ZEND_OPCODE_HANDLER_ARGS) { zend_fetch_dimension_address_from_tmp_var(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts) TSRMLS_CC); @@ -1868,6 +1940,7 @@ int zend_fetch_dim_tmp_var_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_make_var_handler(ZEND_OPCODE_HANDLER_ARGS) { zval *value, *value2; @@ -1897,6 +1970,7 @@ int zend_make_var_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_assign_obj_handler(ZEND_OPCODE_HANDLER_ARGS) { zend_op *op_data = EX(opline)+1; @@ -1906,6 +1980,7 @@ int zend_assign_obj_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_assign_handler(ZEND_OPCODE_HANDLER_ARGS) { zval *value; @@ -1917,6 +1992,7 @@ int zend_assign_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_assign_ref_handler(ZEND_OPCODE_HANDLER_ARGS) { zval **value_ptr_ptr = get_zval_ptr_ptr(&EX(opline)->op2, EX(Ts), BP_VAR_W); @@ -1926,6 +2002,7 @@ int zend_assign_ref_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_jmp_handler(ZEND_OPCODE_HANDLER_ARGS) { #if DEBUG_ZEND>=2 @@ -1935,6 +2012,7 @@ int zend_jmp_handler(ZEND_OPCODE_HANDLER_ARGS) return 0; /* CHECK_ME */ } + int zend_jmpz_handler(ZEND_OPCODE_HANDLER_ARGS) { znode *op1 = &EX(opline)->op1; @@ -1952,6 +2030,7 @@ int zend_jmpz_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_jmpnz_handler(ZEND_OPCODE_HANDLER_ARGS) { znode *op1 = &EX(opline)->op1; @@ -1969,6 +2048,7 @@ int zend_jmpnz_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_jmpznz_handler(ZEND_OPCODE_HANDLER_ARGS) { znode *res = &EX(opline)->op1; @@ -1989,6 +2069,7 @@ int zend_jmpznz_handler(ZEND_OPCODE_HANDLER_ARGS) return 0; /* CHECK_ME */ } + int zend_jmpz_ex_handler(ZEND_OPCODE_HANDLER_ARGS) { zend_op *original_opline = EX(opline); @@ -2007,6 +2088,7 @@ int zend_jmpz_ex_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_jmpnz_ex_handler(ZEND_OPCODE_HANDLER_ARGS) { zend_op *original_opline = EX(opline); @@ -2025,12 +2107,14 @@ int zend_jmpnz_ex_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_free_handler(ZEND_OPCODE_HANDLER_ARGS) { zendi_zval_dtor(EX_T(EX(opline)->op1.u.var).tmp_var); NEXT_OPCODE(); } + int zend_init_string_handler(ZEND_OPCODE_HANDLER_ARGS) { EX_T(EX(opline)->result.u.var).tmp_var.value.str.val = emalloc(1); @@ -2042,6 +2126,7 @@ int zend_init_string_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_add_char_handler(ZEND_OPCODE_HANDLER_ARGS) { add_char_to_string(&EX_T(EX(opline)->result.u.var).tmp_var, @@ -2051,6 +2136,7 @@ int zend_add_char_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_add_string_handler(ZEND_OPCODE_HANDLER_ARGS) { add_string_to_string(&EX_T(EX(opline)->result.u.var).tmp_var, @@ -2060,6 +2146,7 @@ int zend_add_string_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_add_var_handler(ZEND_OPCODE_HANDLER_ARGS) { zval *var = get_zval_ptr(&EX(opline)->op2, EX(Ts), &EG(free_op2), BP_VAR_R); @@ -2087,6 +2174,7 @@ int zend_add_var_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_import_function_handler(ZEND_OPCODE_HANDLER_ARGS) { zend_class_entry *ce; @@ -2116,6 +2204,7 @@ int zend_import_function_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_import_class_handler(ZEND_OPCODE_HANDLER_ARGS) { zend_class_entry *ce; @@ -2146,6 +2235,7 @@ int zend_import_class_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_import_const_handler(ZEND_OPCODE_HANDLER_ARGS) { zend_class_entry *ce; @@ -2198,6 +2288,7 @@ int zend_import_const_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_fetch_class_handler(ZEND_OPCODE_HANDLER_ARGS) { zend_class_entry **pce; @@ -2351,6 +2442,7 @@ int zend_init_method_call_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_init_static_method_call_handler(ZEND_OPCODE_HANDLER_ARGS) { zval *function_name; @@ -2400,6 +2492,7 @@ int zend_init_static_method_call_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_init_fcall_by_name_handler(ZEND_OPCODE_HANDLER_ARGS) { zval *function_name; @@ -2457,6 +2550,7 @@ int zend_init_fcall_by_name_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_do_fcall_common_helper(ZEND_OPCODE_HANDLER_ARGS) { zval **original_return_value; @@ -2569,12 +2663,14 @@ int zend_do_fcall_common_helper(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_do_fcall_by_name_handler(ZEND_OPCODE_HANDLER_ARGS) { EX(function_state).function = EX(fbc); return zend_do_fcall_common_helper(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); } + int zend_do_fcall_handler(ZEND_OPCODE_HANDLER_ARGS) { zval *fname = get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R); @@ -2605,6 +2701,7 @@ int zend_do_fcall_handler(ZEND_OPCODE_HANDLER_ARGS) return zend_do_fcall_common_helper(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); } + int zend_return_handler(ZEND_OPCODE_HANDLER_ARGS) { zval *retval_ptr; @@ -2648,6 +2745,7 @@ int zend_return_handler(ZEND_OPCODE_HANDLER_ARGS) RETURN_FROM_EXECUTE_LOOP(execute_data); } + int zend_throw_handler(ZEND_OPCODE_HANDLER_ARGS) { zval *value; @@ -2676,6 +2774,7 @@ int zend_throw_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_catch_handler(ZEND_OPCODE_HANDLER_ARGS) { zend_class_entry *ce; @@ -2704,6 +2803,7 @@ exception_should_be_taken: NEXT_OPCODE(); } + int zend_send_val_handler(ZEND_OPCODE_HANDLER_ARGS) { if (EX(opline)->extended_value==ZEND_DO_FCALL_BY_NAME @@ -2727,6 +2827,7 @@ int zend_send_val_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + inline int zend_send_by_var_helper(ZEND_OPCODE_HANDLER_ARGS) { zval *varptr; @@ -2752,6 +2853,7 @@ inline int zend_send_by_var_helper(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_send_var_no_ref_handler(ZEND_OPCODE_HANDLER_ARGS) { if (EX(opline)->extended_value & ZEND_ARG_COMPILE_TIME_BOUND) { /* Had function_ptr at compile_time */ @@ -2776,6 +2878,7 @@ int zend_send_var_no_ref_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_send_ref_handler(ZEND_OPCODE_HANDLER_ARGS) { zval **varptr_ptr; @@ -2794,6 +2897,7 @@ int zend_send_ref_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_send_var_handler(ZEND_OPCODE_HANDLER_ARGS) { if ((EX(opline)->extended_value == ZEND_DO_FCALL_BY_NAME) @@ -2803,6 +2907,7 @@ int zend_send_var_handler(ZEND_OPCODE_HANDLER_ARGS) return zend_send_by_var_helper(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); } + int zend_recv_handler(ZEND_OPCODE_HANDLER_ARGS) { zval **param; @@ -2821,6 +2926,7 @@ int zend_recv_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_recv_init_handler(ZEND_OPCODE_HANDLER_ARGS) { zval **param, *assignment_value; @@ -2857,6 +2963,7 @@ int zend_recv_init_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_bool_handler(ZEND_OPCODE_HANDLER_ARGS) { /* PHP 3.0 returned "" for false and 1 for true, here we use 0 and 1 for now */ @@ -2867,6 +2974,7 @@ int zend_bool_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + inline int zend_brk_cont_helper(ZEND_OPCODE_HANDLER_ARGS) { zval *nest_levels_zval = get_zval_ptr(&EX(opline)->op2, EX(Ts), &EG(free_op2), BP_VAR_R); @@ -2913,16 +3021,19 @@ inline int zend_brk_cont_helper(ZEND_OPCODE_HANDLER_ARGS) return 0; /* CHECK_ME */ } + int zend_brk_handler(ZEND_OPCODE_HANDLER_ARGS) { return zend_brk_cont_helper(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); } + int zend_cont_handler(ZEND_OPCODE_HANDLER_ARGS) { return zend_brk_cont_helper(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); } + int zend_case_handler(ZEND_OPCODE_HANDLER_ARGS) { int switch_expr_is_overloaded=0; @@ -2955,12 +3066,14 @@ int zend_case_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_switch_free_handler(ZEND_OPCODE_HANDLER_ARGS) { zend_switch_free(EX(opline), EX(Ts) TSRMLS_CC); NEXT_OPCODE(); } + int zend_new_handler(ZEND_OPCODE_HANDLER_ARGS) { if (EX_T(EX(opline)->op1.u.var).EA.class_entry->ce_flags & ZEND_ACC_ABSTRACT) { @@ -2975,6 +3088,7 @@ int zend_new_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_clone_handler(ZEND_OPCODE_HANDLER_ARGS) { zval *obj = get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R); @@ -2988,6 +3102,7 @@ int zend_clone_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_fetch_constant_handler(ZEND_OPCODE_HANDLER_ARGS) { zend_class_entry *ce; @@ -3036,6 +3151,7 @@ int zend_fetch_constant_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + inline int zend_init_add_array_helper(ZEND_OPCODE_HANDLER_ARGS) { zval *array_ptr = &EX_T(EX(opline)->result.u.var).tmp_var; @@ -3106,16 +3222,19 @@ inline int zend_init_add_array_helper(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_init_array_handler(ZEND_OPCODE_HANDLER_ARGS) { return zend_init_add_array_helper(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); } + int zend_add_array_element_handler(ZEND_OPCODE_HANDLER_ARGS) { return zend_init_add_array_helper(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); } + int zend_cast_handler(ZEND_OPCODE_HANDLER_ARGS) { zval *expr = get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R); @@ -3151,6 +3270,7 @@ int zend_cast_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_include_or_eval_handler(ZEND_OPCODE_HANDLER_ARGS) { zend_op_array *new_op_array=NULL; @@ -3276,6 +3396,7 @@ int zend_include_or_eval_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_unset_var_handler(ZEND_OPCODE_HANDLER_ARGS) { zval tmp, *variable; @@ -3301,6 +3422,7 @@ int zend_unset_var_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_unset_dim_obj_handler(ZEND_OPCODE_HANDLER_ARGS) { zval **container = get_obj_zval_ptr_ptr(&EX(opline)->op1, EX(Ts), BP_VAR_R TSRMLS_CC); @@ -3354,6 +3476,7 @@ int zend_unset_dim_obj_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_fe_reset_handler(ZEND_OPCODE_HANDLER_ARGS) { zval *array_ptr, **array_ptr_ptr; @@ -3394,6 +3517,7 @@ int zend_fe_reset_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_fe_fetch_handler(ZEND_OPCODE_HANDLER_ARGS) { zval *array = get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R); @@ -3440,6 +3564,7 @@ int zend_fe_fetch_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_jmp_no_ctor_handler(ZEND_OPCODE_HANDLER_ARGS) { zval *object_zval; @@ -3463,6 +3588,7 @@ int zend_jmp_no_ctor_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_isset_isempty_var_handler(ZEND_OPCODE_HANDLER_ARGS) { zval tmp, *variable = get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R); @@ -3510,6 +3636,7 @@ int zend_isset_isempty_var_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_isset_isempty_dim_obj_handler(ZEND_OPCODE_HANDLER_ARGS) { zval **container = get_obj_zval_ptr_ptr(&EX(opline)->op1, EX(Ts), BP_VAR_R TSRMLS_CC); @@ -3608,6 +3735,7 @@ int zend_isset_isempty_dim_obj_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_exit_handler(ZEND_OPCODE_HANDLER_ARGS) { if (EX(opline)->op1.op_type != IS_UNUSED) { @@ -3625,6 +3753,7 @@ int zend_exit_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_begin_silence_handler(ZEND_OPCODE_HANDLER_ARGS) { EX_T(EX(opline)->result.u.var).tmp_var.value.lval = EG(error_reporting); @@ -3633,12 +3762,14 @@ int zend_begin_silence_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_raise_abstract_error_handler(ZEND_OPCODE_HANDLER_ARGS) { zend_error(E_ERROR, "Cannot call abstract method %s::%s()", EG(scope)->name, op_array->function_name); NEXT_OPCODE(); /* Never reached */ } + int zend_end_silence_handler(ZEND_OPCODE_HANDLER_ARGS) { zval restored_error_reporting; @@ -3651,6 +3782,7 @@ int zend_end_silence_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_qm_assign_handler(ZEND_OPCODE_HANDLER_ARGS) { zval *value = get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R); @@ -3662,6 +3794,7 @@ int zend_qm_assign_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_ext_stmt_handler(ZEND_OPCODE_HANDLER_ARGS) { if (!EG(no_extensions)) { @@ -3670,6 +3803,7 @@ int zend_ext_stmt_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_ext_fcall_begin_handler(ZEND_OPCODE_HANDLER_ARGS) { if (!EG(no_extensions)) { @@ -3678,6 +3812,7 @@ int zend_ext_fcall_begin_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_ext_fcall_end_handler(ZEND_OPCODE_HANDLER_ARGS) { if (!EG(no_extensions)) { @@ -3686,24 +3821,28 @@ int zend_ext_fcall_end_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_declare_class_handler(ZEND_OPCODE_HANDLER_ARGS) { do_bind_class(EX(opline), EG(function_table), EG(class_table)); NEXT_OPCODE(); } + int zend_declare_inherited_class_handler(ZEND_OPCODE_HANDLER_ARGS) { do_bind_inherited_class(EX(opline), EG(function_table), EG(class_table), EX_T(EX(opline)->extended_value).EA.class_entry); NEXT_OPCODE(); } + int zend_declare_function_handler(ZEND_OPCODE_HANDLER_ARGS) { do_bind_function(EX(opline), EG(function_table), EG(class_table), 0); NEXT_OPCODE(); } + int zend_ticks_handler(ZEND_OPCODE_HANDLER_ARGS) { if (++EG(ticks_count)>=EX(opline)->op1.u.constant.value.lval) { @@ -3715,6 +3854,7 @@ int zend_ticks_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_instanceof_handler(ZEND_OPCODE_HANDLER_ARGS) { zval *expr = get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R); @@ -3724,16 +3864,19 @@ int zend_instanceof_handler(ZEND_OPCODE_HANDLER_ARGS) NEXT_OPCODE(); } + int zend_ext_nop_handler(ZEND_OPCODE_HANDLER_ARGS) { NEXT_OPCODE(); } + int zend_nop_handler(ZEND_OPCODE_HANDLER_ARGS) { NEXT_OPCODE(); } + void zend_init_opcodes_handlers() { zend_opcode_handlers[ZEND_NOP] = zend_nop_handler;