mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-01-21 12:03:55 -08:00
9c222b9c1a
The C standard does not allow size-zero arrays, so redo struct Lisp_Subr to not use size-zero arrays when native compilation is not being used. Formerly, the code was using size-zero arrays (a GNU C extension) to avoid using memory unnecessarily when HAVE_NATIVE_COMP is not defined. Replace this hack with the more-traditional hack of putting the relevant members inside ‘#ifdef HAVE_NATIVE_COMP’. * src/alloc.c (cleanup_vector, mark_object): * src/comp.c (make_subr): * src/data.c (Fsubr_native_lambda_list, Fsubr_native_comp_unit): * src/eval.c (init_eval_once, funcall_lambda): * src/lisp.h (SUBR_NATIVE_COMPILEDP, SUBR_NATIVE_COMPILED_DYNP) (SUBR_TYPE): * src/lread.c (Fload): Conditionally compile with ‘#ifdef HAVE_NATIVE_COMP’ instead of with ‘if (NATIVE_COMP_FLAG)’. Redo members like native_comp_u[0] to be plain native_comp_u. Put all uses of these members inside ‘#ifdef HAVE_NATIVE_COMP’. * src/lisp.h (struct Lisp_Subr): Members native_comp_u, native_c_name, lambda_list, type are now all ifdeffed out if HAVE_NATIVE_COMP is not defined, instead of being size-zero arrays. All uses changed. * src/pdumper.c (dump_subr, dump_cold_native_subr) (dump_do_dump_relocation): * src/comp.h (NATIVE_COMP_FLAG): Remove; no longer needed.
104 lines
3 KiB
C
104 lines
3 KiB
C
/* Elisp native compiler definitions
|
|
|
|
Copyright (C) 2019-2021 Free Software Foundation, Inc.
|
|
|
|
This file is part of GNU Emacs.
|
|
|
|
GNU Emacs is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
GNU Emacs is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef COMP_H
|
|
#define COMP_H
|
|
|
|
#include <dynlib.h>
|
|
|
|
struct Lisp_Native_Comp_Unit
|
|
{
|
|
union vectorlike_header header;
|
|
/* The original eln file loaded. In the pdumper file this is stored
|
|
as a cons cell of 2 alternative file names: the car is the
|
|
filename relative to the directory of an installed binary, the
|
|
cdr is the filename relative to the directory of an uninstalled
|
|
binary. This is arranged in loadup.el. */
|
|
Lisp_Object file;
|
|
Lisp_Object optimize_qualities;
|
|
/* Guard anonymous lambdas against Garbage Collection and serve
|
|
sanity checks. */
|
|
Lisp_Object lambda_gc_guard_h;
|
|
/* Hash c_name -> d_reloc_imp index. */
|
|
Lisp_Object lambda_c_name_idx_h;
|
|
/* Hash doc-idx -> function documentation. */
|
|
Lisp_Object data_fdoc_v;
|
|
/* Analogous to the constant vector but per compilation unit. */
|
|
Lisp_Object data_vec;
|
|
/* 'data_impure_vec' must be last (see allocate_native_comp_unit).
|
|
Same as data_vec but for data that cannot be moved to pure space. */
|
|
Lisp_Object data_impure_vec;
|
|
/* STUFFS WE DO NOT DUMP!! */
|
|
Lisp_Object *data_imp_relocs;
|
|
bool loaded_once;
|
|
bool load_ongoing;
|
|
dynlib_handle_ptr handle;
|
|
} GCALIGNED_STRUCT;
|
|
|
|
#ifdef HAVE_NATIVE_COMP
|
|
|
|
INLINE bool
|
|
NATIVE_COMP_UNITP (Lisp_Object a)
|
|
{
|
|
return PSEUDOVECTORP (a, PVEC_NATIVE_COMP_UNIT);
|
|
}
|
|
|
|
INLINE struct Lisp_Native_Comp_Unit *
|
|
XNATIVE_COMP_UNIT (Lisp_Object a)
|
|
{
|
|
eassert (NATIVE_COMP_UNITP (a));
|
|
return XUNTAG (a, Lisp_Vectorlike, struct Lisp_Native_Comp_Unit);
|
|
}
|
|
|
|
/* Defined in comp.c. */
|
|
|
|
extern void hash_native_abi (void);
|
|
|
|
extern Lisp_Object load_comp_unit (struct Lisp_Native_Comp_Unit *comp_u,
|
|
bool loading_dump, bool late_load);
|
|
|
|
extern void unload_comp_unit (struct Lisp_Native_Comp_Unit *);
|
|
|
|
extern Lisp_Object native_function_doc (Lisp_Object function);
|
|
|
|
extern void syms_of_comp (void);
|
|
|
|
extern void maybe_defer_native_compilation (Lisp_Object function_name,
|
|
Lisp_Object definition);
|
|
|
|
extern void eln_load_path_final_clean_up (void);
|
|
|
|
extern void fixup_eln_load_path (Lisp_Object directory);
|
|
|
|
#else /* #ifdef HAVE_NATIVE_COMP */
|
|
|
|
static inline void
|
|
maybe_defer_native_compilation (Lisp_Object function_name,
|
|
Lisp_Object definition)
|
|
{}
|
|
|
|
static inline
|
|
void unload_comp_unit (struct Lisp_Native_Comp_Unit *cu)
|
|
{}
|
|
|
|
extern void syms_of_comp (void);
|
|
|
|
#endif /* #ifdef HAVE_NATIVE_COMP */
|
|
|
|
#endif /* #ifndef COMP_H */
|