#18221 broke t/op/eval.t

[p5sagit/p5-mst-13.2.git] / embed.fnc

diff --git a/embed.fnc b/embed.fnc
index c7c03b8..08a8f9d 100644 (file)
--- a/embed.fnc
+++ b/embed.fnc
@@ -106,9 +106,6 @@ Ap  |UV     |cast_uv        |NV f
 #if !defined(HAS_TRUNCATE) && !defined(HAS_CHSIZE) && defined(F_FREESP)
 Ap     |I32    |my_chsize      |int fd|Off_t length
 #endif
-#if defined(USE_5005THREADS)
-Ap     |MAGIC* |condpair_magic |SV *sv
-#endif
 p      |OP*    |convert        |I32 optype|I32 flags|OP* o
 Afprd  |void   |croak          |const char* pat|...
 Apr    |void   |vcroak         |const char* pat|va_list* args
@@ -222,9 +219,6 @@ Apd |char*  |fbm_instr      |unsigned char* big|unsigned char* bigend \
                                |SV* littlesv|U32 flags
 p      |char*  |find_script    |char *scriptname|bool dosearch \
                                |char **search_ext|I32 flags
-#if defined(USE_5005THREADS)
-p      |PADOFFSET|find_threadsv|const char *name
-#endif
 p      |OP*    |force_list     |OP* arg
 p      |OP*    |fold_constants |OP* arg
 Afpd   |char*  |form           |const char* pat|...
@@ -392,9 +386,6 @@ p   |int    |magic_gettaint |SV* sv|MAGIC* mg
 p      |int    |magic_getuvar  |SV* sv|MAGIC* mg
 p      |int    |magic_getvec   |SV* sv|MAGIC* mg
 p      |U32    |magic_len      |SV* sv|MAGIC* mg
-#if defined(USE_5005THREADS)
-p      |int    |magic_mutexfree|SV* sv|MAGIC* mg
-#endif
 p      |int    |magic_nextpack |SV* sv|MAGIC* mg|SV* key
 p      |U32    |magic_regdata_cnt|SV* sv|MAGIC* mg
 p      |int    |magic_regdatum_get|SV* sv|MAGIC* mg
@@ -559,9 +550,6 @@ pd  |void   |pad_reset
 pd     |void   |pad_swipe      |PADOFFSET po|bool refadjust
 p      |void   |peep           |OP* o
 dopM   |PerlIO*|start_glob     |SV* pattern|IO *io
-#if defined(USE_5005THREADS)
-Ap     |struct perl_thread*    |new_struct_thread|struct perl_thread *t
-#endif
 #if defined(USE_REENTRANT_API)
 Ap     |void   |reentrant_size
 Ap     |void   |reentrant_init
@@ -728,7 +716,7 @@ Apd |I32    |sv_cmp_locale  |SV* sv1|SV* sv2
 #if defined(USE_LOCALE_COLLATE)
 Apd    |char*  |sv_collxfrm    |SV* sv|STRLEN* nxp
 #endif
-Ap     |OP*    |sv_compile_2op |SV* sv|OP** startp|char* code|AV** avp
+Ap     |OP*    |sv_compile_2op |SV* sv|OP** startp|char* code|PAD** padp
 Apd    |int    |getcwd_sv      |SV* sv
 Apd    |void   |sv_dec         |SV* sv
 Ap     |void   |sv_dump        |SV* sv
@@ -806,9 +794,6 @@ Apd |UV     |to_utf8_fold   |U8 *p|U8* ustrp|STRLEN *lenp
 #if defined(UNLINK_ALL_VERSIONS)
 Ap     |I32    |unlnk          |char* f
 #endif
-#if defined(USE_5005THREADS)
-Ap     |void   |unlock_condpair|void* svv
-#endif
 Apd    |I32    |unpack_str     |char *pat|char *patend|char *s|char *strbeg|char *strend|char **new_s|I32 ocnt|U32 flags
 Ap     |void   |unsharepvn     |const char* sv|I32 len|U32 hash
 p      |void   |unshare_hek    |HEK* hek
@@ -863,9 +848,6 @@ Ap  |struct perl_vars *|GetVars
 #endif
 Ap     |int    |runops_standard
 Ap     |int    |runops_debug
-#if defined(USE_5005THREADS)
-Ap     |SV*    |sv_lock        |SV *sv
-#endif
 Afpd   |void   |sv_catpvf_mg   |SV *sv|const char* pat|...
 Ap     |void   |sv_vcatpvf_mg  |SV* sv|const char* pat|va_list* args
 Apd    |void   |sv_catpv_mg    |SV *sv|const char *ptr
@@ -1030,7 +1012,7 @@ s      |void   |Slab_Free      |void *op
 #if defined(PERL_IN_PERL_C) || defined(PERL_DECL_PROT)
 s      |void   |find_beginning
 s      |void   |forbid_setid   |char *
-s      |void   |incpush        |char *|int|int
+s      |void   |incpush        |char *|int|int|int
 s      |void   |init_interp
 s      |void   |init_ids
 s      |void   |init_lexer
@@ -1056,9 +1038,6 @@ s |void*  |vrun_body      |va_list args
 s      |void*  |vcall_body     |va_list args
 s      |void*  |vcall_list_body|va_list args
 #endif
-#  if defined(USE_5005THREADS)
-s      |struct perl_thread *   |init_main_thread
-#  endif
 #endif
 
 #if defined(PERL_IN_PP_C) || defined(PERL_DECL_PROT)
@@ -1091,7 +1070,7 @@ s |I32    |dopoptoloop    |I32 startingblock
 s      |I32    |dopoptosub     |I32 startingblock
 s      |I32    |dopoptosub_at  |PERL_CONTEXT* cxstk|I32 startingblock
 s      |void   |save_lines     |AV *array|SV *sv
-s      |OP*    |doeval         |int gimme|OP** startop
+s      |OP*    |doeval         |int gimme|OP** startop|CV* outside|U32 seq
 s      |PerlIO *|doopen_pmc    |const char *name|const char *mode
 s      |bool   |path_is_absolute|char *name
 #endif
@@ -1350,7 +1329,7 @@ s |void   |deb_stack_n    |SV** stack_base|I32 stack_min \
 #endif
 
 pd     |PADLIST*|pad_new       |padnew_flags flags
-pd     |void   |pad_undef      |CV* cv|CV* outercv
+pd     |void   |pad_undef      |CV* cv
 pd     |PADOFFSET|pad_add_name |char *name\
                                |HV* typestash|HV* ourstash \
                                |bool clone
@@ -1368,13 +1347,13 @@ pd      |void   |pad_fixup_inner_anons|PADLIST *padlist|CV *old_cv|CV *new_cv
 pd     |void   |pad_push       |PADLIST *padlist|int depth|int has_args
 
 #if defined(PERL_IN_PAD_C) || defined(PERL_DECL_PROT)
-sd     |PADOFFSET|pad_findlex  |char* name|PADOFFSET newoff|U32 seq \
-                               |CV* startcv|I32 cx_ix|I32 saweval|U32 flags
+sd     |PADOFFSET|pad_findlex  |char* name|PADOFFSET newoff|CV* innercv
 #  if defined(DEBUGGING)
 sd     |void   |cv_dump        |CV *cv|char *title
 #  endif
 s      |CV*    |cv_clone2      |CV *proto|CV *outside
 #endif
+pd     |CV*    |find_runcv