diff options
Diffstat (limited to 'src/lj_dispatch.h')
-rw-r--r-- | src/lj_dispatch.h | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/src/lj_dispatch.h b/src/lj_dispatch.h index 5960e64a..c3f6d86b 100644 --- a/src/lj_dispatch.h +++ b/src/lj_dispatch.h | |||
@@ -29,15 +29,17 @@ | |||
29 | _(floor) _(ceil) _(trunc) _(log) _(log10) _(exp) _(sin) _(cos) _(tan) \ | 29 | _(floor) _(ceil) _(trunc) _(log) _(log10) _(exp) _(sin) _(cos) _(tan) \ |
30 | _(asin) _(acos) _(atan) _(sinh) _(cosh) _(tanh) _(frexp) _(modf) _(atan2) \ | 30 | _(asin) _(acos) _(atan) _(sinh) _(cosh) _(tanh) _(frexp) _(modf) _(atan2) \ |
31 | _(pow) _(fmod) _(ldexp) \ | 31 | _(pow) _(fmod) _(ldexp) \ |
32 | _(lj_dispatch_call) _(lj_dispatch_ins) _(lj_err_throw) \ | 32 | _(lj_dispatch_call) _(lj_dispatch_ins) _(lj_dispatch_stitch) \ |
33 | _(lj_dispatch_profile) _(lj_err_throw) \ | ||
33 | _(lj_ffh_coroutine_wrap_err) _(lj_func_closeuv) _(lj_func_newL_gc) \ | 34 | _(lj_ffh_coroutine_wrap_err) _(lj_func_closeuv) _(lj_func_newL_gc) \ |
34 | _(lj_gc_barrieruv) _(lj_gc_step) _(lj_gc_step_fixtop) _(lj_meta_arith) \ | 35 | _(lj_gc_barrieruv) _(lj_gc_step) _(lj_gc_step_fixtop) _(lj_meta_arith) \ |
35 | _(lj_meta_call) _(lj_meta_cat) _(lj_meta_comp) _(lj_meta_equal) \ | 36 | _(lj_meta_call) _(lj_meta_cat) _(lj_meta_comp) _(lj_meta_equal) \ |
36 | _(lj_meta_for) _(lj_meta_len) _(lj_meta_tget) _(lj_meta_tset) \ | 37 | _(lj_meta_for) _(lj_meta_istype) _(lj_meta_len) _(lj_meta_tget) \ |
37 | _(lj_state_growstack) _(lj_str_fromnum) _(lj_str_fromnumber) _(lj_str_new) \ | 38 | _(lj_meta_tset) _(lj_state_growstack) _(lj_strfmt_num) \ |
38 | _(lj_tab_dup) _(lj_tab_get) _(lj_tab_getinth) _(lj_tab_len) _(lj_tab_new) \ | 39 | _(lj_str_new) _(lj_tab_dup) _(lj_tab_get) _(lj_tab_getinth) _(lj_tab_len) \ |
39 | _(lj_tab_newkey) _(lj_tab_next) _(lj_tab_reasize) \ | 40 | _(lj_tab_new) _(lj_tab_newkey) _(lj_tab_next) _(lj_tab_reasize) \ |
40 | JITGOTDEF(_) FFIGOTDEF(_) | 41 | _(lj_tab_setinth) _(lj_buf_putstr_reverse) _(lj_buf_putstr_lower) \ |
42 | _(lj_buf_putstr_upper) _(lj_buf_tostr) JITGOTDEF(_) FFIGOTDEF(_) | ||
41 | 43 | ||
42 | enum { | 44 | enum { |
43 | #define GOTENUM(name) LJ_GOT_##name, | 45 | #define GOTENUM(name) LJ_GOT_##name, |
@@ -60,7 +62,7 @@ typedef uint16_t HotCount; | |||
60 | #define HOTCOUNT_CALL 1 | 62 | #define HOTCOUNT_CALL 1 |
61 | 63 | ||
62 | /* This solves a circular dependency problem -- bump as needed. Sigh. */ | 64 | /* This solves a circular dependency problem -- bump as needed. Sigh. */ |
63 | #define GG_NUM_ASMFF 62 | 65 | #define GG_NUM_ASMFF 57 |
64 | 66 | ||
65 | #define GG_LEN_DDISP (BC__MAX + GG_NUM_ASMFF) | 67 | #define GG_LEN_DDISP (BC__MAX + GG_NUM_ASMFF) |
66 | #define GG_LEN_SDISP BC_FUNCF | 68 | #define GG_LEN_SDISP BC_FUNCF |
@@ -109,7 +111,12 @@ LJ_FUNC void lj_dispatch_update(global_State *g); | |||
109 | /* Instruction dispatch callback for hooks or when recording. */ | 111 | /* Instruction dispatch callback for hooks or when recording. */ |
110 | LJ_FUNCA void LJ_FASTCALL lj_dispatch_ins(lua_State *L, const BCIns *pc); | 112 | LJ_FUNCA void LJ_FASTCALL lj_dispatch_ins(lua_State *L, const BCIns *pc); |
111 | LJ_FUNCA ASMFunction LJ_FASTCALL lj_dispatch_call(lua_State *L, const BCIns*pc); | 113 | LJ_FUNCA ASMFunction LJ_FASTCALL lj_dispatch_call(lua_State *L, const BCIns*pc); |
112 | LJ_FUNCA void LJ_FASTCALL lj_dispatch_return(lua_State *L, const BCIns *pc); | 114 | #if LJ_HASJIT |
115 | LJ_FUNCA void LJ_FASTCALL lj_dispatch_stitch(jit_State *J, const BCIns *pc); | ||
116 | #endif | ||
117 | #if LJ_HASPROFILE | ||
118 | LJ_FUNCA void LJ_FASTCALL lj_dispatch_profile(lua_State *L, const BCIns *pc); | ||
119 | #endif | ||
113 | 120 | ||
114 | #if LJ_HASFFI && !defined(_BUILDVM_H) | 121 | #if LJ_HASFFI && !defined(_BUILDVM_H) |
115 | /* Save/restore errno and GetLastError() around hooks, exits and recording. */ | 122 | /* Save/restore errno and GetLastError() around hooks, exits and recording. */ |