archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed "zend_vm_gen.php --without-specializer"

Browse source
This commit is contained in:
Dmitry Stogov 2006-03-15 08:06:28 +00:00
parent c6b8c26cdf
commit 056bea6de7
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Zend/zend_vm_def.h
View file

@ -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_VM_HANDLER(79, ZEND_EXIT, CONST|TMP|VAR|UNUSED|CV, ANY)
{ {
zend_op *opline = EX(opline);
if (OP1_TYPE != IS_UNUSED) { if (OP1_TYPE != IS_UNUSED) {
zend_op *opline = EX(opline);
zend_free_op free_op1; zend_free_op free_op1;
zval *ptr = GET_OP1_ZVAL_PTR(BP_VAR_R); zval *ptr = GET_OP1_ZVAL_PTR(BP_VAR_R);

10
Zend/zend_vm_execute.h
View file

@ -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) static int ZEND_EXIT_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
{ {
zend_op *opline = EX(opline);
if (IS_CONST != IS_UNUSED) { if (IS_CONST != IS_UNUSED) {
zend_op *opline = EX(opline);
zval *ptr = &opline->op1.u.constant; 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) static int ZEND_EXIT_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
{ {
zend_op *opline = EX(opline);
if (IS_TMP_VAR != IS_UNUSED) { if (IS_TMP_VAR != IS_UNUSED) {
zend_op *opline = EX(opline);
zend_free_op free_op1; zend_free_op free_op1;
zval *ptr = _get_zval_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC); 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) static int ZEND_EXIT_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
{ {
zend_op *opline = EX(opline);
if (IS_VAR != IS_UNUSED) { if (IS_VAR != IS_UNUSED) {
zend_op *opline = EX(opline);
zend_free_op free_op1; zend_free_op free_op1;
zval *ptr = _get_zval_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC); 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) static int ZEND_EXIT_SPEC_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
{ {
zend_op *opline = EX(opline);
if (IS_UNUSED != IS_UNUSED) { if (IS_UNUSED != IS_UNUSED) {
zend_op *opline = EX(opline);
zval *ptr = NULL; 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) static int ZEND_EXIT_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
{ {
zend_op *opline = EX(opline);
if (IS_CV != IS_UNUSED) { 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); zval *ptr = _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC);

4
Zend/zend_vm_gen.php
View file

@ -1200,13 +1200,13 @@ function gen_vm($def, $skel) {
if ($kind == "handler") { if ($kind == "handler") {
$op = $opcodes[$opnames[$name]]; $op = $opcodes[$opnames[$name]];
if (isset($op['op1']["ANY"]) && isset($op['op2']["ANY"])) { 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; $done = 1;
} }
} else if ($helpers[$name]["param"] == null) { } else if ($helpers[$name]["param"] == null) {
$h = $helpers[$name]; $h = $helpers[$name];
if (isset($h['op1']["ANY"]) && isset($h['op2']["ANY"])) { 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; $done = 1;
} }
} }