Changeset 44

Timestamp:

12/27/04 15:02:31 (4 years ago)

Author:

segv74

Message:

1. pretty disassembler's output
2. change FE_FETCH's opcode type from EXT_FETCH to EXT_FE (FE = foreach)

Files:

• eaccelerator/trunk/eaccelerator.c (modified) (16 diffs)
• eaccelerator/trunk/encoder.c (modified) (1 diff)
• eaccelerator/trunk/loader.c (modified) (1 diff)
• eaccelerator/trunk/opcodes.c (modified) (1 diff)
• eaccelerator/trunk/opcodes.h (modified) (1 diff)

eaccelerator/trunk/eaccelerator.c

@@ -5767 +5767 @@
-};
-
+static const char* extopnames_fe[] = {
+  "",                         /* 0 */
+  "FE_FETCH_BYREF",           /* 1 */
+  "FE_FETCH_WITH_KEY"         /* 2 */
+};
+
-static void dump_write(const char* s, uint len) {
-  uint i = 0;
@@ -5888 +5894 @@
-}
-
+static const char *color_list[] = {
+  "#FF0000",
+  "#00FF00",
+  "#0000FF",
+  "#FFFF00",
+  "#00FFFF",
+  "#FF00FF",
+  "#800000",
+  "#008000",
+  "#000080",
+  "#808000",
+  "#008080",
+  "#800080"
+};
+
+static char *color(int num) {
+  return color_list[num % (sizeof(color_list)/sizeof(char *))];
+}
+
+static char *get_file_contents(char *filename)
+{
+  struct stat st;
+  char *buf;
+  FILE *fp;
+
+  if (stat(filename, &st) == -1)
+    return NULL;
+
+  buf = emalloc(st.st_size);
+  if (buf == NULL)
+    return NULL;
+
+  fp = fopen(filename, "rb");
+  fread(buf, 1, st.st_size, fp);
+  fclose(fp);
+
+  return buf;
+}
+
+static void print_file_line(char *p, int line)
+{
+  char *s;
+
+  if (p == NULL) {
+    zend_printf("..can't open file..");
+    return;
+  }
+
+  while (line > 0 && *p) {
+    if (*p == '\n') {
+      line --;
+    }
+    else if (line == 1) {
+      if (*p == '<')
+        zend_printf("&lt;");
+      else if (*p == '>')
+        zend_printf("&gt;");
+      else
+        zend_printf("%c", *p);
+    }
+
+    p++;
+  }
+}
+
-static void dump_op_array(eaccelerator_op_array* p TSRMLS_DC) {
-  zend_op *opline;
-  zend_op *end;
+  char *filebuf;
+  unsigned last_line = 0;
-
-#ifdef ZEND_ENGINE_2
-<br>\n", p->T, p->last, p->last_brk_cont
-
-<br>\n", p->T, p->last ,p->uses_globals, p->last_brk_cont
+, file = %s<br>\n", p->T, p->last, p->last_brk_cont, p->filename
+
+, file = %s<br>\n", p->T, p->last ,p->uses_globals, p->last_brk_cont, p->filename
-#endif
-
@@ -5919 +5992 @@
-    end = opline + p->last;
-
+    filebuf = get_file_contents(p->filename);
+
-    ZEND_PUTS("<table border=\"0\" cellpadding=\"3\" cellspacing=\"1\" width=\"900\" bgcolor=\"#000000\" align=\"center\" style=\"table-layout:fixed\">\n");
-    ZEND_PUTS("<thead valign=\"middle\" bgcolor=\"#9999cc\"><tr><th width=\"40\">N</th><th width=\"160\">OPCODE</th><th width=\"160\">EXTENDED_VALUE</th><th width=\"220\">OP1</th><th width=\"220\">OP2</th><th width=\"80\">RESULT</th></tr></thead>\n");
@@ -5924 +5999 @@
-    for (;opline < end; opline++) {
-      const opcode_dsc* op = get_opcode_dsc(opline->opcode);
+
+      while (last_line < opline->lineno) {
+        last_line++;
+        zend_printf("<tr><td colspan=6 bgcolor=black><pre><font color=#80ff80>");
+        print_file_line(filebuf, last_line);
+        zend_printf("</font></pre></td></tr>\n");
+      }
+
-      if (op != NULL) {
-%d </td><td>%s </td>",
+<font color=%s>%d</font> </td><td>%s </td>",color(n), 
-        if ((op->ops & EXT_MASK) == EXT_OPLINE) {
-opline(%lu) </td>"
+<font color=%s>opline(%lu)</font> </td>",color(opline->extended_value)
-        } else if ((op->ops & EXT_MASK) == EXT_FCALL) {
-          zend_printf("<td>args(%lu) </td>",opline->extended_value);
@@ -5940 +6023 @@
-        } else if ((op->ops & EXT_MASK) == EXT_FETCH) {
-          zend_printf("<td>%s </td>", extopnames_fetch[opline->extended_value]);
+        } else if ((op->ops & EXT_MASK) == EXT_FE) {
+          zend_printf("<td>%s </td>", extopnames_fe[opline->extended_value]);
-        } else if ((op->ops & EXT_MASK) == EXT_DECLARE) {
-          zend_printf("<td>%s </td>", extopnames_declare[opline->extended_value]);
@@ -5951 +6036 @@
-          zend_printf("<td>$class%u </td>",VAR_NUM(opline->extended_value));
-        } else if ((op->ops & EXT_MASK) == EXT_BIT) {
-d </td>",opline->extended_value?1:0
+s </td>",opline->extended_value?"true":"false"
-        } else if ((op->ops & EXT_MASK) == EXT_ISSET) {
-          if (opline->extended_value == ZEND_ISSET) {
@@ -5989 +6074 @@
-
-      if ((op->ops & OP1_MASK) == OP1_OPLINE) {
-opline(%d) </td>",
+<font color=%s>opline(%d)</font> </td>", color(opline->op1.u.opline_num), 
-#ifdef ZEND_ENGINE_2
-      } else if ((op->ops & OP1_MASK) == OP1_JMPADDR) {
-
+
+
+
-      } else if ((op->ops & OP1_MASK) == OP1_CLASS) {
-        zend_printf("<td>$class%u </td>",VAR_NUM(opline->op1.u.var));
@@ -6016 +6103 @@
-            offset = jmp_to->parent;
-          } while (--level > 0);
-opline(%d) </td>"
+<font color=%s>opline(%d)</font> </td>",color(jmp_to->brk)
-        } else {
-brk_failed:
@@ -6035 +6122 @@
-            offset = jmp_to->parent;
-          } while (--level > 0);
-opline(%d) </td>"
+<font color=%s>opline(%d)</font> </td>",color(jmp_to->cont)
-        } else {
-cont_failed:
@@ -6043 +6130 @@
-        zend_printf("<td>arg(%ld) </td>",opline->op1.u.constant.value.lval);
-      } else if ((op->ops & OP1_MASK) == OP1_VAR) {
-$var%u </td>",
+<font color=%s>$var%u</font> </td>", color(VAR_NUM(opline->op1.u.var)), 
-      } else if ((op->ops & OP1_MASK) == OP1_TMP) {
-$tmp%u </td>",
+<font color=%s>$tmp%u</font> </td>", color(VAR_NUM(opline->op1.u.var)), 
-      } else {
-        if (opline->op1.op_type == IS_CONST) {
@@ -6052 +6139 @@
-          ZEND_PUTS(" </td>");
-        } else if (opline->op1.op_type == IS_TMP_VAR) {
-$tmp%u </td>",
+<font color=%s>$tmp%u</font> </td>", color(VAR_NUM(opline->op1.u.var)), 
-        } else if (opline->op1.op_type == IS_VAR) {
-$var%u </td>",
+<font color=%s>$var%u</font> </td>", color(VAR_NUM(opline->op1.u.var)), 
-        } else if (opline->op1.op_type == IS_UNUSED) {
-          ZEND_PUTS("<td>&nbsp;</td>");
@@ -6063 +6150 @@
-
-      if ((op->ops & OP2_MASK) == OP2_OPLINE) {
-opline(%d) </td>"
+<font color=%s>opline(%d)</font> </td>",color(opline->op2.u.opline_num)
-#ifdef ZEND_ENGINE_2
-      } else if ((op->ops & OP2_MASK) == OP2_JMPADDR) {
-opline(%u) </td>"
+<font color=%s>opline(%u)</font> </td>",color((unsigned int)(opline->op2.u.jmp_addr - p->opcodes))
-      } else if ((op->ops & OP2_MASK) == OP2_CLASS) {
-          zend_printf("<td>$class%u </td>",VAR_NUM(opline->op2.u.var));
-#endif
-      } else if ((op->ops & OP2_MASK) == OP2_VAR) {
-$var%u </td>",
+<font color=%s>$var%u</font> </td>", color(VAR_NUM(opline->op2.u.var)), 
-      } else if ((op->ops & OP2_MASK) == OP2_FETCH) {
-#ifdef ZEND_ENGINE_2
@@ -6112 +6199 @@
-          ZEND_PUTS(" </td>");
-        } else if (opline->op2.op_type == IS_TMP_VAR) {
-$tmp%u </td>",
+<font color=%s>$tmp%u</font> </td>", color(VAR_NUM(opline->op2.u.var)), 
-        } else if (opline->op2.op_type == IS_VAR) {
-$var%u </td>",
+<font color=%s>$var%u</font> </td>", color(VAR_NUM(opline->op2.u.var)), 
-        } else if (opline->op2.op_type == IS_UNUSED) {
-          ZEND_PUTS("<td>&nbsp; </td>");
@@ -6129 +6216 @@
-            ZEND_PUTS("</td>");
-          } else if (opline->result.op_type == IS_TMP_VAR) {
-$tmp%u</td>",VAR_NUM(opline->result
+<font color=%s>$tmp%u</font> </td>", color(VAR_NUM(opline->op2.u.var)), VAR_NUM(opline->op2
-          } else if (opline->result.op_type == IS_VAR) {
-            if ((opline->result.u.EA.type & EXT_TYPE_UNUSED) != 0)
-$var%u <small>(unused)</small></td>",
+<font color=%s>$var%u <small>(unused)</small></font> </td>", color(VAR_NUM(opline->result.u.var)), 
-            else
-$var%u</td>",
+<font color=%s>$var%u</font> </td>", color(VAR_NUM(opline->result.u.var)), 
-          } else if (opline->result.op_type == IS_UNUSED) {
-            ZEND_PUTS("<td>&nbsp;</td>");
@@ -6145 +6232 @@
-          break;
-        case RES_TMP:
-$tmp%u</td>",
+<font color=%s>$tmp%u</font> </td>", color(VAR_NUM(opline->result.u.var)), 
-          break;
-        case RES_VAR:
-          if ((opline->result.u.EA.type & EXT_TYPE_UNUSED) != 0) {
-$var%u <small>(unused)</small></td>",
+<font color=%s>$var%u <small>(unused)</small></font> </td>", color(VAR_NUM(opline->result.u.var)), 
-          } else {
-$var%u</td>",
+<font color=%s>$var%u</font> </td>", color(VAR_NUM(opline->result.u.var)), 
-          }
-          break;
@@ -6165 +6252 @@
-    }
-    ZEND_PUTS("</tbody></table>\n");
+
+    efree(filebuf);
-  }
-}

eaccelerator/trunk/encoder.c

@@ -867 +867 @@
-          case EXT_INIT_FCALL:
-          case EXT_FETCH:
+          case EXT_FE:
-          case EXT_CAST:
-          case EXT_DECLARE:

eaccelerator/trunk/loader.c

@@ -606 +606 @@
-          case EXT_INIT_FCALL:
-          case EXT_FETCH:
+          case EXT_FE:
-          case EXT_CAST:
-          case EXT_DECLARE:

eaccelerator/trunk/opcodes.c

@@ -170 +170 @@
-#endif
-  OPDEF("FE_RESET",                  EXT_BIT    | OP1_STD    | OP2_UNUSED | RES_VAR), /* 77 */
-TCH
+   
-  OPDEF("EXIT",                      EXT_UNUSED | OP1_STD    | OP2_UNUSED | RES_UNUSED), /* 79 */
-  OPDEF("FETCH_R",                   EXT_UNUSED | OP1_STD    | OP2_FETCH  | RES_VAR), /* 80 */

eaccelerator/trunk/opcodes.h

@@ -50 +50 @@
-#define EXT_CLASS      0x00e00
-#define EXT_ASSIGN     0x00f00
+#define EXT_FE         0x01000
-
-#define OP1_MASK       0x000f0