regenerate perl stuff

- typemap from perl 5.22.1
- ppport.h from Devel::PPPort 3.32
- xs.inc using ExtUtils::ParseXS 3.28

3 files changed, 134 insertions, 52 deletions

diff --git a/src/modules/perlcore/ppport.h b/src/modules/perlcore/ppport.h
index b4019924e..f0f9d6c4a 100644
--- a/src/modules/perlcore/ppport.h
+++ b/src/modules/perlcore/ppport.h
@@ -4,9 +4,9 @@
 /*
 ----------------------------------------------------------------------
 
-    ppport.h -- Perl/Pollution/Portability Version 3.24
+    ppport.h -- Perl/Pollution/Portability Version 3.32
 
-    Automatically created by Devel::PPPort running under perl 5.020000.
+    Automatically created by Devel::PPPort running under perl 5.022001.
 
     Version 3.x, Copyright (c) 2004-2013, Marcus Holland-Moritz.
 
@@ -23,8 +23,8 @@ SKIP
 if (@ARGV && $ARGV[0] eq '--unstrip') {
   eval { require Devel::PPPort };
   $@ and die "Cannot require Devel::PPPort, please install.\n";
-  if (eval $Devel::PPPort::VERSION < 3.24) {
-    die "ppport.h was originally generated with Devel::PPPort 3.24.\n"
+  if (eval $Devel::PPPort::VERSION < 3.32) {
+    die "ppport.h was originally generated with Devel::PPPort 3.32.\n"
       . "Your Devel::PPPort is only version $Devel::PPPort::VERSION.\n"
       . "Please install a newer version, or --unstrip will not work.\n";
   }
@@ -762,8 +762,12 @@ typedef OP* (CPERLscope(*Perl_check_t)) (pTHX_ OP*);
 #undef isPRINT
 #endif
 #ifdef HAS_QUAD
+#ifdef U64TYPE
 #define WIDEST_UTYPE U64TYPE
 #else
+#define WIDEST_UTYPE Quad_t
+#endif
+#else
 #define WIDEST_UTYPE U32
 #endif
 #ifndef isALNUMC
@@ -2279,19 +2283,16 @@ sv_magic(SvMp_sv, obj, how, SvMp_name, SvMp_namlen); \
 #endif
 #if !defined(mg_findext)
 #if defined(NEED_mg_findext)
-static MAGIC * DPPP_(my_mg_findext)(pTHX_ SV * sv, int type, const MGVTBL *vtbl);
+static MAGIC * DPPP_(my_mg_findext)(SV * sv, int type, const MGVTBL *vtbl);
 static
 #else
-extern MAGIC * DPPP_(my_mg_findext)(pTHX_ SV * sv, int type, const MGVTBL *vtbl);
-#endif
-#ifdef mg_findext
-#undef mg_findext
+extern MAGIC * DPPP_(my_mg_findext)(SV * sv, int type, const MGVTBL *vtbl);
 #endif
-#define mg_findext(a,b,c) DPPP_(my_mg_findext)(aTHX_ a,b,c)
+#define mg_findext DPPP_(my_mg_findext)
 #define Perl_mg_findext DPPP_(my_mg_findext)
 #if defined(NEED_mg_findext) || defined(NEED_mg_findext_GLOBAL)
 MAGIC *
-DPPP_(my_mg_findext)(pTHX_ SV * sv, int type, const MGVTBL *vtbl) {
+DPPP_(my_mg_findext)(SV * sv, int type, const MGVTBL *vtbl) {
 if (sv) {
 MAGIC *mg;
 #ifdef AvPAD_NAMELIST
@@ -2428,6 +2429,73 @@ return 0;
 #define CopSTASH_eq(c,hv) (CopSTASH(c) == (hv))
 #endif
 #endif
+#if (PERL_BCDVERSION >= 0x5006000)
+#ifndef caller_cx
+#if defined(NEED_caller_cx) || defined(NEED_caller_cx_GLOBAL)
+static I32
+DPPP_dopoptosub_at(const PERL_CONTEXT *cxstk, I32 startingblock)
+{
+I32 i;
+for (i = startingblock; i >= 0; i--) {
+register const PERL_CONTEXT * const cx = &cxstk[i];
+switch (CxTYPE(cx)) {
+default:
+continue;
+case CXt_EVAL:
+case CXt_SUB:
+case CXt_FORMAT:
+return i;
+}
+}
+return i;
+}
+#endif
+#if defined(NEED_caller_cx)
+static const PERL_CONTEXT * DPPP_(my_caller_cx)(pTHX_ I32 count, const PERL_CONTEXT **dbcxp);
+static
+#else
+extern const PERL_CONTEXT * DPPP_(my_caller_cx)(pTHX_ I32 count, const PERL_CONTEXT **dbcxp);
+#endif
+#ifdef caller_cx
+#undef caller_cx
+#endif
+#define caller_cx(a,b) DPPP_(my_caller_cx)(aTHX_ a,b)
+#define Perl_caller_cx DPPP_(my_caller_cx)
+#if defined(NEED_caller_cx) || defined(NEED_caller_cx_GLOBAL)
+const PERL_CONTEXT *
+DPPP_(my_caller_cx)(pTHX_ I32 count, const PERL_CONTEXT **dbcxp)
+{
+register I32 cxix = DPPP_dopoptosub_at(cxstack, cxstack_ix);
+register const PERL_CONTEXT *cx;
+register const PERL_CONTEXT *ccstack = cxstack;
+const PERL_SI *top_si = PL_curstackinfo;
+for (;;) {
+while (cxix < 0 && top_si->si_type != PERLSI_MAIN) {
+top_si = top_si->si_prev;
+ccstack = top_si->si_cxstack;
+cxix = DPPP_dopoptosub_at(ccstack, top_si->si_cxix);
+}
+if (cxix < 0)
+return NULL;
+if (PL_DBsub && GvCV(PL_DBsub) && cxix >= 0 &&
+ccstack[cxix].blk_sub.cv == GvCV(PL_DBsub))
+count++;
+if (!count--)
+break;
+cxix = DPPP_dopoptosub_at(ccstack, cxix - 1);
+}
+cx = &ccstack[cxix];
+if (dbcxp) *dbcxp = cx;
+if (CxTYPE(cx) == CXt_SUB || CxTYPE(cx) == CXt_FORMAT) {
+const I32 dbcxix = DPPP_dopoptosub_at(ccstack, cxix - 1);
+if (PL_DBsub && GvCV(PL_DBsub) && dbcxix >= 0 && ccstack[dbcxix].blk_sub.cv == GvCV(PL_DBsub))
+cx = &ccstack[dbcxix];
+}
+return cx;
+}
+#endif
+#endif
+#endif
 #ifndef IN_PERL_COMPILETIME
 #define IN_PERL_COMPILETIME (PL_curcop == &PL_compiling)
 #endif
diff --git a/src/modules/perlcore/typemap b/src/modules/perlcore/typemap
index 874bc161a..0b09641f8 100644
--- a/src/modules/perlcore/typemap
+++ b/src/modules/perlcore/typemap
@@ -71,7 +71,7 @@ T_SVREF
 		    $var = SvRV(xsub_tmp_sv);
 		}
 		else{
-		    Perl_croak(aTHX_ \"%s: %s is not a reference\",
+		    Perl_croak_nocontext(\"%s: %s is not a reference\",
 				${$ALIAS?\q[GvNAME(CvGV(cv))]:\qq[\"$pname\"]},
 				\"$var\");
 		}
@@ -84,7 +84,7 @@ T_SVREF_REFCOUNT_FIXED
 		    $var = SvRV(xsub_tmp_sv);
 		}
 		else{
-		    Perl_croak(aTHX_ \"%s: %s is not a reference\",
+		    Perl_croak_nocontext(\"%s: %s is not a reference\",
 				${$ALIAS?\q[GvNAME(CvGV(cv))]:\qq[\"$pname\"]},
 				\"$var\");
 		}
@@ -97,7 +97,7 @@ T_AVREF
 		    $var = (AV*)SvRV(xsub_tmp_sv);
 		}
 		else{
-		    Perl_croak(aTHX_ \"%s: %s is not an ARRAY reference\",
+		    Perl_croak_nocontext(\"%s: %s is not an ARRAY reference\",
 				${$ALIAS?\q[GvNAME(CvGV(cv))]:\qq[\"$pname\"]},
 				\"$var\");
 		}
@@ -110,7 +110,7 @@ T_AVREF_REFCOUNT_FIXED
 		    $var = (AV*)SvRV(xsub_tmp_sv);
 		}
 		else{
-		    Perl_croak(aTHX_ \"%s: %s is not an ARRAY reference\",
+		    Perl_croak_nocontext(\"%s: %s is not an ARRAY reference\",
 				${$ALIAS?\q[GvNAME(CvGV(cv))]:\qq[\"$pname\"]},
 				\"$var\");
 		}
@@ -123,7 +123,7 @@ T_HVREF
 		    $var = (HV*)SvRV(xsub_tmp_sv);
 		}
 		else{
-		    Perl_croak(aTHX_ \"%s: %s is not a HASH reference\",
+		    Perl_croak_nocontext(\"%s: %s is not a HASH reference\",
 				${$ALIAS?\q[GvNAME(CvGV(cv))]:\qq[\"$pname\"]},
 				\"$var\");
 		}
@@ -136,7 +136,7 @@ T_HVREF_REFCOUNT_FIXED
 		    $var = (HV*)SvRV(xsub_tmp_sv);
 		}
 		else{
-		    Perl_croak(aTHX_ \"%s: %s is not a HASH reference\",
+		    Perl_croak_nocontext(\"%s: %s is not a HASH reference\",
 				${$ALIAS?\q[GvNAME(CvGV(cv))]:\qq[\"$pname\"]},
 				\"$var\");
 		}
@@ -149,7 +149,7 @@ T_CVREF
 		SvGETMAGIC(xsub_tmp_sv);
                 $var = sv_2cv(xsub_tmp_sv, &st, &gvp, 0);
 		if (!$var) {
-		    Perl_croak(aTHX_ \"%s: %s is not a CODE reference\",
+		    Perl_croak_nocontext(\"%s: %s is not a CODE reference\",
 				${$ALIAS?\q[GvNAME(CvGV(cv))]:\qq[\"$pname\"]},
 				\"$var\");
 		}
@@ -162,7 +162,7 @@ T_CVREF_REFCOUNT_FIXED
 		SvGETMAGIC(xsub_tmp_sv);
                 $var = sv_2cv(xsub_tmp_sv, &st, &gvp, 0);
 		if (!$var) {
-		    Perl_croak(aTHX_ \"%s: %s is not a CODE reference\",
+		    Perl_croak_nocontext(\"%s: %s is not a CODE reference\",
 				${$ALIAS?\q[GvNAME(CvGV(cv))]:\qq[\"$pname\"]},
 				\"$var\");
 		}
@@ -209,7 +209,7 @@ T_PTRREF
 	    $var = INT2PTR($type,tmp);
 	}
 	else
-	    Perl_croak(aTHX_ \"%s: %s is not a reference\",
+	    Perl_croak_nocontext(\"%s: %s is not a reference\",
 			${$ALIAS?\q[GvNAME(CvGV(cv))]:\qq[\"$pname\"]},
 			\"$var\")
 T_REF_IV_REF
@@ -218,7 +218,7 @@ T_REF_IV_REF
 	    $var = *INT2PTR($type *, tmp);
 	}
 	else
-	    Perl_croak(aTHX_ \"%s: %s is not of type %s\",
+	    Perl_croak_nocontext(\"%s: %s is not of type %s\",
 			${$ALIAS?\q[GvNAME(CvGV(cv))]:\qq[\"$pname\"]},
 			\"$var\", \"$ntype\")
 T_REF_IV_PTR
@@ -227,7 +227,7 @@ T_REF_IV_PTR
 	    $var = INT2PTR($type, tmp);
 	}
 	else
-	    Perl_croak(aTHX_ \"%s: %s is not of type %s\",
+	    Perl_croak_nocontext(\"%s: %s is not of type %s\",
 			${$ALIAS?\q[GvNAME(CvGV(cv))]:\qq[\"$pname\"]},
 			\"$var\", \"$ntype\")
 T_PTROBJ
@@ -236,7 +236,7 @@ T_PTROBJ
 	    $var = INT2PTR($type,tmp);
 	}
 	else
-	    Perl_croak(aTHX_ \"%s: %s is not of type %s\",
+	    Perl_croak_nocontext(\"%s: %s is not of type %s\",
 			${$ALIAS?\q[GvNAME(CvGV(cv))]:\qq[\"$pname\"]},
 			\"$var\", \"$ntype\")
 T_PTRDESC
@@ -246,7 +246,7 @@ T_PTRDESC
 	    $var = ${type}_desc->ptr;
 	}
 	else
-	    Perl_croak(aTHX_ \"%s: %s is not of type %s\",
+	    Perl_croak_nocontext(\"%s: %s is not of type %s\",
 			${$ALIAS?\q[GvNAME(CvGV(cv))]:\qq[\"$pname\"]},
 			\"$var\", \"$ntype\")
 T_REFREF
@@ -255,7 +255,7 @@ T_REFREF
 	    $var = *INT2PTR($type,tmp);
 	}
 	else
-	    Perl_croak(aTHX_ \"%s: %s is not a reference\",
+	    Perl_croak_nocontext(\"%s: %s is not a reference\",
 			${$ALIAS?\q[GvNAME(CvGV(cv))]:\qq[\"$pname\"]},
 			\"$var\")
 T_REFOBJ
@@ -264,7 +264,7 @@ T_REFOBJ
 	    $var = *INT2PTR($type,tmp);
 	}
 	else
-	    Perl_croak(aTHX_ \"%s: %s is not of type %s\",
+	    Perl_croak_nocontext(\"%s: %s is not of type %s\",
 			${$ALIAS?\q[GvNAME(CvGV(cv))]:\qq[\"$pname\"]},
 			\"$var\", \"$ntype\")
 T_OPAQUE
diff --git a/src/modules/perlcore/xs.inc b/src/modules/perlcore/xs.inc
index 2638dde2e..db3dda6a8 100644
--- a/src/modules/perlcore/xs.inc
+++ b/src/modules/perlcore/xs.inc
@@ -1,5 +1,5 @@
 /*
- * This file was generated automatically by ExtUtils::ParseXS version 3.24 from the
+ * This file was generated automatically by ExtUtils::ParseXS version 3.28 from the
  * contents of KVIrc.xs. Do not edit this file, edit KVIrc.xs instead.
  *
  *    ANY CHANGES MADE HERE WILL BE LOST!
@@ -131,10 +131,10 @@
 
 /* prototype to pass -Wmissing-prototypes */
 STATIC void
