Change 27380 by [EMAIL PROTECTED] on 2006/03/05 18:13:42

        Move the GvNAME HEK into the IV union - every GV is now 1 pointer
        smaller.

Affected files ...

... //depot/perl/av.h#37 edit
... //depot/perl/cv.h#64 edit
... //depot/perl/gv.c#309 edit
... //depot/perl/gv.h#61 edit
... //depot/perl/hv.h#87 edit
... //depot/perl/sv.h#266 edit

Differences ...

==== //depot/perl/av.h#37 (text) ====
Index: perl/av.h
--- perl/av.h#36~27326~ 2006-02-25 07:38:25.000000000 -0800
+++ perl/av.h   2006-03-05 10:13:42.000000000 -0800
@@ -19,6 +19,8 @@
        IV      xivu_iv;        /* integer value or pv offset */
        UV      xivu_uv;
        void *  xivu_p1;
+       I32     xivu_i32;
+       HEK *   xivu_namehek;
     }          xiv_u;
     union {
        MAGIC*  xmg_magic;      /* linked list of magicalness */
@@ -37,6 +39,8 @@
        IV      xivu_iv;        /* integer value or pv offset */
        UV      xivu_uv;
        void *  xivu_p1;
+       I32     xivu_i32;
+       HEK *   xivu_namehek;
     }          xiv_u;
     union {
        MAGIC*  xmg_magic;      /* linked list of magicalness */

==== //depot/perl/cv.h#64 (text) ====
Index: perl/cv.h
--- perl/cv.h#63~27326~ 2006-02-25 07:38:25.000000000 -0800
+++ perl/cv.h   2006-03-05 10:13:42.000000000 -0800
@@ -22,6 +22,7 @@
        UV      xivu_uv;
        void *  xivu_p1;
        I32     xivu_i32;       /* depth, >= 2 indicates recursive call */
+       HEK *   xivu_namehek;
     }          xiv_u;
     union {
        MAGIC*  xmg_magic;      /* linked list of magicalness */
@@ -56,6 +57,7 @@
        UV      xivu_uv;
        void *  xivu_p1;
        I32     xivu_i32;       /* depth, >= 2 indicates recursive call */
+       HEK *   xivu_namehek;
     }          xiv_u;
     union {
        MAGIC*  xmg_magic;      /* linked list of magicalness */

==== //depot/perl/gv.c#309 (text) ====
Index: perl/gv.c
--- perl/gv.c#308~27379~        2006-03-05 09:47:23.000000000 -0800
+++ perl/gv.c   2006-03-05 10:13:42.000000000 -0800
@@ -2115,7 +2115,7 @@
        Perl_croak(aTHX_ "panic: gv name too long (%"UVuf")", (UV) len);
 
     PERL_HASH(hash, name, len);
-    GvXPVGV(gv)->xgv_namehek = name ? share_hek(name, len, hash) : 0;
+    GvNAME_HEK(gv) = name ? share_hek(name, len, hash) : 0;
 }
 
 /*

==== //depot/perl/gv.h#61 (text) ====
Index: perl/gv.h
--- perl/gv.h#60~27379~ 2006-03-05 09:47:23.000000000 -0800
+++ perl/gv.h   2006-03-05 10:13:42.000000000 -0800
@@ -47,7 +47,7 @@
        (*({ GV * const zzzz = (GV *) (gv);                             \
           assert(isGV_with_GP(zzzz));                                  \
           assert(SvTYPE(zzzz) == SVt_PVGV || SvTYPE(zzzz) >= SVt_PVLV); \
-          &(GvXPVGV(zzzz)->xgv_namehek);                               \
+          &(GvXPVGV(zzzz)->xiv_u.xivu_namehek);                        \
         }))
 #else
 #  define GvGP(gv)     ((gv)->sv_u.svu_gp)

==== //depot/perl/hv.h#87 (text) ====
Index: perl/hv.h
--- perl/hv.h#86~27326~ 2006-02-25 07:38:25.000000000 -0800
+++ perl/hv.h   2006-03-05 10:13:42.000000000 -0800
@@ -59,6 +59,8 @@
        IV      xivu_iv;        /* integer value or pv offset */
        UV      xivu_uv;
        void *  xivu_p1;
