diff options
| author | Dmitry Stogov <dmitry@php.net> | 2006-03-15 08:06:28 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2006-03-15 08:06:28 +0000 |
| commit | 056bea6de7fff4824838ae95d7e12df384ef80b4 (patch) | |
| tree | c07d5bb9c6ca29694b7513e7106be6b9ff82d2ce | |
| parent | c6b8c26cdf46c3fae9b492c6a487951ae5e0b014 (diff) | |
| download | php-git-056bea6de7fff4824838ae95d7e12df384ef80b4.tar.gz | |
Fixed "zend_vm_gen.php --without-specializer"
| -rw-r--r-- | Zend/zend_vm_def.h | 2 | ||||
| -rw-r--r-- | Zend/zend_vm_execute.h | 10 | ||||
| -rw-r--r-- | Zend/zend_vm_gen.php | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index c63a337eb9..85ecccbc85 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -3414,8 +3414,8 @@ ZEND_VM_HANDLER(148, ZEND_ISSET_ISEMPTY_PROP_OBJ, VAR|UNUSED|CV, CONST|TMP|VAR|C ZEND_VM_HANDLER(79, ZEND_EXIT, CONST|TMP|VAR|UNUSED|CV, ANY) { + zend_op *opline = EX(opline); if (OP1_TYPE != IS_UNUSED) { - zend_op *opline = EX(opline); zend_free_op free_op1; zval *ptr = GET_OP1_ZVAL_PTR(BP_VAR_R); diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 78c0c6bdaa..cf9e1100d5 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -2187,8 +2187,8 @@ static int ZEND_ISSET_ISEMPTY_VAR_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) static int ZEND_EXIT_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) { + zend_op *opline = EX(opline); if (IS_CONST != IS_UNUSED) { - zend_op *opline = EX(opline); zval *ptr = &opline->op1.u.constant; @@ -4606,8 +4606,8 @@ static int ZEND_ISSET_ISEMPTY_VAR_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS) static int ZEND_EXIT_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS) { + zend_op *opline = EX(opline); if (IS_TMP_VAR != IS_UNUSED) { - zend_op *opline = EX(opline); zend_free_op free_op1; zval *ptr = _get_zval_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC); @@ -7744,8 +7744,8 @@ static int ZEND_ISSET_ISEMPTY_VAR_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) static int ZEND_EXIT_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) { + zend_op *opline = EX(opline); if (IS_VAR != IS_UNUSED) { - zend_op *opline = EX(opline); zend_free_op free_op1; zval *ptr = _get_zval_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC); @@ -14031,8 +14031,8 @@ static int ZEND_CLONE_SPEC_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS) static int ZEND_EXIT_SPEC_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS) { + zend_op *opline = EX(opline); if (IS_UNUSED != IS_UNUSED) { - zend_op *opline = EX(opline); zval *ptr = NULL; @@ -19702,8 +19702,8 @@ static int ZEND_ISSET_ISEMPTY_VAR_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) static int ZEND_EXIT_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) { + zend_op *opline = EX(opline); if (IS_CV != IS_UNUSED) { - zend_op *opline = EX(opline); zval *ptr = _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC); diff --git a/Zend/zend_vm_gen.php b/Zend/zend_vm_gen.php index 1821ef4eca..b3134fe0ea 100644 --- a/Zend/zend_vm_gen.php +++ b/Zend/zend_vm_gen.php @@ -1200,13 +1200,13 @@ function gen_vm($def, $skel) { if ($kind == "handler") { $op = $opcodes[$opnames[$name]]; if (isset($op['op1']["ANY"]) && isset($op['op2']["ANY"])) { - out($f, "{\n\treturn ".$name."_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);\n}\n\n"); + out($f, "{\n\treturn ".$name.(ZEND_VM_SPEC?"_SPEC":"")."_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);\n}\n\n"); $done = 1; } } else if ($helpers[$name]["param"] == null) { $h = $helpers[$name]; if (isset($h['op1']["ANY"]) && isset($h['op2']["ANY"])) { - out($f, "{\n\treturn ".$name."_SPEC(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);\n}\n\n"); + out($f, "{\n\treturn ".$name.(ZEND_VM_SPEC?"_SPEC":"")."(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);\n}\n\n"); $done = 1; } } |