X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/c2b1997a64b4faf9c52a72614bfeb0a1f6eeeba8..36491eae02a83b9427d3cd26fd92b13a1c12602b:/op.h diff --git a/op.h b/op.h index 0dee522..2720df0 100644 --- a/op.h +++ b/op.h @@ -1,7 +1,7 @@ /* op.h * * Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - * 2000, 2001, 2002, 2003, 2004, 2005, 2006 by Larry Wall and others + * 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, by Larry Wall and others * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. @@ -19,20 +19,17 @@ * op_type The type of the operation. * op_opt Whether or not the op has been optimised by the * peephole optimiser. - * op_static Whether or not the op is statically defined. - * This flag is used by the B::C compiler backend - * and indicates that the op should not be freed. * * See the comments in S_clear_yystack() for more * details on the following three flags: - + * * op_latefree tell op_free() to clear this op (and free any kids) * but not yet deallocate the struct. This means that * the op may be safely op_free()d multiple times * op_latefreed an op_latefree op has been op_free()d * op_attached this op (sub)tree has been attached to a CV * - * op_spare two spare bits! + * op_spare three spare bits! * op_flags Flags common to all operations. See OPf_* below. * op_private Flags peculiar to a particular operation (BUT, * by default, set to the number of children until @@ -40,11 +37,7 @@ * which may or may not check number of children). */ -#ifdef DEBUGGING_OPS -#define OPCODE opcode -#else #define OPCODE U16 -#endif #ifdef PERL_MAD # define MADPROP_IN_BASEOP MADPROP* op_madprop; @@ -63,11 +56,10 @@ PADOFFSET op_targ; \ unsigned op_type:9; \ unsigned op_opt:1; \ - unsigned op_static:1; \ unsigned op_latefree:1; \ unsigned op_latefreed:1; \ unsigned op_attached:1; \ - unsigned op_spare:2; \ + unsigned op_spare:3; \ U8 op_flags; \ U8 op_private; #endif @@ -124,7 +116,7 @@ Deprecated. Use C instead. /* On OP_EXISTS, treat av as av, not avhv. */ /* On OP_(ENTER|LEAVE)EVAL, don't clear $@ */ /* On OP_ENTERITER, loop var is per-thread */ - /* On pushre, re is /\s+/ imp. by split " " */ + /* On pushre, rx is used as part of split, e.g. split " " */ /* On regcomp, "use re 'eval'" was in scope */ /* On OP_READLINE, was <$filehandle> */ /* On RV2[ACGHS]V, don't create GV--in @@ -166,9 +158,6 @@ Deprecated. Use C instead. #define OPpASSIGN_BACKWARDS 64 /* Left & right switched. */ #define OPpASSIGN_CV_TO_GV 128 /* Possible optimisation for constants. */ -/* Private for OP_[AS]ASSIGN */ -#define OPpASSIGN_STATE 32 /* Assign to a "state" variable */ - /* Private for OP_MATCH and OP_SUBST{,CONST} */ #define OPpRUNTIME 64 /* Pattern coming in on the stack */ @@ -318,19 +307,28 @@ struct pmop { BASEOP OP * op_first; OP * op_last; - OP * op_pmreplroot; /* (type is really union {OP*,GV*,PADOFFSET}) */ - OP * op_pmreplstart; #ifdef USE_ITHREADS IV op_pmoffset; #else REGEXP * op_pmregexp; /* compiled expression */ #endif - U32 op_pmflags; + U32 op_pmflags; + union { + OP * op_pmreplroot; /* For OP_SUBST */ #ifdef USE_ITHREADS - char * op_pmstashpv; + PADOFFSET op_pmtargetoff; /* For OP_PUSHRE */ #else - HV * op_pmstash; + GV * op_pmtargetgv; #endif + } op_pmreplrootu; + union { + OP * op_pmreplstart; /* Only used in OP_SUBST */ +#ifdef USE_ITHREADS + char * op_pmstashpv; /* Only used in OP_MATCH, with PMf_ONCE set */ +#else + HV * op_pmstash; +#endif + } op_pmstashstartu; }; #ifdef USE_ITHREADS @@ -352,7 +350,9 @@ struct pmop { #define PMf_RETAINT 0x0001 /* taint $1 etc. if target tainted */ #define PMf_ONCE 0x0002 /* match successfully only once per reset, with related flag RXf_USED - in re->extflags holding state */ + in re->extflags holding state. + This is used only for ?? matches, + and only on OP_MATCH and OP_QR */ #define PMf_UNUSED 0x0004 /* free for use */ #define PMf_MAYBE_CONST 0x0008 /* replacement contains variables */ @@ -381,19 +381,38 @@ struct pmop { #ifdef USE_ITHREADS -# define PmopSTASHPV(o) ((o)->op_pmstashpv) -# define PmopSTASHPV_set(o,pv) (PmopSTASHPV(o) = savesharedpv(pv)) +# define PmopSTASHPV(o) \ + (((o)->op_pmflags & PMf_ONCE) ? (o)->op_pmstashstartu.op_pmstashpv : NULL) +# if defined (DEBUGGING) && defined(__GNUC__) && !defined(PERL_GCC_BRACE_GROUPS_FORBIDDEN) +# define PmopSTASHPV_set(o,pv) ({ \ + assert((o)->op_pmflags & PMf_ONCE); \ + ((o)->op_pmstashstartu.op_pmstashpv = savesharedpv(pv)); \ + }) +# else +# define PmopSTASHPV_set(o,pv) \ + ((o)->op_pmstashstartu.op_pmstashpv = savesharedpv(pv)) +# endif # define PmopSTASH(o) (PmopSTASHPV(o) \ - ? gv_stashpv(PmopSTASHPV(o),GV_ADD) : NULL) + ? gv_stashpv((o)->op_pmstashstartu.op_pmstashpv,GV_ADD) : NULL) # define PmopSTASH_set(o,hv) PmopSTASHPV_set(o, ((hv) ? HvNAME_get(hv) : NULL)) # define PmopSTASH_free(o) PerlMemShared_free(PmopSTASHPV(o)) #else -# define PmopSTASH(o) ((o)->op_pmstash) -# define PmopSTASH_set(o,hv) ((o)->op_pmstash = (hv)) +# define PmopSTASH(o) \ + (((o)->op_pmflags & PMf_ONCE) ? (o)->op_pmstashstartu.op_pmstash : NULL) +# if defined (DEBUGGING) && defined(__GNUC__) && !defined(PERL_GCC_BRACE_GROUPS_FORBIDDEN) +# define PmopSTASH_set(o,hv) ({ \ + assert((o)->op_pmflags & PMf_ONCE); \ + ((o)->op_pmstashstartu.op_pmstash = (hv)); \ + }) +# else +# define PmopSTASH_set(o,hv) ((o)->op_pmstashstartu.op_pmstash = (hv)) +# endif # define PmopSTASHPV(o) (PmopSTASH(o) ? HvNAME_get(PmopSTASH(o)) : NULL) - /* op_pmstash is not refcounted */ + /* op_pmstashstartu.op_pmstash is not refcounted */ # define PmopSTASHPV_set(o,pv) PmopSTASH_set((o), gv_stashpv(pv,GV_ADD)) +/* Note that if this becomes non-empty, then S_forget_pmop in op.c will need + changing */ # define PmopSTASH_free(o) #endif @@ -562,8 +581,13 @@ struct loop { #endif #define OpREFCNT_set(o,n) ((o)->op_targ = (n)) -#define OpREFCNT_inc(o) ((o) ? (++(o)->op_targ, (o)) : NULL) -#define OpREFCNT_dec(o) (--(o)->op_targ) +#ifdef PERL_DEBUG_READONLY_OPS +# define OpREFCNT_inc(o) Perl_op_refcnt_inc(aTHX_ o) +# define OpREFCNT_dec(o) Perl_op_refcnt_dec(aTHX_ o) +#else +# define OpREFCNT_inc(o) ((o) ? (++(o)->op_targ, (o)) : NULL) +# define OpREFCNT_dec(o) (--(o)->op_targ) +#endif /* flags used by Perl_load_module() */ #define PERL_LOADMOD_DENY 0x1 @@ -607,7 +631,7 @@ struct loop { struct madprop { MADPROP* mad_next; - void *mad_val; + const void *mad_val; U32 mad_vlen; /* short mad_count; */ char mad_key; @@ -622,7 +646,7 @@ struct token { #endif /* - * Values that can be hold by mad_key : + * Values that can be held by mad_key : * ^ unfilled head spot * , literal , * ; literal ; (blank if implicit ; at end of block) @@ -661,13 +685,14 @@ struct token { * E tr/E/R/, /E/ * f folded constant op * F peg op for format + * g op was forced to be a word * i if/unless modifier * I if/elsif/unless statement + * k local declarator * K retired kid op * l last index of array ($#foo) * L label * m modifier on regex - * M my assignment slurped into some other operator's target * n sub or format name * o current operator/declarator name * o else/continue @@ -680,7 +705,6 @@ struct token { * Q optimized qw// * r expression producing R * R tr/E/R/ s/E/R/ - * R assign slurped by split * s sub signature * S use import stub (no import) * S retired sort block @@ -695,3 +719,13 @@ struct token { * _ whitespace/comments preceding anything else * ~ =~ operator */ + +/* + * Local variables: + * c-indentation-style: bsd + * c-basic-offset: 4 + * indent-tabs-mode: t + * End: + * + * ex: set ts=8 sts=4 sw=4 noet: + */