By re-ordering declarations in interpvar.h and thrdvar.h, reduce the

size of the interpreter structure. (For LP64, from 3712 to 3584, for
ILP32, from 2288 to 2248).

p4raw-id: //depot/perl@31014

diff --git a/intrpvar.h b/intrpvar.h
index 55c5972..781de8f 100644 (file)
--- a/intrpvar.h
+++ b/intrpvar.h
@@ -17,7 +17,6 @@
  * When building without MULTIPLICITY, these variables will be truly global. */
 
 /* pseudo environmental stuff */
-PERLVAR(Iorigargc,     int)
 PERLVAR(Iorigargv,     char **)
 PERLVAR(Ienvgv,                GV *)
 PERLVAR(Iincgv,                GV *)
@@ -27,10 +26,11 @@ PERLVAR(Idiehook,   SV *)
 PERLVAR(Iwarnhook,     SV *)
 
 /* switches */
-PERLVAR(Iminus_c,      bool)
 PERLVAR(Ipatchlevel,   SV *)
 PERLVAR(Ilocalpatches, const char * const *)
 PERLVARI(Isplitstr,    const char *, " ")
+
+PERLVAR(Iminus_c,      bool)
 PERLVAR(Ipreprocess,   bool)
 PERLVAR(Iminus_n,      bool)
 PERLVAR(Iminus_p,      bool)
@@ -38,6 +38,7 @@ PERLVAR(Iminus_l,     bool)
 PERLVAR(Iminus_a,      bool)
 PERLVAR(Iminus_F,      bool)
 PERLVAR(Idoswitches,   bool)
+
 PERLVAR(Iminus_E,      bool)
 
 /*
@@ -54,6 +55,10 @@ PERLVAR(Idowarn,     U8)
 PERLVAR(Idoextract,    bool)
 PERLVAR(Isawampersand, bool)           /* must save all match strings */
 PERLVAR(Iunsafe,       bool)
+PERLVAR(Iexit_flags,   U8)             /* was exit() unexpected, etc. */
+PERLVAR(Isrand_called, bool)
+/* Part of internal state, but makes the 16th 1 byte variable in a row.  */
+PERLVAR(Itainting,     bool)           /* doing taint checks */
 PERLVAR(Iinplace,      char *)
 PERLVAR(Ie_script,     SV *)
 PERLVAR(Iperldb,       U32)
@@ -70,13 +75,15 @@ PERLVAR(Iformfeed,  SV *)           /* $^L */
 PERLVARI(Imaxsysfd,    I32,    MAXSYSFD)
                                        /* top fd to pass to subprocesses */
 PERLVAR(Istatusvalue,  I32)            /* $? */
-PERLVAR(Iexit_flags,   U8)             /* was exit() unexpected, etc. */
 #ifdef VMS
 PERLVAR(Istatusvalue_vms,U32)
 #else
 PERLVAR(Istatusvalue_posix,I32)
 #endif
 
+/* Moved here to give an even number of adjacent I32s/U32s/ints */
+PERLVAR(Iorigargc,     int)
+
 /* shortcuts to various I/O objects */
 PERLVAR(Istdingv,      GV *)
 PERLVAR(Istderrgv,     GV *)
@@ -138,20 +145,19 @@ PERLVAR(Iinitav,  AV *)           /* names of INIT subroutines */
 PERLVAR(Istrtab,       HV *)           /* shared string table */
 PERLVARI(Isub_generation,U32,1)                /* incr to invalidate method cache */
 
+/* funky return mechanisms */
+PERLVAR(Iforkprocess,  int)            /* so do_open |- can return proc# */
+
 /* memory management */
 PERLVAR(Isv_count,     I32)            /* how many SV* are currently allocated */
 PERLVAR(Isv_objcount,  I32)            /* how many objects are currently allocated */
 PERLVAR(Isv_root,      SV*)            /* storage for SVs belonging to interp */
 PERLVAR(Isv_arenaroot, SV*)            /* list of areas for garbage collection */
 
