From: Gurusamy Sarathy Date: Fri, 4 Jun 1999 23:00:22 +0000 (+0000) Subject: clean up some stray "global" symbols X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=fdf134946da249a71c49962435817212b8fa195a;p=p5sagit%2Fp5-mst-13.2.git clean up some stray "global" symbols p4raw-id: //depot/perl@3521 --- diff --git a/embed.h b/embed.h index 7542fe6..c15013e 100644 --- a/embed.h +++ b/embed.h @@ -51,6 +51,7 @@ #define ck_anoncode Perl_ck_anoncode #define ck_bitop Perl_ck_bitop #define ck_concat Perl_ck_concat +#define ck_defined Perl_ck_defined #define ck_delete Perl_ck_delete #define ck_eof Perl_ck_eof #define ck_eval Perl_ck_eval @@ -1021,6 +1022,7 @@ #define ck_anoncode CPerlObj::Perl_ck_anoncode #define ck_bitop CPerlObj::Perl_ck_bitop #define ck_concat CPerlObj::Perl_ck_concat +#define ck_defined CPerlObj::Perl_ck_defined #define ck_delete CPerlObj::Perl_ck_delete #define ck_eof CPerlObj::Perl_ck_eof #define ck_eval CPerlObj::Perl_ck_eval diff --git a/embed.pl b/embed.pl index 381c040..37a0070 100755 --- a/embed.pl +++ b/embed.pl @@ -271,8 +271,6 @@ my @staticfuncs = qw( mul128 is_an_int div128 - runops_standard - runops_debug check_uni force_next force_version @@ -400,9 +398,7 @@ my @staticfuncs = qw( restore_rsfp restore_expect restore_lex_expect - yydestruct del_sv - fprintf ); for $sym (sort(keys(%global),@staticfuncs)) { diff --git a/global.sym b/global.sym index 44f4361..35acec5 100644 --- a/global.sym +++ b/global.sym @@ -35,42 +35,10 @@ boot_core_UNIVERSAL bset_obj_store call_list cando -cast_ulong cast_i32 cast_iv +cast_ulong cast_uv -ck_anoncode -ck_bitop -ck_concat -ck_delete -ck_eof -ck_eval -ck_exec -ck_exists -ck_ftst -ck_fun -ck_fun_locale -ck_glob -ck_grep -ck_index -ck_lengthconst -ck_lfun -ck_listiob -ck_match -ck_null -ck_repeat -ck_require -ck_rfun -ck_rvconst -ck_scmp -ck_select -ck_shift -ck_sort -ck_spair -ck_split -ck_subr -ck_svconst -ck_trunc condpair_magic convert croak @@ -100,9 +68,9 @@ do_eof do_exec do_exec3 do_execfree -do_hv_dump do_gv_dump do_gvgv_dump +do_hv_dump do_ipcctl do_ipcget do_join @@ -110,8 +78,8 @@ do_kv do_magic_dump do_msgrcv do_msgsnd -do_open do_op_dump +do_open do_pipe do_pmop_dump do_print @@ -149,11 +117,12 @@ force_list form free_tmps gen_constant_list +get_no_modify get_op_descs get_op_names -get_no_modify get_opargs get_vtbl +getenv_len gp_free gp_ref gv_AVadd @@ -321,8 +290,6 @@ my_setenv my_stat my_swap my_unexec -new_stackinfo -new_struct_thread newANONHASH newANONLIST newANONSUB @@ -370,6 +337,8 @@ newSVsv newUNOP newWHILEOP newXS +new_stackinfo +new_struct_thread nextargv ninstr oopsAV @@ -395,18 +364,18 @@ pmruntime pmtrans pop_return pop_scope -pv_display pregcomp pregexec pregfree prepend_elem push_return push_scope +pv_display ref refkids -reginitcolors regdump regexec_flags +reginitcolors regnext regprop repeatcpy @@ -526,14 +495,14 @@ sv_isobject sv_iv sv_len sv_len_utf8 -sv_pos_u2b -sv_pos_b2u sv_magic sv_mortalcopy sv_newmortal sv_newref sv_nv sv_peek +sv_pos_b2u +sv_pos_u2b sv_pv sv_pvn sv_pvn_force diff --git a/objXSUB.h b/objXSUB.h index 857a942..1fbb214 100644 --- a/objXSUB.h +++ b/objXSUB.h @@ -897,6 +897,8 @@ #define ck_bitop pPerl->Perl_ck_bitop #undef ck_concat #define ck_concat pPerl->Perl_ck_concat +#undef ck_defined +#define ck_defined pPerl->Perl_ck_defined #undef ck_delete #define ck_delete pPerl->Perl_ck_delete #undef ck_eof diff --git a/opcode.pl b/opcode.pl index 2733cbe..7ca580b 100755 --- a/opcode.pl +++ b/opcode.pl @@ -219,6 +219,7 @@ open PPSYM, '>pp.sym' or die "Error creating pp.sym: $!"; for (sort keys %ckname) { print PP "PERL_CKDEF($_)\n"; + print PPSYM "$_\n"; #OP *\t", &tab(3,$_),"(OP* o);\n"; } diff --git a/pp.sym b/pp.sym index e991d6b..609739b 100644 --- a/pp.sym +++ b/pp.sym @@ -1,3 +1,36 @@ +ck_anoncode +ck_bitop +ck_concat +ck_defined +ck_delete +ck_eof +ck_eval +ck_exec +ck_exists +ck_ftst +ck_fun +ck_fun_locale +ck_glob +ck_grep +ck_index +ck_lengthconst +ck_lfun +ck_listiob +ck_match +ck_null +ck_repeat +ck_require +ck_rfun +ck_rvconst +ck_scmp +ck_select +ck_shift +ck_sort +ck_spair +ck_split +ck_subr +ck_svconst +ck_trunc pp_null pp_stub pp_scalar diff --git a/pp_proto.h b/pp_proto.h index 7f57282..9beb681 100644 --- a/pp_proto.h +++ b/pp_proto.h @@ -1,8 +1,8 @@ PERL_CKDEF(ck_anoncode) PERL_CKDEF(ck_bitop) PERL_CKDEF(ck_concat) -PERL_CKDEF(ck_delete) PERL_CKDEF(ck_defined) +PERL_CKDEF(ck_delete) PERL_CKDEF(ck_eof) PERL_CKDEF(ck_eval) PERL_CKDEF(ck_exec) diff --git a/proto.h b/proto.h index 018eef4..97e209b 100644 --- a/proto.h +++ b/proto.h @@ -104,14 +104,14 @@ VIRTUAL bool do_exec3 (char* cmd, int fd, int flag); #endif VIRTUAL void do_execfree (void); #if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM) -I32 do_ipcctl (I32 optype, SV** mark, SV** sp); -I32 do_ipcget (I32 optype, SV** mark, SV** sp); +VIRTUAL I32 do_ipcctl (I32 optype, SV** mark, SV** sp); +VIRTUAL I32 do_ipcget (I32 optype, SV** mark, SV** sp); #endif VIRTUAL void do_join (SV* sv, SV* del, SV** mark, SV** sp); VIRTUAL OP* do_kv (ARGSproto); #if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM) -I32 do_msgrcv (SV** mark, SV** sp); -I32 do_msgsnd (SV** mark, SV** sp); +VIRTUAL I32 do_msgrcv (SV** mark, SV** sp); +VIRTUAL I32 do_msgsnd (SV** mark, SV** sp); #endif VIRTUAL bool do_open (GV* gv, char* name, I32 len, int as_raw, int rawmode, int rawperm, PerlIO* supplied_fp); @@ -121,8 +121,8 @@ VIRTUAL OP* do_readline (void); VIRTUAL I32 do_chomp (SV* sv); VIRTUAL bool do_seek (GV* gv, Off_t pos, int whence); #if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM) -I32 do_semop (SV** mark, SV** sp); -I32 do_shmio (I32 optype, SV** mark, SV** sp); +VIRTUAL I32 do_semop (SV** mark, SV** sp); +VIRTUAL I32 do_shmio (I32 optype, SV** mark, SV** sp); #endif VIRTUAL void do_sprintf (SV* sv, I32 len, SV** sarg); VIRTUAL Off_t do_sysseek (GV* gv, Off_t pos, int whence); @@ -325,7 +325,7 @@ VIRTUAL OP* my (OP* o); VIRTUAL char* my_bcopy (const char* from, char* to, I32 len); #endif #if !defined(HAS_BZERO) && !defined(HAS_MEMSET) -char* my_bzero (char* loc, I32 len); +VIRTUAL char* my_bzero (char* loc, I32 len); #endif VIRTUAL void my_exit (U32 status) __attribute__((noreturn)); VIRTUAL void my_failure_exit (void) __attribute__((noreturn)); @@ -774,10 +774,6 @@ I32 amagic_cmp_locale (SV *str1, SV *str2); SV *mul128 (SV *sv, U8 m); SV *is_an_int (char *s, STRLEN l); int div128 (SV *pnum, bool *done); - -int runops_standard (void); -int runops_debug (void); - void check_uni (void); void force_next (I32 type); char *force_version (char *start); @@ -931,8 +927,10 @@ void restore_magic (void *p); void restore_rsfp (void *f); void restore_expect (void *e); void restore_lex_expect (void *e); -void yydestruct (void *ptr); +VIRTUAL void yydestruct (void *ptr); VIRTUAL int fprintf (PerlIO *pf, const char *pat, ...); +VIRTUAL int runops_standard (void); +VIRTUAL int runops_debug (void); #ifdef WIN32 VIRTUAL int& ErrorNo (void);