-S_croak_xs_usage(pTHX_ const CV *const cv, const char *const params);
+S_croak_xs_usage(const CV *const cv, const char *const params);
 
 STATIC void
-S_croak_xs_usage(pTHX_ const CV *const cv, const char *const params)
+S_croak_xs_usage(const CV *const cv, const char *const params)
 {
     const GV *const gv = CvGV(cv);
 
@@ -146,21 +146,17 @@ S_croak_xs_usage(pTHX_ const CV *const cv, const char *const params)
         const char *const hvname = stash ? HvNAME(stash) : NULL;
 
         if (hvname)
-            Perl_croak(aTHX_ "Usage: %s::%s(%s)", hvname, gvname, params);
+	    Perl_croak_nocontext("Usage: %s::%s(%s)", hvname, gvname, params);
         else
-            Perl_croak(aTHX_ "Usage: %s(%s)", gvname, params);
+	    Perl_croak_nocontext("Usage: %s(%s)", gvname, params);
     } else {
         /* Pants. I don't think that it should be possible to get here. */
-        Perl_croak(aTHX_ "Usage: CODE(0x%"UVxf")(%s)", PTR2UV(cv), params);
+	Perl_croak_nocontext("Usage: CODE(0x%"UVxf")(%s)", PTR2UV(cv), params);
     }
 }
 #undef  PERL_ARGS_ASSERT_CROAK_XS_USAGE
 
