@@ -2414,7 +2414,16 @@ function gen_vm($def, $skel) {
2414
2414
strpos ($ line ,"ZEND_VM_COLD_CONSTCONST_HANDLER( " ) === 0 ) {
2415
2415
// Parsing opcode handler's definition
2416
2416
if (preg_match (
2417
- "/^ZEND_VM_(HOT_|INLINE_|HOT_OBJ_|HOT_SEND_|HOT_NOCONST_|HOT_NOCONSTCONST_|COLD_|COLD_CONST_|COLD_CONSTCONST_)?HANDLER\(\s*([0-9]+)\s*,\s*([A-Z_]+)\s*,\s*([A-Z_|]+)\s*,\s*([A-Z_|]+)\s*(,\s*([A-Z_|]+)\s*)?(,\s*SPEC\(([A-Z_|=,]+)\)\s*)?\)/ " ,
2417
+ "/^
2418
+ ZEND_VM_(HOT_|INLINE_|HOT_OBJ_|HOT_SEND_|HOT_NOCONST_|HOT_NOCONSTCONST_|COLD_|COLD_CONST_|COLD_CONSTCONST_)?HANDLER\(
2419
+ \s*([0-9]+)\s*,
2420
+ \s*([A-Z_]+)\s*,
2421
+ \s*([A-Z_|]+)\s*,
2422
+ \s*([A-Z_|]+)\s*
2423
+ (,\s*([A-Z_|]+)\s*)?
2424
+ (,\s*SPEC\(([A-Z_|=,]+)\)\s*)?
2425
+ \)
2426
+ $/x " ,
2418
2427
$ line ,
2419
2428
$ m ) == 0 ) {
2420
2429
die ("ERROR ( $ def: $ lineno): Invalid ZEND_VM_HANDLER definition. \n" );
@@ -2465,7 +2474,17 @@ function gen_vm($def, $skel) {
2465
2474
strpos ($ line ,"ZEND_VM_HOT_OBJ_TYPE_SPEC_HANDLER( " ) === 0 ) {
2466
2475
// Parsing opcode handler's definition
2467
2476
if (preg_match (
2468
- "/^ZEND_VM_(HOT_|INLINE_|HOT_OBJ_|HOT_SEND_|HOT_NOCONST_|HOT_NOCONSTCONST_)?TYPE_SPEC_HANDLER\(\s*([A-Z_|]+)\s*,\s*((?:[^(,]|\([^()]*|(?R)*\))*),\s*([A-Za-z_]+)\s*,\s*([A-Z_|]+)\s*,\s*([A-Z_|]+)\s*(,\s*([A-Z_|]+)\s*)?(,\s*SPEC\(([A-Z_|=,]+)\)\s*)?\)/ " ,
2477
+ "/^
2478
+ ZEND_VM_(HOT_|INLINE_|HOT_OBJ_|HOT_SEND_|HOT_NOCONST_|HOT_NOCONSTCONST_)?TYPE_SPEC_HANDLER\(
2479
+ \s*([A-Z_|]+)\s*,
2480
+ \s*((?:[^(,]|\([^()]*|(?R)*\))*),
2481
+ \s*([A-Za-z_]+)\s*,
2482
+ \s*([A-Z_|]+)\s*,
2483
+ \s*([A-Z_|]+)\s*
2484
+ (,\s*([A-Z_|]+)\s*)?
2485
+ (,\s*SPEC\(([A-Z_|=,]+)\)\s*)?
2486
+ \)
2487
+ $/x " ,
2469
2488
$ line ,
2470
2489
$ m ) == 0 ) {
2471
2490
die ("ERROR ( $ def: $ lineno): Invalid ZEND_VM_TYPE_HANDLER_HANDLER definition. \n" );
@@ -2513,7 +2532,15 @@ function gen_vm($def, $skel) {
2513
2532
strpos ($ line ,"ZEND_VM_HOT_HELPER( " ) === 0 ) {
2514
2533
// Parsing helper's definition
2515
2534
if (preg_match (
2516
- "/^ZEND_VM(_INLINE|_COLD|_HOT)?_HELPER\(\s*([A-Za-z_]+)\s*,\s*([A-Z_|]+)\s*,\s*([A-Z_|]+)\s*(?:,\s*SPEC\(([A-Z_|=,]+)\)\s*)?(?:,\s*([^)]*)\s*)?\)/ " ,
2535
+ "/^
2536
+ ZEND_VM(_INLINE|_COLD|_HOT)?_HELPER\(
2537
+ \s*([A-Za-z_]+)\s*,
2538
+ \s*([A-Z_|]+)\s*,
2539
+ \s*([A-Z_|]+)\s*
2540
+ (?:,\s*SPEC\(([A-Z_|=,]+)\)\s*)?
2541
+ (?:,\s*([^)]*)\s*)?
2542
+ \)
2543
+ $/x " ,
2517
2544
$ line ,
2518
2545
$ m ) == 0 ) {
2519
2546
die ("ERROR ( $ def: $ lineno): Invalid ZEND_VM_HELPER definition. \n" );
0 commit comments