com php-src: Properly define ZEND_OP_DATA in zend_vm _def.h This allows zend_vm_gen.php to defin e them in zend_vm_opcodes.{c,h} without f urther
hacks.: Zend/zend_compile.h Zend/zend_vm _def.h Zend/zend_vm_execute.h Zend/zend_vm_ge n.php Zend/zend_vm_opcodes.c Zend/zend_vm_opcod es.h
| From: | Bob Weinand | Date: | Sun, 19 Apr 2015 21:21:57 +0000 |
| Subject: | com php-src: Properly define ZEND_OP_DATA in zend_vm _def.h This allows zend_vm_gen.php to defin e them in zend_vm_opcodes.{c,h} without f urther hacks.: Zend/zend_compile.h Zend/zend_vm _def.h Zend/zend_vm_execute.h Zend/zend_vm_ge n.php Zend/zend_vm_opcodes.c Zend/zend_vm_opcod es.h |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-86394@lists.php.net to get a copy of this message | ||
Commit: b1bd6f502faa546d575eb24adcd2c4ca69628614
Author: Bob Weinand <bobwei9@hotmail.com> Sun, 19 Apr 2015 23:21:57 +0200
Parents: 31e98386dbdd0c0853a041fe450c1d48eb39c6ac
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b1bd6f502faa546d575eb24adcd2c4ca69628614
Log:
Properly define ZEND_OP_DATA in zend_vm_def.h
This allows zend_vm_gen.php to define them in zend_vm_opcodes.{c,h} without further hacks.
Changed paths:
M Zend/zend_compile.h
M Zend/zend_vm_def.h
M Zend/zend_vm_execute.h
M Zend/zend_vm_gen.php
M Zend/zend_vm_opcodes.c
M Zend/zend_vm_opcodes.h
Diff:
diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h
index 980a06c..754b786 100644
--- a/Zend/zend_compile.h
+++ b/Zend/zend_compile.h
@@ -766,8 +766,6 @@ ZEND_API void zend_assert_valid_class_name(const zend_string *const_name);
#include "zend_vm_opcodes.h"
-#define ZEND_OP_DATA 137
-
/* END: OPCODES */
/* class fetches */
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 811de53..25f6bf8 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -7875,3 +7875,5 @@ ZEND_VM_C_LABEL(call_trampoline_end):
ZEND_VM_INC_OPCODE();
ZEND_VM_LEAVE();
}
+
+ZEND_VM_DEFINE_OP(137, ZEND_OP_DATA);
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 7775c83..56a40f8 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -1911,6 +1911,7 @@ call_trampoline_end:
ZEND_VM_INC_OPCODE();
ZEND_VM_LEAVE();
}
+
static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL
ZEND_FETCH_CLASS_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
{
USE_OPLINE
diff --git a/Zend/zend_vm_gen.php b/Zend/zend_vm_gen.php
index 75ed953..7d49bea 100644
--- a/Zend/zend_vm_gen.php
+++ b/Zend/zend_vm_gen.php
@@ -1353,6 +1353,31 @@ function gen_vm($def, $skel) {
die("ERROR ($def:$lineno): helper '{$m[2]}' is not defined.\n");
}
$export[] = array("helper",$m[1],$m[2]);
+ } else if (strpos($line,"ZEND_VM_DEFINE_OP(") === 0) {
+ if (preg_match(
+ "/^ZEND_VM_DEFINE_OP\(\s*([0-9]+)\s*,\s*([A-Z_]+)\s*\);/",
+ $line,
+ $m) == 0) {
+ die("ERROR ($def:$lineno): Invalid ZEND_VM_DEFINE_OP definition.\n");
+ }
+ $code = (int)$m[1];
+ $op = $m[2];
+ $len = strlen($op);
+
+ if ($len > $max_opcode_len) {
+ $max_opcode_len = $len;
+ }
+ if ($code > $max_opcode) {
+ $max_opcode = $code;
+ }
+ if (isset($opcodes[$code])) {
+ die("ERROR ($def:$lineno): Opcode with code '$code' is already
defined.\n");
+ }
+ if (isset($opnames[$op])) {
+ die("ERROR ($def:$lineno): Opcode with name '$op' is already defined.\n");
+ }
+ $opcodes[$code] = array("op"=>$op,"code"=>"");
+ $opnames[$op] = $code;
} else if ($handler !== null) {
// Add line of code to current opcode handler
$opcodes[$handler]["code"] .= $line;
@@ -1418,9 +1443,9 @@ function gen_vm($def, $skel) {
}
fputs($f, "};\n\n");
- fputs($f, "ZEND_API const char* zend_get_opcode_name(zend_uchar opcode) {\n");
- fputs($f, "\treturn zend_vm_opcodes_map[opcode];\n");
- fputs($f, "}\n");
+ fputs($f, "ZEND_API const char* zend_get_opcode_name(zend_uchar opcode) {\n");
+ fputs($f, "\treturn zend_vm_opcodes_map[opcode];\n");
+ fputs($f, "}\n");
fclose($f);
echo "zend_vm_opcodes.c generated successfully.\n";
diff --git a/Zend/zend_vm_opcodes.c b/Zend/zend_vm_opcodes.c
index ff986d1..e833740 100644
--- a/Zend/zend_vm_opcodes.c
+++ b/Zend/zend_vm_opcodes.c
@@ -159,7 +159,7 @@ const char *zend_vm_opcodes_map[171] = {
"ZEND_POST_INC_OBJ",
"ZEND_POST_DEC_OBJ",
"ZEND_ASSIGN_OBJ",
- NULL,
+ "ZEND_OP_DATA",
"ZEND_INSTANCEOF",
"ZEND_DECLARE_CLASS",
"ZEND_DECLARE_INHERITED_CLASS",
diff --git a/Zend/zend_vm_opcodes.h b/Zend/zend_vm_opcodes.h
index edee61f..a562037 100644
--- a/Zend/zend_vm_opcodes.h
+++ b/Zend/zend_vm_opcodes.h
@@ -169,6 +169,7 @@ END_EXTERN_C()
#define ZEND_POST_INC_OBJ 134
#define ZEND_POST_DEC_OBJ 135
#define ZEND_ASSIGN_OBJ 136
+#define ZEND_OP_DATA 137
#define ZEND_INSTANCEOF 138
#define ZEND_DECLARE_CLASS 139
#define ZEND_DECLARE_INHERITED_CLASS 140