X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=ext%2FB%2FB.xs;h=f9c8647b963a6bc408869c4187f89615a196866f;hb=00baac8f3bcc04befcd869d03d8fa7c580011507;hp=9b7fa9d683c6fdf2bd2a3ec5c6bfba42f56d77d5;hpb=bde7177df8a653ca87ecd91ccbb107a8a43388c7;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/ext/B/B.xs b/ext/B/B.xs
index 9b7fa9d..f9c8647 100644
--- a/ext/B/B.xs
+++ b/ext/B/B.xs
@@ -19,7 +19,7 @@ typedef FILE * InputStream;
 #endif
 
 
-static char *svclassnames[] = {
+static const char* const svclassnames[] = {
     "B::NULL",
     "B::IV",
     "B::NV",
@@ -29,11 +29,16 @@ static char *svclassnames[] = {
     "B::PVNV",
     "B::PVMG",
     "B::BM",
+#if PERL_VERSION >= 9
+    "B::GV",
+#endif
     "B::PVLV",
     "B::AV",
     "B::HV",
     "B::CV",
+#if PERL_VERSION <= 8
     "B::GV",
+#endif
     "B::FM",
     "B::IO",
 };
@@ -49,12 +54,11 @@ typedef enum {
     OPc_SVOP,	/* 7 */
     OPc_PADOP,	/* 8 */
     OPc_PVOP,	/* 9 */
-    OPc_CVOP,	/* 10 */
-    OPc_LOOP,	/* 11 */
-    OPc_COP	/* 12 */
+    OPc_LOOP,	/* 10 */
+    OPc_COP	/* 11 */
 } opclass;
 
-static char *opclassnames[] = {
+static const char* const opclassnames[] = {
     "B::NULL",
     "B::OP",
     "B::UNOP",
@@ -65,11 +69,25 @@ static char *opclassnames[] = {
     "B::SVOP",
     "B::PADOP",
     "B::PVOP",
-    "B::CVOP",
     "B::LOOP",
     "B::COP"	
 };
 
+static const size_t opsizes[] = {
+    0,	
+    sizeof(OP),
+    sizeof(UNOP),
+    sizeof(BINOP),
+    sizeof(LOGOP),
+    sizeof(LISTOP),
+    sizeof(PMOP),
+    sizeof(SVOP),
+    sizeof(PADOP),
+    sizeof(PVOP),
+    sizeof(LOOP),
+    sizeof(COP)	
+};
+
 #define MY_CXT_KEY "B::_guts" XS_VERSION
 
 typedef struct {
@@ -83,7 +101,7 @@ START_MY_CXT
 #define specialsv_list		(MY_CXT.x_specialsv_list)
 
 static opclass
-cc_opclass(pTHX_ OP *o)
+cc_opclass(pTHX_ const OP *o)
 {
     if (!o)
 	return OPc_NULL;
@@ -95,7 +113,8 @@ cc_opclass(pTHX_ OP *o)
 	return ((o->op_private & OPpASSIGN_BACKWARDS) ? OPc_UNOP : OPc_BINOP);
 
 #ifdef USE_ITHREADS
-    if (o->op_type == OP_GV || o->op_type == OP_GVSV || o->op_type == OP_AELEMFAST)
+    if (o->op_type == OP_GV || o->op_type == OP_GVSV ||
+	o->op_type == OP_AELEMFAST || o->op_type == OP_RCATLINE)
 	return OPc_PADOP;
 #endif
 
@@ -190,15 +209,15 @@ cc_opclass(pTHX_ OP *o)
 }
 
 static char *
-cc_opclassname(pTHX_ OP *o)
+cc_opclassname(pTHX_ const OP *o)
 {
-    return opclassnames[cc_opclass(aTHX_ o)];
+    return (char *)opclassnames[cc_opclass(aTHX_ o)];
 }
 
 static SV *
 make_sv_object(pTHX_ SV *arg, SV *sv)
 {
-    char *type = 0;
+    const char *type = 0;
     IV iv;
     dMY_CXT;
     
@@ -224,19 +243,44 @@ make_mg_object(pTHX_ SV *arg, MAGIC *mg)
 }
 
 static SV *
-cstring(pTHX_ SV *sv)
+cstring(pTHX_ SV *sv, bool perlstyle)
 {
     SV *sstr = newSVpvn("", 0);
-    STRLEN len;
-    char *s;
-    char escbuff[5]; /* to fit backslash, 3 octals + trailing \0 */
 
     if (!SvOK(sv))
 	sv_setpvn(sstr, "0", 1);
+    else if (perlstyle && SvUTF8(sv)) {
+	SV *tmpsv = sv_newmortal(); /* Temporary SV to feed sv_uni_display */
+	const STRLEN len = SvCUR(sv);
+	const char *s = sv_uni_display(tmpsv, sv, 8*len, UNI_DISPLAY_QQ);
+	sv_setpvn(sstr,"\"",1);
+	while (*s)
+	{
+	    if (*s == '"')
+		sv_catpvn(sstr, "\\\"", 2);
+	    else if (*s == '$')
+		sv_catpvn(sstr, "\\$", 2);
+	    else if (*s == '@')
+		sv_catpvn(sstr, "\\@", 2);
+	    else if (*s == '\\')
+	    {
+		if (strchr("nrftax\\",*(s+1)))
+		    sv_catpvn(sstr, s++, 2);
+		else
+		    sv_catpvn(sstr, "\\\\", 2);
+	    }
+	    else /* should always be printable */
+		sv_catpvn(sstr, s, 1);
+	    ++s;
+	}
+	sv_catpv(sstr, "\"");
+	return sstr;
+    }
     else
     {
 	/* XXX Optimise? */
-	s = SvPV(sv, len);
+	STRLEN len;
+	const char *s = SvPV(sv, len);
 	sv_catpv(sstr, "\"");
 	for (; len; len--, s++)
 	{
@@ -246,12 +290,20 @@ cstring(pTHX_ SV *sv)
 	    else if (*s == '\\')
 		sv_catpv(sstr, "\\\\");
             /* trigraphs - bleagh */
-            else if (*s == '?' && len>=3 && s[1] == '?')
-            {
+            else if (!perlstyle && *s == '?' && len>=3 && s[1] == '?') {
+		char escbuff[5]; /* to fit backslash, 3 octals + trailing \0 */
                 sprintf(escbuff, "\\%03o", '?');
                 sv_catpv(sstr, escbuff);
             }
-	    else if (*s >= ' ' && *s < 127) /* XXX not portable */
+	    else if (perlstyle && *s == '$')
+		sv_catpv(sstr, "\\$");
+	    else if (perlstyle && *s == '@')
+		sv_catpv(sstr, "\\@");
+#ifdef EBCDIC
+	    else if (isPRINT(*s))
+#else
+	    else if (*s >= ' ' && *s < 127)
+#endif /* EBCDIC */
 		sv_catpvn(sstr, s, 1);
 	    else if (*s == '\n')
 		sv_catpv(sstr, "\\n");
@@ -265,12 +317,13 @@ cstring(pTHX_ SV *sv)
 		sv_catpv(sstr, "\\b");
 	    else if (*s == '\f')
 		sv_catpv(sstr, "\\f");
-	    else if (*s == '\v')
+	    else if (!perlstyle && *s == '\v')
 		sv_catpv(sstr, "\\v");
 	    else
 	    {
 		/* Don't want promotion of a signed -1 char in sprintf args */
-		unsigned char c = (unsigned char) *s;
+		char escbuff[5]; /* to fit backslash, 3 octals + trailing \0 */
+		const unsigned char c = (unsigned char) *s;
 		sprintf(escbuff, "\\%03o", c);
 		sv_catpv(sstr, escbuff);
 	    }
@@ -285,29 +338,32 @@ static SV *
 cchar(pTHX_ SV *sv)
 {
     SV *sstr = newSVpvn("'", 1);
-    STRLEN n_a;
-    char *s = SvPV(sv, n_a);
+    const char *s = SvPV_nolen(sv);
 
     if (*s == '\'')
-	sv_catpv(sstr, "\\'");
+	sv_catpvn(sstr, "\\'", 2);
     else if (*s == '\\')
-	sv_catpv(sstr, "\\\\");
-    else if (*s >= ' ' && *s < 127) /* XXX not portable */
+	sv_catpvn(sstr, "\\\\", 2);
+#ifdef EBCDIC
+    else if (isPRINT(*s))
+#else
+    else if (*s >= ' ' && *s < 127)
+#endif /* EBCDIC */
 	sv_catpvn(sstr, s, 1);
     else if (*s == '\n')
-	sv_catpv(sstr, "\\n");
+	sv_catpvn(sstr, "\\n", 2);
     else if (*s == '\r')
-	sv_catpv(sstr, "\\r");
+	sv_catpvn(sstr, "\\r", 2);
     else if (*s == '\t')
-	sv_catpv(sstr, "\\t");
+	sv_catpvn(sstr, "\\t", 2);
     else if (*s == '\a')
-	sv_catpv(sstr, "\\a");
+	sv_catpvn(sstr, "\\a", 2);
     else if (*s == '\b')
-	sv_catpv(sstr, "\\b");
+	sv_catpvn(sstr, "\\b", 2);
     else if (*s == '\f')
-	sv_catpv(sstr, "\\f");
+	sv_catpvn(sstr, "\\f", 2);
     else if (*s == '\v')
-	sv_catpv(sstr, "\\v");
+	sv_catpvn(sstr, "\\v", 2);
     else
     {
 	/* no trigraph support */
@@ -317,15 +373,15 @@ cchar(pTHX_ SV *sv)
 	sprintf(escbuff, "\\%03o", c);
 	sv_catpv(sstr, escbuff);
     }
-    sv_catpv(sstr, "'");
+    sv_catpvn(sstr, "'", 1);
     return sstr;
 }
 
-void
-walkoptree(pTHX_ SV *opsv, char *method)
+static void
+walkoptree(pTHX_ SV *opsv, const char *method)
 {
     dSP;
-    OP *o;
+    OP *o, *kid;
     dMY_CXT;
 
     if (!SvROK(opsv))
@@ -343,13 +399,62 @@ walkoptree(pTHX_ SV *opsv, char *method)
     PUTBACK;
     perl_call_method(method, G_DISCARD);
     if (o && (o->op_flags & OPf_KIDS)) {
-	OP *kid;
 	for (kid = ((UNOP*)o)->op_first; kid; kid = kid->op_sibling) {
 	    /* Use the same opsv. Rely on methods not to mess it up. */
 	    sv_setiv(newSVrv(opsv, cc_opclassname(aTHX_ kid)), PTR2IV(kid));
 	    walkoptree(aTHX_ opsv, method);
 	}
     }
+    if (o && (cc_opclass(aTHX_ o) == OPc_PMOP) && o->op_type != OP_PUSHRE
+	    && (kid = cPMOPo->op_pmreplroot))
+    {
+	sv_setiv(newSVrv(opsv, cc_opclassname(aTHX_ kid)), PTR2IV(kid));
+	walkoptree(aTHX_ opsv, method);
+    }
+}
+
+static SV **
+oplist(pTHX_ OP *o, SV **SP)
+{
+    for(; o; o = o->op_next) {
+	SV *opsv;
+#if PERL_VERSION >= 9
+	if (o->op_opt == 0)
+	    break;
+	o->op_opt = 0;
+#else
+	if (o->op_seq == 0)
+	    break;
+	o->op_seq = 0;
+#endif
+	opsv = sv_newmortal();
+	sv_setiv(newSVrv(opsv, cc_opclassname(aTHX_ (OP*)o)), PTR2IV(o));
+	XPUSHs(opsv);
+        switch (o->op_type) {
+	case OP_SUBST:
+            SP = oplist(aTHX_ cPMOPo->op_pmreplstart, SP);
+            continue;
+	case OP_SORT:
+	    if (o->op_flags & OPf_STACKED && o->op_flags & OPf_SPECIAL) {
+		OP *kid = cLISTOPo->op_first->op_sibling;   /* pass pushmark */
+		kid = kUNOP->op_first;                      /* pass rv2gv */
+		kid = kUNOP->op_first;                      /* pass leave */
+		SP = oplist(aTHX_ kid->op_next, SP);
+	    }
+	    continue;
+        }
+	switch (PL_opargs[o->op_type] & OA_CLASS_MASK) {
+	case OA_LOGOP:
+	    SP = oplist(aTHX_ cLOGOPo->op_other, SP);
+	    break;
+	case OA_LOOP:
+	    SP = oplist(aTHX_ cLOOPo->op_lastop, SP);
+	    SP = oplist(aTHX_ cLOOPo->op_nextop, SP);
+	    SP = oplist(aTHX_ cLOOPo->op_redoop, SP);
+	    break;
+	}
+    }
+    return SP;
 }
 
 typedef OP	*B__OP;
@@ -372,6 +477,7 @@ typedef SV	*B__PVMG;
 typedef SV	*B__PVLV;
 typedef SV	*B__BM;
 typedef SV	*B__RV;
+typedef SV	*B__FM;
 typedef AV	*B__AV;
 typedef HV	*B__HV;
 typedef CV	*B__CV;
@@ -396,20 +502,29 @@ BOOT:
     specialsv_list[4] = pWARN_ALL;
     specialsv_list[5] = pWARN_NONE;
     specialsv_list[6] = pWARN_STD;
+#if PERL_VERSION <= 8
+#  define CVf_ASSERTION	0
+#endif
 #include "defsubs.h"
 }
 
 #define B_main_cv()	PL_main_cv
 #define B_init_av()	PL_initav
+#define B_inc_gv()	PL_incgv
+#define B_check_av()	PL_checkav_save
 #define B_begin_av()	PL_beginav_save
 #define B_end_av()	PL_endav
 #define B_main_root()	PL_main_root
 #define B_main_start()	PL_main_start
 #define B_amagic_generation()	PL_amagic_generation
+#define B_defstash()	PL_defstash
+#define B_curstash()	PL_curstash
+#define B_dowarn()	PL_dowarn
 #define B_comppadlist()	(PL_main_cv ? CvPADLIST(PL_main_cv) : CvPADLIST(PL_compcv))
 #define B_sv_undef()	&PL_sv_undef
 #define B_sv_yes()	&PL_sv_yes
 #define B_sv_no()	&PL_sv_no
+#define B_formfeed()	PL_formfeed
 #ifdef USE_ITHREADS
 #define B_regex_padav()	PL_regex_padav
 #endif
@@ -418,11 +533,17 @@ B::AV
 B_init_av()
 
 B::AV
+B_check_av()
+
+B::AV
 B_begin_av()
 
 B::AV
 B_end_av()
 
+B::GV
+B_inc_gv()
+
 #ifdef USE_ITHREADS
 
 B::AV
@@ -454,13 +575,34 @@ B_sv_yes()
 B::SV
 B_sv_no()
 
-MODULE = B	PACKAGE = B
+B::HV
+B_curstash()
+
+B::HV
+B_defstash()
+
+U8
+B_dowarn()
+
+B::SV
+B_formfeed()
+
+void
+B_warnhook()
+    CODE:
+	ST(0) = make_sv_object(aTHX_ sv_newmortal(), PL_warnhook);
+
+void
+B_diehook()
+    CODE:
+	ST(0) = make_sv_object(aTHX_ sv_newmortal(), PL_diehook);
 
+MODULE = B	PACKAGE = B
 
 void
 walkoptree(opsv, method)
 	SV *	opsv
-	char *	method
+	const char *	method
     CODE:
 	walkoptree(aTHX_ opsv, method);
 
@@ -492,7 +634,7 @@ svref_2object(sv)
 
 void
 opnumber(name)
-char *	name
+const char *	name
 CODE:
 {
  int i; 
@@ -525,11 +667,10 @@ void
 hash(sv)
 	SV *	sv
     CODE:
-	char *s;
 	STRLEN len;
 	U32 hash = 0;
 	char hexhash[19]; /* must fit "0xffffffffffffffff" plus trailing \0 */
-	s = SvPV(sv, len);
+	const char *s = SvPV(sv, len);
 	PERL_HASH(hash, s, len);
 	sprintf(hexhash, "0x%"UVxf, (UV)hash);
 	ST(0) = sv_2mortal(newSVpv(hexhash, 0));
@@ -553,7 +694,15 @@ SV *
 cstring(sv)
 	SV *	sv
     CODE:
-	RETVAL = cstring(aTHX_ sv);
+	RETVAL = cstring(aTHX_ sv, 0);
+    OUTPUT:
+	RETVAL
+
+SV *
+perlstring(sv)
+	SV *	sv
+    CODE:
+	RETVAL = cstring(aTHX_ sv, 1);
     OUTPUT:
 	RETVAL
 
@@ -568,27 +717,42 @@ cchar(sv)
 void
 threadsv_names()
     PPCODE:
-#ifdef USE_5005THREADS
+#if PERL_VERSION <= 8
+# ifdef USE_5005THREADS
 	int i;
-	STRLEN len = strlen(PL_threadsv_names);
+	const STRLEN len = strlen(PL_threadsv_names);
 
 	EXTEND(sp, len);
 	for (i = 0; i < len; i++)
 	    PUSHs(sv_2mortal(newSVpvn(&PL_threadsv_names[i], 1)));
+# endif
 #endif
 
-
 #define OP_next(o)	o->op_next
 #define OP_sibling(o)	o->op_sibling
-#define OP_desc(o)	PL_op_desc[o->op_type]
+#define OP_desc(o)	(char *)PL_op_desc[o->op_type]
 #define OP_targ(o)	o->op_targ
 #define OP_type(o)	o->op_type
-#define OP_seq(o)	o->op_seq
+#if PERL_VERSION >= 9
+#  define OP_opt(o)	o->op_opt
+#  define OP_static(o)	o->op_static
+#else
+#  define OP_seq(o)	o->op_seq
+#endif
 #define OP_flags(o)	o->op_flags
 #define OP_private(o)	o->op_private
+#define OP_spare(o)	o->op_spare
 
 MODULE = B	PACKAGE = B::OP		PREFIX = OP_
 
+size_t
+OP_size(o)
+	B::OP		o
+    CODE:
+	RETVAL = opsizes[cc_opclass(aTHX_ o)];
+    OUTPUT:
+	RETVAL
+
 B::OP
 OP_next(o)
 	B::OP		o
@@ -601,7 +765,7 @@ char *
 OP_name(o)
 	B::OP		o
     CODE:
-	RETVAL = PL_op_name[o->op_type];
+	RETVAL = (char *)PL_op_name[o->op_type];
     OUTPUT:
 	RETVAL
 
@@ -615,7 +779,7 @@ OP_ppaddr(o)
     CODE:
 	sv_setpvn(sv, "PL_ppaddr[OP_", 13);
 	sv_catpv(sv, PL_op_name[o->op_type]);
-	for (i=13; i<SvCUR(sv); ++i)
+	for (i=13; (STRLEN)i < SvCUR(sv); ++i)
 	    SvPVX(sv)[i] = toUPPER(SvPVX(sv)[i]);
 	sv_catpv(sv, "]");
 	ST(0) = sv;
@@ -632,10 +796,24 @@ U16
 OP_type(o)
 	B::OP		o
 
+#if PERL_VERSION >= 9
+
+U8
+OP_opt(o)
+	B::OP		o
+
+U8
+OP_static(o)
+	B::OP		o
+
+#else
+
 U16
 OP_seq(o)
 	B::OP		o
 
+#endif
+
 U8
 OP_flags(o)
 	B::OP		o
@@ -644,6 +822,20 @@ U8
 OP_private(o)
 	B::OP		o
 
+#if PERL_VERSION >= 9
+
+U8
+OP_spare(o)
+	B::OP		o
+
+#endif
+
+void
+OP_oplist(o)
+	B::OP		o
+    PPCODE:
+	SP = oplist(aTHX_ o, SP);
+
 #define UNOP_first(o)	o->op_first
 
 MODULE = B	PACKAGE = B::UNOP		PREFIX = UNOP_
@@ -689,6 +881,9 @@ LISTOP_children(o)
 #define PMOP_pmregexp(o)	PM_GETRE(o)
 #ifdef USE_ITHREADS
 #define PMOP_pmoffset(o)	o->op_pmoffset
+#define PMOP_pmstashpv(o)	o->op_pmstashpv
+#else
+#define PMOP_pmstash(o)		o->op_pmstash
 #endif
 #define PMOP_pmflags(o)		o->op_pmflags
 #define PMOP_pmpermflags(o)	o->op_pmpermflags
@@ -731,13 +926,23 @@ IV
 PMOP_pmoffset(o)
 	B::PMOP		o
 
+char*
+PMOP_pmstashpv(o)
+	B::PMOP		o
+
+#else
+
+B::HV
+PMOP_pmstash(o)
+	B::PMOP		o
+
 #endif
 
-U16
+U32
 PMOP_pmflags(o)
 	B::PMOP		o
 
-U16
+U32
 PMOP_pmpermflags(o)
 	B::PMOP		o
 
@@ -769,10 +974,10 @@ SVOP_gv(o)
 	B::SVOP	o
 
 #define PADOP_padix(o)	o->op_padix
-#define PADOP_sv(o)	(o->op_padix ? PL_curpad[o->op_padix] : Nullsv)
+#define PADOP_sv(o)	(o->op_padix ? PAD_SVl(o->op_padix) : Nullsv)
 #define PADOP_gv(o)	((o->op_padix \
-			  && SvTYPE(PL_curpad[o->op_padix]) == SVt_PVGV) \
-			 ? (GV*)PL_curpad[o->op_padix] : Nullgv)
+			  && SvTYPE(PAD_SVl(o->op_padix)) == SVt_PVGV) \
+			 ? (GV*)PAD_SVl(o->op_padix) : Nullgv)
 
 MODULE = B	PACKAGE = B::PADOP		PREFIX = PADOP_
 
@@ -802,8 +1007,8 @@ PVOP_pv(o)
 		(o->op_private & OPpTRANS_COMPLEMENT) &&
 		!(o->op_private & OPpTRANS_DELETE))
 	{
-	    short* tbl = (short*)o->op_pv;
-	    short entries = 257 + tbl[256];
+	    const short* const tbl = (short*)o->op_pv;
+	    const short entries = 257 + tbl[256];
 	    ST(0) = sv_2mortal(newSVpv(o->op_pv, entries * sizeof(short)));
 	}
 	else if (o->op_type == OP_TRANS) {
@@ -835,10 +1040,12 @@ LOOP_lastop(o)
 #define COP_stashpv(o)	CopSTASHPV(o)
 #define COP_stash(o)	CopSTASH(o)
 #define COP_file(o)	CopFILE(o)
+#define COP_filegv(o)	CopFILEGV(o)
 #define COP_cop_seq(o)	o->cop_seq
 #define COP_arybase(o)	o->cop_arybase
 #define COP_line(o)	CopLINE(o)
 #define COP_warnings(o)	o->cop_warnings
+#define COP_io(o)	o->cop_io
 
 MODULE = B	PACKAGE = B::COP		PREFIX = COP_
 
@@ -858,6 +1065,11 @@ char *
 COP_file(o)
 	B::COP	o
 
+B::GV
+COP_filegv(o)
+       B::COP  o
+
+
 U32
 COP_cop_seq(o)
 	B::COP	o
@@ -866,7 +1078,7 @@ I32
 COP_arybase(o)
 	B::COP	o
 
-U16
+U32
 COP_line(o)
 	B::COP	o
 
@@ -874,6 +1086,23 @@ B::SV
 COP_warnings(o)
 	B::COP	o
 
+B::SV
+COP_io(o)
+	B::COP	o
+
+MODULE = B	PACKAGE = B::SV
+
+U32
+SvTYPE(sv)
+	B::SV	sv
+
+#define object_2svref(sv)	sv
+#define SVREF SV *
+	
+SVREF
+object_2svref(sv)
+	B::SV	sv
+
 MODULE = B	PACKAGE = B::SV		PREFIX = Sv
 
 U32
@@ -884,6 +1113,18 @@ U32
 SvFLAGS(sv)
 	B::SV	sv
 
+U32
+SvPOK(sv)
+	B::SV	sv
+
+U32
+SvROK(sv)
+	B::SV	sv
+
+U32
+SvMAGICAL(sv)
+	B::SV	sv
+
 MODULE = B	PACKAGE = B::IV		PREFIX = Sv
 
 IV
@@ -913,7 +1154,7 @@ packiv(sv)
     CODE:
 	if (sizeof(IV) == 8) {
 	    U32 wp[2];
-	    IV iv = SvIVX(sv);
+	    const IV iv = SvIVX(sv);
 	    /*
 	     * The following way of spelling 32 is to stop compilers on
 	     * 32-bit architectures from moaning about the shift count
@@ -973,8 +1214,16 @@ SvPV(sv)
 	B::PV	sv
     CODE:
         ST(0) = sv_newmortal();
-        if( SvPOK(sv) ) { 
-            sv_setpvn(ST(0), SvPVX(sv), SvCUR(sv));
+        if( SvPOK(sv) ) {
+	    /* FIXME - we need a better way for B to identify PVs that are
+	       in the pads as variable names.  */
+	    if((SvLEN(sv) && SvCUR(sv) >= SvLEN(sv))) {
+		/* It claims to be longer than the space allocated for it -
+		   presuambly it's a variable name in the pad  */
+		sv_setpv(ST(0), SvPV_nolen_const(sv));
+	    } else {
+		sv_setpvn(ST(0), SvPVX_const(sv), SvCUR(sv));
+	    }
             SvFLAGS(ST(0)) |= SvUTF8(sv);
         }
         else {
@@ -983,6 +1232,15 @@ SvPV(sv)
             sv_setpvn(ST(0), NULL, 0);
         }
 
+void
+SvPVBM(sv)
+	B::PV	sv
+    CODE:
+        ST(0) = sv_newmortal();
+	sv_setpvn(ST(0), SvPVX_const(sv),
+	    SvCUR(sv) + (SvTYPE(sv) == SVt_PVBM ? 257 : 0));
+
+
 STRLEN
 SvLEN(sv)
 	B::PV	sv
@@ -1020,6 +1278,15 @@ MODULE = B	PACKAGE = B::MAGIC	PREFIX = Mg
 B::MAGIC
 MgMOREMAGIC(mg)
 	B::MAGIC	mg
+     CODE:
+	if( MgMOREMAGIC(mg) ) {
+	    RETVAL = MgMOREMAGIC(mg);
+	}
+	else {
+	    XSRETURN_UNDEF;
+	}
+     OUTPUT:
+	RETVAL
 
 U16
 MgPRIVATE(mg)
@@ -1036,15 +1303,6 @@ MgFLAGS(mg)
 B::SV
 MgOBJ(mg)
 	B::MAGIC	mg
-    CODE:
-        if( mg->mg_type != 'r' ) {
-            RETVAL = MgOBJ(mg);
-        }
-        else {
-            croak( "OBJ is not meaningful on r-magic" );
-        }
-    OUTPUT:
-        RETVAL
 
 IV
 MgREGEX(mg)
@@ -1086,9 +1344,9 @@ MgPTR(mg)
  	if (mg->mg_ptr){
 		if (mg->mg_len >= 0){
 	    		sv_setpvn(ST(0), mg->mg_ptr, mg->mg_len);
-		} else {
-			if (mg->mg_len == HEf_SVKEY)	
-				sv_setsv(ST(0),newRV((SV*)mg->mg_ptr));
+		} else if (mg->mg_len == HEf_SVKEY) {
+			ST(0) = make_sv_object(aTHX_
+				    sv_newmortal(), (SV*)mg->mg_ptr);
 		}
 	}
 
@@ -1150,6 +1408,10 @@ is_empty(gv)
     OUTPUT:
         RETVAL
 
+void*
+GvGP(gv)
+	B::GV	gv
+
 B::HV
 GvSTASH(gv)
 	B::GV	gv
@@ -1162,9 +1424,13 @@ B::IO
 GvIO(gv)
 	B::GV	gv
 
-B::CV
+B::FM
 GvFORM(gv)
 	B::GV	gv
+    CODE:
+	RETVAL = (SV*)GvFORM(gv);
+    OUTPUT:
+	RETVAL
 
 B::AV
 GvAV(gv)
@@ -1186,7 +1452,7 @@ U32
 GvCVGEN(gv)
 	B::GV	gv
 
-U16
+U32
 GvLINE(gv)
 	B::GV	gv
 
@@ -1257,7 +1523,7 @@ IoSUBPROCESS(io)
 bool
 IsSTD(io,name)
 	B::IO	io
-	char*	name
+	const char*	name
     PREINIT:
 	PerlIO* handle = 0;
     CODE:
@@ -1297,12 +1563,6 @@ SSize_t
 AvMAX(av)
 	B::AV	av
 
-#define AvOFF(av) ((XPVAV*)SvANY(av))->xof_off
-
-IV
-AvOFF(av)
-	B::AV	av
-
 void
 AvARRAY(av)
 	B::AV	av
@@ -1314,14 +1574,28 @@ AvARRAY(av)
 		XPUSHs(make_sv_object(aTHX_ sv_newmortal(), svp[i]));
 	}
 
-MODULE = B	PACKAGE = B::AV
-
-U8
-AvFLAGS(av)
+void
+AvARRAYelt(av, idx)
 	B::AV	av
+	int	idx
+    PPCODE:
+    	if (idx >= 0 && AvFILL(av) >= 0 && idx <= AvFILL(av))
+	    XPUSHs(make_sv_object(aTHX_ sv_newmortal(), (AvARRAY(av)[idx])));
+	else
+	    XPUSHs(make_sv_object(aTHX_ sv_newmortal(), NULL));
+
+MODULE = B	PACKAGE = B::FM		PREFIX = Fm
+
+IV
+FmLINES(form)
+	B::FM	form
 
 MODULE = B	PACKAGE = B::CV		PREFIX = Cv
 
+U32
+CvCONST(cv)
+	B::CV	cv
+
 B::HV
 CvSTASH(cv)
 	B::CV	cv
@@ -1354,6 +1628,10 @@ B::CV
 CvOUTSIDE(cv)
 	B::CV	cv
 
+U32
+CvOUTSIDE_SEQ(cv)
+	B::CV	cv
+
 void
 CvXSUB(cv)
 	B::CV	cv
@@ -1366,8 +1644,8 @@ CvXSUBANY(cv)
 	B::CV	cv
     CODE:
 	ST(0) = CvCONST(cv) ?
-                    make_sv_object(aTHX_ sv_newmortal(),CvXSUBANY(cv).any_ptr) :
-                    sv_2mortal(newSViv(CvXSUBANY(cv).any_iv));
+	    make_sv_object(aTHX_ sv_newmortal(),(SV *)CvXSUBANY(cv).any_ptr) :
+	    sv_2mortal(newSViv(CvXSUBANY(cv).any_iv));
 
 MODULE = B    PACKAGE = B::CV
 
@@ -1404,10 +1682,6 @@ char *
 HvNAME(hv)
 	B::HV	hv
 
-B::PMOP
-HvPMROOT(hv)
-	B::HV	hv
-
 void
 HvARRAY(hv)
 	B::HV	hv