-/* funky return mechanisms */
-PERLVAR(Iforkprocess,  int)            /* so do_open |- can return proc# */
-
 /* subprocess state */
 PERLVAR(Ifdpid,                AV *)           /* keep fd-to-pid mappings for my_popen */
 
 /* internal state */
-PERLVAR(Itainting,     bool)           /* doing taint checks */
 PERLVARI(Iop_mask,     char *, NULL)   /* masked operations for safe evals */
 
 /* current interpreter roots */
@@ -166,12 +172,12 @@ PERLVARI(Icurcopdb,       COP *,  NULL)
 PERLVARI(Icopline,     line_t, NOLINE)
 
 /* statics moved here for shared library purposes */
+PERLVARI(Igensym,      I32,    0)      /* next symbol for getsym() to define */
 PERLVAR(Ifilemode,     int)            /* so nextargv() can preserve mode */
 PERLVAR(Ilastfd,       int)            /* what to preserve mode on */
 PERLVAR(Ioldname,      char *)         /* what to preserve mode on */
 PERLVAR(IArgv,         char **)        /* stuff to free from do_aexec, vfork safe */
 PERLVAR(ICmd,          char *)         /* stuff to free from do_aexec, vfork safe */
-PERLVARI(Igensym,      I32,    0)      /* next symbol for getsym() to define */
 PERLVAR(Ipreambleav,   AV *)
 PERLVARI(Ilaststatval, int,    -1)
 PERLVARI(Ilaststype,   I32,    OP_STAT)
@@ -218,11 +224,13 @@ PERLVAR(Isys_intern,      struct interp_intern)
 #endif
 
 /* more statics moved here */
-PERLVARI(Igeneration,  int,    100)    /* from op.c */
 PERLVAR(IDBcv,         CV *)           /* from perl.c */
+PERLVARI(Igeneration,  int,    100)    /* from op.c */
 
 PERLVARI(Iin_clean_objs,bool,    FALSE)        /* from sv.c */
 PERLVARI(Iin_clean_all,        bool,    FALSE) /* from sv.c */
+PERLVAR(Inomemok,      bool)           /* let malloc context handle nomem */
+PERLVARI(Isavebegin,     bool, FALSE)  /* save BEGINs for compiler     */
 
 PERLVAR(Ilinestart,    char *)         /* beg. of most recently read line */
 
@@ -230,16 +238,14 @@ PERLVAR(Iuid,             Uid_t)          /* current real user id */
 PERLVAR(Ieuid,         Uid_t)          /* current effective user id */
 PERLVAR(Igid,          Gid_t)          /* current real group id */
 PERLVAR(Iegid,         Gid_t)          /* current effective group id */
-PERLVAR(Inomemok,      bool)           /* let malloc context handle nomem */
 PERLVARI(Ian,          U32,    0)      /* malloc sequence number */
 PERLVARI(Icop_seqmax,  U32,    0)      /* statement sequence number */
 PERLVARI(Ievalseq,     U32,    0)      /* eval sequence number */
-PERLVAR(Iorigenviron,  char **)
 PERLVAR(Iorigalen,     U32)
+PERLVAR(Iorigenviron,  char **)
 #ifdef PERL_USES_PL_PIDSTATUS
 PERLVAR(Ipidstatus,    HV *)           /* pid-to-status mappings for waitpid */
 #endif
-PERLVARI(Imaxo,        int,    MAXO)           /* maximum number of ops */
 PERLVAR(Iosname,       char *)         /* operating system */
 
 PERLVAR(Isighandlerp,  Sighandler_t)
@@ -249,6 +255,8 @@ PERLVARA(Ibody_roots,       PERL_ARENA_ROOTS_SIZE, void*) /* array of body roots */
 PERLVAR(Inice_chunk,   char *)         /* a nice chunk of memory to reuse */
 PERLVAR(Inice_chunk_size,      U32)    /* how nice the chunk of memory is */
 
