X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=proto.h;h=0e1d3b058b05ba3de02a15fbc5c5d0c342e63bee;hb=8cf8f3d16d82d8b3561907820401eea7766f2f96;hp=5110345ccfdf79fd28b1e99527c4a937c00140ee;hpb=8eceec63d7a4c39284b15f8b23984d5483bf6573;p=p5sagit%2Fp5-mst-13.2.git diff --git a/proto.h b/proto.h index 5110345..0e1d3b0 100644 --- a/proto.h +++ b/proto.h @@ -13,7 +13,7 @@ PERL_CALLCONV PerlInterpreter* perl_alloc_using(struct IPerlMem* m, struct IPerl #endif PERL_CALLCONV PerlInterpreter* perl_alloc(void); PERL_CALLCONV void perl_construct(PerlInterpreter* interp); -PERL_CALLCONV void perl_destruct(PerlInterpreter* interp); +PERL_CALLCONV int perl_destruct(PerlInterpreter* interp); PERL_CALLCONV void perl_free(PerlInterpreter* interp); PERL_CALLCONV int perl_run(PerlInterpreter* interp); PERL_CALLCONV int perl_parse(PerlInterpreter* interp, XSINIT_t xsinit, int argc, char** argv, char** env); @@ -38,23 +38,7 @@ PERL_CALLCONV void Perl_set_context(void *thx); END_EXTERN_C /* functions with flag 'n' should come before here */ -#if defined(PERL_OBJECT) -class CPerlObj { -public: - struct interpreter interp; - CPerlObj(IPerlMem*, IPerlMem*, IPerlMem*, IPerlEnv*, IPerlStdIO*, - IPerlLIO*, IPerlDir*, IPerlSock*, IPerlProc*); - void* operator new(size_t nSize, IPerlMem *pvtbl); -#ifndef __BORLANDC__ - static void operator delete(void* pPerl, IPerlMem *pvtbl); -#endif - int do_aspawn (void *vreally, void **vmark, void **vsp); -#endif -#if defined(PERL_OBJECT) -public: -#else START_EXTERN_C -#endif # include "pp_proto.h" PERL_CALLCONV SV* Perl_amagic_call(pTHX_ SV* left, SV* right, int method, int dir); PERL_CALLCONV bool Perl_Gv_AMupdate(pTHX_ HV* stash); @@ -101,7 +85,7 @@ PERL_CALLCONV UV Perl_cast_uv(pTHX_ NV f); #if !defined(HAS_TRUNCATE) && !defined(HAS_CHSIZE) && defined(F_FREESP) PERL_CALLCONV I32 Perl_my_chsize(pTHX_ int fd, Off_t length); #endif -#if defined(USE_THREADS) +#if defined(USE_5005THREADS) PERL_CALLCONV MAGIC* Perl_condpair_magic(pTHX_ SV *sv); #endif PERL_CALLCONV OP* Perl_convert(pTHX_ I32 optype, I32 flags, OP* o); @@ -271,7 +255,7 @@ PERL_CALLCONV void Perl_dump_sub(pTHX_ GV* gv); PERL_CALLCONV void Perl_fbm_compile(pTHX_ SV* sv, U32 flags); PERL_CALLCONV char* Perl_fbm_instr(pTHX_ unsigned char* big, unsigned char* bigend, SV* littlesv, U32 flags); PERL_CALLCONV char* Perl_find_script(pTHX_ char *scriptname, bool dosearch, char **search_ext, I32 flags); -#if defined(USE_THREADS) +#if defined(USE_5005THREADS) PERL_CALLCONV PADOFFSET Perl_find_threadsv(pTHX_ const char *name); #endif PERL_CALLCONV OP* Perl_force_list(pTHX_ OP* arg); @@ -355,9 +339,9 @@ PERL_CALLCONV bool Perl_is_uni_lower(pTHX_ U32 c); PERL_CALLCONV bool Perl_is_uni_print(pTHX_ U32 c); PERL_CALLCONV bool Perl_is_uni_punct(pTHX_ U32 c); PERL_CALLCONV bool Perl_is_uni_xdigit(pTHX_ U32 c); -PERL_CALLCONV U32 Perl_to_uni_upper(pTHX_ U32 c); -PERL_CALLCONV U32 Perl_to_uni_title(pTHX_ U32 c); -PERL_CALLCONV U32 Perl_to_uni_lower(pTHX_ U32 c); +PERL_CALLCONV U32 Perl_to_uni_upper(pTHX_ U32 c, U8 *p, STRLEN *lenp); +PERL_CALLCONV U32 Perl_to_uni_title(pTHX_ U32 c, U8 *p, STRLEN *lenp); +PERL_CALLCONV U32 Perl_to_uni_lower(pTHX_ U32 c, U8 *p, STRLEN *lenp); PERL_CALLCONV bool Perl_is_uni_alnum_lc(pTHX_ U32 c); PERL_CALLCONV bool Perl_is_uni_alnumc_lc(pTHX_ U32 c); PERL_CALLCONV bool Perl_is_uni_idfirst_lc(pTHX_ U32 c); @@ -372,9 +356,6 @@ PERL_CALLCONV bool Perl_is_uni_lower_lc(pTHX_ U32 c); PERL_CALLCONV bool Perl_is_uni_print_lc(pTHX_ U32 c); PERL_CALLCONV bool Perl_is_uni_punct_lc(pTHX_ U32 c); PERL_CALLCONV bool Perl_is_uni_xdigit_lc(pTHX_ U32 c); -PERL_CALLCONV U32 Perl_to_uni_upper_lc(pTHX_ U32 c); -PERL_CALLCONV U32 Perl_to_uni_title_lc(pTHX_ U32 c); -PERL_CALLCONV U32 Perl_to_uni_lower_lc(pTHX_ U32 c); PERL_CALLCONV STRLEN Perl_is_utf8_char(pTHX_ U8 *p); PERL_CALLCONV bool Perl_is_utf8_string(pTHX_ U8 *s, STRLEN len); PERL_CALLCONV bool Perl_is_utf8_alnum(pTHX_ U8 *p); @@ -406,8 +387,11 @@ PERL_CALLCONV void Perl_load_module(pTHX_ U32 flags, SV* name, SV* ver, ...); PERL_CALLCONV void Perl_vload_module(pTHX_ U32 flags, SV* name, SV* ver, va_list* args); PERL_CALLCONV OP* Perl_localize(pTHX_ OP* arg, I32 lexical); PERL_CALLCONV I32 Perl_looks_like_number(pTHX_ SV* sv); +PERL_CALLCONV UV Perl_grok_bin(pTHX_ char* start, STRLEN* len, I32* flags, NV *result); +PERL_CALLCONV UV Perl_grok_hex(pTHX_ char* start, STRLEN* len, I32* flags, NV *result); PERL_CALLCONV int Perl_grok_number(pTHX_ const char *pv, STRLEN len, UV *valuep); PERL_CALLCONV bool Perl_grok_numeric_radix(pTHX_ const char **sp, const char *send); +PERL_CALLCONV UV Perl_grok_oct(pTHX_ char* start, STRLEN* len, I32* flags, NV *result); PERL_CALLCONV int Perl_magic_clearenv(pTHX_ SV* sv, MAGIC* mg); PERL_CALLCONV int Perl_magic_clear_all_env(pTHX_ SV* sv, MAGIC* mg); PERL_CALLCONV int Perl_magic_clearpack(pTHX_ SV* sv, MAGIC* mg); @@ -428,7 +412,7 @@ PERL_CALLCONV int Perl_magic_gettaint(pTHX_ SV* sv, MAGIC* mg); PERL_CALLCONV int Perl_magic_getuvar(pTHX_ SV* sv, MAGIC* mg); PERL_CALLCONV int Perl_magic_getvec(pTHX_ SV* sv, MAGIC* mg); PERL_CALLCONV U32 Perl_magic_len(pTHX_ SV* sv, MAGIC* mg); -#if defined(USE_THREADS) +#if defined(USE_5005THREADS) PERL_CALLCONV int Perl_magic_mutexfree(pTHX_ SV* sv, MAGIC* mg); #endif PERL_CALLCONV int Perl_magic_nextpack(pTHX_ SV* sv, MAGIC* mg, SV* key); @@ -472,6 +456,7 @@ PERL_CALLCONV SV* Perl_mess(pTHX_ const char* pat, ...) ; PERL_CALLCONV SV* Perl_vmess(pTHX_ const char* pat, va_list* args); PERL_CALLCONV void Perl_qerror(pTHX_ SV* err); +PERL_CALLCONV void Perl_sortsv(pTHX_ SV ** array, size_t num_elts, SVCOMPARE_t f); PERL_CALLCONV int Perl_mg_clear(pTHX_ SV* sv); PERL_CALLCONV int Perl_mg_copy(pTHX_ SV* sv, SV* nsv, const char* key, I32 klen); PERL_CALLCONV MAGIC* Perl_mg_find(pTHX_ SV* sv, int type); @@ -496,6 +481,9 @@ PERL_CALLCONV char* Perl_my_bzero(char* loc, I32 len); PERL_CALLCONV void Perl_my_exit(pTHX_ U32 status) __attribute__((noreturn)); PERL_CALLCONV void Perl_my_failure_exit(pTHX) __attribute__((noreturn)); PERL_CALLCONV I32 Perl_my_fflush_all(pTHX); +PERL_CALLCONV Pid_t Perl_my_fork(void); +PERL_CALLCONV void Perl_atfork_lock(void); +PERL_CALLCONV void Perl_atfork_unlock(void); PERL_CALLCONV I32 Perl_my_lstat(pTHX); #if !defined(HAS_MEMCMP) || !defined(HAS_SANE_MEMCMP) PERL_CALLCONV I32 Perl_my_memcmp(const char* s1, const char* s2, I32 len); @@ -503,11 +491,9 @@ PERL_CALLCONV I32 Perl_my_memcmp(const char* s1, const char* s2, I32 len); #if !defined(HAS_MEMSET) PERL_CALLCONV void* Perl_my_memset(char* loc, I32 ch, I32 len); #endif -#if !defined(PERL_OBJECT) PERL_CALLCONV I32 Perl_my_pclose(pTHX_ PerlIO* ptr); PERL_CALLCONV PerlIO* Perl_my_popen(pTHX_ char* cmd, char* mode); PERL_CALLCONV PerlIO* Perl_my_popen_list(pTHX_ char* mode, int n, SV ** args); -#endif PERL_CALLCONV void Perl_my_setenv(pTHX_ char* nam, char* val); PERL_CALLCONV I32 Perl_my_stat(pTHX); PERL_CALLCONV char * Perl_my_strftime(pTHX_ char *fmt, int sec, int min, int hour, int mday, int mon, int year, int wday, int yday, int isdst); @@ -591,14 +577,7 @@ PERL_CALLCONV void Perl_pad_reset(pTHX); PERL_CALLCONV void Perl_pad_swipe(pTHX_ PADOFFSET po); PERL_CALLCONV void Perl_peep(pTHX_ OP* o); PERL_CALLCONV PerlIO* Perl_start_glob(pTHX_ SV* pattern, IO *io); -#if defined(PERL_OBJECT) -PERL_CALLCONV void Perl_construct(pTHX); -PERL_CALLCONV void Perl_destruct(pTHX); -PERL_CALLCONV void Perl_free(pTHX); -PERL_CALLCONV int Perl_run(pTHX); -PERL_CALLCONV int Perl_parse(pTHX_ XSINIT_t xsinit, int argc, char** argv, char** env); -#endif -#if defined(USE_THREADS) +#if defined(USE_5005THREADS) PERL_CALLCONV struct perl_thread* Perl_new_struct_thread(pTHX_ struct perl_thread *t); #endif PERL_CALLCONV void Perl_call_atexit(pTHX_ ATEXIT_t fn, void *ptr); @@ -725,6 +704,7 @@ PERL_CALLCONV NV Perl_sv_2nv(pTHX_ SV* sv); PERL_CALLCONV char* Perl_sv_2pv(pTHX_ SV* sv, STRLEN* lp); PERL_CALLCONV char* Perl_sv_2pvutf8(pTHX_ SV* sv, STRLEN* lp); PERL_CALLCONV char* Perl_sv_2pvbyte(pTHX_ SV* sv, STRLEN* lp); +PERL_CALLCONV char* Perl_sv_pvn_nomg(pTHX_ SV* sv, STRLEN* lp); PERL_CALLCONV UV Perl_sv_2uv(pTHX_ SV* sv); PERL_CALLCONV IV Perl_sv_iv(pTHX_ SV* sv); PERL_CALLCONV UV Perl_sv_uv(pTHX_ SV* sv); @@ -817,13 +797,13 @@ PERL_CALLCONV SV* Perl_swash_init(pTHX_ char* pkg, char* name, SV* listsv, I32 m PERL_CALLCONV UV Perl_swash_fetch(pTHX_ SV *sv, U8 *ptr, bool do_utf8); PERL_CALLCONV void Perl_taint_env(pTHX); PERL_CALLCONV void Perl_taint_proper(pTHX_ const char* f, const char* s); -PERL_CALLCONV UV Perl_to_utf8_lower(pTHX_ U8 *p); -PERL_CALLCONV UV Perl_to_utf8_upper(pTHX_ U8 *p); -PERL_CALLCONV UV Perl_to_utf8_title(pTHX_ U8 *p); +PERL_CALLCONV UV Perl_to_utf8_lower(pTHX_ U8 *p, U8* ustrp, STRLEN *lenp); +PERL_CALLCONV UV Perl_to_utf8_upper(pTHX_ U8 *p, U8* ustrp, STRLEN *lenp); +PERL_CALLCONV UV Perl_to_utf8_title(pTHX_ U8 *p, U8* ustrp, STRLEN *lenp); #if defined(UNLINK_ALL_VERSIONS) PERL_CALLCONV I32 Perl_unlnk(pTHX_ char* f); #endif -#if defined(USE_THREADS) +#if defined(USE_5005THREADS) PERL_CALLCONV void Perl_unlock_condpair(pTHX_ void* svv); #endif PERL_CALLCONV void Perl_unsharepvn(pTHX_ const char* sv, I32 len, U32 hash); @@ -888,7 +868,7 @@ PERL_CALLCONV struct perl_vars * Perl_GetVars(pTHX); #endif PERL_CALLCONV int Perl_runops_standard(pTHX); PERL_CALLCONV int Perl_runops_debug(pTHX); -#if defined(USE_THREADS) +#if defined(USE_5005THREADS) PERL_CALLCONV SV* Perl_sv_lock(pTHX_ SV *sv); #endif PERL_CALLCONV void Perl_sv_catpvf_mg(pTHX_ SV *sv, const char* pat, ...) @@ -915,7 +895,8 @@ PERL_CALLCONV void Perl_sv_setpvn_mg(pTHX_ SV *sv, const char *ptr, STRLEN len); PERL_CALLCONV void Perl_sv_setsv_mg(pTHX_ SV *dstr, SV *sstr); PERL_CALLCONV void Perl_sv_usepvn_mg(pTHX_ SV *sv, char *ptr, STRLEN len); PERL_CALLCONV MGVTBL* Perl_get_vtbl(pTHX_ int vtbl_id); -PERL_CALLCONV char* Perl_pv_display(pTHX_ SV *sv, char *pv, STRLEN cur, STRLEN len, STRLEN pvlim); +PERL_CALLCONV char* Perl_pv_display(pTHX_ SV *dsv, char *pv, STRLEN cur, STRLEN len, STRLEN pvlim); +PERL_CALLCONV char* Perl_sv_uni_display(pTHX_ SV *dsv, SV *ssv, STRLEN pvlim); PERL_CALLCONV void Perl_dump_indent(pTHX_ I32 level, PerlIO *file, const char* pat, ...) #ifdef CHECK_FORMAT __attribute__((format(printf,pTHX_3,pTHX_4))) @@ -956,17 +937,17 @@ PERL_CALLCONV void Perl_newMYSUB(pTHX_ I32 floor, OP *o, OP *proto, OP *attrs, O PERL_CALLCONV OP * Perl_my_attrs(pTHX_ OP *o, OP *attrs); PERL_CALLCONV void Perl_boot_core_xsutils(pTHX); #if defined(USE_ITHREADS) -PERL_CALLCONV PERL_CONTEXT* Perl_cx_dup(pTHX_ PERL_CONTEXT* cx, I32 ix, I32 max, clone_params* param); -PERL_CALLCONV PERL_SI* Perl_si_dup(pTHX_ PERL_SI* si, clone_params* param); -PERL_CALLCONV ANY* Perl_ss_dup(pTHX_ PerlInterpreter* proto_perl, clone_params* param); +PERL_CALLCONV PERL_CONTEXT* Perl_cx_dup(pTHX_ PERL_CONTEXT* cx, I32 ix, I32 max, CLONE_PARAMS* param); +PERL_CALLCONV PERL_SI* Perl_si_dup(pTHX_ PERL_SI* si, CLONE_PARAMS* param); +PERL_CALLCONV ANY* Perl_ss_dup(pTHX_ PerlInterpreter* proto_perl, CLONE_PARAMS* param); PERL_CALLCONV void* Perl_any_dup(pTHX_ void* v, PerlInterpreter* proto_perl); -PERL_CALLCONV HE* Perl_he_dup(pTHX_ HE* e, bool shared, clone_params* param); -PERL_CALLCONV REGEXP* Perl_re_dup(pTHX_ REGEXP* r); -PERL_CALLCONV PerlIO* Perl_fp_dup(pTHX_ PerlIO* fp, char type); +PERL_CALLCONV HE* Perl_he_dup(pTHX_ HE* e, bool shared, CLONE_PARAMS* param); +PERL_CALLCONV REGEXP* Perl_re_dup(pTHX_ REGEXP* r, CLONE_PARAMS* param); +PERL_CALLCONV PerlIO* Perl_fp_dup(pTHX_ PerlIO* fp, char type, CLONE_PARAMS* param); PERL_CALLCONV DIR* Perl_dirp_dup(pTHX_ DIR* dp); -PERL_CALLCONV GP* Perl_gp_dup(pTHX_ GP* gp, clone_params* param); -PERL_CALLCONV MAGIC* Perl_mg_dup(pTHX_ MAGIC* mg, clone_params* param); -PERL_CALLCONV SV* Perl_sv_dup(pTHX_ SV* sstr, clone_params* param); +PERL_CALLCONV GP* Perl_gp_dup(pTHX_ GP* gp, CLONE_PARAMS* param); +PERL_CALLCONV MAGIC* Perl_mg_dup(pTHX_ MAGIC* mg, CLONE_PARAMS* param); +PERL_CALLCONV SV* Perl_sv_dup(pTHX_ SV* sstr, CLONE_PARAMS* param); #if defined(HAVE_INTERP_INTERN) PERL_CALLCONV void Perl_sys_intern_dup(pTHX_ struct interp_intern* src, struct interp_intern* dst); #endif @@ -982,11 +963,11 @@ PERL_CALLCONV void Perl_sys_intern_clear(pTHX); PERL_CALLCONV void Perl_sys_intern_init(pTHX); #endif -#if defined(PERL_OBJECT) -protected: -#else +PERL_CALLCONV char * Perl_custom_op_name(pTHX_ OP* op); +PERL_CALLCONV char * Perl_custom_op_desc(pTHX_ OP* op); + + END_EXTERN_C -#endif #if defined(PERL_IN_AV_C) || defined(PERL_DECL_PROT) STATIC I32 S_avhv_index_sv(pTHX_ SV* sv); @@ -1082,7 +1063,7 @@ STATIC void* S_vrun_body(pTHX_ va_list args); STATIC void* S_vcall_body(pTHX_ va_list args); STATIC void* S_vcall_list_body(pTHX_ va_list args); #endif -# if defined(USE_THREADS) +# if defined(USE_5005THREADS) STATIC struct perl_thread * S_init_main_thread(pTHX); # endif #endif @@ -1115,7 +1096,6 @@ STATIC I32 S_dopoptosub_at(pTHX_ PERL_CONTEXT* cxstk, I32 startingblock); STATIC void S_save_lines(pTHX_ AV *array, SV *sv); STATIC OP* S_doeval(pTHX_ int gimme, OP** startop); STATIC PerlIO * S_doopen_pmc(pTHX_ const char *name, const char *mode); -STATIC void S_qsortsv(pTHX_ SV ** array, size_t num_elts, SVCOMPARE_t f); #endif #if defined(PERL_IN_PP_HOT_C) || defined(PERL_DECL_PROT) @@ -1194,6 +1174,17 @@ STATIC void S_debprof(pTHX_ OP *o); STATIC SV* S_save_scalar_at(pTHX_ SV **sptr); #endif +#if defined(USE_ITHREADS) +PERL_CALLCONV void Perl_sharedsv_init(pTHX); +PERL_CALLCONV shared_sv* Perl_sharedsv_new(pTHX); +PERL_CALLCONV shared_sv* Perl_sharedsv_find(pTHX_ SV* sv); +PERL_CALLCONV void Perl_sharedsv_lock(pTHX_ shared_sv* ssv); +PERL_CALLCONV void Perl_sharedsv_unlock(pTHX_ shared_sv* ssv); +PERL_CALLCONV void Perl_sharedsv_unlock_scope(pTHX_ shared_sv* ssv); +PERL_CALLCONV void Perl_sharedsv_thrcnt_inc(pTHX_ shared_sv* ssv); +PERL_CALLCONV void Perl_sharedsv_thrcnt_dec(pTHX_ shared_sv* ssv); +#endif + #if defined(PERL_IN_SV_C) || defined(PERL_DECL_PROT) STATIC IV S_asIV(pTHX_ SV* sv); STATIC UV S_asUV(pTHX_ SV* sv); @@ -1255,7 +1246,7 @@ STATIC SV* S_gv_share(pTHX_ SV *sv); #if defined(PERL_IN_TOKE_C) || defined(PERL_DECL_PROT) STATIC void S_check_uni(pTHX); STATIC void S_force_next(pTHX_ I32 type); -STATIC char* S_force_version(pTHX_ char *start); +STATIC char* S_force_version(pTHX_ char *start, int guessing); STATIC char* S_force_word(pTHX_ char *start, int token, int check_keyword, int allow_pack, int allow_tick); STATIC SV* S_tokeq(pTHX_ SV *sv); STATIC int S_pending_ident(pTHX); @@ -1313,16 +1304,13 @@ STATIC char* S_stdize_locale(pTHX_ char* locs); #endif #if defined(PERL_IN_UTIL_C) || defined(PERL_DECL_PROT) +STATIC COP* S_closest_cop(pTHX_ COP *cop, OP *o); STATIC SV* S_mess_alloc(pTHX); # if defined(LEAKTEST) STATIC void S_xstat(pTHX_ int); # endif #endif -#if defined(PERL_OBJECT) -}; -#endif - START_EXTERN_C PERL_CALLCONV void Perl_sv_setsv_flags(pTHX_ SV* dsv, SV* ssv, I32 flags);