Changeset 930 for trunk/processor/processor.m4

Timestamp:

2012-06-26T15:53:44+02:00 (11 months ago)

Author:

moo

Message:

fix disassembler for 2.4 literal

File:

• trunk/processor/processor.m4 (modified) (9 diffs)

trunk/processor/processor.m4

@@ -161 +161 @@
     IFDASM(`
         pushdefFUNC_NAME(`zval')
-        FUNC_NAME (dst, src[0] TSRMLS_CC);
+        FUNC_NAME (dasm, dst, src[0] TSRMLS_CC);
         popdef(`FUNC_NAME')
     ', `
@@ -321 +321 @@
     IFDASM(`
         pushdefFUNC_NAME(`zend_trait_alias')
-        FUNC_NAME (dst, src[0] TSRMLS_CC);
+        FUNC_NAME (dasm, dst, src[0] TSRMLS_CC);
         popdef(`FUNC_NAME')
     ', `
@@ -334 +334 @@
     IFDASM(`
         pushdefFUNC_NAME(`zend_trait_precedence')
-        FUNC_NAME (dst, src[0] TSRMLS_CC);
+        FUNC_NAME (dasm, dst, src[0] TSRMLS_CC);
         popdef(`FUNC_NAME')
     ', `
@@ -523 +523 @@
                     zval *zv;
                     ALLOC_INIT_ZVAL(zv);
-                    *zv = src->$1.literal->constant;
+                    *zv = dasm->active_op_array_src->literals[src->$1.constant].constant;
                     zval_copy_ctor(zv);
                     add_assoc_zval_ex(dst, ZEND_STRS("$1.constant"), zv);
@@ -695 +695 @@
         processor->active_op_array_src = src;
     ')
+    IFDASM(`
+        dasm->active_op_array_src = src;
+    ')
     {
     IFRESTORE(`
@@ -737 +740 @@
                 pushdef(`UNION_znode_op_literal', `
                     if (opline->$1_type == IS_CONST) {
-                        opline->$1.constant = opline->$1.literal - src->literals;
-                        opline->$1.literal = &dst->literals[opline->$1.constant];
+                        opline->$1.literal = &dst->literals[opline->$1.literal - src->literals];
                     }
                 ')
@@ -751 +753 @@
 #endif
                     case ZEND_JMP:
-                        Z_OP(opline->op1).jmp_addr = dst->opcodes + (Z_OP(opline->op1).jmp_addr - src->opcodes);
+                        Z_OP(opline->op1).jmp_addr = &dst->opcodes[Z_OP(opline->op1).jmp_addr - src->opcodes];
                         break;
 
@@ -764 +766 @@
             case ZEND_JMP_SET_VAR:
 #endif
-                        Z_OP(opline->op2).jmp_addr = dst->opcodes + (Z_OP(opline->op2).jmp_addr - src->opcodes);
+                        Z_OP(opline->op2).jmp_addr = &dst->opcodes[Z_OP(opline->op2).jmp_addr - src->opcodes];
                         break;
 
@@ -971 +973 @@
         processor->active_op_array_src = NULL;
     ')
+    IFDASM(`
+        dasm->active_op_array_src = NULL;
+    ')
 ')
 dnl }}}