+PERLVARI(Imaxo,        int,    MAXO)           /* maximum number of ops */
+
 PERLVARI(Irunops,      runops_proc_t,  MEMBER_TO_FPTR(RUNOPS_DEFAULT))
 
 PERLVARA(Itokenbuf,256,        char)
@@ -324,22 +332,28 @@ PERLVAR(Idebug,           VOL U32)        /* flags given to -D switch */
 PERLVARI(Iamagic_generation,   long,   0)
 
 #ifdef USE_LOCALE_COLLATE
-PERLVARI(Icollation_ix,        U32,    0)      /* Collation generation index */
 PERLVAR(Icollation_name,char *)                /* Name of current collation */
-PERLVARI(Icollation_standard, bool,    TRUE)
-                                       /* Assume simple collation */
 PERLVAR(Icollxfrm_base,        Size_t)         /* Basic overhead in *xfrm() */
 PERLVARI(Icollxfrm_mult,Size_t,        2)      /* Expansion factor in *xfrm() */
+PERLVARI(Icollation_ix,        U32,    0)      /* Collation generation index */
+PERLVARI(Icollation_standard, bool,    TRUE)
+                                       /* Assume simple collation */
 #endif /* USE_LOCALE_COLLATE */
 
+
+#ifdef PERL_UTF8_CACHE_ASSERT
+PERLVARI(Iutf8cache, I8, -1)   /* Is the utf8 caching code enabled? */
+#else
+PERLVARI(Iutf8cache, I8, 1)    /* Is the utf8 caching code enabled? */
+#endif
+
 #ifdef USE_LOCALE_NUMERIC
 
-PERLVAR(Inumeric_name, char *)         /* Name of current numeric locale */
 PERLVARI(Inumeric_standard,    bool,   TRUE)
                                        /* Assume simple numerics */
 PERLVARI(Inumeric_local,       bool,   TRUE)
                                        /* Assume local numerics */
-
+PERLVAR(Inumeric_name, char *)         /* Name of current numeric locale */
 #endif /* !USE_LOCALE_NUMERIC */
 
 /* utf8 character classes */
@@ -362,15 +376,14 @@ PERLVAR(Iutf8_totitle,    SV *)
 PERLVAR(Iutf8_tolower, SV *)
 PERLVAR(Iutf8_tofold,  SV *)
 PERLVAR(Ilast_swash_hv,        HV *)
-PERLVAR(Ilast_swash_klen,      U32)
-PERLVARA(Ilast_swash_key,10,   U8)
 PERLVAR(Ilast_swash_tmps,      U8 *)
 PERLVAR(Ilast_swash_slen,      STRLEN)
+PERLVARI(Iglob_index,  int,    0)
+PERLVAR(Ilast_swash_klen,      U32)
+PERLVARA(Ilast_swash_key,10,   U8)
 
 PERLVAR(Iparser,       yy_parser *)    /* current parser state */
 
-PERLVARI(Iglob_index,  int,    0)
-PERLVAR(Isrand_called, bool)
 PERLVARA(Iuudmap,256,  char)
 PERLVAR(Ibitcount,     char *)
 
@@ -394,8 +407,6 @@ PERLVARI(Ibeginav_save, AV*, NULL)  /* save BEGIN{}s when compiling */
 
 PERLVAR(Ibody_arenas, void*) /* pointer to list of body-arenas */
 
-     /* 5.6.0 stopped here */
-
 PERLVAR(Ipsig_pend, int *)             /* per-signal "count" of pending */
 PERLVARI(Isig_pending, int,0)           /* Number if highest signal pending */
 
@@ -415,7 +426,6 @@ PERLVAR(Iregex_padav,   AV*)                /* All regex objects */
 PERLVAR(Ireentrant_buffer, REENTR*)    /* here we store the _r buffers */
 #endif
 
-PERLVARI(Isavebegin,     bool, FALSE)  /* save BEGINs for compiler     */
 
 #ifdef PERL_MAD
 PERLVARI(Imadskills,   bool, FALSE)    /* preserve all syntactic info */
