--without-lines changed to --with-lines

diff --git a/Zend/README.ZEND_VM b/Zend/README.ZEND_VM
index 7bbb46c1f8a30c2298f2fa53a8281b7b9532a10f..bc71179fe6ce3293aabb23c96563b257c0729951 100644 (file)
--- a/Zend/README.ZEND_VM
+++ b/Zend/README.ZEND_VM
@@ -96,10 +96,10 @@ different opcode threading model using --with-vm-kind=CALL|SWITCH|GOTO. You can
 disable opcode specialization using --without-specializer. You can include or
 exclude old executor together with specialized one using --without-old-executor.
 At last you can debug executor using original zend_vm_def.h or generated file
-zend_vm_execute.h. Debugging with generated file requires --without-lines
+zend_vm_execute.h. Debugging with original file requires --with-lines
 option. By default ZE2 uses the following command to generate executor:
 
-$ php zend_vm_gen.php --with-vm-kind=CALL --without-lines
+$ php zend_vm_gen.php --with-vm-kind=CALL
 
 Zend Engine II currently includes two executors during the build process, one
 is the specialized version and the other is the old one non-specialized with

diff --git a/Zend/zend_vm_gen.php b/Zend/zend_vm_gen.php
index 17b8bddb2a5a590b7f6745021520b7611a136abc..4e26792efa68c1a42e4eb74834e6d3e706fdbb2b 100644 (file)
--- a/Zend/zend_vm_gen.php
+++ b/Zend/zend_vm_gen.php
@@ -1002,7 +1002,7 @@ function usage() {
             "\n  --with-vm-kind=CALL|SWITCH|GOTO - select threading model (default is CALL)".
             "\n  --without-specializer           - disable executor specialization".
             "\n  --without-old-executor          - disable old executor".
-            "\n  --without-lines                 - disable #line directives".
+            "\n  --with-lines                    - enable #line directives".
             "\n\n");
 }
 
@@ -1031,9 +1031,9 @@ for ($i = 1;  $i < $argc; $i++) {
        } else if ($argv[$i] == "--without-old-executor") {
          // Disabling code for old-style executor
                define("ZEND_VM_OLD_EXECUTOR", 0);
-       } else if ($argv[$i] == "--without-lines") {
-               // Disabling debuging using original zend_vm_def.h
-               define("ZEND_VM_LINES", 0);
+       } else if ($argv[$i] == "--with-lines") {
+               // Enabling debuging using original zend_vm_def.h
+               define("ZEND_VM_LINES", 1);
        } else if ($argv[$i] == "--help") {
                usage();
                exit();
@@ -1058,8 +1058,8 @@ if (!defined("ZEND_VM_OLD_EXECUTOR")) {
        define("ZEND_VM_OLD_EXECUTOR", 1);
 }
 if (!defined("ZEND_VM_LINES")) {
-  // Using #line directives to debug with original zend_vm_def.h by default
-       define("ZEND_VM_LINES", 1);
+  // Disabling #line directives
+       define("ZEND_VM_LINES", 0);
 }
 
 gen_vm("zend_vm_def.h", "zend_vm_execute.skl");