-#ifdef PERL_IMPLICIT_CONTEXT
-#define croak_xs_usage(a,b)    S_croak_xs_usage(aTHX_ a,b)
-#else
 #define croak_xs_usage        S_croak_xs_usage
-#endif
 
 #endif
 
@@ -173,7 +169,13 @@ S_croak_xs_usage(pTHX_ const CV *const cv, const char *const params)
 #define newXSproto_portable(name, c_impl, file, proto) (PL_Sv=(SV*)newXS(name, c_impl, file), sv_setpv(PL_Sv, proto), (CV*)PL_Sv)
 #endif /* !defined(newXS_flags) */
 
-#line 177 "KVIrc.c"
+#if PERL_VERSION_LE(5, 21, 5)
+#  define newXS_deffile(a,b) Perl_newXS(aTHX_ a,b,file)
+#else
+#  define newXS_deffile(a,b) Perl_newXS_deffile(aTHX_ a,b)
+#endif
+
+#line 179 "KVIrc.c"
 
 XS_EUPXS(XS_KVIrc_echo); /* prototype to pass -Wmissing-prototypes */
 XS_EUPXS(XS_KVIrc_echo)
@@ -213,7 +215,7 @@ XS_EUPXS(XS_KVIrc_echo)
 			}
 			pWnd->outputNoFmt(colorset,QString::fromUtf8(text));
 		}
