From 10a5c9138224597d018843f3b298a928555b67f0 Mon Sep 17 00:00:00 2001 From: Richard Leach Date: Tue, 2 Aug 2022 21:48:26 +0000 Subject: OP_EMPTYAVHV - optimized empty ANONLIST/ANONHASH This commit introduces a new OP to replace cases of OP_ANONLIST and OP_ANONHASH where there are zero elements, which is very common in Perl code. As an example, `my $x = {}` is currently implemented like this: ... 6 <2> sassign vKS/2 ->7 4 <@> anonhash sK* ->5 3 <0> pushmark s ->4 5 <0> padsv[$x:1,2] sRM*/LVINTRO ->6 The pushmark serves no meaningful purpose when there are zero elements and the anonhash, besides undoing the pushmark, performs work that is unnecessary for this special case. The peephole optimizer, which also checks for applicability of a related TARGMY optimization, transforms this example into: ... - <1> ex-sassign vKS/2 ->4 3 <@> emptyavhv[$x:1,2] vK*/LVINTRO,ANONHASH,TARGMY ->4 - <0> ex-pushmark s ->3 - <0> ex-padsv sRM*/LVINTRO ->- --- opnames.h | 509 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 255 insertions(+), 254 deletions(-) (limited to 'opnames.h') diff --git a/opnames.h b/opnames.h index 3e1751006d..b86f00b7f2 100644 --- a/opnames.h +++ b/opnames.h @@ -178,263 +178,264 @@ typedef enum opcode { OP_LSLICE = 161, OP_ANONLIST = 162, OP_ANONHASH = 163, - OP_SPLICE = 164, - OP_PUSH = 165, - OP_POP = 166, - OP_SHIFT = 167, - OP_UNSHIFT = 168, - OP_SORT = 169, - OP_REVERSE = 170, - OP_GREPSTART = 171, - OP_GREPWHILE = 172, - OP_MAPSTART = 173, - OP_MAPWHILE = 174, - OP_RANGE = 175, - OP_FLIP = 176, - OP_FLOP = 177, - OP_AND = 178, - OP_OR = 179, - OP_XOR = 180, - OP_DOR = 181, - OP_COND_EXPR = 182, - OP_ANDASSIGN = 183, - OP_ORASSIGN = 184, - OP_DORASSIGN = 185, - OP_ENTERSUB = 186, - OP_LEAVESUB = 187, - OP_LEAVESUBLV = 188, - OP_ARGCHECK = 189, - OP_ARGELEM = 190, - OP_ARGDEFELEM = 191, - OP_CALLER = 192, - OP_WARN = 193, - OP_DIE = 194, - OP_RESET = 195, - OP_LINESEQ = 196, - OP_NEXTSTATE = 197, - OP_DBSTATE = 198, - OP_UNSTACK = 199, - OP_ENTER = 200, - OP_LEAVE = 201, - OP_SCOPE = 202, - OP_ENTERITER = 203, - OP_ITER = 204, - OP_ENTERLOOP = 205, - OP_LEAVELOOP = 206, - OP_RETURN = 207, - OP_LAST = 208, - OP_NEXT = 209, - OP_REDO = 210, - OP_DUMP = 211, - OP_GOTO = 212, - OP_EXIT = 213, - OP_METHOD = 214, - OP_METHOD_NAMED = 215, - OP_METHOD_SUPER = 216, - OP_METHOD_REDIR = 217, - OP_METHOD_REDIR_SUPER = 218, - OP_ENTERGIVEN = 219, - OP_LEAVEGIVEN = 220, - OP_ENTERWHEN = 221, - OP_LEAVEWHEN = 222, - OP_BREAK = 223, - OP_CONTINUE = 224, - OP_OPEN = 225, - OP_CLOSE = 226, - OP_PIPE_OP = 227, - OP_FILENO = 228, - OP_UMASK = 229, - OP_BINMODE = 230, - OP_TIE = 231, - OP_UNTIE = 232, - OP_TIED = 233, - OP_DBMOPEN = 234, - OP_DBMCLOSE = 235, - OP_SSELECT = 236, - OP_SELECT = 237, - OP_GETC = 238, - OP_READ = 239, - OP_ENTERWRITE = 240, - OP_LEAVEWRITE = 241, - OP_PRTF = 242, - OP_PRINT = 243, - OP_SAY = 244, - OP_SYSOPEN = 245, - OP_SYSSEEK = 246, - OP_SYSREAD = 247, - OP_SYSWRITE = 248, - OP_EOF = 249, - OP_TELL = 250, - OP_SEEK = 251, - OP_TRUNCATE = 252, - OP_FCNTL = 253, - OP_IOCTL = 254, - OP_FLOCK = 255, - OP_SEND = 256, - OP_RECV = 257, - OP_SOCKET = 258, - OP_SOCKPAIR = 259, - OP_BIND = 260, - OP_CONNECT = 261, - OP_LISTEN = 262, - OP_ACCEPT = 263, - OP_SHUTDOWN = 264, - OP_GSOCKOPT = 265, - OP_SSOCKOPT = 266, - OP_GETSOCKNAME = 267, - OP_GETPEERNAME = 268, - OP_LSTAT = 269, - OP_STAT = 270, - OP_FTRREAD = 271, - OP_FTRWRITE = 272, - OP_FTREXEC = 273, - OP_FTEREAD = 274, - OP_FTEWRITE = 275, - OP_FTEEXEC = 276, - OP_FTIS = 277, - OP_FTSIZE = 278, - OP_FTMTIME = 279, - OP_FTATIME = 280, - OP_FTCTIME = 281, - OP_FTROWNED = 282, - OP_FTEOWNED = 283, - OP_FTZERO = 284, - OP_FTSOCK = 285, - OP_FTCHR = 286, - OP_FTBLK = 287, - OP_FTFILE = 288, - OP_FTDIR = 289, - OP_FTPIPE = 290, - OP_FTSUID = 291, - OP_FTSGID = 292, - OP_FTSVTX = 293, - OP_FTLINK = 294, - OP_FTTTY = 295, - OP_FTTEXT = 296, - OP_FTBINARY = 297, - OP_CHDIR = 298, - OP_CHOWN = 299, - OP_CHROOT = 300, - OP_UNLINK = 301, - OP_CHMOD = 302, - OP_UTIME = 303, - OP_RENAME = 304, - OP_LINK = 305, - OP_SYMLINK = 306, - OP_READLINK = 307, - OP_MKDIR = 308, - OP_RMDIR = 309, - OP_OPEN_DIR = 310, - OP_READDIR = 311, - OP_TELLDIR = 312, - OP_SEEKDIR = 313, - OP_REWINDDIR = 314, - OP_CLOSEDIR = 315, - OP_FORK = 316, - OP_WAIT = 317, - OP_WAITPID = 318, - OP_SYSTEM = 319, - OP_EXEC = 320, - OP_KILL = 321, - OP_GETPPID = 322, - OP_GETPGRP = 323, - OP_SETPGRP = 324, - OP_GETPRIORITY = 325, - OP_SETPRIORITY = 326, - OP_TIME = 327, - OP_TMS = 328, - OP_LOCALTIME = 329, - OP_GMTIME = 330, - OP_ALARM = 331, - OP_SLEEP = 332, - OP_SHMGET = 333, - OP_SHMCTL = 334, - OP_SHMREAD = 335, - OP_SHMWRITE = 336, - OP_MSGGET = 337, - OP_MSGCTL = 338, - OP_MSGSND = 339, - OP_MSGRCV = 340, - OP_SEMOP = 341, - OP_SEMGET = 342, - OP_SEMCTL = 343, - OP_REQUIRE = 344, - OP_DOFILE = 345, - OP_HINTSEVAL = 346, - OP_ENTEREVAL = 347, - OP_LEAVEEVAL = 348, - OP_ENTERTRY = 349, - OP_LEAVETRY = 350, - OP_GHBYNAME = 351, - OP_GHBYADDR = 352, - OP_GHOSTENT = 353, - OP_GNBYNAME = 354, - OP_GNBYADDR = 355, - OP_GNETENT = 356, - OP_GPBYNAME = 357, - OP_GPBYNUMBER = 358, - OP_GPROTOENT = 359, - OP_GSBYNAME = 360, - OP_GSBYPORT = 361, - OP_GSERVENT = 362, - OP_SHOSTENT = 363, - OP_SNETENT = 364, - OP_SPROTOENT = 365, - OP_SSERVENT = 366, - OP_EHOSTENT = 367, - OP_ENETENT = 368, - OP_EPROTOENT = 369, - OP_ESERVENT = 370, - OP_GPWNAM = 371, - OP_GPWUID = 372, - OP_GPWENT = 373, - OP_SPWENT = 374, - OP_EPWENT = 375, - OP_GGRNAM = 376, - OP_GGRGID = 377, - OP_GGRENT = 378, - OP_SGRENT = 379, - OP_EGRENT = 380, - OP_GETLOGIN = 381, - OP_SYSCALL = 382, - OP_LOCK = 383, - OP_ONCE = 384, - OP_CUSTOM = 385, - OP_COREARGS = 386, - OP_AVHVSWITCH = 387, - OP_RUNCV = 388, - OP_FC = 389, - OP_PADCV = 390, - OP_INTROCV = 391, - OP_CLONECV = 392, - OP_PADRANGE = 393, - OP_REFASSIGN = 394, - OP_LVREF = 395, - OP_LVREFSLICE = 396, - OP_LVAVREF = 397, - OP_ANONCONST = 398, - OP_ISA = 399, - OP_CMPCHAIN_AND = 400, - OP_CMPCHAIN_DUP = 401, - OP_ENTERTRYCATCH = 402, - OP_LEAVETRYCATCH = 403, - OP_POPTRY = 404, - OP_CATCH = 405, - OP_PUSHDEFER = 406, - OP_IS_BOOL = 407, - OP_IS_WEAK = 408, - OP_WEAKEN = 409, - OP_UNWEAKEN = 410, - OP_BLESSED = 411, - OP_REFADDR = 412, - OP_REFTYPE = 413, - OP_CEIL = 414, - OP_FLOOR = 415, - OP_IS_TAINTED = 416, + OP_EMPTYAVHV = 164, + OP_SPLICE = 165, + OP_PUSH = 166, + OP_POP = 167, + OP_SHIFT = 168, + OP_UNSHIFT = 169, + OP_SORT = 170, + OP_REVERSE = 171, + OP_GREPSTART = 172, + OP_GREPWHILE = 173, + OP_MAPSTART = 174, + OP_MAPWHILE = 175, + OP_RANGE = 176, + OP_FLIP = 177, + OP_FLOP = 178, + OP_AND = 179, + OP_OR = 180, + OP_XOR = 181, + OP_DOR = 182, + OP_COND_EXPR = 183, + OP_ANDASSIGN = 184, + OP_ORASSIGN = 185, + OP_DORASSIGN = 186, + OP_ENTERSUB = 187, + OP_LEAVESUB = 188, + OP_LEAVESUBLV = 189, + OP_ARGCHECK = 190, + OP_ARGELEM = 191, + OP_ARGDEFELEM = 192, + OP_CALLER = 193, + OP_WARN = 194, + OP_DIE = 195, + OP_RESET = 196, + OP_LINESEQ = 197, + OP_NEXTSTATE = 198, + OP_DBSTATE = 199, + OP_UNSTACK = 200, + OP_ENTER = 201, + OP_LEAVE = 202, + OP_SCOPE = 203, + OP_ENTERITER = 204, + OP_ITER = 205, + OP_ENTERLOOP = 206, + OP_LEAVELOOP = 207, + OP_RETURN = 208, + OP_LAST = 209, + OP_NEXT = 210, + OP_REDO = 211, + OP_DUMP = 212, + OP_GOTO = 213, + OP_EXIT = 214, + OP_METHOD = 215, + OP_METHOD_NAMED = 216, + OP_METHOD_SUPER = 217, + OP_METHOD_REDIR = 218, + OP_METHOD_REDIR_SUPER = 219, + OP_ENTERGIVEN = 220, + OP_LEAVEGIVEN = 221, + OP_ENTERWHEN = 222, + OP_LEAVEWHEN = 223, + OP_BREAK = 224, + OP_CONTINUE = 225, + OP_OPEN = 226, + OP_CLOSE = 227, + OP_PIPE_OP = 228, + OP_FILENO = 229, + OP_UMASK = 230, + OP_BINMODE = 231, + OP_TIE = 232, + OP_UNTIE = 233, + OP_TIED = 234, + OP_DBMOPEN = 235, + OP_DBMCLOSE = 236, + OP_SSELECT = 237, + OP_SELECT = 238, + OP_GETC = 239, + OP_READ = 240, + OP_ENTERWRITE = 241, + OP_LEAVEWRITE = 242, + OP_PRTF = 243, + OP_PRINT = 244, + OP_SAY = 245, + OP_SYSOPEN = 246, + OP_SYSSEEK = 247, + OP_SYSREAD = 248, + OP_SYSWRITE = 249, + OP_EOF = 250, + OP_TELL = 251, + OP_SEEK = 252, + OP_TRUNCATE = 253, + OP_FCNTL = 254, + OP_IOCTL = 255, + OP_FLOCK = 256, + OP_SEND = 257, + OP_RECV = 258, + OP_SOCKET = 259, + OP_SOCKPAIR = 260, + OP_BIND = 261, + OP_CONNECT = 262, + OP_LISTEN = 263, + OP_ACCEPT = 264, + OP_SHUTDOWN = 265, + OP_GSOCKOPT = 266, + OP_SSOCKOPT = 267, + OP_GETSOCKNAME = 268, + OP_GETPEERNAME = 269, + OP_LSTAT = 270, + OP_STAT = 271, + OP_FTRREAD = 272, + OP_FTRWRITE = 273, + OP_FTREXEC = 274, + OP_FTEREAD = 275, + OP_FTEWRITE = 276, + OP_FTEEXEC = 277, + OP_FTIS = 278, + OP_FTSIZE = 279, + OP_FTMTIME = 280, + OP_FTATIME = 281, + OP_FTCTIME = 282, + OP_FTROWNED = 283, + OP_FTEOWNED = 284, + OP_FTZERO = 285, + OP_FTSOCK = 286, + OP_FTCHR = 287, + OP_FTBLK = 288, + OP_FTFILE = 289, + OP_FTDIR = 290, + OP_FTPIPE = 291, + OP_FTSUID = 292, + OP_FTSGID = 293, + OP_FTSVTX = 294, + OP_FTLINK = 295, + OP_FTTTY = 296, + OP_FTTEXT = 297, + OP_FTBINARY = 298, + OP_CHDIR = 299, + OP_CHOWN = 300, + OP_CHROOT = 301, + OP_UNLINK = 302, + OP_CHMOD = 303, + OP_UTIME = 304, + OP_RENAME = 305, + OP_LINK = 306, + OP_SYMLINK = 307, + OP_READLINK = 308, + OP_MKDIR = 309, + OP_RMDIR = 310, + OP_OPEN_DIR = 311, + OP_READDIR = 312, + OP_TELLDIR = 313, + OP_SEEKDIR = 314, + OP_REWINDDIR = 315, + OP_CLOSEDIR = 316, + OP_FORK = 317, + OP_WAIT = 318, + OP_WAITPID = 319, + OP_SYSTEM = 320, + OP_EXEC = 321, + OP_KILL = 322, + OP_GETPPID = 323, + OP_GETPGRP = 324, + OP_SETPGRP = 325, + OP_GETPRIORITY = 326, + OP_SETPRIORITY = 327, + OP_TIME = 328, + OP_TMS = 329, + OP_LOCALTIME = 330, + OP_GMTIME = 331, + OP_ALARM = 332, + OP_SLEEP = 333, + OP_SHMGET = 334, + OP_SHMCTL = 335, + OP_SHMREAD = 336, + OP_SHMWRITE = 337, + OP_MSGGET = 338, + OP_MSGCTL = 339, + OP_MSGSND = 340, + OP_MSGRCV = 341, + OP_SEMOP = 342, + OP_SEMGET = 343, + OP_SEMCTL = 344, + OP_REQUIRE = 345, + OP_DOFILE = 346, + OP_HINTSEVAL = 347, + OP_ENTEREVAL = 348, + OP_LEAVEEVAL = 349, + OP_ENTERTRY = 350, + OP_LEAVETRY = 351, + OP_GHBYNAME = 352, + OP_GHBYADDR = 353, + OP_GHOSTENT = 354, + OP_GNBYNAME = 355, + OP_GNBYADDR = 356, + OP_GNETENT = 357, + OP_GPBYNAME = 358, + OP_GPBYNUMBER = 359, + OP_GPROTOENT = 360, + OP_GSBYNAME = 361, + OP_GSBYPORT = 362, + OP_GSERVENT = 363, + OP_SHOSTENT = 364, + OP_SNETENT = 365, + OP_SPROTOENT = 366, + OP_SSERVENT = 367, + OP_EHOSTENT = 368, + OP_ENETENT = 369, + OP_EPROTOENT = 370, + OP_ESERVENT = 371, + OP_GPWNAM = 372, + OP_GPWUID = 373, + OP_GPWENT = 374, + OP_SPWENT = 375, + OP_EPWENT = 376, + OP_GGRNAM = 377, + OP_GGRGID = 378, + OP_GGRENT = 379, + OP_SGRENT = 380, + OP_EGRENT = 381, + OP_GETLOGIN = 382, + OP_SYSCALL = 383, + OP_LOCK = 384, + OP_ONCE = 385, + OP_CUSTOM = 386, + OP_COREARGS = 387, + OP_AVHVSWITCH = 388, + OP_RUNCV = 389, + OP_FC = 390, + OP_PADCV = 391, + OP_INTROCV = 392, + OP_CLONECV = 393, + OP_PADRANGE = 394, + OP_REFASSIGN = 395, + OP_LVREF = 396, + OP_LVREFSLICE = 397, + OP_LVAVREF = 398, + OP_ANONCONST = 399, + OP_ISA = 400, + OP_CMPCHAIN_AND = 401, + OP_CMPCHAIN_DUP = 402, + OP_ENTERTRYCATCH = 403, + OP_LEAVETRYCATCH = 404, + OP_POPTRY = 405, + OP_CATCH = 406, + OP_PUSHDEFER = 407, + OP_IS_BOOL = 408, + OP_IS_WEAK = 409, + OP_WEAKEN = 410, + OP_UNWEAKEN = 411, + OP_BLESSED = 412, + OP_REFADDR = 413, + OP_REFTYPE = 414, + OP_CEIL = 415, + OP_FLOOR = 416, + OP_IS_TAINTED = 417, OP_max } opcode; -#define MAXO 417 +#define MAXO 418 #define OP_FREED MAXO /* the OP_IS_* macros are optimized to a simple range check because -- cgit v1.2.1