diff options
| -rw-r--r-- | bytecode.h | 2 | ||||
| -rw-r--r-- | bytecode.pl | 2 | ||||
| -rw-r--r-- | byterun.h | 2 | ||||
| -rw-r--r-- | embedvar.h | 2 | ||||
| -rw-r--r-- | objXSUB.h | 2 | ||||
| -rw-r--r-- | perlvars.h | 3 |
6 files changed, 10 insertions, 3 deletions
diff --git a/bytecode.h b/bytecode.h index 9f4f781b8e..b08dc7cf5f 100644 --- a/bytecode.h +++ b/bytecode.h @@ -134,7 +134,7 @@ typedef IV IV64; ((PMOP*)o)->op_pmregexp = arg ? \ CALLREGCOMP(arg, arg + PL_bytecode_pv.xpv_cur, ((PMOP*)o)) : 0 #define BSET_newsv(sv, arg) sv = NEWSV(666,0); SvUPGRADE(sv, arg) -#define BSET_newop(o, arg) o = (OP*)safemalloc(optype_size[arg]) +#define BSET_newop(o, arg) o = (OP*)safemalloc(PL_optype_size[arg]) #define BSET_newopn(o, arg) STMT_START { \ OP *oldop = o; \ BSET_newop(o, arg); \ diff --git a/bytecode.pl b/bytecode.pl index f53b0cef4b..704d3b1623 100644 --- a/bytecode.pl +++ b/bytecode.pl @@ -198,7 +198,7 @@ for ($i = 0; $i < @optype - 1; $i++) { } printf BYTERUN_H " OPt_%s\t\t/* %d */\n};\n\n", $optype[$i], $i; print BYTERUN_H <<'EOT'; -EXT int optype_size[] +EXT int PL_optype_size[] #ifdef DOINIT = { EOT @@ -156,7 +156,7 @@ enum { OPt_COP /* 11 */ }; -EXT int optype_size[] +EXT int PL_optype_size[] #ifdef DOINIT = { sizeof(OP), diff --git a/embedvar.h b/embedvar.h index 73c674caf2..41a566f046 100644 --- a/embedvar.h +++ b/embedvar.h @@ -757,6 +757,7 @@ #define PL_oldbufptr (PL_Vars.Goldbufptr) #define PL_oldoldbufptr (PL_Vars.Goldoldbufptr) #define PL_op_seqmax (PL_Vars.Gop_seqmax) +#define PL_optype_size (PL_Vars.Goptype_size) #define PL_origalen (PL_Vars.Gorigalen) #define PL_origenviron (PL_Vars.Gorigenviron) #define PL_osname (PL_Vars.Gosname) @@ -896,6 +897,7 @@ #define PL_Goldbufptr PL_oldbufptr #define PL_Goldoldbufptr PL_oldoldbufptr #define PL_Gop_seqmax PL_op_seqmax +#define PL_Goptype_size PL_optype_size #define PL_Gorigalen PL_origalen #define PL_Gorigenviron PL_origenviron #define PL_Gosname PL_osname @@ -442,6 +442,8 @@ #define PL_op_seqmax pPerl->PL_op_seqmax #undef PL_opsave #define PL_opsave pPerl->PL_opsave +#undef PL_optype_size +#define PL_optype_size pPerl->PL_optype_size #undef PL_origalen #define PL_origalen pPerl->PL_origalen #undef PL_origargc diff --git a/perlvars.h b/perlvars.h index 67dc7c181f..061f8f3794 100644 --- a/perlvars.h +++ b/perlvars.h @@ -204,3 +204,6 @@ PERLVAR(Guudmap[256], char) PERLVAR(Gbitcount, char *) PERLVAR(Gfilter_debug, int) +/* byterun globals */ +PERLVAR(Goptype_size[], int) + |