-#line 217 "KVIrc.c"
+#line 219 "KVIrc.c"
     }
     XSRETURN_EMPTY;
 }
@@ -250,7 +252,7 @@ XS_EUPXS(XS_KVIrc_say)
 			QString tmp = QString::fromUtf8(text);
 			KviUserInput::parse(tmp,pWnd);
 		}
-#line 254 "KVIrc.c"
+#line 256 "KVIrc.c"
     }
     XSRETURN_EMPTY;
 }
@@ -268,7 +270,7 @@ XS_EUPXS(XS_KVIrc_warning)
 #line 68 "KVIrc.xs"
 		if((!g_bExecuteQuiet) && g_pCurrentKvsContext)
 			g_pCurrentKvsContext->warning(text);
-#line 272 "KVIrc.c"
+#line 274 "KVIrc.c"
     }
     XSRETURN_EMPTY;
 }
@@ -286,7 +288,7 @@ XS_EUPXS(XS_KVIrc_internalWarning)
 #line 74 "KVIrc.xs"
 		if(!g_bExecuteQuiet)
 			g_lWarningList.append(QString(text));
-#line 290 "KVIrc.c"
+#line 292 "KVIrc.c"
     }
     XSRETURN_EMPTY;
 }
@@ -318,7 +320,7 @@ XS_EUPXS(XS_KVIrc_getLocal)
 			}
 			RETVAL = hack.ptr();
 		}
