From 2cb0016ce423361a0670c5d2bbcd21eea3fbd328 Mon Sep 17 00:00:00 2001
From: Reini Urban <rurban@cpanel.net>
Date: Wed, 31 Oct 2012 17:59:21 -0500
Subject: [PATCH] BC: rename newpadl to newpadlx

---
 ByteLoader/bytecode.h | 6 +++---
 bytecode.pl           | 6 +++---
 lib/B/Assembler.pm    | 2 +-
 lib/B/Bytecode.pm     | 2 +-
 lib/B/Disassembler.pm | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ByteLoader/bytecode.h b/ByteLoader/bytecode.h
index d3fb3c362..2e7c72ad3 100644
--- a/ByteLoader/bytecode.h
+++ b/ByteLoader/bytecode.h
@@ -748,12 +748,12 @@ static int bget_swab = 0;
     } STMT_END
 
 #if PERL_VERSION >= 17
-#define BSET_newpadl(padl, arg)  STMT_START {		\
+#define BSET_newpadlx(padl, arg)  STMT_START {		\
 	    padl = (SV*)Perl_pad_new(arg);		\
 	    BSET_OBJ_STOREX(padl);			\
 	} STMT_END
-#define BSET_padl_name(padl, pad)  PadlistARRAY((PADLIST*)padl)[0] = (PAD*)pad;
-#define BSET_padl_sym(padl, pad)   PadlistARRAY((PADLIST*)padl)[1] = (PAD*)pad;
+#define BSET_padl_name(padl, pad)  PadlistARRAY((PADLIST*)padl)[0] = (PAD*)pad
+#define BSET_padl_sym(padl, pad)   PadlistARRAY((PADLIST*)padl)[1] = (PAD*)pad
 #endif
 
 /* NOTE: The bytecode header only sanity-checks the bytecode. If a script cares about
diff --git a/bytecode.pl b/bytecode.pl
index 7352cc434..2dfdf37f5 100644
--- a/bytecode.pl
+++ b/bytecode.pl
@@ -1042,6 +1042,6 @@ =head1 AUTHOR
 # restore dup to stdio handles 0-2
 158 0 	xio_ifp		bstate->bs_sv	  		char		x
 159 10 	xpvshared	bstate->bs_sv			none		x
-160 17.005 newpadl	bstate->bs_sv			U8		x
-161 17.005 padl_name	PadlistARRAY((PADLIST*)bstate->bs_sv)[0]  svindex	x
-162 17.005 padl_sym	PadlistARRAY((PADLIST*)bstate->bs_sv)[1]  svindex	x
+160 17.005 newpadlx	bstate->bs_sv			U8		x
+161 17.005 padl_name	bstate->bs_sv			svindex		x
+162 17.005 padl_sym	bstate->bs_sv			svindex		x
diff --git a/lib/B/Assembler.pm b/lib/B/Assembler.pm
index c6484dc12..92e19aab3 100644
--- a/lib/B/Assembler.pm
+++ b/lib/B/Assembler.pm
@@ -425,7 +425,7 @@ sub asm ($;$$) {
   if ( defined $_[1] ) {
     return
       if $_[1] eq "0"
-        and $_[0] !~ /^(?:ldsv|stsv|newsvx?|newpadl|av_pushx?|av_extend|xav_flags)$/;
+        and $_[0] !~ /^(?:ldsv|stsv|newsvx?|newpadlx|av_pushx?|av_extend|xav_flags)$/;
     return if $_[1] eq "1" and $]>5.007 and $_[0] =~ /^(?:sv_refcnt)$/;
   }
   my ( $insn, $arg, $comment ) = @_;
diff --git a/lib/B/Bytecode.pm b/lib/B/Bytecode.pm
index ba12455d7..05d8887f3 100644
--- a/lib/B/Bytecode.pm
+++ b/lib/B/Bytecode.pm
@@ -248,7 +248,7 @@ sub B::PADLIST::ix {
   defined($ix) ? $ix : do {
     nice '[' . class($padl) . " $tix]";
     B::Assembler::maxsvix($tix) if $debug{A};
-    asm "newpadl", 0;
+    asm "newpadlx", 0;
     $svtab{$$padl} = $varix = $ix = $tix++;
     $padl->bsave($ix);
     $ix;
diff --git a/lib/B/Disassembler.pm b/lib/B/Disassembler.pm
index 09c8fc051..f1c0e3e58 100644
--- a/lib/B/Disassembler.pm
+++ b/lib/B/Disassembler.pm
@@ -318,7 +318,7 @@ sub print_insn {
       $arg .= sprintf( " \t# size:%d, type:%d %s", $size, $type ) if $comment;
       printf "\n# [%s %d]\n", $opname[$type], $ix++;
     }
-    elsif ( $insn eq 'newpadl' ) {
+    elsif ( $insn eq 'newpadlx' ) {
       $arg .= "\t# " . $comment if $comment ne '1';
       printf "\n# [%s %d]\n", "PADLIST", $ix++;
     }