+       I32     xivu_i32;
+       HEK *   xivu_namehek;
     }          xiv_u;
     union {
        MAGIC*  xmg_magic;      /* linked list of magicalness */
@@ -79,6 +81,8 @@
        IV      xivu_iv;        /* integer value or pv offset */
        UV      xivu_uv;
        void *  xivu_p1;
+       I32     xivu_i32;
+       HEK *   xivu_namehek;
     }          xiv_u;
     union {
        MAGIC*  xmg_magic;      /* linked list of magicalness */

==== //depot/perl/sv.h#266 (text) ====
Index: perl/sv.h
--- perl/sv.h#265~27379~        2006-03-05 09:47:23.000000000 -0800
+++ perl/sv.h   2006-03-05 10:13:42.000000000 -0800
@@ -395,6 +395,7 @@
        UV      xivu_uv;
        void *  xivu_p1;
        I32     xivu_i32;
+       HEK *   xivu_namehek;
     }          xiv_u;
 };
 
@@ -409,6 +410,7 @@
        UV      xivu_uv;
        void *  xivu_p1;
        I32     xivu_i32;
+       HEK *   xivu_namehek;
     }          xiv_u;
 } xpviv_allocated;
 #endif
@@ -426,6 +428,7 @@
        IV      xuvu_iv;
        UV      xuvu_uv;        /* unsigned value or pv offset */
        void *  xuvu_p1;
+       HEK *   xivu_namehek;
     }          xuv_u;
 };
 
@@ -443,6 +446,7 @@
        UV      xivu_uv;
        void *  xivu_p1;
        I32     xivu_i32;
+       HEK *   xivu_namehek;
     }          xiv_u;
 };
 
@@ -459,6 +463,7 @@
        UV      xivu_uv;
        void *  xivu_p1;
        I32     xivu_i32;
+       HEK *   xivu_namehek;
     }          xiv_u;
     union {
        MAGIC*  xmg_magic;      /* linked list of magicalness */
@@ -479,6 +484,7 @@
        UV      xivu_uv;
        void *  xivu_p1;
        I32     xivu_i32;
+       HEK *   xivu_namehek;   /* GvNAME */
     }          xiv_u;
     union {
        MAGIC*  xmg_magic;      /* linked list of magicalness */
@@ -486,9 +492,6 @@
     } xmg_u;
     HV*                xmg_stash;      /* class package */
 
-    /* a full glob fits into this */
-    HEK *      xgv_namehek;
-
     STRLEN     xlv_targoff;
     STRLEN     xlv_targlen;
     SV*                xlv_targ;
@@ -504,10 +507,11 @@
     STRLEN     xpv_cur;        /* xgv_flags */
     STRLEN     xpv_len;        /* 0 */
     union {
-       IV      xivu_iv;        /* integer value or pv offset */
+       IV      xivu_iv;
        UV      xivu_uv;
        void *  xivu_p1;
        I32     xivu_i32;
+       HEK *   xivu_namehek;   /* GvNAME */
     }          xiv_u;
     union {
        MAGIC*  xmg_magic;      /* linked list of magicalness */
@@ -515,7 +519,6 @@
     } xmg_u;
     HV*                xmg_stash;      /* class package */
 
-    HEK *      xgv_namehek;
 };
 
 struct xpvbm {
@@ -530,6 +533,7 @@
        UV      xivu_uv;
        void *  xivu_p1;
        I32     xivu_i32;
+       HEK *   xivu_namehek;
     }          xiv_u;
     union {
        MAGIC*  xmg_magic;      /* linked list of magicalness */
@@ -558,6 +562,7 @@
        UV      xivu_uv;
        void *  xivu_p1;
        I32     xivu_i32;
+       HEK *   xivu_namehek;
     }          xiv_u;
     union {
        MAGIC*  xmg_magic;      /* linked list of magicalness */
@@ -593,6 +598,7 @@
        UV      xivu_uv;
        void *  xivu_p1;
        I32     xivu_i32;
+       HEK *   xivu_namehek;
     }          xiv_u;
     union {
        MAGIC*  xmg_magic;      /* linked list of magicalness */
@@ -632,6 +638,7 @@
        UV      xivu_uv;
        void *  xivu_p1;
        I32     xivu_i32;
+       HEK *   xivu_namehek;
     }          xiv_u;
     union {
        MAGIC*  xmg_magic;      /* linked list of magicalness */
End of Patch.

Reply via email to