diff options
author | Mike Pall <mike> | 2014-12-15 02:27:27 +0100 |
---|---|---|
committer | Mike Pall <mike> | 2014-12-15 02:27:27 +0100 |
commit | 881f48f9808a950f8e046a3b299db0269506a87d (patch) | |
tree | 43584223f3b77d77af5a3515b3191c21fd012f01 /src/lj_debug.c | |
parent | b93b624ad88a9455cb3f12db93a9c5e153ff8a62 (diff) | |
download | luajit-881f48f9808a950f8e046a3b299db0269506a87d.tar.gz luajit-881f48f9808a950f8e046a3b299db0269506a87d.tar.bz2 luajit-881f48f9808a950f8e046a3b299db0269506a87d.zip |
Cleanup of frame handling. No functional changes.
Diffstat (limited to 'src/lj_debug.c')
-rw-r--r-- | src/lj_debug.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/lj_debug.c b/src/lj_debug.c index 889ac017..1b794753 100644 --- a/src/lj_debug.c +++ b/src/lj_debug.c | |||
@@ -15,7 +15,6 @@ | |||
15 | #include "lj_frame.h" | 15 | #include "lj_frame.h" |
16 | #include "lj_bc.h" | 16 | #include "lj_bc.h" |
17 | #include "lj_strfmt.h" | 17 | #include "lj_strfmt.h" |
18 | #include "lj_vm.h" | ||
19 | #if LJ_HASJIT | 18 | #if LJ_HASJIT |
20 | #include "lj_jit.h" | 19 | #include "lj_jit.h" |
21 | #endif | 20 | #endif |
@@ -88,8 +87,7 @@ static BCPos debug_framepc(lua_State *L, GCfunc *fn, cTValue *nextframe) | |||
88 | if (frame_islua(f)) { | 87 | if (frame_islua(f)) { |
89 | f = frame_prevl(f); | 88 | f = frame_prevl(f); |
90 | } else { | 89 | } else { |
91 | if (frame_isc(f) || (LJ_HASFFI && frame_iscont(f) && | 90 | if (frame_isc(f) || (frame_iscont(f) && frame_iscont_fficb(f))) |
92 | (f-1)->u32.lo == LJ_CONT_FFI_CALLBACK)) | ||
93 | cf = cframe_raw(cframe_prev(cf)); | 91 | cf = cframe_raw(cframe_prev(cf)); |
94 | f = frame_prevd(f); | 92 | f = frame_prevd(f); |
95 | } | 93 | } |