Change 26113 by [EMAIL PROTECTED] on 2005/11/13 18:53:10
Integrate:
[ 25064]
sv_setuv_mg is so rarely called that the IV optimisation test is not
needed.
[ 25177]
Subject: Re: [PATCH] Faster **
From: "Piotr Fusik" <[EMAIL PROTECTED]>
Date: Fri, 24 Jun 2005 12:47:40 +0200
Message-Id: <[EMAIL PROTECTED]>
[ 25530]
Remove the last STRLEN n_a;s that my compiler can reach.
[ 25615]
Micro-optimisation: use PL_globalstash instead of looking up
CORE::GLOBAL::require by name
[ 25634]
We can use the C pre-processor to build a single, longer string
constant which makes the object code slightly smaller.
[ 25651]
Attempting to do too many things simultaneously with the C pre-
processor considered harmful.
[ 25763]
Subject: pre{inc,dec} is faster, even with integers
From: [EMAIL PROTECTED]
Message-Id: <[EMAIL PROTECTED]>
Date: Fri, 14 Oct 2005 18:22:41 +0100
Affected files ...
... //depot/maint-5.8/perl/doop.c#31 integrate
... //depot/maint-5.8/perl/ext/Devel/DProf/DProf.xs#11 integrate
... //depot/maint-5.8/perl/ext/Opcode/Opcode.xs#8 integrate
... //depot/maint-5.8/perl/op.c#113 integrate
... //depot/maint-5.8/perl/perl.c#140 integrate
... //depot/maint-5.8/perl/perly.act#1 branch
... //depot/maint-5.8/perl/pp.c#81 integrate
... //depot/maint-5.8/perl/sv.c#194 integrate
... //depot/maint-5.8/perl/sv.h#48 integrate
... //depot/maint-5.8/perl/t/op/inc.t#4 integrate
Differences ...
==== //depot/maint-5.8/perl/doop.c#31 (text) ====
Index: perl/doop.c
--- perl/doop.c#30~25641~ Wed Sep 28 13:19:53 2005
+++ perl/doop.c Sun Nov 13 10:53:10 2005
@@ -1173,8 +1173,9 @@
Newxz(dc, needlen + 1, char);
}
else if (SvOK(sv) || SvTYPE(sv) > SVt_PVMG) {
- STRLEN n_a;
- dc = SvPV_force(sv, n_a);
+ /* Fix this to nong when change 22613 is integrated.
+ (Which in turn awaits merging sv_2iv and sv_2uv) */
+ dc = SvPV_force_nolen(sv);
if (SvCUR(sv) < (STRLEN)len) {
dc = SvGROW(sv, (STRLEN)(len + 1));
(void)memzero(dc + SvCUR(sv), len - SvCUR(sv) + 1);
==== //depot/maint-5.8/perl/ext/Devel/DProf/DProf.xs#11 (text) ====
Index: perl/ext/Devel/DProf/DProf.xs
--- perl/ext/Devel/DProf/DProf.xs#10~25572~ Thu Sep 22 09:46:28 2005
+++ perl/ext/Devel/DProf/DProf.xs Sun Nov 13 10:53:10 2005
@@ -183,7 +183,6 @@
#ifdef OS2
ULONG rc;
QWORD cnt;
- STRLEN n_a;
if (!g_frequ) {
if (CheckOSError(DosTmrQueryFreq(&g_frequ)))
@@ -192,7 +191,7 @@
g_frequ = g_frequ/DPROF_HZ; /* count per tick */
if (CheckOSError(DosTmrQueryTime(&cnt)))
croak("DosTmrQueryTime: %s",
- SvPV(perl_get_sv("!",TRUE), n_a));
+ SvPV_nolen_const(perl_get_sv("!",TRUE)));
g_start_cnt = toLongLong(cnt);
}
==== //depot/maint-5.8/perl/ext/Opcode/Opcode.xs#8 (text) ====
Index: perl/ext/Opcode/Opcode.xs
--- perl/ext/Opcode/Opcode.xs#7~25572~ Thu Sep 22 09:46:28 2005
+++ perl/ext/Opcode/Opcode.xs Sun Nov 13 10:53:10 2005
@@ -466,8 +466,7 @@
}
else if (SvPOK(bitspec) && SvCUR(bitspec) == (STRLEN)opset_len) {
int b, j;
- STRLEN n_a;
- const char * const bitmap = SvPV(bitspec,n_a);
+ const char * const bitmap = SvPV_nolen_const(bitspec);
int myopcode = 0;
for (b=0; b < opset_len; b++) {
const U16 bits = bitmap[b];
==== //depot/maint-5.8/perl/op.c#113 (text) ====
Index: perl/op.c
--- perl/op.c#112~26111~ Sun Nov 13 10:09:54 2005
+++ perl/op.c Sun Nov 13 10:53:10 2005
@@ -856,6 +856,16 @@
o->op_ppaddr = PL_ppaddr[OP_PREDEC];
break;
+ case OP_I_POSTINC:
+ o->op_type = OP_I_PREINC; /* pre-increment is faster */
+ o->op_ppaddr = PL_ppaddr[OP_I_PREINC];
+ break;
+
+ case OP_I_POSTDEC:
+ o->op_type = OP_I_PREDEC; /* pre-decrement is faster */
+ o->op_ppaddr = PL_ppaddr[OP_I_PREDEC];
+ break;
+
case OP_OR:
case OP_AND:
case OP_COND_EXPR:
==== //depot/maint-5.8/perl/perl.c#140 (text) ====
Index: perl/perl.c
--- perl/perl.c#139~25713~ Sat Oct 8 08:19:54 2005
+++ perl/perl.c Sun Nov 13 10:53:10 2005
@@ -1795,85 +1795,86 @@
#endif
opts = SvCUR(opts_prog);
- sv_catpv(opts_prog,"\" Compile-time options:");
+ Perl_sv_catpv(aTHX_ opts_prog,"\" Compile-time options:"
# ifdef DEBUGGING
- sv_catpv(opts_prog," DEBUGGING");
+ " DEBUGGING"
# endif
# ifdef DEBUG_LEAKING_SCALARS_FORK_DUMP
- sv_catpv(opts_prog," DEBUG_LEAKING_SCALARS_FORK_DUMP");
+ " DEBUG_LEAKING_SCALARS_FORK_DUMP"
# endif
# ifdef FAKE_THREADS
- sv_catpv(opts_prog," FAKE_THREADS");
+ " FAKE_THREADS"
# endif
# ifdef MULTIPLICITY
- sv_catpv(opts_prog," MULTIPLICITY");
+ " MULTIPLICITY"
# endif
# ifdef MYMALLOC
- sv_catpv(opts_prog," MYMALLOC");
+ " MYMALLOC"
# endif
# ifdef PERL_DONT_CREATE_GVSV
- sv_catpv(opts_prog," PERL_DONT_CREATE_GVSV");
+ " PERL_DONT_CREATE_GVSV"
# endif
# ifdef PERL_GLOBAL_STRUCT
- sv_catpv(opts_prog," PERL_GLOBAL_STRUCT");
+ " PERL_GLOBAL_STRUCT"
# endif
# ifdef PERL_IMPLICIT_CONTEXT
- sv_catpv(opts_prog," PERL_IMPLICIT_CONTEXT");
+ " PERL_IMPLICIT_CONTEXT"
# endif
# ifdef PERL_IMPLICIT_SYS
- sv_catpv(opts_prog," PERL_IMPLICIT_SYS");
+ " PERL_IMPLICIT_SYS"
# endif
# ifdef PERL_MALLOC_WRAP
- sv_catpv(opts_prog," PERL_MALLOC_WRAP");
+ " PERL_MALLOC_WRAP"
# endif
# ifdef PERL_NEED_APPCTX
- sv_catpv(opts_prog," PERL_NEED_APPCTX");
+ " PERL_NEED_APPCTX"
# endif
# ifdef PERL_NEED_TIMESBASE
- sv_catpv(opts_prog," PERL_NEED_TIMESBASE");
+ " PERL_NEED_TIMESBASE"
# endif
# ifdef PERL_OLD_COPY_ON_WRITE
- sv_catpv(opts_prog," PERL_OLD_COPY_ON_WRITE");
+ " PERL_OLD_COPY_ON_WRITE"
# endif
# ifdef PL_OP_SLAB_ALLOC
- sv_catpv(opts_prog," PL_OP_SLAB_ALLOC");
+ " PL_OP_SLAB_ALLOC"
# endif
# ifdef THREADS_HAVE_PIDS
- sv_catpv(opts_prog," THREADS_HAVE_PIDS");
+ " THREADS_HAVE_PIDS"
# endif
# ifdef USE_5005THREADS
- sv_catpv(opts_prog," USE_5005THREADS");
+ " USE_5005THREADS"
# endif
# ifdef USE_64_BIT_ALL
- sv_catpv(opts_prog," USE_64_BIT_ALL");
+ " USE_64_BIT_ALL"
# endif
# ifdef USE_64_BIT_INT
- sv_catpv(opts_prog," USE_64_BIT_INT");
+ " USE_64_BIT_INT"
# endif
# ifdef USE_ITHREADS
- sv_catpv(opts_prog," USE_ITHREADS");
+ " USE_ITHREADS"
# endif
# ifdef USE_LARGE_FILES
- sv_catpv(opts_prog," USE_LARGE_FILES");
+ " USE_LARGE_FILES"
# endif
# ifdef USE_LONG_DOUBLE
- sv_catpv(opts_prog," USE_LONG_DOUBLE");
+ " USE_LONG_DOUBLE"
# endif
# ifdef USE_PERLIO
- sv_catpv(opts_prog," USE_PERLIO");
+ " USE_PERLIO"
# endif
# ifdef USE_REENTRANT_API
- sv_catpv(opts_prog," USE_REENTRANT_API");
+ " USE_REENTRANT_API"
# endif
# ifdef USE_SFIO
- sv_catpv(opts_prog," USE_SFIO");
+ " USE_SFIO"
# endif
# ifdef USE_SITECUSTOMIZE
- sv_catpv(opts_prog," USE_SITECUSTOMIZE");
+ " USE_SITECUSTOMIZE"
# endif
# ifdef USE_SOCKS
- sv_catpv(opts_prog," USE_SOCKS");
+ " USE_SOCKS"
# endif
+ );
while (SvCUR(opts_prog) > opts+76) {
/* find last space after "options: " and before col 76
==== //depot/maint-5.8/perl/perly.act#1 (text) ====
Index: perl/perly.act
--- /dev/null Tue May 5 13:32:27 1998
+++ perl/perly.act Sun Nov 13 10:53:10 2005
@@ -0,0 +1,1047 @@
+case 2:
+#line 97 "perly.y"
+ { (yyval.ival) = (yyvsp[-1].ival);
newPROG(block_end((yyvsp[-1].ival),(yyvsp[0].opval))); ;}
+ break;
+
+ case 3:
+#line 102 "perly.y"
+ { if (PL_copline > (line_t)(yyvsp[-3].ival))
+ PL_copline = (line_t)(yyvsp[-3].ival);
+ (yyval.opval) = block_end((yyvsp[-2].ival),
(yyvsp[-1].opval)); ;}
+ break;
+
+ case 4:
+#line 108 "perly.y"
+ { (yyval.ival) = block_start(TRUE); ;}
+ break;
+
+ case 5:
+#line 112 "perly.y"
+ {
+ PL_expect = XSTATE; (yyval.ival) = block_start(TRUE);
+ ;}
+ break;
+
+ case 6:
+#line 119 "perly.y"
+ { if (PL_copline > (line_t)(yyvsp[-3].ival))
+ PL_copline = (line_t)(yyvsp[-3].ival);
+ (yyval.opval) = block_end((yyvsp[-2].ival),
(yyvsp[-1].opval)); ;}
+ break;
+
+ case 7:
+#line 125 "perly.y"
+ { (yyval.ival) = block_start(FALSE); ;}
+ break;
+
+ case 8:
+#line 129 "perly.y"
+ { (yyval.ival) = PL_savestack_ix; ;}
+ break;
+
+ case 9:
+#line 133 "perly.y"
+ { (yyval.opval) = Nullop; ;}
+ break;
+
+ case 10:
+#line 135 "perly.y"
+ { (yyval.opval) = (yyvsp[-1].opval); ;}
+ break;
+
+ case 11:
+#line 137 "perly.y"
+ { LEAVE_SCOPE((yyvsp[-1].ival));
+ (yyval.opval) = append_list(OP_LINESEQ,
+ (LISTOP*)(yyvsp[-2].opval),
(LISTOP*)(yyvsp[0].opval));
+ PL_pad_reset_pending = TRUE;
+ if ((yyvsp[-2].opval) && (yyvsp[0].opval)) PL_hints
|= HINT_BLOCK_SCOPE; ;}
+ break;
+
+ case 12:
+#line 146 "perly.y"
+ { (yyval.opval) = newSTATEOP(0, (yyvsp[-1].pval), (yyvsp[0].opval)); ;}
+ break;
+
+ case 14:
+#line 149 "perly.y"
+ { if ((yyvsp[-1].pval) != Nullch) {
+ (yyval.opval) = newSTATEOP(0, (yyvsp[-1].pval),
newOP(OP_NULL, 0));
+ }
+ else {
+ (yyval.opval) = Nullop;
+ PL_copline = NOLINE;
+ }
+ PL_expect = XSTATE; ;}
+ break;
+
+ case 15:
+#line 158 "perly.y"
+ { (yyval.opval) = newSTATEOP(0, (yyvsp[-2].pval), (yyvsp[-1].opval));
+ PL_expect = XSTATE; ;}
+ break;
+
+ case 16:
+#line 164 "perly.y"
+ { (yyval.opval) = Nullop; ;}
+ break;
+
+ case 17:
+#line 166 "perly.y"
+ { (yyval.opval) = (yyvsp[0].opval); ;}
+ break;
+
+ case 18:
+#line 168 "perly.y"
+ { (yyval.opval) = newLOGOP(OP_AND, 0, (yyvsp[0].opval),
(yyvsp[-2].opval)); ;}
+ break;
+
+ case 19:
+#line 170 "perly.y"
+ { (yyval.opval) = newLOGOP(OP_OR, 0, (yyvsp[0].opval), (yyvsp[-2].opval));
;}
+ break;
+
+ case 20:
+#line 172 "perly.y"
+ { (yyval.opval) = newLOOPOP(OPf_PARENS, 1, scalar((yyvsp[0].opval)),
(yyvsp[-2].opval)); ;}
+ break;
+
+ case 21:
+#line 174 "perly.y"
+ { (yyval.opval) = newLOOPOP(OPf_PARENS, 1, (yyvsp[0].opval),
(yyvsp[-2].opval));;}
+ break;
+
+ case 22:
+#line 176 "perly.y"
+ { (yyval.opval) = newFOROP(0, Nullch, (line_t)(yyvsp[-1].ival),
+ Nullop, (yyvsp[0].opval),
(yyvsp[-2].opval), Nullop); ;}
+ break;
+
+ case 23:
+#line 182 "perly.y"
+ { (yyval.opval) = Nullop; ;}
+ break;
+
+ case 24:
+#line 184 "perly.y"
+ { ((yyvsp[0].opval))->op_flags |= OPf_PARENS; (yyval.opval) =
scope((yyvsp[0].opval)); ;}
+ break;
+
+ case 25:
+#line 186 "perly.y"
+ { PL_copline = (line_t)(yyvsp[-5].ival);
+ (yyval.opval) = newCONDOP(0, (yyvsp[-3].opval),
scope((yyvsp[-1].opval)), (yyvsp[0].opval));
+ PL_hints |= HINT_BLOCK_SCOPE; ;}
+ break;
+
+ case 26:
+#line 193 "perly.y"
+ { PL_copline = (line_t)(yyvsp[-6].ival);
+ (yyval.opval) = block_end((yyvsp[-4].ival),
+ newCONDOP(0, (yyvsp[-3].opval),
scope((yyvsp[-1].opval)), (yyvsp[0].opval))); ;}
+ break;
+
+ case 27:
+#line 197 "perly.y"
+ { PL_copline = (line_t)(yyvsp[-6].ival);
+ (yyval.opval) = block_end((yyvsp[-4].ival),
+ newCONDOP(0, (yyvsp[-3].opval),
scope((yyvsp[-1].opval)), (yyvsp[0].opval))); ;}
+ break;
+
+ case 28:
+#line 204 "perly.y"
+ { (yyval.opval) = Nullop; ;}
+ break;
+
+ case 29:
+#line 206 "perly.y"
+ { (yyval.opval) = scope((yyvsp[0].opval)); ;}
+ break;
+
+ case 30:
+#line 211 "perly.y"
+ { PL_copline = (line_t)(yyvsp[-7].ival);
+ (yyval.opval) = block_end((yyvsp[-5].ival),
+ newSTATEOP(0, (yyvsp[-8].pval),
+ newWHILEOP(0, 1, (LOOP*)Nullop,
+ (yyvsp[-7].ival),
(yyvsp[-4].opval), (yyvsp[-1].opval), (yyvsp[0].opval), (yyvsp[-2].ival)))); ;}
+ break;
+
+ case 31:
+#line 217 "perly.y"
+ { PL_copline = (line_t)(yyvsp[-7].ival);
+ (yyval.opval) = block_end((yyvsp[-5].ival),
+ newSTATEOP(0, (yyvsp[-8].pval),
+ newWHILEOP(0, 1, (LOOP*)Nullop,
+ (yyvsp[-7].ival),
(yyvsp[-4].opval), (yyvsp[-1].opval), (yyvsp[0].opval), (yyvsp[-2].ival)))); ;}
+ break;
+
+ case 32:
+#line 223 "perly.y"
+ { (yyval.opval) = block_end((yyvsp[-6].ival),
+ newFOROP(0, (yyvsp[-9].pval),
(line_t)(yyvsp[-8].ival), (yyvsp[-5].opval), (yyvsp[-3].opval),
(yyvsp[-1].opval), (yyvsp[0].opval))); ;}
+ break;
+
+ case 33:
+#line 226 "perly.y"
+ { (yyval.opval) = block_end((yyvsp[-4].ival),
+ newFOROP(0, (yyvsp[-8].pval),
(line_t)(yyvsp[-7].ival), mod((yyvsp[-6].opval), OP_ENTERLOOP),
+ (yyvsp[-3].opval), (yyvsp[-1].opval),
(yyvsp[0].opval))); ;}
+ break;
+
+ case 34:
+#line 230 "perly.y"
+ { (yyval.opval) = block_end((yyvsp[-4].ival),
+ newFOROP(0, (yyvsp[-7].pval),
(line_t)(yyvsp[-6].ival), Nullop, (yyvsp[-3].opval), (yyvsp[-1].opval),
(yyvsp[0].opval))); ;}
+ break;
+
+ case 35:
+#line 235 "perly.y"
+ { OP *forop;
+ PL_copline = (line_t)(yyvsp[-10].ival);
+ forop = newSTATEOP(0, (yyvsp[-11].pval),
+ newWHILEOP(0, 1, (LOOP*)Nullop,
+ (yyvsp[-10].ival),
scalar((yyvsp[-5].opval)),
+ (yyvsp[0].opval),
(yyvsp[-2].opval), (yyvsp[-3].ival)));
+ if ((yyvsp[-7].opval)) {
+ forop = append_elem(OP_LINESEQ,
+ newSTATEOP(0,
((yyvsp[-11].pval)?savepv((yyvsp[-11].pval)):Nullch),
+ (yyvsp[-7].opval)),
+ forop);
+ }
+
+ (yyval.opval) = block_end((yyvsp[-8].ival), forop); ;}
+ break;
+
+ case 36:
+#line 250 "perly.y"
+ { (yyval.opval) = newSTATEOP(0, (yyvsp[-2].pval),
+ newWHILEOP(0, 1, (LOOP*)Nullop,
+ NOLINE, Nullop, (yyvsp[-1].opval),
(yyvsp[0].opval), 0)); ;}
+ break;
+
+ case 37:
+#line 257 "perly.y"
+ { (yyval.ival) = (PL_min_intro_pending &&
+ PL_max_intro_pending >= PL_min_intro_pending);
+ intro_my(); ;}
+ break;
+
+ case 38:
+#line 263 "perly.y"
+ { (yyval.opval) = Nullop; ;}
+ break;
+
+ case 40:
+#line 269 "perly.y"
+ { (void)scan_num("1", &yylval); (yyval.opval) = yylval.opval; ;}
+ break;
+
+ case 42:
+#line 275 "perly.y"
+ { (yyval.opval) = invert(scalar((yyvsp[0].opval))); ;}
+ break;
+
+ case 43:
+#line 280 "perly.y"
+ { (yyval.opval) = (yyvsp[0].opval); intro_my(); ;}
+ break;
+
+ case 44:
+#line 284 "perly.y"
+ { (yyval.opval) = (yyvsp[0].opval); intro_my(); ;}
+ break;
+
+ case 45:
+#line 288 "perly.y"
+ { (yyval.opval) = (yyvsp[0].opval); intro_my(); ;}
+ break;
+
+ case 46:
+#line 293 "perly.y"
+ { (yyval.pval) = Nullch; ;}
+ break;
+
+ case 48:
+#line 299 "perly.y"
+ { (yyval.ival) = 0; ;}
+ break;
+
+ case 49:
+#line 301 "perly.y"
+ { (yyval.ival) = 0; ;}
+ break;
+
+ case 50:
+#line 303 "perly.y"
+ { (yyval.ival) = 0; ;}
+ break;
+
+ case 51:
+#line 305 "perly.y"
+ { (yyval.ival) = 0; ;}
+ break;
+
+ case 52:
+#line 307 "perly.y"
+ { (yyval.ival) = 0; ;}
+ break;
+
+ case 53:
+#line 311 "perly.y"
+ { newFORM((yyvsp[-2].ival), (yyvsp[-1].opval), (yyvsp[0].opval)); ;}
+ break;
+
+ case 54:
+#line 314 "perly.y"
+ { (yyval.opval) = (yyvsp[0].opval); ;}
+ break;
+
+ case 55:
+#line 315 "perly.y"
+ { (yyval.opval) = Nullop; ;}
+ break;
+
+ case 56:
+#line 320 "perly.y"
+ { newMYSUB((yyvsp[-4].ival), (yyvsp[-3].opval), (yyvsp[-2].opval),
(yyvsp[-1].opval), (yyvsp[0].opval)); ;}
+ break;
+
+ case 57:
+#line 325 "perly.y"
+ { newATTRSUB((yyvsp[-4].ival), (yyvsp[-3].opval), (yyvsp[-2].opval),
(yyvsp[-1].opval), (yyvsp[0].opval)); ;}
+ break;
+
+ case 58:
+#line 329 "perly.y"
+ { (yyval.ival) = start_subparse(FALSE, 0); ;}
+ break;
+
+ case 59:
+#line 333 "perly.y"
+ { (yyval.ival) = start_subparse(FALSE, CVf_ANON); ;}
+ break;
+
+ case 60:
+#line 337 "perly.y"
+ { (yyval.ival) = start_subparse(TRUE, 0); ;}
+ break;
+
+ case 61:
+#line 341 "perly.y"
+ { const char *const name =
SvPV_nolen_const(((SVOP*)(yyvsp[0].opval))->op_sv);
+ if (strEQ(name, "BEGIN") || strEQ(name, "END")
+ || strEQ(name, "INIT") || strEQ(name, "CHECK"))
+ CvSPECIAL_on(PL_compcv);
+ (yyval.opval) = (yyvsp[0].opval); ;}
+ break;
+
+ case 62:
+#line 350 "perly.y"
+ { (yyval.opval) = Nullop; ;}
+ break;
+
+ case 64:
+#line 356 "perly.y"
+ { (yyval.opval) = Nullop; ;}
+ break;
+
+ case 65:
+#line 358 "perly.y"
+ { (yyval.opval) = (yyvsp[0].opval); ;}
+ break;
+
+ case 66:
+#line 360 "perly.y"
+ { (yyval.opval) = Nullop; ;}
+ break;
+
+ case 67:
+#line 365 "perly.y"
+ { (yyval.opval) = (yyvsp[0].opval); ;}
+ break;
+
+ case 68:
+#line 367 "perly.y"
+ { (yyval.opval) = Nullop; ;}
+ break;
+
+ case 69:
+#line 371 "perly.y"
+ { (yyval.opval) = (yyvsp[0].opval); ;}
+ break;
+
+ case 70:
+#line 372 "perly.y"
+ { (yyval.opval) = Nullop; PL_expect = XSTATE; ;}
+ break;
+
+ case 71:
+#line 376 "perly.y"
+ { package((yyvsp[-1].opval)); ;}
+ break;
+
+ case 72:
+#line 380 "perly.y"
+ { CvSPECIAL_on(PL_compcv); /* It's a BEGIN {} */ ;}
+ break;
+
+ case 73:
+#line 382 "perly.y"
+ { utilize((yyvsp[-6].ival), (yyvsp[-5].ival), (yyvsp[-3].opval),
(yyvsp[-2].opval), (yyvsp[-1].opval)); ;}
+ break;
+
+ case 74:
+#line 387 "perly.y"
+ { (yyval.opval) = newLOGOP(OP_AND, 0, (yyvsp[-2].opval),
(yyvsp[0].opval)); ;}
+ break;
+
+ case 75:
+#line 389 "perly.y"
+ { (yyval.opval) = newLOGOP((yyvsp[-1].ival), 0, (yyvsp[-2].opval),
(yyvsp[0].opval)); ;}
+ break;
+
+ case 76:
+#line 391 "perly.y"
+ { (yyval.opval) = newLOGOP(OP_DOR, 0, (yyvsp[-2].opval),
(yyvsp[0].opval)); ;}
+ break;
+
+ case 78:
+#line 397 "perly.y"
+ { (yyval.opval) = (yyvsp[-1].opval); ;}
+ break;
+
+ case 79:
+#line 399 "perly.y"
+ { (yyval.opval) = append_elem(OP_LIST, (yyvsp[-2].opval),
(yyvsp[0].opval)); ;}
+ break;
+
+ case 81:
+#line 405 "perly.y"
+ { (yyval.opval) = convert((yyvsp[-2].ival), OPf_STACKED,
+ prepend_elem(OP_LIST,
newGVREF((yyvsp[-2].ival),(yyvsp[-1].opval)), (yyvsp[0].opval)) ); ;}
+ break;
+
+ case 82:
+#line 408 "perly.y"
+ { (yyval.opval) = convert((yyvsp[-4].ival), OPf_STACKED,
+ prepend_elem(OP_LIST,
newGVREF((yyvsp[-4].ival),(yyvsp[-2].opval)), (yyvsp[-1].opval)) ); ;}
+ break;
+
+ case 83:
+#line 411 "perly.y"
+ { (yyval.opval) = convert(OP_ENTERSUB, OPf_STACKED,
+ append_elem(OP_LIST,
+ prepend_elem(OP_LIST,
scalar((yyvsp[-5].opval)), (yyvsp[-1].opval)),
+ newUNOP(OP_METHOD, 0, (yyvsp[-3].opval))));
;}
+ break;
+
+ case 84:
+#line 416 "perly.y"
+ { (yyval.opval) = convert(OP_ENTERSUB, OPf_STACKED,
+ append_elem(OP_LIST, scalar((yyvsp[-2].opval)),
+ newUNOP(OP_METHOD, 0, (yyvsp[0].opval))));
;}
+ break;
+
+ case 85:
+#line 420 "perly.y"
+ { (yyval.opval) = convert(OP_ENTERSUB, OPf_STACKED,
+ append_elem(OP_LIST,
+ prepend_elem(OP_LIST, (yyvsp[-1].opval),
(yyvsp[0].opval)),
+ newUNOP(OP_METHOD, 0, (yyvsp[-2].opval))));
;}
+ break;
+
+ case 86:
+#line 425 "perly.y"
+ { (yyval.opval) = convert(OP_ENTERSUB, OPf_STACKED,
+ append_elem(OP_LIST,
+ prepend_elem(OP_LIST, (yyvsp[-3].opval),
(yyvsp[-1].opval)),
+ newUNOP(OP_METHOD, 0, (yyvsp[-4].opval))));
;}
+ break;
+
+ case 87:
+#line 430 "perly.y"
+ { (yyval.opval) = convert((yyvsp[-1].ival), 0, (yyvsp[0].opval)); ;}
+ break;
+
+ case 88:
+#line 432 "perly.y"
+ { (yyval.opval) = convert((yyvsp[-3].ival), 0, (yyvsp[-1].opval)); ;}
+ break;
+
+ case 89:
+#line 434 "perly.y"
+ { (yyvsp[0].opval) = newANONATTRSUB((yyvsp[-1].ival), 0, Nullop,
(yyvsp[0].opval)); ;}
+ break;
+
+ case 90:
+#line 436 "perly.y"
+ { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
+ append_elem(OP_LIST,
+ prepend_elem(OP_LIST, (yyvsp[-2].opval),
(yyvsp[0].opval)), (yyvsp[-4].opval))); ;}
+ break;
+
+ case 93:
+#line 450 "perly.y"
+ { (yyval.opval) = newBINOP(OP_GELEM, 0, (yyvsp[-4].opval),
scalar((yyvsp[-2].opval)));
+ PL_expect = XOPERATOR; ;}
+ break;
+
+ case 94:
+#line 453 "perly.y"
+ { (yyval.opval) = newBINOP(OP_AELEM, 0, oopsAV((yyvsp[-3].opval)),
scalar((yyvsp[-1].opval))); ;}
+ break;
+
+ case 95:
+#line 455 "perly.y"
+ { (yyval.opval) = newBINOP(OP_AELEM, 0,
+
ref(newAVREF((yyvsp[-4].opval)),OP_RV2AV),
+ scalar((yyvsp[-1].opval)));;}
+ break;
+
+ case 96:
+#line 459 "perly.y"
+ { (yyval.opval) = newBINOP(OP_AELEM, 0,
+
ref(newAVREF((yyvsp[-3].opval)),OP_RV2AV),
+ scalar((yyvsp[-1].opval)));;}
+ break;
+
+ case 97:
+#line 463 "perly.y"
+ { (yyval.opval) = newBINOP(OP_HELEM, 0, oopsHV((yyvsp[-4].opval)),
jmaybe((yyvsp[-2].opval)));
+ PL_expect = XOPERATOR; ;}
+ break;
+
+ case 98:
+#line 466 "perly.y"
+ { (yyval.opval) = newBINOP(OP_HELEM, 0,
+
ref(newHVREF((yyvsp[-5].opval)),OP_RV2HV),
+ jmaybe((yyvsp[-2].opval)));
+ PL_expect = XOPERATOR; ;}
+ break;
+
+ case 99:
+#line 471 "perly.y"
+ { (yyval.opval) = newBINOP(OP_HELEM, 0,
+
ref(newHVREF((yyvsp[-4].opval)),OP_RV2HV),
+ jmaybe((yyvsp[-2].opval)));
+ PL_expect = XOPERATOR; ;}
+ break;
+
+ case 100:
+#line 476 "perly.y"
+ { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
+ newCVREF(0, scalar((yyvsp[-3].opval)))); ;}
+ break;
+
+ case 101:
+#line 479 "perly.y"
+ { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
+ append_elem(OP_LIST, (yyvsp[-1].opval),
+ newCVREF(0,
scalar((yyvsp[-4].opval))))); ;}
+ break;
+
+ case 102:
+#line 484 "perly.y"
+ { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
+ append_elem(OP_LIST, (yyvsp[-1].opval),
+ newCVREF(0,
scalar((yyvsp[-3].opval))))); ;}
+ break;
+
+ case 103:
+#line 488 "perly.y"
+ { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
+ newCVREF(0, scalar((yyvsp[-2].opval)))); ;}
+ break;
+
+ case 104:
+#line 491 "perly.y"
+ { (yyval.opval) = newSLICEOP(0, (yyvsp[-1].opval), (yyvsp[-4].opval)); ;}
+ break;
+
+ case 105:
+#line 493 "perly.y"
+ { (yyval.opval) = newSLICEOP(0, (yyvsp[-1].opval), Nullop); ;}
+ break;
+
+ case 106:
+#line 498 "perly.y"
+ { (yyval.opval) = newASSIGNOP(OPf_STACKED, (yyvsp[-2].opval),
(yyvsp[-1].ival), (yyvsp[0].opval)); ;}
+ break;
+
+ case 107:
+#line 500 "perly.y"
+ { (yyval.opval) = newBINOP((yyvsp[-1].ival), 0, scalar((yyvsp[-2].opval)),
scalar((yyvsp[0].opval))); ;}
+ break;
+
+ case 108:
+#line 502 "perly.y"
+ { if ((yyvsp[-1].ival) != OP_REPEAT)
+ scalar((yyvsp[-2].opval));
+ (yyval.opval) = newBINOP((yyvsp[-1].ival), 0,
(yyvsp[-2].opval), scalar((yyvsp[0].opval))); ;}
+ break;
+
+ case 109:
+#line 506 "perly.y"
+ { (yyval.opval) = newBINOP((yyvsp[-1].ival), 0, scalar((yyvsp[-2].opval)),
scalar((yyvsp[0].opval))); ;}
+ break;
+
+ case 110:
+#line 508 "perly.y"
+ { (yyval.opval) = newBINOP((yyvsp[-1].ival), 0, scalar((yyvsp[-2].opval)),
scalar((yyvsp[0].opval))); ;}
+ break;
+
+ case 111:
+#line 510 "perly.y"
+ { (yyval.opval) = newBINOP((yyvsp[-1].ival), 0, scalar((yyvsp[-2].opval)),
scalar((yyvsp[0].opval))); ;}
+ break;
+
+ case 112:
+#line 512 "perly.y"
+ { (yyval.opval) = newBINOP((yyvsp[-1].ival), 0, scalar((yyvsp[-2].opval)),
scalar((yyvsp[0].opval))); ;}
+ break;
+
+ case 113:
+#line 514 "perly.y"
+ { (yyval.opval) = newBINOP((yyvsp[-1].ival), 0, scalar((yyvsp[-2].opval)),
scalar((yyvsp[0].opval))); ;}
+ break;
+
+ case 114:
+#line 516 "perly.y"
+ { (yyval.opval) = newBINOP((yyvsp[-1].ival), 0, scalar((yyvsp[-2].opval)),
scalar((yyvsp[0].opval))); ;}
+ break;
+
+ case 115:
+#line 518 "perly.y"
+ { (yyval.opval) = newRANGE((yyvsp[-1].ival), scalar((yyvsp[-2].opval)),
scalar((yyvsp[0].opval)));;}
+ break;
+
+ case 116:
+#line 520 "perly.y"
+ { (yyval.opval) = newLOGOP(OP_AND, 0, (yyvsp[-2].opval),
(yyvsp[0].opval)); ;}
+ break;
+
+ case 117:
+#line 522 "perly.y"
+ { (yyval.opval) = newLOGOP(OP_OR, 0, (yyvsp[-2].opval), (yyvsp[0].opval));
;}
+ break;
+
+ case 118:
+#line 524 "perly.y"
+ { (yyval.opval) = newLOGOP(OP_DOR, 0, (yyvsp[-2].opval),
(yyvsp[0].opval)); ;}
+ break;
+
+ case 119:
+#line 526 "perly.y"
+ { (yyval.opval) = bind_match((yyvsp[-1].ival), (yyvsp[-2].opval),
(yyvsp[0].opval)); ;}
+ break;
+
+ case 120:
+#line 531 "perly.y"
+ { (yyval.opval) = newUNOP(OP_NEGATE, 0, scalar((yyvsp[0].opval))); ;}
+ break;
+
+ case 121:
+#line 533 "perly.y"
+ { (yyval.opval) = (yyvsp[0].opval); ;}
+ break;
+
+ case 122:
+#line 535 "perly.y"
+ { (yyval.opval) = newUNOP(OP_NOT, 0, scalar((yyvsp[0].opval))); ;}
+ break;
+
+ case 123:
+#line 537 "perly.y"
+ { (yyval.opval) = newUNOP(OP_COMPLEMENT, 0, scalar((yyvsp[0].opval)));;}
+ break;
+
+ case 124:
+#line 539 "perly.y"
+ { (yyval.opval) = newUNOP(OP_POSTINC, 0,
+ mod(scalar((yyvsp[-1].opval)),
OP_POSTINC)); ;}
+ break;
+
+ case 125:
+#line 542 "perly.y"
+ { (yyval.opval) = newUNOP(OP_POSTDEC, 0,
+ mod(scalar((yyvsp[-1].opval)),
OP_POSTDEC)); ;}
+ break;
+
+ case 126:
+#line 545 "perly.y"
+ { (yyval.opval) = newUNOP(OP_PREINC, 0,
+ mod(scalar((yyvsp[0].opval)),
OP_PREINC)); ;}
+ break;
+
+ case 127:
+#line 548 "perly.y"
+ { (yyval.opval) = newUNOP(OP_PREDEC, 0,
+ mod(scalar((yyvsp[0].opval)),
OP_PREDEC)); ;}
+ break;
+
+ case 128:
+#line 555 "perly.y"
+ { (yyval.opval) = newANONLIST((yyvsp[-1].opval)); ;}
+ break;
+
+ case 129:
+#line 557 "perly.y"
+ { (yyval.opval) = newANONLIST(Nullop); ;}
+ break;
+
+ case 130:
+#line 559 "perly.y"
+ { (yyval.opval) = newANONHASH((yyvsp[-2].opval)); ;}
+ break;
+
+ case 131:
+#line 561 "perly.y"
+ { (yyval.opval) = newANONHASH(Nullop); ;}
+ break;
+
+ case 132:
+#line 563 "perly.y"
+ { (yyval.opval) = newANONATTRSUB((yyvsp[-3].ival), (yyvsp[-2].opval),
(yyvsp[-1].opval), (yyvsp[0].opval)); ;}
+ break;
+
+ case 133:
+#line 569 "perly.y"
+ { (yyval.opval) = dofile((yyvsp[0].opval)); ;}
+ break;
+
+ case 134:
+#line 571 "perly.y"
+ { (yyval.opval) = newUNOP(OP_NULL, OPf_SPECIAL, scope((yyvsp[0].opval)));
;}
+ break;
+
+ case 135:
+#line 573 "perly.y"
+ { (yyval.opval) = newUNOP(OP_ENTERSUB,
+ OPf_SPECIAL|OPf_STACKED,
+ prepend_elem(OP_LIST,
+ scalar(newCVREF(
+ (OPpENTERSUB_AMPER<<8),
+ scalar((yyvsp[-2].opval))
+ )),Nullop)); dep();;}
+ break;
+
+ case 136:
+#line 581 "perly.y"
+ { (yyval.opval) = newUNOP(OP_ENTERSUB,
+ OPf_SPECIAL|OPf_STACKED,
+ append_elem(OP_LIST,
+ (yyvsp[-1].opval),
+ scalar(newCVREF(
+ (OPpENTERSUB_AMPER<<8),
+ scalar((yyvsp[-3].opval))
+ )))); dep();;}
+ break;
+
+ case 137:
+#line 590 "perly.y"
+ { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED,
+ prepend_elem(OP_LIST,
+ scalar(newCVREF(0,scalar((yyvsp[-2].opval)))),
Nullop)); dep();;}
+ break;
+
+ case 138:
+#line 594 "perly.y"
+ { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED,
+ prepend_elem(OP_LIST,
+ (yyvsp[-1].opval),
+
scalar(newCVREF(0,scalar((yyvsp[-3].opval)))))); dep();;}
+ break;
+
+ case 143:
+#line 606 "perly.y"
+ { (yyval.opval) = newCONDOP(0, (yyvsp[-4].opval), (yyvsp[-2].opval),
(yyvsp[0].opval)); ;}
+ break;
+
+ case 144:
+#line 608 "perly.y"
+ { (yyval.opval) = newUNOP(OP_REFGEN, 0, mod((yyvsp[0].opval),OP_REFGEN));
;}
+ break;
+
+ case 145:
+#line 610 "perly.y"
+ { (yyval.opval) = (yyvsp[0].opval); ;}
+ break;
+
+ case 146:
+#line 612 "perly.y"
+ { (yyval.opval) = localize((yyvsp[0].opval),(yyvsp[-1].ival)); ;}
+ break;
+
+ case 147:
+#line 614 "perly.y"
+ { (yyval.opval) = sawparens((yyvsp[-1].opval)); ;}
+ break;
+
+ case 148:
+#line 616 "perly.y"
+ { (yyval.opval) = sawparens(newNULLLIST()); ;}
+ break;
+
+ case 149:
+#line 618 "perly.y"
+ { (yyval.opval) = (yyvsp[0].opval); ;}
+ break;
+
+ case 150:
+#line 620 "perly.y"
+ { (yyval.opval) = (yyvsp[0].opval); ;}
+ break;
+
+ case 151:
+#line 622 "perly.y"
+ { (yyval.opval) = (yyvsp[0].opval); ;}
+ break;
+
+ case 152:
+#line 624 "perly.y"
+ { (yyval.opval) = (yyvsp[0].opval); ;}
+ break;
+
+ case 153:
+#line 626 "perly.y"
+ { (yyval.opval) = newUNOP(OP_AV2ARYLEN, 0, ref((yyvsp[0].opval),
OP_AV2ARYLEN));;}
+ break;
+
+ case 154:
+#line 628 "perly.y"
+ { (yyval.opval) = (yyvsp[0].opval); ;}
+ break;
+
+ case 155:
+#line 630 "perly.y"
+ { (yyval.opval) = prepend_elem(OP_ASLICE,
+ newOP(OP_PUSHMARK, 0),
+ newLISTOP(OP_ASLICE, 0,
+ list((yyvsp[-1].opval)),
+ ref((yyvsp[-3].opval), OP_ASLICE))); ;}
+ break;
+
+ case 156:
+#line 636 "perly.y"
+ { (yyval.opval) = prepend_elem(OP_HSLICE,
+ newOP(OP_PUSHMARK, 0),
+ newLISTOP(OP_HSLICE, 0,
+ list((yyvsp[-2].opval)),
+ ref(oopsHV((yyvsp[-4].opval)),
OP_HSLICE)));
+ PL_expect = XOPERATOR; ;}
+ break;
+
+ case 157:
+#line 643 "perly.y"
+ { (yyval.opval) = (yyvsp[0].opval); ;}
+ break;
+
+ case 158:
+#line 645 "perly.y"
+ { (yyval.opval) = newUNOP(OP_ENTERSUB, 0, scalar((yyvsp[0].opval))); ;}
+ break;
+
+ case 159:
+#line 647 "perly.y"
+ { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
scalar((yyvsp[-2].opval))); ;}
+ break;
+
+ case 160:
+#line 649 "perly.y"
+ { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
+ append_elem(OP_LIST, (yyvsp[-1].opval),
scalar((yyvsp[-3].opval)))); ;}
+ break;
+
+ case 161:
+#line 652 "perly.y"
+ { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
+ append_elem(OP_LIST, (yyvsp[0].opval),
scalar((yyvsp[-1].opval)))); ;}
+ break;
+
+ case 162:
+#line 655 "perly.y"
+ { (yyval.opval) = newOP((yyvsp[0].ival), OPf_SPECIAL);
+ PL_hints |= HINT_BLOCK_SCOPE; ;}
+ break;
+
+ case 163:
+#line 658 "perly.y"
+ { (yyval.opval) = newLOOPEX((yyvsp[-1].ival),(yyvsp[0].opval)); ;}
+ break;
+
+ case 164:
+#line 660 "perly.y"
+ { (yyval.opval) = newUNOP(OP_NOT, 0, scalar((yyvsp[0].opval))); ;}
+ break;
+
+ case 165:
+#line 662 "perly.y"
+ { (yyval.opval) = newOP((yyvsp[0].ival), 0); ;}
+ break;
+
+ case 166:
+#line 664 "perly.y"
+ { (yyval.opval) = newUNOP((yyvsp[-1].ival), 0, (yyvsp[0].opval)); ;}
+ break;
+
+ case 167:
+#line 666 "perly.y"
+ { (yyval.opval) = newUNOP((yyvsp[-1].ival), 0, (yyvsp[0].opval)); ;}
+ break;
+
+ case 168:
+#line 668 "perly.y"
+ { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
+ append_elem(OP_LIST, (yyvsp[0].opval),
scalar((yyvsp[-1].opval)))); ;}
+ break;
+
+ case 169:
+#line 671 "perly.y"
+ { (yyval.opval) = newOP((yyvsp[0].ival), 0); ;}
+ break;
+
+ case 170:
+#line 673 "perly.y"
+ { (yyval.opval) = newOP((yyvsp[-2].ival), 0); ;}
+ break;
+
+ case 171:
+#line 675 "perly.y"
+ { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
+ scalar((yyvsp[0].opval))); ;}
+ break;
+
+ case 172:
+#line 678 "perly.y"
+ { (yyval.opval) = (yyvsp[-2].ival) == OP_NOT ? newUNOP((yyvsp[-2].ival),
0, newSVOP(OP_CONST, 0, newSViv(0)))
+ : newOP((yyvsp[-2].ival),
OPf_SPECIAL); ;}
+ break;
+
+ case 173:
+#line 681 "perly.y"
+ { (yyval.opval) = newUNOP((yyvsp[-3].ival), 0, (yyvsp[-1].opval)); ;}
+ break;
+
+ case 174:
+#line 683 "perly.y"
+ { (yyval.opval) = pmruntime((yyvsp[-3].opval), (yyvsp[-1].opval), 1); ;}
+ break;
+
+ case 177:
+#line 690 "perly.y"
+ { (yyval.opval) = my_attrs((yyvsp[-1].opval),(yyvsp[0].opval)); ;}
+ break;
+
+ case 178:
+#line 692 "perly.y"
+ { (yyval.opval) = localize((yyvsp[0].opval),(yyvsp[-1].ival)); ;}
+ break;
+
+ case 179:
+#line 697 "perly.y"
+ { (yyval.opval) = sawparens((yyvsp[-1].opval)); ;}
+ break;
+
+ case 180:
+#line 699 "perly.y"
+ { (yyval.opval) = sawparens(newNULLLIST()); ;}
+ break;
+
+ case 181:
+#line 701 "perly.y"
+ { (yyval.opval) = (yyvsp[0].opval); ;}
+ break;
+
+ case 182:
+#line 703 "perly.y"
+ { (yyval.opval) = (yyvsp[0].opval); ;}
+ break;
+
+ case 183:
+#line 705 "perly.y"
+ { (yyval.opval) = (yyvsp[0].opval); ;}
+ break;
+
+ case 184:
+#line 710 "perly.y"
+ { (yyval.opval) = Nullop; ;}
+ break;
+
+ case 185:
+#line 712 "perly.y"
+ { (yyval.opval) = (yyvsp[0].opval); ;}
+ break;
+
+ case 186:
+#line 716 "perly.y"
+ { (yyval.opval) = Nullop; ;}
+ break;
+
+ case 187:
+#line 718 "perly.y"
+ { (yyval.opval) = (yyvsp[0].opval); ;}
+ break;
+
+ case 188:
+#line 720 "perly.y"
+ { (yyval.opval) = (yyvsp[-1].opval); ;}
+ break;
+
+ case 189:
+#line 726 "perly.y"
+ { PL_in_my = 0; (yyval.opval) = my((yyvsp[0].opval)); ;}
+ break;
+
+ case 190:
+#line 730 "perly.y"
+ { (yyval.opval) = newCVREF((yyvsp[-1].ival),(yyvsp[0].opval)); ;}
+ break;
+
+ case 191:
+#line 734 "perly.y"
+ { (yyval.opval) = newSVREF((yyvsp[0].opval)); ;}
+ break;
+
+ case 192:
+#line 738 "perly.y"
+ { (yyval.opval) = newAVREF((yyvsp[0].opval)); ;}
+ break;
+
+ case 193:
+#line 742 "perly.y"
+ { (yyval.opval) = newHVREF((yyvsp[0].opval)); ;}
+ break;
+
+ case 194:
+#line 746 "perly.y"
+ { (yyval.opval) = newAVREF((yyvsp[0].opval)); ;}
+ break;
+
+ case 195:
+#line 750 "perly.y"
+ { (yyval.opval) = newGVREF(0,(yyvsp[0].opval)); ;}
+ break;
+
+ case 196:
+#line 755 "perly.y"
+ { (yyval.opval) = scalar((yyvsp[0].opval)); ;}
+ break;
+
+ case 197:
+#line 757 "perly.y"
+ { (yyval.opval) = scalar((yyvsp[0].opval)); ;}
+ break;
+
+ case 198:
+#line 759 "perly.y"
+ { (yyval.opval) = scope((yyvsp[0].opval)); ;}
+ break;
+
+ case 199:
+#line 762 "perly.y"
+ { (yyval.opval) = (yyvsp[0].opval); ;}
+ break;
+
+
+
==== //depot/maint-5.8/perl/pp.c#81 (text) ====
Index: perl/pp.c
--- perl/pp.c#80~26111~ Sun Nov 13 10:09:54 2005
+++ perl/pp.c Sun Nov 13 10:53:10 2005
@@ -906,36 +906,37 @@
we're sure it is safe; otherwise we call pow() and try to convert to
integer afterwards. */
{
- SvIV_please(TOPm1s);
- if (SvIOK(TOPm1s)) {
- bool baseuok = SvUOK(TOPm1s);
- UV baseuv;
+ SvIV_please(TOPs);
+ if (SvIOK(TOPs)) {
+ SvIV_please(TOPm1s);
+ if (SvIOK(TOPm1s)) {
+ UV power;
+ bool baseuok;
+ UV baseuv;
- if (baseuok) {
- baseuv = SvUVX(TOPm1s);
- } else {
- const IV iv = SvIVX(TOPm1s);
- if (iv >= 0) {
- baseuv = iv;
- baseuok = TRUE; /* effectively it's a UV now */
- } else {
- baseuv = -iv; /* abs, baseuok == false records sign */
- }
- }
- SvIV_please(TOPs);
- if (SvIOK(TOPs)) {
- UV power;
+ if (SvUOK(TOPs)) {
+ power = SvUVX(TOPs);
+ } else {
+ const IV iv = SvIVX(TOPs);
+ if (iv >= 0) {
+ power = iv;
+ } else {
+ goto float_it; /* Can't do negative powers this way. */
+ }
+ }
- if (SvUOK(TOPs)) {
- power = SvUVX(TOPs);
- } else {
- IV iv = SvIVX(TOPs);
- if (iv >= 0) {
- power = iv;
- } else {
- goto float_it; /* Can't do negative powers this way.
*/
- }
- }
+ baseuok = SvUOK(TOPm1s);
+ if (baseuok) {
+ baseuv = SvUVX(TOPm1s);
+ } else {
+ const IV iv = SvIVX(TOPm1s);
+ if (iv >= 0) {
+ baseuv = iv;
+ baseuok = TRUE; /* effectively it's a UV now */
+ } else {
+ baseuv = -iv; /* abs, baseuok == false records sign */
+ }
+ }
/* now we have integer ** positive integer. */
is_int = 1;
@@ -951,34 +952,28 @@
programmers to notice ** not doing what they mean. */
NV result = 1.0;
NV base = baseuok ? baseuv : -(NV)baseuv;
- int n = 0;
- for (; power; base *= base, n++) {
- /* Do I look like I trust gcc with long longs here?
- Do I hell. */
- const UV bit = (UV)1 << (UV)n;
- if (power & bit) {
- result *= base;
- /* Only bother to clear the bit if it is set. */
- power -= bit;
- /* Avoid squaring base again if we're done. */
- if (power == 0) break;
- }
- }
+ if (power & 1) {
+ result *= base;
+ }
+ while (power >>= 1) {
+ base *= base;
+ if (power & 1) {
+ result *= base;
+ }
+ }
SP--;
SETn( result );
SvIV_please(TOPs);
RETURN;
} else {
register unsigned int highbit = 8 * sizeof(UV);
- register unsigned int lowbit = 0;
- register unsigned int diff;
- bool odd_power = (bool)(power & 1);
- while ((diff = (highbit - lowbit) >> 1)) {
- if (baseuv & ~((1 << (lowbit + diff)) - 1))
- lowbit += diff;
- else
- highbit -= diff;
+ register unsigned int diff = 8 * sizeof(UV);
+ while (diff >>= 1) {
+ highbit -= diff;
+ if (baseuv >> highbit) {
+ highbit += diff;
+ }
}
/* we now have baseuv < 2 ** highbit */
if (power * highbit <= 8 * sizeof(UV)) {
@@ -986,13 +981,14 @@
on same algorithm as above */
register UV result = 1;
register UV base = baseuv;
- register int n = 0;
- for (; power; base *= base, n++) {
- register const UV bit = (UV)1 << (UV)n;
- if (power & bit) {
+ const bool odd_power = (bool)(power & 1);
+ if (odd_power) {
+ result *= base;
+ }
+ while (power >>= 1) {
+ base *= base;
+ if (power & 1) {
result *= base;
- power -= bit;
- if (power == 0) break;
}
}
SP--;
==== //depot/maint-5.8/perl/sv.c#194 (text) ====
Index: perl/sv.c
--- perl/sv.c#193~26111~ Sun Nov 13 10:09:54 2005
+++ perl/sv.c Sun Nov 13 10:53:10 2005
@@ -1827,21 +1827,9 @@
void
Perl_sv_setuv_mg(pTHX_ register SV *sv, UV u)
{
- /* With these two if statements:
- u=1.49 s=0.52 cu=72.49 cs=10.64 scripts=270 tests=20865
-
- without
- u=1.35 s=0.47 cu=73.45 cs=11.43 scripts=270 tests=20865
-
- If you wish to remove them, please benchmark to see what the effect is
- */
- if (u <= (UV)IV_MAX) {
- sv_setiv(sv, (IV)u);
- } else {
- sv_setiv(sv, 0);
- SvIsUV_on(sv);
- sv_setuv(sv,u);
- }
+ sv_setiv(sv, 0);
+ SvIsUV_on(sv);
+ sv_setuv(sv,u);
SvSETMAGIC(sv);
}
==== //depot/maint-5.8/perl/sv.h#48 (text) ====
Index: perl/sv.h
--- perl/sv.h#47~25536~ Wed Sep 21 07:09:01 2005
+++ perl/sv.h Sun Nov 13 10:53:10 2005
@@ -1061,6 +1061,10 @@
((SvFLAGS(sv) & (SVf_POK)) == SVf_POK \
? ((lp = SvCUR(sv)), SvPVX_const(sv)) : \
(const char*) sv_2pv_flags(sv, &lp, flags|SV_CONST_RETURN))
+#define SvPV_flags_const_nolen(sv, flags) \
+ ((SvFLAGS(sv) & (SVf_POK)) == SVf_POK \
+ ? SvPVX_const(sv) : \
+ (const char*) sv_2pv_flags(sv, 0, flags|SV_CONST_RETURN))
#define SvPV_flags_mutable(sv, lp, flags) \
((SvFLAGS(sv) & (SVf_POK)) == SVf_POK \
? ((lp = SvCUR(sv)), SvPVX_mutable(sv)) : \
@@ -1071,6 +1075,7 @@
#define SvPV_force_mutable(sv, lp) SvPV_force_flags_mutable(sv, lp, SV_GMAGIC)
#define SvPV_force_nomg(sv, lp) SvPV_force_flags(sv, lp, 0)
+#define SvPV_force_nomg_nolen(sv) SvPV_force_flags_nolen(sv, 0)
#define SvPV_force_flags(sv, lp, flags) \
((SvFLAGS(sv) & (SVf_POK|SVf_THINKFIRST)) == SVf_POK \
@@ -1093,6 +1098,7 @@
#define SvPV_nomg(sv, lp) SvPV_flags(sv, lp, 0)
#define SvPV_nomg_const(sv, lp) SvPV_flags_const(sv, lp, 0)
+#define SvPV_nomg_const_nolen(sv) SvPV_flags_const_nolen(sv, 0)
/* ----*/
==== //depot/maint-5.8/perl/t/op/inc.t#4 (xtext) ====
Index: perl/t/op/inc.t
--- perl/t/op/inc.t#3~25396~ Mon Sep 12 15:33:56 2005
+++ perl/t/op/inc.t Sun Nov 13 10:53:10 2005
@@ -2,7 +2,7 @@
# use strict;
-print "1..32\n";
+print "1..34\n";
my $test = 1;
@@ -185,3 +185,12 @@
$a = 2147483648;
$c=$a--;
ok ($a == 2147483647, $a);
+
+{
+ use integer;
+ my $x = 0;
+ $x++;
+ ok ($x == 1, "(void) i_postinc");
+ $x--;
+ ok ($x == 0, "(void) i_postdec");
+}
End of Patch.
