com php-src: LOAD_REGS() is not used anymore: Zend/zend_vm_execute.h Zend/zend_vm_execute.sk l Zend/zend_vm_gen.php

From: Date: Thu, 28 Aug 2014 06:55:16 +0000
Subject: com php-src: LOAD_REGS() is not used anymore: Zend/zend_vm_execute.h Zend/zend_vm_execute.sk l Zend/zend_vm_gen.php
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-81251@lists.php.net to get a copy of this message
Commit: 319ce224d2474121b3f14bb88e0e01cfd7bb3679 Author: Dmitry Stogov <dmitry@zend.com> Thu, 28 Aug 2014 10:55:16 +0400 Parents: a038ab892ffd8ee1f808da8c5a84dfa3d06ac9f2 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=319ce224d2474121b3f14bb88e0e01cfd7bb3679 Log: LOAD_REGS() is not used anymore Changed paths: M Zend/zend_vm_execute.h M Zend/zend_vm_execute.skl M Zend/zend_vm_gen.php Diff: diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 7b5ad6b..f1ab7e8 100644 --- 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 4825e02..58cbe09 100644 --- 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 e951053..df4ac12 100644 --- 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");

« previous php.cvs (#81251) next »