-#line 322 "KVIrc.c"
+#line 324 "KVIrc.c"
 	sv_setpv(TARG, RETVAL); XSprePUSH; PUSHTARG;
     }
     XSRETURN(1);
@@ -347,7 +349,7 @@ XS_EUPXS(XS_KVIrc_setLocal)
 				g_pCurrentKvsContext->localVariables()->unset(varname);
 			}
 		}
-#line 351 "KVIrc.c"
+#line 353 "KVIrc.c"
     }
     XSRETURN_EMPTY;
 }
@@ -379,7 +381,7 @@ XS_EUPXS(XS_KVIrc_getGlobal)
 			}
 			RETVAL = hack.ptr();
 		}
-#line 383 "KVIrc.c"
+#line 385 "KVIrc.c"
 	sv_setpv(TARG, RETVAL); XSprePUSH; PUSHTARG;
     }
     XSRETURN(1);
@@ -408,7 +410,7 @@ XS_EUPXS(XS_KVIrc_setGlobal)
 				g_pCurrentKvsContext->localVariables()->unset(varname);
 			}
 		}
-#line 412 "KVIrc.c"
+#line 414 "KVIrc.c"
     }
     XSRETURN_EMPTY;
 }
@@ -443,7 +445,7 @@ XS_EUPXS(XS_KVIrc_eval)
 			hack = "";
 		}
 		RETVAL = hack.ptr();
