Skip to content

Commit fb91611

Browse files
nikicnikic
committed
Remove #undefs from vm_gen
Possibly these were needed for VM_EXPORT, but they don't serve a purpose now.
1 parent 002c264 commit fb91611

File tree

2 files changed

+0
-38
lines changed

2 files changed

+0
-38
lines changed

‎Zend/zend_vm_execute.h

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -391,13 +391,6 @@ static const void *zend_vm_get_opcode_handler_func(zend_uchar opcode, const zend
391391

392392
typedef ZEND_OPCODE_HANDLER_RET (ZEND_FASTCALL *opcode_handler_t) (ZEND_OPCODE_HANDLER_ARGS);
393393

394-
#undef OPLINE
395-
#undef DCL_OPLINE
396-
#undef USE_OPLINE
397-
#undef LOAD_OPLINE
398-
#undef LOAD_OPLINE_EX
399-
#undef SAVE_OPLINE
400-
#undef SAVE_OPLINE_EX
401394
#define DCL_OPLINE
402395
#ifdef ZEND_VM_IP_GLOBAL_REG
403396
# define OPLINE opline
@@ -416,8 +409,6 @@ typedef ZEND_OPCODE_HANDLER_RET (ZEND_FASTCALL *opcode_handler_t) (ZEND_OPCODE_H
416409
# define SAVE_OPLINE()
417410
# define SAVE_OPLINE_EX()
418411
#endif
419-
#undef HANDLE_EXCEPTION
420-
#undef HANDLE_EXCEPTION_LEAVE
421412
#define HANDLE_EXCEPTION() LOAD_OPLINE(); ZEND_VM_CONTINUE()
422413
#define HANDLE_EXCEPTION_LEAVE() LOAD_OPLINE(); ZEND_VM_LEAVE()
423414
#if defined(ZEND_VM_FP_GLOBAL_REG)

‎Zend/zend_vm_gen.php

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1879,13 +1879,6 @@ function gen_executor($f, $skl, $spec, $kind, $executor_name, $initializer_name)
18791879
out($f,"\n");
18801880
out($f,"typedef ZEND_OPCODE_HANDLER_RET (ZEND_FASTCALL *opcode_handler_t) (ZEND_OPCODE_HANDLER_ARGS);\n");
18811881
out($f,"\n");
1882-
out($f,"#undef OPLINE\n");
1883-
out($f,"#undef DCL_OPLINE\n");
1884-
out($f,"#undef USE_OPLINE\n");
1885-
out($f,"#undef LOAD_OPLINE\n");
1886-
out($f,"#undef LOAD_OPLINE_EX\n");
1887-
out($f,"#undef SAVE_OPLINE\n");
1888-
out($f,"#undef SAVE_OPLINE_EX\n");
18891882
out($f,"#define DCL_OPLINE\n");
18901883
out($f,"#ifdef ZEND_VM_IP_GLOBAL_REG\n");
18911884
out($f,"# define OPLINE opline\n");
@@ -1904,8 +1897,6 @@ function gen_executor($f, $skl, $spec, $kind, $executor_name, $initializer_name)
19041897
out($f,"# define SAVE_OPLINE()\n");
19051898
out($f,"# define SAVE_OPLINE_EX()\n");
19061899
out($f,"#endif\n");
1907-
out($f,"#undef HANDLE_EXCEPTION\n");
1908-
out($f,"#undef HANDLE_EXCEPTION_LEAVE\n");
19091900
out($f,"#define HANDLE_EXCEPTION() LOAD_OPLINE(); ZEND_VM_CONTINUE()\n");
19101901
out($f,"#define HANDLE_EXCEPTION_LEAVE() LOAD_OPLINE(); ZEND_VM_LEAVE()\n");
19111902
out($f,"#if defined(ZEND_VM_FP_GLOBAL_REG)\n");
@@ -1935,14 +1926,6 @@ function gen_executor($f, $skl, $spec, $kind, $executor_name, $initializer_name)
19351926
break;
19361927
case ZEND_VM_KIND_SWITCH:
19371928
out($f,"\n");
1938-
out($f,"#undef OPLINE\n");
1939-
out($f,"#undef DCL_OPLINE\n");
1940-
out($f,"#undef USE_OPLINE\n");
1941-
out($f,"#undef LOAD_OPLINE\n");
1942-
out($f,"#undef LOAD_OPLINE_EX\n");
1943-
out($f,"#undef LOAD_NEXT_OPLINE\n");
1944-
out($f,"#undef SAVE_OPLINE\n");
1945-
out($f,"#undef SAVE_OPLINE_EX\n");
19461929
out($f,"#define OPLINE opline\n");
19471930
out($f,"#ifdef ZEND_VM_IP_GLOBAL_REG\n");
19481931
out($f,"# define DCL_OPLINE register const zend_op *opline __asm__(ZEND_VM_IP_GLOBAL_REG);\n");
@@ -1955,8 +1938,6 @@ function gen_executor($f, $skl, $spec, $kind, $executor_name, $initializer_name)
19551938
out($f,"#define LOAD_NEXT_OPLINE() opline = EX(opline) + 1\n");
19561939
out($f,"#define SAVE_OPLINE() EX(opline) = opline\n");
19571940
out($f,"#define SAVE_OPLINE_EX()\n");
1958-
out($f,"#undef HANDLE_EXCEPTION\n");
1959-
out($f,"#undef HANDLE_EXCEPTION_LEAVE\n");
19601941
out($f,"#define HANDLE_EXCEPTION() LOAD_OPLINE(); ZEND_VM_CONTINUE()\n");
19611942
out($f,"#define HANDLE_EXCEPTION_LEAVE() LOAD_OPLINE(); ZEND_VM_LEAVE()\n");
19621943
out($f,"#define ZEND_VM_CONTINUE() goto zend_vm_continue\n");
@@ -1971,14 +1952,6 @@ function gen_executor($f, $skl, $spec, $kind, $executor_name, $initializer_name)
19711952
break;
19721953
case ZEND_VM_KIND_GOTO:
19731954
out($f,"\n");
1974-
out($f,"#undef OPLINE\n");
1975-
out($f,"#undef DCL_OPLINE\n");
1976-
out($f,"#undef USE_OPLINE\n");
1977-
out($f,"#undef LOAD_OPLINE\n");
1978-
out($f,"#undef LOAD_OPLINE_EX\n");
1979-
out($f,"#undef LOAD_NEXT_OPLINE\n");
1980-
out($f,"#undef SAVE_OPLINE\n");
1981-
out($f,"#undef SAVE_OPLINE_EX\n");
19821955
out($f,"#define OPLINE opline\n");
19831956
out($f,"#ifdef ZEND_VM_IP_GLOBAL_REG\n");
19841957
out($f,"# define DCL_OPLINE register const zend_op *opline __asm__(ZEND_VM_IP_GLOBAL_REG);\n");
@@ -1991,8 +1964,6 @@ function gen_executor($f, $skl, $spec, $kind, $executor_name, $initializer_name)
19911964
out($f,"#define LOAD_NEXT_OPLINE() opline = EX(opline) + 1\n");
19921965
out($f,"#define SAVE_OPLINE() EX(opline) = opline\n");
19931966
out($f,"#define SAVE_OPLINE_EX()\n");
1994-
out($f,"#undef HANDLE_EXCEPTION\n");
1995-
out($f,"#undef HANDLE_EXCEPTION_LEAVE\n");
19961967
if (ZEND_VM_SPEC) {
19971968
out($f,"#define HANDLE_EXCEPTION() goto ZEND_HANDLE_EXCEPTION_SPEC_LABEL\n");
19981969
out($f,"#define HANDLE_EXCEPTION_LEAVE() goto ZEND_HANDLE_EXCEPTION_SPEC_LABEL\n");

0 commit comments

Comments
 (0)