com php-src: more cleanup for num args: Zend/zend_compile.c Zend/zend_execute.h Zend/zend_vm_def.h Zend/ze nd_vm_execute.h

Commit: c5668d1fae40c209e8ff644a5b76228007dc9f80 Author: Anatol Belski <ab@php.net> Mon, 3 Feb 2014 15:59:35 +0100 Parents: 6fb3434592e1d542ee24bec7d593c1ea0a0efafb Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c5668d1fae40c209e8ff644a5b76228007dc9f80 Log: more cleanup for num args Changed paths: M Zend/zend_compile.c M Zend/zend_execute.h M Zend/zend_vm_def.h M Zend/zend_vm_execute.h

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 53dfb24..f0209e5 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -3188,7 +3188,7 @@ static void do_inherit_method(zend_function *function) /* {{{ */ static zend_bool zend_do_perform_implementation_check(const zend_function *fe, const zend_function *proto TSRMLS_DC) /* {{{ */ { - zend_uint i, num_args; + zend_size_t i, num_args; /* If it's a user function then arg_info == NULL means we don't have any parameters but * we still need to do the arg number checks. We are only willing to ignore this for internal @@ -3352,7 +3352,7 @@ static char * zend_get_function_declaration(zend_function *fptr TSRMLS_DC) /* {{ *(offset++) = '('; if (fptr->common.arg_info) { - zend_uint i, required; + zend_size_t i, required; zend_arg_info *arg_info = fptr->common.arg_info; required = fptr->common.required_num_args; @@ -3401,7 +3401,7 @@ static char * zend_get_function_declaration(zend_function *fptr TSRMLS_DC) /* {{ memcpy(offset, arg_info->name, arg_info->name_len); offset += arg_info->name_len; } else { - zend_uint idx = i; + zend_size_t idx = i; memcpy(offset, "param", 5); offset += 5; do { @@ -3416,14 +3416,14 @@ static char * zend_get_function_declaration(zend_function *fptr TSRMLS_DC) /* {{ if (fptr->type == ZEND_USER_FUNCTION) { zend_op *precv = NULL; { - zend_uint idx = i; + zend_size_t idx = i; zend_op *op = ((zend_op_array *)fptr)->opcodes; zend_op *end = op + ((zend_op_array *)fptr)->last; ++idx; while (op < end) { if ((op->opcode == ZEND_RECV || op->opcode == ZEND_RECV_INIT) - && op->op1.num == (long)idx) + && op->op1.num == idx) { precv = op; } diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h index 62bc150..0c0aee0 100644 --- a/Zend/zend_execute.h +++ b/Zend/zend_execute.h @@ -312,17 +312,17 @@ static zend_always_inline void zend_vm_stack_clear_multiple(int nested TSRMLS_DC } } -static zend_always_inline int zend_vm_stack_get_args_count_ex(zend_execute_data *ex) +static zend_always_inline zend_size_t zend_vm_stack_get_args_count_ex(zend_execute_data *ex) { if (ex) { void **p = ex->function_state.arguments; - return (int)(zend_uintptr_t) *p; + return (zend_size_t)(zend_uintptr_t) *p; } else { return 0; } } -static zend_always_inline zval** zend_vm_stack_get_arg_ex(zend_execute_data *ex, int requested_arg) +static zend_always_inline zval** zend_vm_stack_get_arg_ex(zend_execute_data *ex, zend_size_t requested_arg) { void **p = ex->function_state.arguments; int arg_count = (int)(zend_uintptr_t) *p; @@ -333,12 +333,12 @@ static zend_always_inline zval** zend_vm_stack_get_arg_ex(zend_execute_data *ex, return (zval**)p - arg_count + requested_arg - 1; } -static zend_always_inline int zend_vm_stack_get_args_count(TSRMLS_D) +static zend_always_inline zend_size_t zend_vm_stack_get_args_count(TSRMLS_D) { return zend_vm_stack_get_args_count_ex(EG(current_execute_data)->prev_execute_data); } -static zend_always_inline zval** zend_vm_stack_get_arg(int requested_arg TSRMLS_DC) +static zend_always_inline zval** zend_vm_stack_get_arg(zend_size_t requested_arg TSRMLS_DC) { return zend_vm_stack_get_arg_ex(EG(current_execute_data)->prev_execute_data, requested_arg); } diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index eabe1f1..02f9e11 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -3063,7 +3063,7 @@ ZEND_VM_HANDLER(65, ZEND_SEND_VAL, CONST|TMP, ANY) SAVE_OPLINE(); if (opline->extended_value == ZEND_DO_FCALL_BY_NAME) { - int arg_num = opline->op2.num + EX(call)->num_additional_args; + zend_size_t arg_num = opline->op2.num + EX(call)->num_additional_args; if (ARG_MUST_BE_SENT_BY_REF(EX(call)->fbc, arg_num)) { zend_error_noreturn(E_ERROR, "Cannot pass parameter %d by reference", arg_num); } @@ -3126,7 +3126,7 @@ ZEND_VM_HANDLER(106, ZEND_SEND_VAR_NO_REF, VAR|CV, ANY) USE_OPLINE zend_free_op free_op1; zval *varptr; - int arg_num; + zend_size_t arg_num; SAVE_OPLINE(); if (opline->extended_value & ZEND_ARG_COMPILE_TIME_BOUND) { /* Had function_ptr at compile_time */ @@ -3193,7 +3193,7 @@ ZEND_VM_HANDLER(67, ZEND_SEND_REF, VAR|CV, ANY) if (opline->extended_value == ZEND_DO_FCALL_BY_NAME && EX(function_state).function->type == ZEND_INTERNAL_FUNCTION) { - int arg_num = opline->op2.num + EX(call)->num_additional_args; + zend_size_t arg_num = opline->op2.num + EX(call)->num_additional_args; if (!ARG_SHOULD_BE_SENT_BY_REF(EX(call)->fbc, arg_num)) { ZEND_VM_DISPATCH_TO_HELPER(zend_send_by_var_helper); } @@ -3214,7 +3214,7 @@ ZEND_VM_HANDLER(66, ZEND_SEND_VAR, VAR|CV, ANY) USE_OPLINE if (opline->extended_value == ZEND_DO_FCALL_BY_NAME) { - int arg_num = opline->op2.num + EX(call)->num_additional_args; + zend_size_t arg_num = opline->op2.num + EX(call)->num_additional_args; if (ARG_SHOULD_BE_SENT_BY_REF(EX(call)->fbc, arg_num)) { ZEND_VM_DISPATCH_TO_HANDLER(ZEND_SEND_REF); } @@ -3228,7 +3228,7 @@ ZEND_VM_HANDLER(165, ZEND_SEND_UNPACK, ANY, ANY) USE_OPLINE zend_free_op free_op1; zval *args; - int arg_num; + zend_size_t arg_num; SAVE_OPLINE(); args = GET_OP1_ZVAL_PTR(BP_VAR_R); @@ -3374,7 +3374,7 @@ ZEND_VM_C_LABEL(unpack_iter_dtor): ZEND_VM_HANDLER(63, ZEND_RECV, ANY, ANY) { USE_OPLINE - zend_uint arg_num = opline->op1.num; + zend_size_t arg_num = opline->op1.num; zval **param = zend_vm_stack_get_arg(arg_num TSRMLS_CC); SAVE_OPLINE(); @@ -3416,7 +3416,7 @@ ZEND_VM_HANDLER(64, ZEND_RECV_INIT, ANY, CONST) { USE_OPLINE zval *assignment_value; - zend_uint arg_num = opline->op1.num; + zend_size_t arg_num = opline->op1.num; zval **param = zend_vm_stack_get_arg(arg_num TSRMLS_CC); zval **var_ptr; @@ -3448,8 +3448,8 @@ ZEND_VM_HANDLER(64, ZEND_RECV_INIT, ANY, CONST) ZEND_VM_HANDLER(164, ZEND_RECV_VARIADIC, ANY, ANY) { USE_OPLINE - zend_uint arg_num = opline->op1.num; - zend_uint arg_count = zend_vm_stack_get_args_count(TSRMLS_C); + zend_size_t arg_num = opline->op1.num; + zend_size_t arg_count = zend_vm_stack_get_args_count(TSRMLS_C); zval **var_ptr, *params; SAVE_OPLINE(); diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index e74410b6..e5388a3 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -710,7 +710,7 @@ static int ZEND_FASTCALL ZEND_SEND_UNPACK_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS USE_OPLINE zend_free_op free_op1; zval *args; - int arg_num; + zend_size_t arg_num; SAVE_OPLINE(); args = get_zval_ptr(opline->op1_type, &opline->op1, execute_data, &free_op1, BP_VAR_R); @@ -856,7 +856,7 @@ unpack_iter_dtor: static int ZEND_FASTCALL ZEND_RECV_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS) { USE_OPLINE - zend_uint arg_num = opline->op1.num; + zend_size_t arg_num = opline->op1.num; zval **param = zend_vm_stack_get_arg(arg_num TSRMLS_CC); SAVE_OPLINE(); @@ -897,8 +897,8 @@ static int ZEND_FASTCALL ZEND_RECV_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS) static int ZEND_FASTCALL ZEND_RECV_VARIADIC_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS) { USE_OPLINE - zend_uint arg_num = opline->op1.num; - zend_uint arg_count = zend_vm_stack_get_args_count(TSRMLS_C); + zend_size_t arg_num = opline->op1.num; + zend_size_t arg_count = zend_vm_stack_get_args_count(TSRMLS_C); zval **var_ptr, *params; SAVE_OPLINE(); @@ -1613,7 +1613,7 @@ static int ZEND_FASTCALL ZEND_RECV_INIT_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ { USE_OPLINE zval *assignment_value; - zend_uint arg_num = opline->op1.num; + zend_size_t arg_num = opline->op1.num; zval **param = zend_vm_stack_get_arg(arg_num TSRMLS_CC); zval **var_ptr; @@ -2736,7 +2736,7 @@ static int ZEND_FASTCALL ZEND_SEND_VAL_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_A SAVE_OPLINE(); if (opline->extended_value == ZEND_DO_FCALL_BY_NAME) { - int arg_num = opline->op2.num + EX(call)->num_additional_args; + zend_size_t arg_num = opline->op2.num + EX(call)->num_additional_args; if (ARG_MUST_BE_SENT_BY_REF(EX(call)->fbc, arg_num)) { zend_error_noreturn(E_ERROR, "Cannot pass parameter %d by reference", arg_num); } @@ -8034,7 +8034,7 @@ static int ZEND_FASTCALL ZEND_SEND_VAL_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARG SAVE_OPLINE(); if (opline->extended_value == ZEND_DO_FCALL_BY_NAME) { - int arg_num = opline->op2.num + EX(call)->num_additional_args; + zend_size_t arg_num = opline->op2.num + EX(call)->num_additional_args; if (ARG_MUST_BE_SENT_BY_REF(EX(call)->fbc, arg_num)) { zend_error_noreturn(E_ERROR, "Cannot pass parameter %d by reference", arg_num); } @@ -13265,7 +13265,7 @@ static int ZEND_FASTCALL ZEND_SEND_VAR_NO_REF_SPEC_VAR_HANDLER(ZEND_OPCODE_HAND USE_OPLINE zend_free_op free_op1; zval *varptr; - int arg_num; + zend_size_t arg_num; SAVE_OPLINE(); if (opline->extended_value & ZEND_ARG_COMPILE_TIME_BOUND) { /* Had function_ptr at compile_time */ @@ -13332,7 +13332,7 @@ static int ZEND_FASTCALL ZEND_SEND_REF_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARG if (opline->extended_value == ZEND_DO_FCALL_BY_NAME && EX(function_state).function->type == ZEND_INTERNAL_FUNCTION) { - int arg_num = opline->op2.num + EX(call)->num_additional_args; + zend_size_t arg_num = opline->op2.num + EX(call)->num_additional_args; if (!ARG_SHOULD_BE_SENT_BY_REF(EX(call)->fbc, arg_num)) { return zend_send_by_var_helper_SPEC_VAR(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); } @@ -13353,7 +13353,7 @@ static int ZEND_FASTCALL ZEND_SEND_VAR_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARG USE_OPLINE if (opline->extended_value == ZEND_DO_FCALL_BY_NAME) { - int arg_num = opline->op2.num + EX(call)->num_additional_args; + zend_size_t arg_num = opline->op2.num + EX(call)->num_additional_args; if (ARG_SHOULD_BE_SENT_BY_REF(EX(call)->fbc, arg_num)) { return ZEND_SEND_REF_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); } @@ -30770,7 +30770,7 @@ static int ZEND_FASTCALL ZEND_SEND_VAR_NO_REF_SPEC_CV_HANDLER(ZEND_OPCODE_HANDL USE_OPLINE zval *varptr; - int arg_num; + zend_size_t arg_num; SAVE_OPLINE(); if (opline->extended_value & ZEND_ARG_COMPILE_TIME_BOUND) { /* Had function_ptr at compile_time */ @@ -30837,7 +30837,7 @@ static int ZEND_FASTCALL ZEND_SEND_REF_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS if (opline->extended_value == ZEND_DO_FCALL_BY_NAME && EX(function_state).function->type == ZEND_INTERNAL_FUNCTION) { - int arg_num = opline->op2.num + EX(call)->num_additional_args; + zend_size_t arg_num = opline->op2.num + EX(call)->num_additional_args; if (!ARG_SHOULD_BE_SENT_BY_REF(EX(call)->fbc, arg_num)) { return zend_send_by_var_helper_SPEC_CV(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); } @@ -30857,7 +30857,7 @@ static int ZEND_FASTCALL ZEND_SEND_VAR_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS USE_OPLINE if (opline->extended_value == ZEND_DO_FCALL_BY_NAME) { - int arg_num = opline->op2.num + EX(call)->num_additional_args; + zend_size_t arg_num = opline->op2.num + EX(call)->num_additional_args; if (ARG_SHOULD_BE_SENT_BY_REF(EX(call)->fbc, arg_num)) { return ZEND_SEND_REF_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); }