aboutsummaryrefslogtreecommitdiff
path: root/ldebug.c
diff options
context:
space:
mode:
authorRoberto Ierusalimschy <roberto@inf.puc-rio.br>2017-11-13 10:20:51 -0200
committerRoberto Ierusalimschy <roberto@inf.puc-rio.br>2017-11-13 10:20:51 -0200
commit62f3b7c472c6bb293b3622ebdcd1747dc0e19d61 (patch)
tree21ce5190fc614dbe8afe432229670f70b59dffbf /ldebug.c
parentfb9be62f793240234ee3cedd29678b5103e3824d (diff)
downloadlua-62f3b7c472c6bb293b3622ebdcd1747dc0e19d61.tar.gz
lua-62f3b7c472c6bb293b3622ebdcd1747dc0e19d61.tar.bz2
lua-62f3b7c472c6bb293b3622ebdcd1747dc0e19d61.zip
detail
Diffstat (limited to 'ldebug.c')
-rw-r--r--ldebug.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/ldebug.c b/ldebug.c
index 037809a2..89b36f07 100644
--- a/ldebug.c
+++ b/ldebug.c
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: ldebug.c,v 2.141 2017/11/07 17:20:42 roberto Exp roberto $ 2** $Id: ldebug.c,v 2.142 2017/11/08 14:50:23 roberto Exp roberto $
3** Debug Interface 3** Debug Interface
4** See Copyright Notice in lua.h 4** See Copyright Notice in lua.h
5*/ 5*/
@@ -754,15 +754,16 @@ void luaG_traceexec (lua_State *L) {
754 luaD_hook(L, LUA_HOOKCOUNT, -1); /* call count hook */ 754 luaD_hook(L, LUA_HOOKCOUNT, -1); /* call count hook */
755 if (mask & LUA_MASKLINE) { 755 if (mask & LUA_MASKLINE) {
756 Proto *p = ci_func(ci)->p; 756 Proto *p = ci_func(ci)->p;
757 int npc = pcRel(ci->u.l.savedpc, p); 757 const Instruction *npc = ci->u.l.savedpc;
758 if (npc == 0 || /* call linehook when enter a new function, */ 758 int npci = pcRel(npc, p);
759 ci->u.l.savedpc <= L->oldpc || /* when jump back (loop), or when */ 759 if (npci == 0 || /* call linehook when enter a new function, */
760 changedline(p, pcRel(L->oldpc, p), npc)) { /* enter new line */ 760 npc <= L->oldpc || /* when jump back (loop), or when */
761 int newline = luaG_getfuncline(p, npc); /* new line */ 761 changedline(p, pcRel(L->oldpc, p), npci)) { /* enter new line */
762 int newline = luaG_getfuncline(p, npci); /* new line */
762 luaD_hook(L, LUA_HOOKLINE, newline); /* call line hook */ 763 luaD_hook(L, LUA_HOOKLINE, newline); /* call line hook */
763 } 764 }
765 L->oldpc = npc;
764 } 766 }
765 L->oldpc = ci->u.l.savedpc;
766 if (L->status == LUA_YIELD) { /* did hook yield? */ 767 if (L->status == LUA_YIELD) { /* did hook yield? */
767 if (counthook) 768 if (counthook)
768 L->hookcount = 1; /* undo decrement to zero */ 769 L->hookcount = 1; /* undo decrement to zero */