Introduce zend_vm_opcode_handler_t / zend_vm_opcode_handler_func_t #19006
+109
−84
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This reduces confusion between opcode handlers used by the VM, and opcode handler functions used for tracing. Depending on the VM, zend_vm_opcode_handler_t may not be a real function. For instance in the HYBRID VM this is a label pointer.
arnaud-lb
force-pushed
the
opcode-handler-type
branch
from
bdaf126 to
ed49acd
Compare
dstogov
reviewed
Jul 7, 2025
Comment on lines
+2372
to
+2374
| $str .= "#else\n"; | ||
| $str .= "typedef const void* zend_vm_opcode_handler_t;\n"; | ||
| $str .= "typedef const void* zend_vm_opcode_handler_func_t;\n"; |
There was a problem hiding this comment.
I suppose #else means GOTO and SWITCH VM.
Most probably GOTO uses only zend_vm_opcode_handler_t and SWITCH doesn't use both (or zend_vm_opcode_handler_t is just int).
Comment on lines
+2367
to
+2368
| $str .= "typedef const void* zend_vm_opcode_handler_t;\n"; | ||
| $str .= "typedef void (ZEND_FASTCALL *zend_vm_opcode_handler_func_t)(void);\n"; |
There was a problem hiding this comment.
Some comments that explain the conceptual difference for all VM types would be helpful.
| @@ -298,6 +298,7 @@ void ZEND_FASTCALL zend_jit_undefined_string_key(EXECUTE_DATA_D) | |||
| ZVAL_NULL(result); | |||
| } | |||
|
|
|||
| #if ZEND_VM_KIND != ZEND_VM_KIND_HYBRID | |||
There was a problem hiding this comment.
Previously opcache and JIT didn't have compile-time dependencies on VM type. The same opcache build was able to work with HYBRID and CALL VM.
It's not necessary to keep this, but if we decide to remove this possibility we also may remove zend_jit_vm_kind run-time checks.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This reduces the chances of confusion between opcode handlers used by the VM, and opcode handler functions used for tracing or debugging. Depending on the VM, zend_vm_opcode_handler_t may not be a function. For instance in the HYBRID VM this is a label pointer.
Extracted from #18720.