X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=XSUB.h;h=9f881a2ebdb4a832831c8689a0893566746d6162;hb=00b1698f76403476df2006ff536ab00ffc650220;hp=77b94415db8ac1d0841db80c103217ee99d2b6c8;hpb=c578083cbad7ac35910083ca23adee0a729612ab;p=p5sagit%2Fp5-mst-13.2.git diff --git a/XSUB.h b/XSUB.h index 77b9441..9f881a2 100644 --- a/XSUB.h +++ b/XSUB.h @@ -1,7 +1,7 @@ /* XSUB.h * * Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, - * 2000, 2001, 2002, 2003, by Larry Wall and others + * 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. @@ -54,6 +54,10 @@ C. Sets up the C variable. This is usually handled automatically by C by calling C. +=for apidoc Ams||dAXMARK +Sets up the C variable and stack marker variable C. +This is usually handled automatically by C by calling C. + =for apidoc Ams||dITEMS Sets up the C variable. This is usually handled automatically by C by calling C. @@ -78,23 +82,53 @@ is a lexical $_ in scope. =cut */ +#ifndef PERL_UNUSED_ARG +# ifdef lint +# include +# define PERL_UNUSED_ARG(x) NOTE(ARGUNUSED(x)) +# else +# define PERL_UNUSED_ARG(x) ((void)x) +# endif +#endif +#ifndef PERL_UNUSED_VAR +# define PERL_UNUSED_VAR(x) ((void)x) +#endif + #define ST(off) PL_stack_base[ax + (off)] +#undef XS #if defined(__CYGWIN__) && defined(USE_DYNAMIC_LOADING) # define XS(name) __declspec(dllexport) void name(pTHX_ CV* cv) -#else -# define XS(name) void name(pTHX_ CV* cv) +#endif +#if defined(__SYMBIAN32__) +# define XS(name) EXPORT_C void name(pTHX_ CV* cv) +#endif +#ifndef XS +# if defined(HASATTRIBUTE_UNUSED) && !defined(__cplusplus) +# define XS(name) void name(pTHX_ CV* cv __attribute__unused__) +# else +# define XS(name) void name(pTHX_ CV* cv) +# endif #endif -#define dAX I32 ax = MARK - PL_stack_base + 1 +#define dAX const I32 ax = MARK - PL_stack_base + 1 + +#define dAXMARK \ + I32 ax = POPMARK; \ + register SV **mark = PL_stack_base + ax++ #define dITEMS I32 items = SP - MARK -#define dXSARGS \ - dSP; dMARK; \ - dAX; dITEMS +#ifdef lint +# define dXSARGS \ + NOTE(ARGUNUSED(cv)) \ + dSP; dAXMARK; dITEMS +#else +# define dXSARGS \ + dSP; dAXMARK; dITEMS +#endif -#define dXSTARG SV * targ = ((PL_op->op_private & OPpENTERSUB_HASTARG) \ +#define dXSTARG SV * const targ = ((PL_op->op_private & OPpENTERSUB_HASTARG) \ ? PAD_SV(PL_op->op_targ) : sv_newmortal()) /* Should be used before final PUSHi etc. if not in PPCODE section. */ @@ -114,9 +148,9 @@ is a lexical $_ in scope. #define XSINTERFACE_FUNC_SET(cv,f) \ CvXSUBANY(cv).any_dxptr = (void (*) (pTHX_ void*))(f) -#define dUNDERBAR I32 padoff_du = Perl_find_rundefsvoffset() +#define dUNDERBAR I32 padoff_du = find_rundefsvoffset() #define UNDERBAR ((padoff_du == NOT_IN_PAD \ - || PAD_COMPNAME_FLAGS(padoff_du) & SVpad_OUR) \ + || PAD_COMPNAME_FLAGS_isOUR(padoff_du)) \ ? DEFSV : PAD_SVl(padoff_du)) /* Simple macros to put new mortal values onto the stack. */ @@ -192,6 +226,24 @@ Macro to verify that a PM module's $VERSION variable matches the XS module's C variable. This is usually handled automatically by C. See L. +=head1 Simple Exception Handling Macros + +=for apidoc Ams||dXCPT +Set up necessary local variables for exception handling. +See L. + +=for apidoc AmU||XCPT_TRY_START +Starts a try block. See L. + +=for apidoc AmU||XCPT_TRY_END +Ends a try block. See L. + +=for apidoc AmU||XCPT_CATCH +Introduces a catch block. See L. + +=for apidoc Ams||XCPT_RETHROW +Rethrows a previously caught exception. See L. + =cut */ @@ -226,8 +278,8 @@ C. See L. #ifdef XS_VERSION # define XS_VERSION_BOOTCHECK \ STMT_START { \ - SV *_sv; STRLEN n_a; \ - char *vn = Nullch, *module = SvPV(ST(0),n_a); \ + SV *_sv; \ + const char *vn = NULL, *module = SvPV_nolen_const(ST(0)); \ if (items >= 2) /* version supplied as bootstrap arg */ \ _sv = ST(1); \ else { \ @@ -238,23 +290,37 @@ C. See L. _sv = get_sv(Perl_form(aTHX_ "%s::%s", module, \ vn = "VERSION"), FALSE); \ } \ - if (_sv && (!SvOK(_sv) || strNE(XS_VERSION, SvPV(_sv, n_a)))) \ - Perl_croak(aTHX_ "%s object version %s does not match %s%s%s%s %"SVf,\ - module, XS_VERSION, \ - vn ? "$" : "", vn ? module : "", vn ? "::" : "", \ - vn ? vn : "bootstrap parameter", _sv); \ + if (_sv) { \ + SV *xssv = Perl_newSVpvf(aTHX_ "%s",XS_VERSION); \ + xssv = new_version(xssv); \ + if ( !sv_derived_from(_sv, "version") ) \ + _sv = new_version(_sv); \ + if ( vcmp(_sv,xssv) ) \ + Perl_croak(aTHX_ "%s object version %"SVf" does not match %s%s%s%s %"SVf,\ + module, vstringify(xssv), \ + vn ? "$" : "", vn ? module : "", vn ? "::" : "", \ + vn ? vn : "bootstrap parameter", vstringify(_sv));\ + } \ } STMT_END #else # define XS_VERSION_BOOTCHECK #endif +#ifdef NO_XSLOCKS +# define dXCPT dJMPENV; int rEtV = 0 +# define XCPT_TRY_START JMPENV_PUSH(rEtV); if (rEtV == 0) +# define XCPT_TRY_END JMPENV_POP; +# define XCPT_CATCH if (rEtV != 0) +# define XCPT_RETHROW JMPENV_JUMP(rEtV) +#endif + /* The DBM_setFilter & DBM_ckFilter macros are only used by the *DB*_File modules */ #define DBM_setFilter(db_type,code) \ - { \ + STMT_START { \ if (db_type) \ RETVAL = sv_mortalcopy(db_type) ; \ ST(0) = RETVAL ; \ @@ -268,9 +334,10 @@ C. See L. else \ db_type = newSVsv(code) ; \ } \ - } + } STMT_END #define DBM_ckFilter(arg,type,name) \ + STMT_START { \ if (db->type) { \ if (db->filtering) { \ croak("recursion detected in %s", name) ; \ @@ -295,7 +362,7 @@ C. See L. arg = sv_2mortal(arg); \ } \ SvOKp(arg); \ - } + } } STMT_END #if 1 /* for compatibility */ # define VTBL_sv &PL_vtbl_sv @@ -553,3 +620,13 @@ C. See L. #endif /* PERL_IMPLICIT_SYS && !PERL_CORE */ #endif /* _INC_PERL_XSUB_H */ /* include guard */ + +/* + * Local variables: + * c-indentation-style: bsd + * c-basic-offset: 4 + * indent-tabs-mode: t + * End: + * + * ex: set ts=8 sts=4 sw=4 noet: + */