LOAD_REGS() is not used anymore

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 7b5ad6b10fb4f40a57ce731d9440d885bfe9eb69..f1ab7e85c45f60f17951a387fda7ab0f2b3df6b2 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -325,7 +325,6 @@ static opcode_handler_t zend_vm_get_opcode_handler(zend_uchar opcode, const zend
 #define CHECK_EXCEPTION() LOAD_OPLINE()
 #define HANDLE_EXCEPTION() LOAD_OPLINE(); ZEND_VM_CONTINUE()
 #define HANDLE_EXCEPTION_LEAVE() LOAD_OPLINE(); ZEND_VM_LEAVE()
-#define LOAD_REGS()
 #define ZEND_VM_CONTINUE()         return  0
 #define ZEND_VM_RETURN()           return -1
 #define ZEND_VM_ENTER()            return  1
@@ -340,7 +339,6 @@ ZEND_API void execute_ex(zend_execute_data *execute_data TSRMLS_DC)
 
 
 
-       LOAD_REGS();
        LOAD_OPLINE();
 
        while (1) {

diff --git a/Zend/zend_vm_execute.skl b/Zend/zend_vm_execute.skl
index 4825e02b53d5a4ac13b6c17adff8c0f2f2453016..58cbe097872cc6972dd8a7f397c4f34a68f1e948 100644 (file)
--- a/Zend/zend_vm_execute.skl
+++ b/Zend/zend_vm_execute.skl
@@ -8,7 +8,6 @@ ZEND_API void {%EXECUTOR_NAME%}_ex(zend_execute_data *execute_data TSRMLS_DC)
 
        {%INTERNAL_LABELS%}
 
-       LOAD_REGS();
        LOAD_OPLINE();
 
        while (1) {

diff --git a/Zend/zend_vm_gen.php b/Zend/zend_vm_gen.php
index e9510535f79c33f195ef51baba88bce971be276d..df4ac12d3a77783150226e6b7d16cea36c9003aa 100644 (file)
--- a/Zend/zend_vm_gen.php
+++ b/Zend/zend_vm_gen.php
@@ -904,7 +904,6 @@ function gen_executor($f, $skl, $spec, $kind, $executor_name, $initializer_name,
                                                        out($f,"#define CHECK_EXCEPTION() LOAD_OPLINE()\n");
                                                        out($f,"#define HANDLE_EXCEPTION() LOAD_OPLINE(); ZEND_VM_CONTINUE()\n");
                                                        out($f,"#define HANDLE_EXCEPTION_LEAVE() LOAD_OPLINE(); ZEND_VM_LEAVE()\n");
-                                                       out($f,"#define LOAD_REGS()\n");
                                                        out($f,"#define ZEND_VM_CONTINUE()         return  0\n");
                                                        out($f,"#define ZEND_VM_RETURN()           return -1\n");
                                                        out($f,"#define ZEND_VM_ENTER()            return  1\n");
@@ -930,7 +929,6 @@ function gen_executor($f, $skl, $spec, $kind, $executor_name, $initializer_name,
                                                        out($f,"#define CHECK_EXCEPTION() LOAD_OPLINE()\n");
                                                        out($f,"#define HANDLE_EXCEPTION() LOAD_OPLINE(); ZEND_VM_CONTINUE()\n");
                                                        out($f,"#define HANDLE_EXCEPTION_LEAVE() LOAD_OPLINE(); ZEND_VM_LEAVE()\n");
-                                                       out($f,"#define LOAD_REGS()\n");
                                                        out($f,"#define ZEND_VM_CONTINUE() goto zend_vm_continue\n");
                                                        out($f,"#define ZEND_VM_RETURN()   return\n");
                                                        out($f,"#define ZEND_VM_ENTER()    execute_data = EG(current_execute_data); LOAD_OPLINE(); ZEND_VM_CONTINUE()\n");
@@ -962,7 +960,6 @@ function gen_executor($f, $skl, $spec, $kind, $executor_name, $initializer_name,
                                                                out($f,"#define HANDLE_EXCEPTION() goto ZEND_HANDLE_EXCEPTION_HANDLER\n");
                                                                out($f,"#define HANDLE_EXCEPTION_LEAVE() goto ZEND_HANDLE_EXCEPTION_HANDLER\n");
                                                        }
-                                                       out($f,"#define LOAD_REGS()\n");
                                                        out($f,"#define ZEND_VM_CONTINUE() goto *(void**)(OPLINE->handler)\n");
                                                        out($f,"#define ZEND_VM_RETURN()   return\n");
                                                        out($f,"#define ZEND_VM_ENTER()    execute_data = EG(current_execute_data); LOAD_OPLINE(); ZEND_VM_CONTINUE()\n");