@@ -436,7 +446,12 @@ PERLVARI(Iencoding,        SV*, NULL)              /* character encoding */
 
 PERLVAR(Idebug_pad,    struct perl_debug_pad)  /* always needed because of the re extension */
 
-PERLVAR(Itaint_warn, bool)      /* taint warns instead of dying */
+PERLVAR(Itaint_warn,   bool)      /* taint warns instead of dying */
+PERLVAR(Iutf8locale,   bool)           /* utf8 locale detected */
+PERLVARI(Ihash_seed_set, bool, FALSE)          /* Hash initialized? */
+PERLVARI(Irehash_seed_set, bool, FALSE)        /* 582 hash initialized? */
+
+PERLVARI(Icv_has_eval, I32, 0) /* PL_compcv includes an entereval or similar */
 
 #ifdef PL_OP_SLAB_ALLOC
 PERLVAR(IOpPtr,I32 **)
@@ -444,8 +459,6 @@ PERLVARI(IOpSpace,I32,0)
 PERLVAR(IOpSlab,I32 *)
 #endif
 
-PERLVAR(Iutf8locale,   bool)           /* utf8 locale detected */
-
 PERLVAR(Iutf8_idstart, SV *)
 PERLVAR(Iutf8_idcont,  SV *)
 
@@ -462,10 +475,10 @@ PERLVAR(Iunicode, U32)    /* Unicode features: $ENV{PERL_UNICODE} or -C */
 
 PERLVAR(Isignals, U32) /* Using which pre-5.8 signals */
 
-PERLVAR(Istashcache,   HV *)           /* Cache to speed up S_method_common */
-
 PERLVAR(Ireentrant_retint, int)        /* Integer return value from reentrant functions */
 
+PERLVAR(Istashcache,   HV *)           /* Cache to speed up S_method_common */
+
 /* Hooks to shared SVs and locks. */
 PERLVARI(Isharehook,   share_proc_t,   MEMBER_TO_FPTR(Perl_sv_nosharing))
 PERLVARI(Ilockhook,    share_proc_t,   MEMBER_TO_FPTR(Perl_sv_nosharing))
@@ -490,16 +503,10 @@ PERLVARI(Ippid,           IV,             0)
 
 PERLVARI(Ihash_seed, UV, 0)            /* Hash initializer */
 
-PERLVARI(Ihash_seed_set, bool, FALSE)          /* Hash initialized? */
-
 PERLVAR(IDBassertion,   SV *)
 
-PERLVARI(Icv_has_eval, I32, 0) /* PL_compcv includes an entereval or similar */
-
 PERLVARI(Irehash_seed, UV, 0)          /* 582 hash initializer */
 
-PERLVARI(Irehash_seed_set, bool, FALSE)        /* 582 hash initialized? */
-
 #ifdef DEBUG_LEAKING_SCALARS_FORK_DUMP
 /* File descriptor to talk to the child which dumps scalars.  */
 PERLVARI(Idumper_fd, int, -1)
@@ -518,12 +525,6 @@ PERLVARI(Imy_cxt_keys, const char **, NULL) /* per-module array of pointers to M
 PERLVAR(Imemory_debug_header, struct perl_memory_debug_header)
 #endif
 
-#ifdef PERL_UTF8_CACHE_ASSERT
-PERLVARI(Iutf8cache, I8, -1)   /* Is the utf8 caching code enabled? */
-#else
-PERLVARI(Iutf8cache, I8, 1)    /* Is the utf8 caching code enabled? */
-#endif
-
 #ifdef PERL_DEBUG_READONLY_OPS
 PERLVARI(Islabs, I32**, NULL)  /* Array of slabs that have been allocated */
 PERLVARI(Islab_count, U32, 0)  /* Size of the array */

diff --git a/thrdvar.h b/thrdvar.h
index 61298ed..02b023f 100644 (file)
--- a/thrdvar.h
+++ b/thrdvar.h
@@ -52,6 +52,7 @@ PERLVAR(Ttmps_stack,  SV **)          /* mortals we've made */
 PERLVARI(Ttmps_ix,     I32,    -1)
 PERLVARI(Ttmps_floor,  I32,    -1)
 PERLVAR(Ttmps_max,     I32)