-#line 447 "KVIrc.c"
+#line 449 "KVIrc.c"
 	sv_setpv(TARG, RETVAL); XSprePUSH; PUSHTARG;
     }
     XSRETURN(1);
@@ -455,19 +457,27 @@ extern "C"
 XS_EXTERNAL(boot_KVIrc); /* prototype to pass -Wmissing-prototypes */
 XS_EXTERNAL(boot_KVIrc)
 {
+#if PERL_VERSION_LE(5, 21, 5)
     dVAR; dXSARGS;
+#else
+    dVAR; dXSBOOTARGSXSAPIVERCHK;
+#endif
 #if (PERL_REVISION == 5 && PERL_VERSION < 9)
     char* file = __FILE__;
 #else
     const char* file = __FILE__;
 #endif
 
+    PERL_UNUSED_VAR(file);
+
     PERL_UNUSED_VAR(cv); /* -W */
     PERL_UNUSED_VAR(items); /* -W */
-#ifdef XS_APIVERSION_BOOTCHECK
+#if PERL_VERSION_LE(5, 21, 5)
+    XS_VERSION_BOOTCHECK;
+#  ifdef XS_APIVERSION_BOOTCHECK
     XS_APIVERSION_BOOTCHECK;
+#  endif
 #endif
-    XS_VERSION_BOOTCHECK;
 
         (void)newXSproto_portable("KVIrc::echo", XS_KVIrc_echo, file, "$;$$");
         (void)newXSproto_portable("KVIrc::say", XS_KVIrc_say, file, "$;$");
@@ -478,10 +488,14 @@ XS_EXTERNAL(boot_KVIrc)
         (void)newXSproto_portable("KVIrc::getGlobal", XS_KVIrc_getGlobal, file, "$");
         (void)newXSproto_portable("KVIrc::setGlobal", XS_KVIrc_setGlobal, file, "$$");
         (void)newXSproto_portable("KVIrc::eval", XS_KVIrc_eval, file, "$");
-#if (PERL_REVISION == 5 && PERL_VERSION >= 9)
-  if (PL_unitcheckav)
-       call_list(PL_scopestack_ix, PL_unitcheckav);
-#endif
+#if PERL_VERSION_LE(5, 21, 5)
+#  if PERL_VERSION_GE(5, 9, 0)
+    if (PL_unitcheckav)
+        call_list(PL_scopestack_ix, PL_unitcheckav);
+#  endif
     XSRETURN_YES;
+#else
+    Perl_xs_boot_epilog(aTHX_ ax);
+#endif
 }