cvs commit: ponie/perl gv.c perl.c sv.c sv.h universal.c util.c
[email protected] (Nicholas Clark) 1 May 2005 22:11:41 -0000
| Newsgroups | perl.ponie.changes |
|---|---|
| Message-ID | <[email protected]> |
cvsuser 05/05/01 15:11:41
Modified: perl gv.c perl.c sv.c sv.h universal.c util.c
Log:
SvREFCNT() is now an RVALUE, with set,++ and -- done via SvREFCNT_set() and
PMC calls.
Revision Changes Path
1.11 +1 -1 ponie/perl/gv.c
Index: gv.c
===================================================================
RCS file: /cvs/public/ponie/perl/gv.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gv.c 1 May 2005 18:34:07 -0000 1.10
+++ gv.c 1 May 2005 22:11:41 -0000 1.11
@@ -1180,7 +1180,7 @@
io = (IO*)NEWSV(0,0);
sv_upgrade((SV *)io,SVt_PVIO);
- SvREFCNT(io) = 1;
+ SvREFCNT_set(io, 1);
SvOBJECT_on(io);
/* Clear the stashcache because a new IO could overrule a
package name */
1.22 +8 -8 ponie/perl/perl.c
Index: perl.c
===================================================================
RCS file: /cvs/public/ponie/perl/perl.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- perl.c 30 Apr 2005 10:18:59 -0000 1.21
+++ perl.c 1 May 2005 22:11:41 -0000 1.22
@@ -312,7 +312,7 @@
PL_sv_undef_p = newSV(0);
SvREADONLY_on(&PL_sv_undef);
- SvREFCNT(&PL_sv_undef) = (~(U32)0)/2;
+ SvREFCNT_set(&PL_sv_undef, (~(U32)0)/2);
PL_sv_no_p = newSV(0);
sv_setpv(&PL_sv_no,PL_No);
@@ -321,18 +321,18 @@
SvIV(&PL_sv_no);
SvNV(&PL_sv_no);
SvREADONLY_on(&PL_sv_no);
- SvREFCNT(&PL_sv_no) = (~(U32)0)/2;
+ SvREFCNT_set(&PL_sv_no, (~(U32)0)/2);
PL_sv_yes_p = newSV(0);
sv_setpv(&PL_sv_yes,PL_Yes);
SvIV(&PL_sv_yes);
SvNV(&PL_sv_yes);
SvREADONLY_on(&PL_sv_yes);
- SvREFCNT(&PL_sv_yes) = (~(U32)0)/2;
+ SvREFCNT_set(&PL_sv_yes, (~(U32)0)/2);
PL_sv_placeholder_p = newSV(0);
SvREADONLY_on(&PL_sv_placeholder);
- SvREFCNT(&PL_sv_placeholder) = (~(U32)0)/2;
+ SvREFCNT_set(&PL_sv_placeholder, (~(U32)0)/2);
}
PL_sighandlerp = Perl_sighandler;
@@ -912,22 +912,22 @@
temp = PL_sv_placeholder_p;
PL_sv_placeholder_p = Nullsv;
- SvREFCNT(temp) = 1;
+ SvREFCNT_set(temp, 1);
sv_free(temp);
temp = PL_sv_yes_p;
PL_sv_yes_p = Nullsv;
- SvREFCNT(temp) = 1;
+ SvREFCNT_set(temp, 1);
sv_free(temp);
temp = PL_sv_no_p;
PL_sv_no_p = Nullsv;
- SvREFCNT(temp) = 1;
+ SvREFCNT_set(temp, 1);
sv_free(temp);
temp = PL_sv_undef_p;
PL_sv_undef_p = Nullsv;
- SvREFCNT(temp) = 1;
+ SvREFCNT_set(temp, 1);
sv_free(temp);
}
1.78 +21 -14 ponie/perl/sv.c
Index: sv.c
===================================================================
RCS file: /cvs/public/ponie/perl/sv.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- sv.c 1 May 2005 17:13:13 -0000 1.77
+++ sv.c 1 May 2005 22:11:41 -0000 1.78
@@ -189,7 +189,7 @@
++PL_sv_count;
UNLOCK_SV_MUTEX;
SvANY_set(sv, 0);
- SvREFCNT(sv) = 1;
+ SvREFCNT_set(sv, 1);
Parrot_PMC_set_intval_intkey(PL_Parrot,MUMBLE(sv),
Ponie_I_SV_ZERO_FLAGS_SET_TYPE, 0);
#ifdef DEBUG_LEAKING_SCALARS
@@ -4877,10 +4877,10 @@
SvMAGICAL_off(sv);
SvMAGIC_set(sv, 0);
}
- SvREFCNT(sv) = 0;
+ SvREFCNT_set(sv, 0);
sv_clear(sv);
assert(!SvREFCNT(sv));
- SvREFCNT(sv) = SvREFCNT(nsv);
+ SvREFCNT_set(sv, SvREFCNT(nsv));
SvFLAGS(sv) = SvFLAGS(nsv);
SvANY_set(sv, SvANY(nsv));
/* Because the SV data structure is rearranged */
@@ -4912,9 +4912,9 @@
SV_COW_NEXT_SV_SET(current, sv);
}
#endif
- SvREFCNT(sv) = refcnt;
+ SvREFCNT_set(sv, refcnt);
SvTYPE_set(nsv, SVTYPEMASK); /* Mark as freed */
- SvREFCNT(nsv) = 0;
+ SvREFCNT_set(nsv, 0);
del_SV(nsv);
}
@@ -4964,7 +4964,10 @@
LEAVE;
if(SvREFCNT(tmpref) < 2) {
/* tmpref is not kept alive! */
- SvREFCNT(sv)--;
+ /* SvREFCNT(sv)--; becomes: */
+ Parrot_PMC_set_intval_intkey(PL_Parrot, MUMBLE(sv),
+ Ponie_I_SV_REFCNT_INC,
+ -1);
SvRV_set(tmpref, NULL);
SvROK_off(tmpref);
}
@@ -5006,7 +5009,8 @@
Perl_sv_newref(pTHX_ SV *sv)
{
if (sv)
- (SvREFCNT(sv))++;
+ Parrot_PMC_set_intval_intkey(PL_Parrot, MUMBLE(sv),
+ Ponie_I_SV_REFCNT_INC, +1);
return sv;
}
@@ -5035,7 +5039,7 @@
return;
if (SvREADONLY(sv) && SvIMMORTAL(sv)) {
/* make sure SvREFCNT(sv)==0 happens very seldom */
- SvREFCNT(sv) = (~(U32)0)/2;
+ SvREFCNT_set(sv, (~(U32)0)/2);
return;
}
if (ckWARN_d(WARN_INTERNAL))
@@ -5044,7 +5048,10 @@
pTHX__FORMAT, PTR2UV(sv) pTHX__VALUE);
return;
}
- if (--(SvREFCNT(sv)) > 0)
+ /* --SvREFCNT(sv) becomes: */
+ Parrot_PMC_set_intval_intkey(PL_Parrot, MUMBLE(sv),
+ Ponie_I_SV_REFCNT_INC, -1);
+ if (SvREFCNT(sv) > 0)
return;
Perl_sv_free2(aTHX_ sv);
}
@@ -5063,7 +5070,7 @@
#endif
if (SvREADONLY(sv) && SvIMMORTAL(sv)) {
/* make sure SvREFCNT(sv)==0 happens very seldom */
- SvREFCNT(sv) = (~(U32)0)/2;
+ SvREFCNT_set(sv, (~(U32)0)/2);
return;
}
sv_clear(sv);
@@ -7421,14 +7428,14 @@
if (SvTYPE(rv) >= SVt_PVMG) {
U32 refcnt = SvREFCNT(rv);
- SvREFCNT(rv) = 0;
+ SvREFCNT_set(rv, 0);
/* FIXME. A downgrade upgrade. */
sv_clear(rv);
SvANY_set(rv, 0);
Parrot_PMC_set_pointer_intkey(PL_Parrot, MUMBLE(rv), Ponie_P_NEWRV_HACK,
0);
SvFLAGS(rv) = 0;
- SvREFCNT(rv) = refcnt;
+ SvREFCNT_set(rv, refcnt);
}
if (SvTYPE(rv) < SVt_RV)
@@ -7658,8 +7665,8 @@
= (SvFLAGS(new_mg) & SVTYPEMASK) | (temp & ~SVTYPEMASK);
temp = SvREFCNT(sv);
- SvREFCNT(sv) = SvREFCNT(new_mg);
- SvREFCNT(new_mg) = temp;
+ SvREFCNT_set(sv, SvREFCNT(new_mg));
+ SvREFCNT_set(new_mg, temp);
/* Swap the bodies */
1.81 +9 -4 ponie/perl/sv.h
Index: sv.h
===================================================================
RCS file: /cvs/public/ponie/perl/sv.h,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- sv.h 1 May 2005 21:00:48 -0000 1.80
+++ sv.h 1 May 2005 22:11:41 -0000 1.81
@@ -134,7 +134,9 @@
#define SvANY(sv) Parrot_PMC_get_pointer_intkey(PL_Parrot, MUMBLE(sv), Ponie_P_ANY)
#define SvANY_set(sv, p) Parrot_PMC_set_pointer_intkey(PL_Parrot, MUMBLE(sv), Ponie_P_ANY, p)
-#define SvREFCNT(sv) (*((U32 *)Parrot_PMC_get_pointer_intkey(PL_Parrot, MUMBLE(sv), Ponie_P_REFCNT)))
+#define SvREFCNT(sv) ((U32)Parrot_PMC_get_intval_intkey(PL_Parrot, MUMBLE(sv), Ponie_I_SV_REFCNT))
+#define SvREFCNT_set(sv, v) Parrot_PMC_set_intval_intkey(PL_Parrot, MUMBLE(sv), Ponie_I_SV_REFCNT, v)
+
#if defined(PERL_CORE) && defined(PERL_IN_SV_C)
/* sv.c will be replaced with PMC code to clone things etc, so little point
in re-working it to avoid all LVALUE accesses at this point. */
@@ -149,12 +151,13 @@
({ \
SV *_sv = (SV*)(sv); \
if (_sv) \
- (SvREFCNT(_sv))++; \
+ Parrot_PMC_set_intval_intkey(PL_Parrot, MUMBLE(_sv), \
+ Ponie_I_SV_REFCNT_INC, +1); \
_sv; \
})
#else
# define SvREFCNT_inc(sv) \
- ((PL_Sv=(SV*)(sv)), (PL_Sv && ++(SvREFCNT(PL_Sv))), (SV*)PL_Sv)
+ ((PL_Sv=(SV*)(sv)), (PL_Sv && Parrot_PMC_set_intval_intkey(PL_Parrot, MUMBLE(PL_Sv), Ponie_I_SV_REFCNT_INC, +1)), (SV*)PL_Sv)
#endif
#if defined(__GNUC__) && !defined(__STRICT_ANSI__) && !defined(PERL_GCC_PEDANTIC)
@@ -163,7 +166,9 @@
SV *_sv = (SV*)(sv); \
if (_sv) { \
if (SvREFCNT(_sv)) { \
- if (--(SvREFCNT(_sv)) == 0) \
+ Parrot_PMC_set_intval_intkey(PL_Parrot, MUMBLE(_sv), \
+ Ponie_I_SV_REFCNT_INC, -1); \
+ if ((SvREFCNT(_sv)) == 0) \
Perl_sv_free2(aTHX_ _sv); \
} else { \
sv_free(_sv); \
1.2 +127 -78 ponie/perl/universal.c
Index: universal.c
===================================================================
RCS file: /cvs/public/ponie/perl/universal.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- universal.c 9 Sep 2003 11:58:56 -0000 1.1
+++ universal.c 1 May 2005 22:11:41 -0000 1.2
@@ -1,7 +1,7 @@
/* universal.c
*
- * Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
- * by Larry Wall and others
+ * Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+ * 2005, 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.
@@ -14,6 +14,10 @@
* beginning." --Gandalf, relating Gollum's story
*/
+/* This file contains the code that implements the functions in Perl's
+ * UNIVERSAL package, such as UNIVERSAL->can().
+ */
+
#include "EXTERN.h"
#define PERL_IN_UNIVERSAL_C
#include "perl.h"
@@ -133,7 +137,7 @@
bool
Perl_sv_derived_from(pTHX_ SV *sv, const char *name)
{
- char *type;
+ const char *type;
HV *stash;
HV *name_stash;
@@ -174,6 +178,7 @@
XS(XS_version_boolean);
XS(XS_version_noop);
XS(XS_version_is_alpha);
+XS(XS_version_qv);
XS(XS_utf8_is_utf8);
XS(XS_utf8_valid);
XS(XS_utf8_encode);
@@ -188,11 +193,13 @@
XS(XS_PerlIO_get_layers);
XS(XS_Regexp_DESTROY);
XS(XS_Internals_hash_seed);
+XS(XS_Internals_rehash_seed);
+XS(XS_Internals_HvREHASH);
void
Perl_boot_core_UNIVERSAL(pTHX)
{
- char *file = __FILE__;
+ const char file[] = __FILE__;
newXS("UNIVERSAL::isa", XS_UNIVERSAL_isa, file);
newXS("UNIVERSAL::can", XS_UNIVERSAL_can, file);
@@ -215,6 +222,7 @@
newXS("version::(nomethod", XS_version_noop, file);
newXS("version::noop", XS_version_noop, file);
newXS("version::is_alpha", XS_version_is_alpha, file);
+ newXS("version::qv", XS_version_qv, file);
}
newXS("utf8::is_utf8", XS_utf8_is_utf8, file);
newXS("utf8::valid", XS_utf8_valid, file);
@@ -232,6 +240,8 @@
XS_PerlIO_get_layers, file, "*;@");
newXS("Regexp::DESTROY", XS_Regexp_DESTROY, file);
newXSproto("Internals::hash_seed",XS_Internals_hash_seed, file, "");
+ newXSproto("Internals::rehash_seed",XS_Internals_rehash_seed, file, "");
+ newXSproto("Internals::HvREHASH", XS_Internals_HvREHASH, file, "\\%");
}
@@ -310,7 +320,7 @@
GV **gvp;
GV *gv;
SV *sv;
- char *undef;
+ const char *undef;
if (SvROK(ST(0))) {
sv = (SV*)SvRV(ST(0));
@@ -328,6 +338,8 @@
SV *nsv = sv_newmortal();
sv_setsv(nsv, sv);
sv = nsv;
+ if ( !sv_derived_from(sv, "version"))
+ upg_version(sv);
undef = Nullch;
}
else {
@@ -345,26 +357,33 @@
"%s does not define $%s::VERSION--version check failed",
HvNAME(pkg), HvNAME(pkg));
else {
- char *str = SvPVx(ST(0), len);
+ const char *str = SvPVx(ST(0), len);
Perl_croak(aTHX_
"%s defines neither package nor VERSION--version check failed", str);
}
}
- if ( !sv_derived_from(sv, "version"))
- sv = new_version(sv);
- if ( !sv_derived_from(req, "version"))
- req = new_version(req);
-
- if ( vcmp( SvRV(req), SvRV(sv) ) > 0 )
- Perl_croak(aTHX_
- "%s version %"SVf" required--this is only version %"SVf,
- HvNAME(pkg), req, sv);
+ if ( !sv_derived_from(req, "version")) {
+ /* req may very well be R/O, so create a new object */
+ SV *nsv = sv_newmortal();
+ sv_setsv(nsv, req);
+ req = nsv;
+ upg_version(req);
+ }
+
+ if ( vcmp( req, sv ) > 0 )
+ Perl_croak(aTHX_ "%s version %"SVf" (%"SVf") required--"
+ "this is only version %"SVf" (%"SVf")", HvNAME(pkg),
+ vnumify(req),vnormal(req),vnumify(sv),vnormal(sv));
+ }
+
+ if ( SvOK(sv) && sv_derived_from(sv, "version") ) {
+ ST(0) = vnumify(sv);
+ } else {
+ ST(0) = sv;
}
- ST(0) = sv;
-
XSRETURN(1);
}
@@ -375,15 +394,20 @@
Perl_croak(aTHX_ "Usage: version::new(class, version)");
SP -= items;
{
-/* char * class = (char *)SvPV_nolen(ST(0)); */
- SV *version = ST(1);
+ const char *class = SvPV_nolen(ST(0));
+ SV *vs = ST(1);
+ SV *rv;
if (items == 3 )
{
- char *vs = savepvn(SvPVX(ST(2)),SvCUR(ST(2)));
- version = Perl_newSVpvf(aTHX_ "v%s",vs);
+ vs = sv_newmortal();
+ Perl_sv_setpvf(aTHX_ vs,"v%s",SvPV_nolen(ST(2)));
}
- PUSHs(new_version(version));
+ rv = new_version(vs);
+ if ( strcmp(class,"version") != 0 ) /* inherited new() */
+ sv_bless(rv, gv_stashpv(class,TRUE));
+
+ PUSHs(sv_2mortal(rv));
PUTBACK;
return;
}
@@ -405,9 +429,7 @@
else
Perl_croak(aTHX_ "lobj is not of type version");
- {
- PUSHs(vstringify(lobj));
- }
+ PUSHs(sv_2mortal(vstringify(lobj)));
PUTBACK;
return;
@@ -430,9 +452,7 @@
else
Perl_croak(aTHX_ "lobj is not of type version");
- {
- PUSHs(vnumify(lobj));
- }
+ PUSHs(sv_2mortal(vnumify(lobj)));
PUTBACK;
return;
@@ -476,7 +496,7 @@
rs = newSViv(vcmp(lobj,rvs));
}
- PUSHs(rs);
+ PUSHs(sv_2mortal(rs));
}
PUTBACK;
@@ -503,7 +523,7 @@
{
SV *rs;
rs = newSViv( vcmp(lobj,new_version(newSVpvn("0",1))) );
- PUSHs(rs);
+ PUSHs(sv_2mortal(rs));
}
PUTBACK;
@@ -562,6 +582,43 @@
}
}
+XS(XS_version_qv)
+{
+ dXSARGS;
+ if (items != 1)
+ Perl_croak(aTHX_ "Usage: version::qv(ver)");
+ SP -= items;
+ {
+ SV * ver = ST(0);
+ if ( !SvVOK(ver) ) /* only need to do with if not already v-string */
+ {
+ SV *vs = sv_newmortal();
+ char *version;
+ if ( SvNOK(ver) ) /* may get too much accuracy */
+ {
+ char tbuf[64];
+ sprintf(tbuf,"%.9"NVgf, SvNVX(ver));
+ version = savepv(tbuf);
+ }
+ else
+ {
+ version = savesvpv(ver);
+ }
+ (void)scan_version(version,vs,TRUE);
+ Safefree(version);
+
+ PUSHs(vs);
+ }
+ else
+ {
+ PUSHs(sv_2mortal(new_version(ver)));
+ }
+
+ PUTBACK;
+ return;
+ }
+}
+
XS(XS_utf8_is_utf8)
{
dXSARGS;
@@ -721,60 +778,20 @@
if (items == 1)
XSRETURN_IV(SvREFCNT(sv) - 1); /* Minus the ref created for us. */
else if (items == 2) {
- /* I hope you really know what you are doing. */
- SvREFCNT(sv) = SvIV(ST(1));
- XSRETURN_IV(SvREFCNT(sv));
+ /* I hope you really know what you are doing. */
+ SvREFCNT_set(sv, SvIV(ST(1)));
+ XSRETURN_IV(SvREFCNT(sv));
}
XSRETURN_UNDEF; /* Can't happen. */
}
-/* Maybe this should return the number of placeholders found in scalar context,
- and a list of them in list context. */
XS(XS_Internals_hv_clear_placehold)
{
dXSARGS;
HV *hv = (HV *) SvRV(ST(0));
-
- /* I don't care how many parameters were passed in, but I want to avoid
- the unused variable warning. */
-
- items = (I32)HvPLACEHOLDERS(hv);
-
- if (items) {
- HE *entry;
- I32 riter = HvRITER(hv);
- HE *eiter = HvEITER(hv);
- hv_iterinit(hv);
- /* This may look suboptimal with the items *after* the iternext, but
- it's quite deliberate. We only get here with items==0 if we've
- just deleted the last placeholder in the hash. If we've just done
- that then it means that the hash is in lazy delete mode, and the
- HE is now only referenced in our iterator. If we just quit the loop
- and discarded our iterator then the HE leaks. So we do the && the
- other way to ensure iternext is called just one more time, which
- has the side effect of triggering the lazy delete. */
- while ((entry = hv_iternext_flags(hv, HV_ITERNEXT_WANTPLACEHOLDERS))
- && items) {
- SV *val = hv_iterval(hv, entry);
-
- if (val == &PL_sv_placeholder) {
-
- /* It seems that I have to go back in the front of the hash
- API to delete a hash, even though I have a HE structure
- pointing to the very entry I want to delete, and could hold
- onto the previous HE that points to it. And it's easier to
- go in with SVs as I can then specify the precomputed hash,
- and don't have fun and games with utf8 keys. */
- SV *key = hv_iterkeysv(entry);
-
- hv_delete_ent (hv, key, G_DISCARD, HeHASH(entry));
- items--;
- }
- }
- HvRITER(hv) = riter;
- HvEITER(hv) = eiter;
- }
-
+ if (items != 1)
+ Perl_croak(aTHX_ "Usage: UNIVERSAL::hv_clear_placeholders(hv)");
+ hv_clear_placeholders(hv);
XSRETURN(0);
}
@@ -842,7 +859,7 @@
if (SvROK(sv) && isGV(SvRV(sv)))
gv = (GV*)SvRV(sv);
else
- gv = gv_fetchpv(SvPVX(sv), FALSE, SVt_PVIO);
+ gv = gv_fetchsv(sv, FALSE, SVt_PVIO);
}
if (gv && (io = GvIO(gv))) {
@@ -913,6 +930,38 @@
/* Using dXSARGS would also have dITEM and dSP,
* which define 2 unused local variables. */
dMARK; dAX;
- XSRETURN_UV(PL_hash_seed);
+ XSRETURN_UV(PERL_HASH_SEED);
+}
+
+XS(XS_Internals_rehash_seed)
+{
+ /* Using dXSARGS would also have dITEM and dSP,
+ * which define 2 unused local variables. */
+ dMARK; dAX;
+ XSRETURN_UV(PL_rehash_seed);
}
+XS(XS_Internals_HvREHASH) /* Subject to change */
+{
+ dXSARGS;
+ if (SvROK(ST(0))) {
+ HV *hv = (HV *) SvRV(ST(0));
+ if (items == 1 && SvTYPE(hv) == SVt_PVHV) {
+ if (HvREHASH(hv))
+ XSRETURN_YES;
+ else
+ XSRETURN_NO;
+ }
+ }
+ Perl_croak(aTHX_ "Internals::HvREHASH $hashref");
+}
+
+/*
+ * Local variables:
+ * c-indentation-style: bsd
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ *
+ * vim: shiftwidth=4:
+*/
1.14 +1 -1 ponie/perl/util.c
Index: util.c
===================================================================
RCS file: /cvs/public/ponie/perl/util.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- util.c 1 May 2005 08:36:41 -0000 1.13
+++ util.c 1 May 2005 22:11:41 -0000 1.14
@@ -876,7 +876,7 @@
Parrot_PMC_set_intval_intkey(PL_Parrot,MUMBLE(sv),
Ponie_I_SV_ZERO_FLAGS_SET_TYPE, SVt_PVMG);
SvANY_set(sv, any);
- SvREFCNT(sv) = 1 << 30; /* practically infinite */
+ SvREFCNT_set(sv, 1 << 30); /* practically infinite */
PL_mess_sv = sv;
return sv;
}