+PERLVAR(Tmodcount,     I32)            /* how much mod()ification in assignment? */
 
 PERLVAR(Tmarkstack,    I32 *)          /* stack_sp locations we're remembering */
 PERLVAR(Tmarkstack_ptr,        I32 *)
@@ -85,7 +86,6 @@ PERLVAR(Ttimesbuf,    struct tms)
 #endif
 
 /* Fields used by magic variables such as $@, $/ and so on */
-PERLVAR(Ttainted,      bool)           /* using variables controlled by $< */
 PERLVAR(Tcurpm,                PMOP *)         /* what to do \ interps in REs from */
 
 /*
@@ -119,10 +119,8 @@ PERLVAR(Tcurstash, HV *)           /* symbol table for current package */
 
 PERLVAR(Trestartop,    OP *)           /* propagating an error from croak? */
 PERLVARI(Tcurcop,      COP * VOL,      &PL_compiling)
-PERLVAR(Tin_eval,      VOL U8) /* trap "fatal" errors? */
-PERLVAR(Tdelaymagic,   U16)            /* ($<,$>) = ... */
-PERLVARI(Tdirty,       bool, FALSE)    /* in the middle of tearing things down? */
 PERLVAR(Tlocalizing,   int)            /* are we processing a local() list? */
+PERLVAR(Tcolorset,     int)            /* from regcomp.c */
 
 PERLVAR(Tcurstack,     AV *)           /* THE STACK */
 PERLVAR(Tcurstackinfo, PERL_SI *)      /* current stack + context */
@@ -137,7 +135,6 @@ PERLVAR(Tav_fetch_sv,       SV *)           /* unused as of change #19268 */
 PERLVAR(Thv_fetch_sv,  SV *)           /* unused as of change #19268 */
 PERLVAR(Thv_fetch_ent_mh, HE*)         /* owned by hv_fetch_ent() */
 
-PERLVAR(Tmodcount,     I32)            /* how much mod()ification in assignment? */
 
 PERLVAR(Tlastgotoprobe,        OP*)            /* from pp_ctl.c */
 PERLVARI(Tdumpindent,  I32, 4)         /* # of blanks per dump indentation level */
@@ -156,17 +153,16 @@ PERLVAR(Tefloatsize,      STRLEN)
 
 PERLVAR(Tscreamfirst,  I32 *)
 PERLVAR(Tscreamnext,   I32 *)
-PERLVARI(Tmaxscream,   I32,    -1)
 PERLVAR(Tlastscream,   SV *)
 
 PERLVAR(Treg_state,    struct re_save_state)
 PERLVAR(Tregdummy,     regnode)        /* from regcomp.c */
-PERLVAR(Tcolorset,     int)            /* from regcomp.c */
 PERLVARA(Tcolors,6,    char *)         /* from regcomp.c */
 
 PERLVARI(Tpeepp,       peep_t, MEMBER_TO_FPTR(Perl_peep))
                                        /* Pointer to peephole optimizer */
 
+PERLVARI(Tmaxscream,   I32,    -1)
 PERLVARI(Treginterp_cnt,int,       0)  /* Whether "Regexp" was interpolated. */
 PERLVARI(Twatchaddr,   char **,    0)
 PERLVAR(Twatchok,      char *)
@@ -179,3 +175,8 @@ PERLVAR(Twatchok,   char *)
 
 PERLVARI(Tregmatch_slab,       regmatch_slab *, NULL)
 PERLVAR(Tregmatch_state,       regmatch_state *)
+
+PERLVAR(Tdelaymagic,   U16)            /* ($<,$>) = ... */
+PERLVARI(Tdirty,       bool, FALSE)    /* in the middle of tearing things down? */
+PERLVAR(Tin_eval,      VOL U8) /* trap "fatal" errors? */
+PERLVAR(Ttainted,      bool)           /* using variables controlled by $< */