archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Removed old executor

Browse source
This commit is contained in:
Dmitry Stogov 2005-06-14 12:55:48 +00:00
parent 1c9a470cbc
commit ae37249fa9
2 changed files with 1255 additions and 5169 deletions
Download patch file Download diff file Expand all files Collapse all files

6378
Zend/zend_vm_execute.h
View file

File diff suppressed because it is too large Load diff

46
Zend/zend_vm_gen.php
View file

@ -380,6 +380,41 @@ function gen_code($f, $spec, $kind, $code, $op1, $op2) {
break;
}
/* Remove unused free_op1 and free_op2 declarations */
if ($spec && preg_match_all('/^\s*zend_free_op\s+[^;]+;\s*$/me', $code, $matches, PREG_SET_ORDER)) {
$n = 0;
foreach ($matches as $match) {
$code = preg_replace('/'.preg_quote($match[0],'/').'/', "\$D$n", $code);
++$n;
}
$del_free_op1 = (strpos($code, "free_op1") === false);
$del_free_op2 = (strpos($code, "free_op2") === false);
$n = 0;
foreach ($matches as $match) {
$dcl = $match[0];
$changed = 0;
if ($del_free_op1 && strpos($dcl, "free_op1") !== false) {
$dcl = preg_replace("/free_op1\s*,\s*/", "", $dcl);
$dcl = preg_replace("/free_op1\s*;/", ";", $dcl);
$changed = 1;
}
if ($del_free_op2 && strpos($dcl, "free_op2") !== false) {
$dcl = preg_replace("/free_op2\s*,\s*/", "", $dcl);
$dcl = preg_replace("/free_op2\s*;/", ";", $dcl);
$changed = 1;
}
if ($changed) {
$dcl = preg_replace("/,\s*;/", ";", $dcl);
$dcl = preg_replace("/zend_free_op\s*;/", "", $dcl);
}
$code = preg_replace("/\\\$D$n/", $dcl, $code);
++$n;
}
}
/* Remove unnecessary ';' */
$code = preg_replace('/^\s*;\s*$/m', '', $code);
out($f, $code);
}
@ -703,6 +738,9 @@ function gen_executor($f, $skl, $spec, $kind, $executor_name, $initializer_name,
if (preg_match("/(.*)[{][%]([A-Z_]*)[%][}](.*)/", $line, $m)) {
switch ($m[2]) {
case "DEFINES":
if (ZEND_VM_OLD_EXECUTOR) {
out($f,"static int zend_vm_old_executor = 0;\n\n");
}
out($f,"static opcode_handler_t zend_vm_get_opcode_handler(zend_uchar opcode, zend_op* op);\n\n");
switch ($kind) {
case ZEND_VM_KIND_CALL:
@ -1064,7 +1102,7 @@ function usage() {
"\nOptions:".
"\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 --with-old-executor - enable old executor".
"\n --with-lines - enable #line directives".
"\n\n");
}
@ -1091,9 +1129,9 @@ for ($i = 1; $i < $argc; $i++) {
} else if ($argv[$i] == "--without-specializer") {
// Disabling specialization
define("ZEND_VM_SPEC", 0);
} else if ($argv[$i] == "--without-old-executor") {
} else if ($argv[$i] == "--with-old-executor") {
// Disabling code for old-style executor
define("ZEND_VM_OLD_EXECUTOR", 0);
define("ZEND_VM_OLD_EXECUTOR", 1);
} else if ($argv[$i] == "--with-lines") {
// Enabling debuging using original zend_vm_def.h
define("ZEND_VM_LINES", 1);
@ -1118,7 +1156,7 @@ if (!defined("ZEND_VM_SPEC")) {
}
if (!defined("ZEND_VM_OLD_EXECUTOR")) {
// Include old-style executor by default
define("ZEND_VM_OLD_EXECUTOR", 1);
define("ZEND_VM_OLD_EXECUTOR", 0);
}
if (!defined("ZEND_VM_LINES")) {
// Disabling #line directives