Browse Source

decompiler: refix FETCH_CONSTANT for PHP_5_3 instead of messing up with UCLASS

git-svn-id: svn://svn.lighttpd.net/xcache/trunk@778 c26eb9a1-5813-0410-bd6c-c2e55f420ca7
3.0
Xuefer 11 years ago
parent
commit
ed71049c18
  1. 4
      opcode_spec_def.h
  2. 6
      utils.c

4
opcode_spec_def.h

@ -146,7 +146,9 @@ static const xc_opcode_spec_t xc_opcode_spec[] = {
OPSPEC( UNUSED, VAR, STD, VAR) /* 96 FETCH_DIM_UNSET */
OPSPEC( UNUSED, VAR_2, STD, VAR) /* 97 FETCH_OBJ_UNSET */
OPSPEC( UNUSED, STD, STD, VAR) /* 98 FETCH_DIM_TMP_VAR */
#ifdef ZEND_ENGINE_2
#ifdef ZEND_ENGINE_2_3
OPSPEC( UNUSED, VAR_2, STD, TMP) /* 99 FETCH_CONSTANT */
#elif defined(ZEND_ENGINE_2)
OPSPEC( UNUSED, UCLASS, STD, TMP) /* 99 FETCH_CONSTANT */
#else
OPSPEC( UNUSED, STD, UNUSED, TMP) /* 99 FETCH_CONSTANT */

6
utils.c

@ -244,12 +244,6 @@ static void xc_fix_opcode_ex_znode(int tofix, xc_op_spec_t spec, Z_OP_TYPEOF_TYP
case IS_TMP_VAR:
break;
case IS_CONST:
if (spec == OPSPEC_UCLASS) {
break;
}
/* fall */
default:
/* TODO: data lost, find a way to keep it */
/* assert(*op_type == IS_CONST); */

Loading…
Cancel
Save