fix up dtrace compile/link for Solaris

[perl5.git] / embed.fnc

diff --git a/embed.fnc b/embed.fnc
index 636b61a..d114b2b 100644 (file)
--- a/embed.fnc
+++ b/embed.fnc
@@ -647,7 +647,7 @@ p   |void   |init_debugger
 Ap     |void   |init_stacks
 Ap     |void   |init_tm        |NN struct tm *ptm
 : Used in perly.y
-AnpPR  |char*  |instr          |NN const char* big|NN const char* little
+AbmnpPR        |char*  |instr          |NN const char* big|NN const char* little
 : Used in sv.c
 p      |bool   |io_close       |NN IO* io|NULLOK GV *gv \
                                |bool not_implicit|bool warn_on_fail
@@ -931,11 +931,11 @@ s |void   |move_proto_attr|NN OP **proto|NN OP **attrs|NN const GV *name
 p      |int    |mode_from_discipline|NULLOK const char* s|STRLEN len
 Ap     |const char*    |moreswitches   |NN const char* s
 Ap     |NV     |my_atof        |NN const char *s
-#if (!defined(HAS_MEMCPY) && !defined(HAS_BCOPY)) || (!defined(HAS_MEMMOVE) && !defined(HAS_SAFE_MEMCPY) && !defined(HAS_SAFE_BCOPY))
-Anp    |char*  |my_bcopy       |NN const char* from|NN char* to|I32 len
+#if !defined(HAS_MEMCPY) || (!defined(HAS_MEMMOVE) && !defined(HAS_SAFE_MEMCPY))
+Anp    |void*  |my_bcopy       |NN const void* vfrom|NN void* vto|size_t len
 #endif
 #if !defined(HAS_BZERO) && !defined(HAS_MEMSET)
-Anp    |char*  |my_bzero       |NN char* loc|I32 len
+Anp    |void*  |my_bzero       |NN void* vloc|size_t len
 #endif
 Apr    |void   |my_exit        |U32 status
 Apr    |void   |my_failure_exit
@@ -946,10 +946,10 @@ Anp       |void   |atfork_unlock
 Apmb   |I32    |my_lstat
 pX     |I32    |my_lstat_flags |NULLOK const U32 flags
 #if !defined(HAS_MEMCMP) || !defined(HAS_SANE_MEMCMP)
-AnpP   |I32    |my_memcmp      |NN const char* s1|NN const char* s2|I32 len
+AnpP   |int    |my_memcmp      |NN const void* vs1|NN const void* vs2|size_t len
 #endif
 #if !defined(HAS_MEMSET)
-Anp    |void*  |my_memset      |NN char* loc|I32 ch|I32 len
+Anp    |void*  |my_memset      |NN void* vloc|int ch|size_t len
 #endif
 #if !defined(PERL_IMPLICIT_SYS)
 Ap     |I32    |my_pclose      |NULLOK PerlIO* ptr
@@ -2118,6 +2118,7 @@ p |OP *   |tied_method|NN SV *methname|NN SV **sp \
 #if defined(PERL_IN_REGCOMP_C) || defined(PERL_IN_REGEXEC_C)
 Ep     |void   |regprop        |NULLOK const regexp *prog|NN SV* sv|NN const regnode* o|NULLOK const regmatch_info *reginfo \
                                |NULLOK const RExC_state_t *pRExC_state
+Ep     |int    |re_printf      |NN const char *fmt|...
 #endif
 #if defined(PERL_IN_REGCOMP_C)
 Es     |regnode*|reg           |NN RExC_state_t *pRExC_state \
@@ -2264,6 +2265,7 @@ EnPs      |int    |edit_distance  |NN const UV *src                   \
                                |const STRLEN y                     \
                                |const SSize_t maxDistance
 #  ifdef DEBUGGING
+Ep     |int    |re_indentf     |NN const char *fmt|U32 depth|...
 Es        |void        |regdump_intflags|NULLOK const char *lead| const U32 flags
 Es     |void   |regdump_extflags|NULLOK const char *lead| const U32 flags
 Es     |const regnode*|dumpuntil|NN const regexp *r|NN const regnode *start \
@@ -2375,10 +2377,12 @@ EsR     |WB_enum|backup_one_WB  |NN WB_enum * previous                  \
                                |const bool utf8_target
 #  ifdef DEBUGGING
 Es     |void   |dump_exec_pos  |NN const char *locinput|NN const regnode *scan|NN const char *loc_regeol\
-                               |NN const char *loc_bostr|NN const char *loc_reg_starttry|const bool do_utf8
+                               |NN const char *loc_bostr|NN const char *loc_reg_starttry|const bool do_utf8|const U32 depth
 Es     |void   |debug_start_match|NN const REGEXP *prog|const bool do_utf8\
                                |NN const char *start|NN const char *end\
                                |NN const char *blurb
+
+Ep     |int    |re_exec_indentf        |NN const char *fmt|U32 depth|...
 #  endif
 #endif
 
@@ -2936,4 +2940,11 @@ AiM      |void   |cx_pushgiven    |NN PERL_CONTEXT *cx|NULLOK SV *orig_defsv
 AiM    |void   |cx_popgiven     |NN PERL_CONTEXT *cx
 #endif
 
+#ifdef USE_DTRACE
+XEop    |void   |dtrace_probe_call |NN CV *cv|bool is_call
+XEop    |void   |dtrace_probe_load |NN const char *name|bool is_loading
+XEop    |void   |dtrace_probe_op   |NN const OP *op
+XEop    |void   |dtrace_probe_phase|enum perl_phase phase
+#endif
+
 : ex: set ts=8 sts=4 sw=4 noet: