summaryrefslogtreecommitdiff
path: root/src/lj_frame.h
diff options
context:
space:
mode:
authorMike Pall <mike>2015-06-09 22:09:11 +0200
committerMike Pall <mike>2015-06-09 22:09:11 +0200
commitfb19df9fd765ce7384e2e28cec78b3c30a10d5ee (patch)
treea3e6b0811cf37b6eb7fc720fc56e7e1c8222b06c /src/lj_frame.h
parent4da1bb66cdd20e868dae42d2c544280ec1b9fa76 (diff)
parent72347895edbdc8730c1e758bfee4264fd60164ac (diff)
downloadluajit-fb19df9fd765ce7384e2e28cec78b3c30a10d5ee.tar.gz
luajit-fb19df9fd765ce7384e2e28cec78b3c30a10d5ee.tar.bz2
luajit-fb19df9fd765ce7384e2e28cec78b3c30a10d5ee.zip
Merge branch 'master' into v2.1
Diffstat (limited to 'src/lj_frame.h')
-rw-r--r--src/lj_frame.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/lj_frame.h b/src/lj_frame.h
index 517f4684..a86c36be 100644
--- a/src/lj_frame.h
+++ b/src/lj_frame.h
@@ -158,7 +158,11 @@ enum { LJ_CONT_TAILCALL, LJ_CONT_FFI_CALLBACK }; /* Special continuations. */
158#define CFRAME_OFS_NRES (4*4) 158#define CFRAME_OFS_NRES (4*4)
159#define CFRAME_OFS_MULTRES (1*4) 159#define CFRAME_OFS_MULTRES (1*4)
160#endif 160#endif
161#if LJ_NO_UNWIND
162#define CFRAME_SIZE (12*8)
163#else
161#define CFRAME_SIZE (10*8) 164#define CFRAME_SIZE (10*8)
165#endif
162#define CFRAME_SIZE_JIT (CFRAME_SIZE + 16) 166#define CFRAME_SIZE_JIT (CFRAME_SIZE + 16)
163#define CFRAME_SHIFT_MULTRES 0 167#define CFRAME_SHIFT_MULTRES 0
164#endif 168#endif