summaryrefslogtreecommitdiff
path: root/pp_hot.c
diff options
context:
space:
mode:
authorDavid Mitchell <davem@iabyn.com>2015-12-25 11:07:28 +0000
committerDavid Mitchell <davem@iabyn.com>2016-02-03 09:19:17 +0000
commitb405d38bc792991fe2bdb47a1503569aba7d5db5 (patch)
treeec18a27a29b8cf50be9cc1910ce6cbad0eb8f14a /pp_hot.c
parentef5889910d6925f89c05af2dac7a543a9678fb52 (diff)
downloadperl-b405d38bc792991fe2bdb47a1503569aba7d5db5.tar.gz
rename POPFOO() to CX_POPFOO()
Rename all the context-popping macros such as POPBLOCK and POPSUB, by giving them a CX_ prefix. (Do TOPBLOCK too). This is principally to deliberately break any existing non-core use of these non-API macros, as their behaviour has changed in this branch. In particular, POPBLOCK(cx) no longer decrements the cxt stack pointer nor sets cx; instead, cx is now expected to already point to the stack frame which POPBLOCK should process. At the same time, giving them a CX_ prefix makes it clearer that these are all part of a family of macros that manipulate the context stack. The PUSHFOO() macros will be renamed in a later commit.
Diffstat (limited to 'pp_hot.c')
-rw-r--r--pp_hot.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/pp_hot.c b/pp_hot.c
index 8b8a0adf8e..824e7e767c 100644
--- a/pp_hot.c
+++ b/pp_hot.c
@@ -3639,8 +3639,8 @@ PP(pp_leavesub)
leave_adjust_stacks(oldsp, oldsp, gimme, 0);
CX_LEAVE_SCOPE(cx);
- POPSUB(cx); /* Stack values are safe: release CV and @_ ... */
- POPBLOCK(cx);
+ CX_POPSUB(cx); /* Stack values are safe: release CV and @_ ... */
+ CX_POPBLOCK(cx);
retop = cx->blk_sub.retop;
CX_POP(cx);
@@ -3875,7 +3875,7 @@ PP(pp_entersub)
/* it's the responsibility of whoever leaves a sub to ensure
* that a clean, empty AV is left in pad[0]. This is normally
- * done by POPSUB() */
+ * done by CX_POPSUB() */
assert(!AvREAL(av) && AvFILLp(av) == -1);
items = SP - MARK;