Changeset 930

Timestamp:

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

Author:

moo

Message:

fix disassembler for 2.4 literal

Location:

trunk

Files:

• disassembler.c (modified) (4 diffs)
• processor/hashtable.m4 (modified) (1 diff)
• processor/head.m4 (modified) (1 diff)
• processor/processor.m4 (modified) (9 diffs)
• processor/struct.m4 (modified) (3 diffs)
• utils.c (modified) (1 diff)

trunk/disassembler.c

@@ -23 +23 @@
     int bufsize = 2;
     char *buf;
+    xc_dasm_t dasm;
 
     xc_compile_result_init_cur(&cr, op_array TSRMLS_CC);
@@ -34 +35 @@
     ALLOC_INIT_ZVAL(zv);
     array_init(zv);
-    xc_dasm_zend_op_array(zv, op_array TSRMLS_CC);
+    xc_dasm_zend_op_array(&dasm, zv, op_array TSRMLS_CC);
     add_assoc_zval_ex(dst, ZEND_STRS("op_array"), zv);
 
@@ -47 +48 @@
         ALLOC_INIT_ZVAL(zv);
         array_init(zv);
-        xc_dasm_zend_function(zv, b->pData TSRMLS_CC);
+        xc_dasm_zend_function(&dasm, zv, b->pData TSRMLS_CC);
 
         keysize = BUCKET_KEY_SIZE(b) + 2;
@@ -84 +85 @@
         ALLOC_INIT_ZVAL(zv);
         array_init(zv);
-        xc_dasm_zend_class_entry(zv, CestToCePtr(*(xc_cest_t *)b->pData) TSRMLS_CC);
+        xc_dasm_zend_class_entry(&dasm, zv, CestToCePtr(*(xc_cest_t *)b->pData) TSRMLS_CC);
 
         keysize = BUCKET_KEY_SIZE(b) + 2;

trunk/processor/hashtable.m4

@@ -37 +37 @@
                 ALLOC_INIT_ZVAL(zv);
                 array_init(zv);
-                FUNC_NAME (zv, (($2*)b->pData) TSRMLS_CC);
+                FUNC_NAME (dasm, zv, (($2*)b->pData) TSRMLS_CC);
                 keysize = BUCKET_KEY_SIZE(b) + 2;
                 if (keysize > bufsize) {

trunk/processor/head.m4

@@ -107 +107 @@
 };
 /* }}} */
+/* export: typedef struct _xc_dasm_t { const zend_op_array *active_op_array_src; } xc_dasm_t; :export {{{ */
+/* }}} */
 /* {{{ memsetptr */
 IFAUTOCHECK(`dnl

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 }}}

trunk/processor/struct.m4

@@ -12 +12 @@
         IFSTORE(  `xc_processor_t *processor, $1 *dst, const $1 * const src')
         IFRESTORE(`xc_processor_t *processor, $1 *dst, const $1 * const src')
-        IFDASM(   `zval *dst, const $1 * const src')
+        IFDASM(   `xc_dasm_t *dasm, zval *dst, const $1 * const src')
         IFASM(    `$1 *dst, const $1 * const src')
         TSRMLS_DC
@@ -137 +137 @@
         IFSTORE(  `processor, $6 $2, $6 $3')
         IFRESTORE(`processor, $6 $2, $6 $3')
-        IFDASM(   `zv, $6 $3')
+        IFDASM(   `dasm, zv, $6 $3')
         IFASM(    `$6 $2, $6 $3')
         TSRMLS_CC
@@ -192 +192 @@
                 ALLOC_INIT_ZVAL(zv);
                 array_init(zv);
-                FUNC_NAME (zv, &(SRC(`$4[LOOPCOUNTER]')) TSRMLS_CC);
+                FUNC_NAME (dasm, zv, &(SRC(`$4[LOOPCOUNTER]')) TSRMLS_CC);
                 add_next_index_zval(arr, zv);
             }

trunk/utils.c

@@ -240 +240 @@
     end = opline + op_array->last;
     while (opline < end) {
-#ifndef ZEND_ENGINE_2_4
+#ifdef ZEND_ENGINE_2_4
+        if (opline->op1_type == IS_CONST) {
+            opline->op1.literal = op_array->literals + opline->op1.constant;
+        }
+        if (opline->op2_type == IS_CONST) {
+            opline->op2.literal = op_array->literals + opline->op2.constant;
+        }
+#else
         if (Z_OP_TYPE(opline->op1) == IS_CONST) {
             Z_SET_ISREF(Z_OP_CONSTANT(opline->op1));