diff options
| author | Moonchild <moonchild@palemoon.org> | 2022-05-21 16:38:37 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2022-05-21 16:38:37 +0000 |
| commit | 2694995e52a0bd767acac74f2306767d0a3720c9 (patch) | |
| tree | d2a1198ccd0b8eab1b0b589b6900845aa3b87d5b /js/src/vm/Opcodes.h | |
| parent | f532bbd7af98d2cb543bf86b93b0e0e9fa1e9b2a (diff) | |
| parent | 00c51f75fa4845f348708a796d552ca281f8210a (diff) | |
| download | uxp-1210.tar.gz | |
Merge branch 'master' into 12101210
Diffstat (limited to 'js/src/vm/Opcodes.h')
| -rw-r--r-- | js/src/vm/Opcodes.h | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/js/src/vm/Opcodes.h b/js/src/vm/Opcodes.h index 58b5d75776..8328dfc994 100644 --- a/js/src/vm/Opcodes.h +++ b/js/src/vm/Opcodes.h @@ -2315,7 +2315,7 @@ * Operands: * Stack: => */ \ - macro(JSOP_JUMPTARGET, 230, "jumptarget", NULL, 1, 0, 0, JOF_BYTE)\ + macro(JSOP_JUMPTARGET, 230, "jumptarget", NULL, 1, 0, 0, JOF_BYTE) \ /* * Like JSOP_CALL, but tells the function that the return value is ignored. * stack. @@ -2325,14 +2325,22 @@ * Stack: callee, this, args[0], ..., args[argc-1] => rval * nuses: (argc+2) */ \ - macro(JSOP_CALL_IGNORES_RV, 231, "call-ignores-rv", NULL, 3, -1, 1, JOF_UINT16|JOF_INVOKE|JOF_TYPESET) - + macro(JSOP_CALL_IGNORES_RV, 231, "call-ignores-rv", NULL, 3, -1, 1, JOF_UINT16|JOF_INVOKE|JOF_TYPESET) \ + /* + * If the value on top of the stack is not null or undefined, jumps to a 32-bit offset from the + * current bytecode. + * + * Category: Statements + * Type: Jumps + * Operands: int32_t offset + * Stack: cond => cond + */ \ + macro(JSOP_COALESCE, 232, "coalesce", NULL, 5, 1, 1, JOF_JUMP|JOF_DETECTING) /* * In certain circumstances it may be useful to "pad out" the opcode space to * a power of two. Use this macro to do so. */ #define FOR_EACH_TRAILING_UNUSED_OPCODE(macro) \ - macro(232) \ macro(233) \ macro(234) \ macro(235) \ |