X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/0f94cb1fe27e58a59d3391214dab34037ab184db..a6d3278e2b83239d3d01366fd1a96fdf05a5994a:/pad.h diff --git a/pad.h b/pad.h index e19c7a8..941ca10 100644 --- a/pad.h +++ b/pad.h @@ -33,8 +33,17 @@ typedef U64TYPE PADOFFSET; struct padlist { SSize_t xpadl_max; /* max index for which array has space */ - PAD ** xpadl_alloc; /* pointer to beginning of array of AVs */ - PADNAMELIST*xpadl_outid; /* Padnamelist of outer pad; used as ID */ + union { + PAD ** xpadlarr_alloc; /* Pointer to beginning of array of AVs. + index 0 is a padnamelist * */ + struct { + PADNAMELIST * padnl; + PAD * pad_1; /* this slice of PAD * array always alloced */ + PAD * pad_2; /* maybe unalloced */ + } * xpadlarr_dbg; /* for use with a C debugger only */ + } xpadl_arr; + U32 xpadl_id; /* Semi-unique ID, shared between clones */ + U32 xpadl_outid; /* ID of outer pad */ }; struct padnamelist { @@ -45,26 +54,46 @@ struct padnamelist { U32 xpadnl_refcnt; }; +/* PERL_PADNAME_MINIMAL uses less memory, but on some platforms + PERL_PADNAME_ALIGNED may be faster, so platform-specific hints can + define one or the other. */ +#if defined(PERL_PADNAME_MINIMAL) && defined (PERL_PADNAME_ALIGNED) +# error PERL_PADNAME_MINIMAL and PERL_PADNAME_ALIGNED are exclusive +#endif + +#if !defined(PERL_PADNAME_MINIMAL) && !defined(PERL_PADNAME_ALIGNED) +# define PERL_PADNAME_MINIMAL +#endif + +#define _PADNAME_BASE \ + char * xpadn_pv; \ + HV * xpadn_ourstash; \ + union { \ + HV * xpadn_typestash; \ + CV * xpadn_protocv; \ + } xpadn_type_u; \ + U32 xpadn_low; \ + U32 xpadn_high; \ + U32 xpadn_refcnt; \ + int xpadn_gen; \ + U8 xpadn_len; \ + U8 xpadn_flags + struct padname { - char * xpadn_pv; - HV * xpadn_ourstash; - union { - HV * xpadn_typestash; - CV * xpadn_protocv; - } xpadn_type_u; - U32 xpadn_low; - U32 xpadn_high; - U32 xpadn_refcnt; - int xpadn_gen; - U8 xpadn_len; - U8 xpadn_flags; + _PADNAME_BASE; }; struct padname_with_str { +#ifdef PERL_PADNAME_MINIMAL + _PADNAME_BASE; +#else struct padname xpadn_padname; +#endif char xpadn_str[1]; }; +#undef _PADNAME_BASE + #define PADNAME_FROM_PV(s) \ ((PADNAME *)((s) - STRUCT_OFFSET(struct padname_with_str, xpadn_str))) @@ -150,10 +179,10 @@ Save a pad slot (used to restore after an iteration) XXX DAPM it would make more sense to make the arg a PADOFFSET =for apidoc m|void|SAVECLEARSV |SV **svp Clear the pointed to pad value on scope exit. (i.e. the runtime action of -'my') +C) =for apidoc m|void|SAVECOMPPAD -save PL_comppad and PL_curpad +save C and C =for apidoc Amx|PAD **|PadlistARRAY|PADLIST padlist @@ -162,7 +191,7 @@ numbers >= 1, as the 0th entry is not guaranteed to remain usable. =for apidoc Amx|SSize_t|PadlistMAX|PADLIST padlist The index of the last allocated space in the padlist. Note that the last -pad may be in an earlier slot. Any entries following it will be NULL in +pad may be in an earlier slot. Any entries following it will be C in that case. =for apidoc Amx|PADNAMELIST *|PadlistNAMES|PADLIST padlist @@ -196,14 +225,14 @@ The C array of pad entries. The index of the last pad entry. =for apidoc Amx|char *|PadnamePV|PADNAME pn -The name stored in the pad name struct. This returns NULL for a target +The name stored in the pad name struct. This returns C for a target slot. =for apidoc Amx|STRLEN|PadnameLEN|PADNAME pn The length of the name. =for apidoc Amx|bool|PadnameUTF8|PADNAME pn -Whether PadnamePV is in UTF8. Currently, this is always true. +Whether PadnamePV is in UTF-8. Currently, this is always true. =for apidoc Amx|SV *|PadnameSV|PADNAME pn Returns the pad name as a mortal SV. @@ -222,7 +251,7 @@ are often referred to as 'fake'. Whether this is a "state" variable. =for apidoc m|HV *|PadnameTYPE|PADNAME pn -The stash associated with a typed lexical. This returns the %Foo:: hash +The stash associated with a typed lexical. This returns the C<%Foo::> hash for C. =for apidoc Amx|SSize_t|PadnameREFCNT|PADNAME pn @@ -263,18 +292,18 @@ like PAD_SET_CUR, but without the save Save the current pad then set it to null. =for apidoc m|void|PAD_SAVE_LOCAL|PAD *opad|PAD *npad -Save the current pad to the local variable opad, then make the -current pad equal to npad +Save the current pad to the local variable C, then make the +current pad equal to C =for apidoc m|void|PAD_RESTORE_LOCAL|PAD *opad -Restore the old pad saved into the local variable opad by PAD_SAVE_LOCAL() +Restore the old pad saved into the local variable C by C =cut */ -#define PadlistARRAY(pl) (pl)->xpadl_alloc +#define PadlistARRAY(pl) (pl)->xpadl_arr.xpadlarr_alloc #define PadlistMAX(pl) (pl)->xpadl_max -#define PadlistNAMES(pl) ((PADNAMELIST *)*PadlistARRAY(pl)) +#define PadlistNAMES(pl) *((PADNAMELIST **)PadlistARRAY(pl)) #define PadlistNAMESARRAY(pl) PadnamelistARRAY(PadlistNAMES(pl)) #define PadlistNAMESMAX(pl) PadnamelistMAX(PadlistNAMES(pl)) #define PadlistREFCNT(pl) 1 /* reserved for future use */ @@ -383,7 +412,7 @@ Restore the old pad saved into the local variable opad by PAD_SAVE_LOCAL() Save the current pad in the given context block structure. =for apidoc m|SV *|CX_CURPAD_SV|struct context|PADOFFSET po -Access the SV at offset po in the saved current pad in the given +Access the SV at offset C in the saved current pad in the given context block structure (can be used as an lvalue). =cut @@ -412,12 +441,11 @@ Assumes the slot entry is a valid C lexical. =for apidoc m|STRLEN|PAD_COMPNAME_GEN|PADOFFSET po The generation number of the name at offset C in the current -compiling pad (lvalue). Note that C is hijacked for this purpose. +compiling pad (lvalue). =for apidoc m|STRLEN|PAD_COMPNAME_GEN_set|PADOFFSET po|int gen Sets the generation number of the name at offset C in the current -ling pad (lvalue) to C. Note that C is hijacked for this purpose. - +ling pad (lvalue) to C. =cut */ @@ -494,11 +522,5 @@ of a string/length pair. Perl_pad_findmy_pvn(aTHX_ STR_WITH_LEN(name), flags) /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */