mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 12:21:25 -08:00
Code Issues Projects Releases Wiki Activity

reworking relocation mechanism to use one single table

Browse source
This commit is contained in:
Andrea Corallo 2019-12-14 09:28:12 +01:00
parent 740462da61
commit 694ece7722
4 changed files with 81 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

116
src/comp.c
View file

@ -70,6 +70,16 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */
#endif
#define SETJMP_NAME SETJMP
/* Max number function importable by native compiled code. */
#define F_RELOC_MAX_SIZE 1500
typedef struct {
void *link_table[F_RELOC_MAX_SIZE];
ptrdiff_t size;
} f_reloc_t;
static f_reloc_t freloc;
/* C side of the compiler context. */
typedef struct {
@ -157,7 +167,7 @@ typedef struct {
gcc_jit_function *check_impure;
Lisp_Object func_blocks_h; /* blk_name -> gcc_block. */
Lisp_Object exported_funcs_h; /* subr_name -> gcc_jit_function *. */
Lisp_Object imported_funcs_h; /* subr_name -> reloc_field. */
Lisp_Object imported_funcs_h; /* subr_name -> gcc_jit_field *reloc_field. */
Lisp_Object emitter_dispatcher;
gcc_jit_rvalue *data_relocs; /* Synthesized struct holding data relocs. */
gcc_jit_lvalue *func_relocs; /* Synthesized struct holding func relocs. */
@ -184,6 +194,20 @@ Lisp_Object helper_unbind_n (Lisp_Object n);
void helper_save_restriction (void);
bool helper_PSEUDOVECTOR_TYPEP_XUNTAG (Lisp_Object a, enum pvec_type code);
void *helper_link_table[] =
{ wrong_type_argument,
helper_PSEUDOVECTOR_TYPEP_XUNTAG,
pure_write_error,
push_handler,
SETJMP_NAME,
record_unwind_protect_excursion,
helper_unbind_n,
helper_save_restriction,
record_unwind_current_buffer,
set_internal,
helper_unwind_protect,
specbind };
static char * ATTRIBUTE_FORMAT_PRINTF (1, 2)
format_string (const char *format, ...)
@ -1758,7 +1782,7 @@ declare_runtime_imported_funcs (void)
#undef ADD_IMPORTED
return field_list;
return Freverse (field_list);
}
/*
@ -1767,7 +1791,6 @@ declare_runtime_imported_funcs (void)
static void
emit_ctxt_code (void)
{
USE_SAFE_ALLOCA;
comp.current_thread_ref =
gcc_jit_lvalue_as_rvalue (
@ -1809,56 +1832,32 @@ emit_ctxt_code (void)
emit_static_object (TEXT_DATA_RELOC_SYM, d_reloc);
/* Imported functions from non Lisp code. */
/* Functions imported from Lisp code. */
static gcc_jit_field *fields[F_RELOC_MAX_SIZE];
ptrdiff_t n_frelocs = 0;
Lisp_Object f_runtime = declare_runtime_imported_funcs ();
EMACS_INT f_reloc_len = XFIXNUM (Flength (f_runtime));
/* Imported subrs. */
Lisp_Object f_subr = CALL1I (comp-ctxt-func-relocs-l, Vcomp_ctxt);
f_reloc_len += XFIXNUM (Flength (f_subr));
gcc_jit_field **fields = SAFE_ALLOCA (f_reloc_len * sizeof (*fields));
Lisp_Object f_reloc_list = Qnil;
int n_frelocs = 0;
FOR_EACH_TAIL (f_runtime)
{
Lisp_Object el = XCAR (f_runtime);
eassert (n_frelocs < ARRAYELTS (fields));
fields[n_frelocs++] = xmint_pointer (XCDR (el));
f_reloc_list = Fcons (XCAR (el), f_reloc_list);
}
FOR_EACH_TAIL (f_subr)
Lisp_Object subr_l = Vsubr_list;
FOR_EACH_TAIL (subr_l)
{
Lisp_Object subr_sym = XCAR (f_subr);
Lisp_Object subr = symbol_subr (subr_sym);
/* Ignore inliners. This are not real functions to be imported. */
if (SUBRP (subr))
{
Lisp_Object maxarg = XCDR (Fsubr_arity (subr));
gcc_jit_field *field =
declare_imported_func (subr_sym, comp.lisp_obj_type,
FIXNUMP (maxarg) ? XFIXNUM (maxarg) :
EQ (maxarg, Qmany) ? MANY : UNEVALLED,
NULL);
fields[n_frelocs++] = field;
f_reloc_list = Fcons (subr_sym, f_reloc_list);
}
struct Lisp_Subr *subr = XSUBR (XCAR (subr_l));
Lisp_Object subr_sym = intern_c_string (subr->symbol_name);
eassert (n_frelocs < ARRAYELTS (fields));
fields[n_frelocs++] = declare_imported_func (subr_sym, comp.lisp_obj_type,
subr->max_args, NULL);
}
Lisp_Object f_reloc_vec = make_vector (n_frelocs, Qnil);
f_reloc_list = Fnreverse (f_reloc_list);
ptrdiff_t i = 0;
FOR_EACH_TAIL (f_reloc_list)
{
ASET (f_reloc_vec, i++, XCAR (f_reloc_list));
}
emit_static_object (TEXT_IMPORTED_FUNC_RELOC_SYM, f_reloc_vec);
gcc_jit_struct *f_reloc_struct =
gcc_jit_context_new_struct_type (comp.ctxt,
NULL,
"function_reloc_struct",
"freloc_link_table",
n_frelocs, fields);
comp.func_relocs =
gcc_jit_context_new_global (
@ -1867,8 +1866,6 @@ emit_ctxt_code (void)
GCC_JIT_GLOBAL_EXPORTED,
gcc_jit_struct_as_type (f_reloc_struct),
IMPORTED_FUNC_RELOC_SYM);
SAFE_FREE ();
}
@ -3038,8 +3035,8 @@ DEFUN ("comp--init-ctxt", Fcomp__init_ctxt, Scomp__init_ctxt,
comp.exported_funcs_h = CALLN (Fmake_hash_table);
/*
Always reinitialize this cause old function definitions are garbage collected
by libgccjit when the ctxt is released.
Always reinitialize this cause old function definitions are garbage
collected by libgccjit when the ctxt is released.
*/
comp.imported_funcs_h = CALLN (Fmake_hash_table);
@ -3140,6 +3137,29 @@ DEFUN ("comp--compile-ctxt-to-file", Fcomp__compile_ctxt_to_file,
}
void
fill_freloc (void)
{
if (ARRAYELTS (helper_link_table) > F_RELOC_MAX_SIZE)
goto overflow;
memcpy (freloc.link_table, helper_link_table, sizeof (freloc.link_table));
freloc.size = ARRAYELTS (helper_link_table);
Lisp_Object subr_l = Vsubr_list;
FOR_EACH_TAIL (subr_l)
{
if (freloc.size == F_RELOC_MAX_SIZE)
goto overflow;
struct Lisp_Subr *subr = XSUBR (XCAR (subr_l));
freloc.link_table[freloc.size] = subr->function.a0;
freloc.size++;
}
return;
overflow:
fatal ("Overflowing function relocation table, increase F_RELOC_MAX_SIZE");
}
/******************************************************************************/
/* Helper functions called from the run-time. */
/* These can't be statics till shared mechanism is used to solve relocations. */
@ -3343,6 +3363,10 @@ DEFUN ("native-elisp-load", Fnative_elisp_load, Snative_elisp_load, 1, 1, 0,
{
CHECK_STRING (file);
if (!freloc.link_table[0])
xsignal2 (Qnative_lisp_load_failed, file,
build_string ("Empty relocation table"));
Frequire (Qadvice, Qnil, Qnil);
dynlib_handle_ptr handle = dynlib_open (SSDATA (file));
@ -3472,6 +3496,10 @@ syms_of_comp (void)
doc: /* The compiler context. */);
Vcomp_ctxt = Qnil;
/* FIXME should be initialized but not here... */
DEFVAR_LISP ("comp-subr-list", Vsubr_list,
doc: /* List of all defined subrs. */);
/* Load mechanism. */
staticpro (&Vnative_elisp_refs_hash);
Vnative_elisp_refs_hash

4
src/emacs.c
View file

@ -2050,6 +2050,10 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem
moncontrol (0);
#endif
#ifdef HAVE_NATIVE_COMP
fill_freloc ();
#endif
initialized = true;
if (dump_mode)

3
src/lisp.h
View file

@ -4750,9 +4750,10 @@ extern bool profiler_memory_running;
extern void malloc_probe (size_t);
extern void syms_of_profiler (void);
/* Defined in comp.c. */
#ifdef HAVE_NATIVE_COMP
/* Defined in comp.c. */
extern void syms_of_comp (void);
extern void fill_freloc (void);
#endif /* HAVE_NATIVE_COMP */
#ifdef DOS_NT

3
src/lread.c
View file

@ -4465,6 +4465,9 @@ defsubr (union Aligned_Lisp_Subr *aname)
XSETPVECTYPE (sname, PVEC_SUBR);
XSETSUBR (tem, sname);
set_symbol_function (sym, tem);
#ifdef HAVE_NATIVE_COMP
Vsubr_list = Fcons (tem, Vsubr_list);
#endif /* HAVE_NATIVE_COMP */
}
#ifdef NOTDEF /* Use fset in subr.el now! */