From 8f2c62407c0659d84126545e19505a851059e750 Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Mon, 20 Nov 2017 06:21:22 +0900 Subject: Add `MRB_METHOD_TABLE_INLINE` option. Now the method tables (in classes/modules and caches) keeps C function pointers without wrapping in `struct RProc` objects. For the sake of portability, `mrb_method_t` is represented by the struct and union, but if the most significant bit of the pointer is not used by the platform, `mrb_method_t` should be packed in `uintptr_t` to reduce memory usage. `MRB_METHOD_TABLE_INLINE` is turned on by default for linux. --- include/mrbconf.h | 7 +++++++ include/mruby.h | 19 +++++++++++++++---- include/mruby/class.h | 6 +++--- include/mruby/proc.h | 36 ++++++++++++++++++++++++++++++++---- 4 files changed, 57 insertions(+), 11 deletions(-) (limited to 'include') diff --git a/include/mrbconf.h b/include/mrbconf.h index c4f6f38cd..96ab6b77f 100644 --- a/include/mrbconf.h +++ b/include/mrbconf.h @@ -36,6 +36,13 @@ /* size of the method cache (need to be the power of 2) */ //#define MRB_METHOD_CACHE_SIZE (1<<7) +/* add -DMRB_METHOD_TABLE_INLINE unless platform uses MSB of pointers */ +//#define MRB_METHOD_TABLE_INLINE +/* turn MRB_METHOD_TABLE_INLINE on for linux by default */ +#if !defined(MRB_METHOD_TABLE_INLINE) && defined(__linux__) +# define MRB_METHOD_TABLE_INLINE +#endif + /* add -DMRB_INT16 to use 16bit integer for mrb_int; conflict with MRB_INT64 */ //#define MRB_INT16 diff --git a/include/mruby.h b/include/mruby.h index 1413d604e..5c8d38200 100644 --- a/include/mruby.h +++ b/include/mruby.h @@ -170,11 +170,25 @@ struct mrb_context { # define MRB_METHOD_CACHE_SIZE (1<<7) #endif +typedef mrb_value (*mrb_func_t)(struct mrb_state *mrb, mrb_value); + +#ifdef MRB_METHOD_TABLE_INLINE +typedef uintptr_t mrb_method_t; +#else +typedef struct { + mrb_bool func_p; + union { + struct RProc *proc; + mrb_func_t func; + }; +} mrb_method_t; +#endif + #ifdef MRB_METHOD_CACHE struct mrb_cache_entry { struct RClass *c; mrb_sym mid; - struct RProc *m; + mrb_method_t m; }; #endif @@ -257,9 +271,6 @@ typedef struct mrb_state { mrb_int atexit_stack_len; } mrb_state; - -typedef mrb_value (*mrb_func_t)(mrb_state *mrb, mrb_value); - /** * Defines a new class. * diff --git a/include/mruby/class.h b/include/mruby/class.h index 1e1d3c136..ea35d8e17 100644 --- a/include/mruby/class.h +++ b/include/mruby/class.h @@ -74,12 +74,12 @@ MRB_API struct RClass* mrb_define_class_id(mrb_state*, mrb_sym, struct RClass*); MRB_API struct RClass* mrb_define_module_id(mrb_state*, mrb_sym); MRB_API struct RClass *mrb_vm_define_class(mrb_state*, mrb_value, mrb_value, mrb_sym); MRB_API struct RClass *mrb_vm_define_module(mrb_state*, mrb_value, mrb_sym); -MRB_API void mrb_define_method_raw(mrb_state*, struct RClass*, mrb_sym, struct RProc *); +MRB_API void mrb_define_method_raw(mrb_state*, struct RClass*, mrb_sym, mrb_method_t); MRB_API void mrb_define_method_id(mrb_state *mrb, struct RClass *c, mrb_sym mid, mrb_func_t func, mrb_aspec aspec); MRB_API void mrb_alias_method(mrb_state *mrb, struct RClass *c, mrb_sym a, mrb_sym b); -MRB_API struct RProc *mrb_method_search_vm(mrb_state*, struct RClass**, mrb_sym); -MRB_API struct RProc *mrb_method_search(mrb_state*, struct RClass*, mrb_sym); +MRB_API mrb_method_t mrb_method_search_vm(mrb_state*, struct RClass**, mrb_sym); +MRB_API mrb_method_t mrb_method_search(mrb_state*, struct RClass*, mrb_sym); MRB_API struct RClass* mrb_class_real(struct RClass* cl); diff --git a/include/mruby/proc.h b/include/mruby/proc.h index b33e9e1a2..d2b676bd0 100644 --- a/include/mruby/proc.h +++ b/include/mruby/proc.h @@ -55,8 +55,9 @@ struct RProc { #define MRB_ASPEC_KDICT(a) ((a) & (1<<1)) #define MRB_ASPEC_BLOCK(a) ((a) & 1) -#define MRB_PROC_CFUNC 128 -#define MRB_PROC_CFUNC_P(p) (((p)->flags & MRB_PROC_CFUNC) != 0) +#define MRB_PROC_CFUNC_FL 128 +#define MRB_PROC_CFUNC_P(p) (((p)->flags & MRB_PROC_CFUNC_FL) != 0) +#define MRB_PROC_CFUNC(p) (p)->body.func #define MRB_PROC_STRICT 256 #define MRB_PROC_STRICT_P(p) (((p)->flags & MRB_PROC_STRICT) != 0) #define MRB_PROC_ORPHAN 512 @@ -64,7 +65,7 @@ struct RProc { #define MRB_PROC_ENVSET 1024 #define MRB_PROC_ENV_P(p) (((p)->flags & MRB_PROC_ENVSET) != 0) #define MRB_PROC_ENV(p) (MRB_PROC_ENV_P(p) ? (p)->e.env : NULL) -#define MRB_PROC_TARGET_CLASS(p) (MRB_PROC_ENV_P(p) ? (p)->e.env->c : (p)->e.target_class ) +#define MRB_PROC_TARGET_CLASS(p) (MRB_PROC_ENV_P(p) ? (p)->e.env->c : (p)->e.target_class) #define MRB_PROC_SET_TARGET_CLASS(p,tc) do {\ if (MRB_PROC_ENV_P(p)) {\ (p)->e.env->c = (tc);\ @@ -95,8 +96,35 @@ MRB_API mrb_value mrb_proc_cfunc_env_get(mrb_state*, mrb_int); /* old name */ #define mrb_cfunc_env_get(mrb, idx) mrb_proc_cfunc_env_get(mrb, idx) +#ifdef MRB_METHOD_TABLE_INLINE + +#define MRB_METHOD_FUNC_FL ((uintptr_t)1U<<(sizeof(uintptr_t)*8-1)) +#define MRB_METHOD_FUNC_P(m) ((uintptr_t)(m)&MRB_METHOD_FUNC_FL) +#define MRB_METHOD_FUNC(m) ((mrb_func_t)((uintptr_t)(m)&(~MRB_METHOD_FUNC_FL))) +#define MRB_METHOD_FROM_FUNC(m,fn) m=(mrb_method_t)((struct RProc*)((uintptr_t)(fn)|MRB_METHOD_FUNC_FL)) +#define MRB_METHOD_FROM_PROC(m,pr) m=(mrb_method_t)(struct RProc*)(pr) +#define MRB_METHOD_PROC_P(m) (!MRB_METHOD_FUNC_P(m)) +#define MRB_METHOD_PROC(m) ((struct RProc*)(m)) +#define MRB_METHOD_UNDEF_P(m) ((m)==0) + +#else + +#define MRB_METHOD_FUNC_P(m) ((m).func_p) +#define MRB_METHOD_FUNC(m) ((m).func) +#define MRB_METHOD_FROM_FUNC(m,fn) do{(m).func_p=TRUE;(m).func=(fn);}while(0) +#define MRB_METHOD_FROM_PROC(m,pr) do{(m).func_p=FALSE;(m).proc=(pr);}while(0) +#define MRB_METHOD_PROC_P(m) (!MRB_METHOD_FUNC_P(m)) +#define MRB_METHOD_PROC(fn) ((m).proc) +#define MRB_METHOD_UNDEF_P(m) ((m).proc==NULL) + +#endif /* MRB_METHOD_TABLE_INLINE */ + +#define MRB_METHOD_CFUNC_P(m) (MRB_METHOD_FUNC_P(m)?TRUE:(MRB_METHOD_PROC(m)?(MRB_PROC_CFUNC_P(MRB_METHOD_PROC(m))):FALSE)) +#define MRB_METHOD_CFUNC(m) (MRB_METHOD_FUNC_P(m)?MRB_METHOD_FUNC(m):((MRB_METHOD_PROC(m)&&MRB_PROC_CFUNC_P(MRB_METHOD_PROC(m)))?MRB_PROC_CFUNC(MRB_METHOD_PROC(m)):NULL)) + + #include -KHASH_DECLARE(mt, mrb_sym, struct RProc*, TRUE) +KHASH_DECLARE(mt, mrb_sym, mrb_method_t, TRUE) MRB_END_DECL -- cgit v1.2.3