[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] coverity 0cb1759 5/9: Merge remote-tracking branch 'origin
|
From: |
John Wiegley |
|
Subject: |
[Emacs-diffs] coverity 0cb1759 5/9: Merge remote-tracking branch 'origin/emacs-25' into coverity |
|
Date: |
Mon, 14 Dec 2015 19:38:16 +0000 |
branch: coverity
commit 0cb17591074c412521639f00882ec634dee48e2c
Merge: 4a157e8 e61f1c3
Author: John Wiegley <address@hidden>
Commit: John Wiegley <address@hidden>
Merge remote-tracking branch 'origin/emacs-25' into coverity
---
.gitignore | 1 +
configure.ac | 5 +-
etc/PROBLEMS | 4 +
lisp/isearch.el | 8 +-
lisp/replace.el | 26 +-
lisp/simple.el | 12 +-
lisp/version.el | 64 ++-
modules/mod-test/Makefile | 20 +-
modules/mod-test/mod-test.c | 201 ++++----
modules/mod-test/test.el | 16 +-
modules/modhelp.py | 33 +-
src/Makefile.in | 2 +-
src/bytecode.c | 14 +-
src/dynlib.c | 151 +++++-
src/dynlib.h | 9 +-
src/emacs-module.c | 1137 ++++++++++++++++++++++++++++++++++++++
src/emacs-module.h | 203 +++++++
src/eval.c | 146 +++---
src/lisp.h | 20 +-
src/lread.c | 4 +-
src/module.c | 1197 -----------------------------------------
src/module.h | 229 --------
src/w32.c | 5 +
test/automated/simple-test.el | 17 +-
24 files changed, 1786 insertions(+), 1738 deletions(-)
diff --git a/.gitignore b/.gitignore
index 86e377e..34b0c02 100644
--- a/.gitignore
+++ b/.gitignore
@@ -141,6 +141,7 @@ src/stamp-h1
*.o
*.res
*.so
+*.dll
[0-9]*.core
core
core.*[0-9]
diff --git a/configure.ac b/configure.ac
index 7c90610..d5638bf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3320,9 +3320,10 @@ if test "${with_modules}" != "no"; then
fi
if test "${HAVE_MODULES}" = yes; then
- MODULES_OBJ="dynlib.o module.o"
+ MODULES_OBJ="dynlib.o emacs-module.o"
AC_DEFINE(HAVE_MODULES, 1, [Define to 1 if dynamic modules are enabled])
- AC_DEFINE_UNQUOTED(MODULES_SUFFIX, "$MODULES_SUFFIX", [System extension for
dynamic libraries])
+ AC_DEFINE_UNQUOTED(MODULES_SUFFIX, "$MODULES_SUFFIX",
+ [System extension for dynamic libraries])
fi
AC_SUBST(MODULES_OBJ)
AC_SUBST(LIBMODULES)
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index 0f76bfc..18b1f84 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -2051,6 +2051,10 @@ pinned icon, a separate button appears on the taskbar,
instead of the
expected effect of the icon you clicked on being converted to that
button.
+This is due to a bug in early versions of Windows 10, reportedly fixed
+in build 1511 of Windows 10 (a.k.a. "Windows 10 SP1"). If you cannot
+upgrade, read the work-around described below.
+
First, be sure to edit the Properties of the pinned icon to invoke
runemacs.exe, not emacs.exe. (The latter will cause an extra cmd
window to appear when you invoke Emacs from the pinned icon.)
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 9f8ba8d..080eb57 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1828,7 +1828,13 @@ characters in that string."
isearch-regexp-lax-whitespace
isearch-lax-whitespace)
search-whitespace-regexp)))
- (occur regexp nlines)))
+ (occur (if isearch-regexp-function
+ (propertize regexp
+ 'isearch-string isearch-string
+ 'isearch-regexp-function-descr
+ (isearch--describe-regexp-mode
isearch-regexp-function))
+ regexp)
+ nlines)))
(declare-function hi-lock-read-face-name "hi-lock" ())
diff --git a/lisp/replace.el b/lisp/replace.el
index b6802ae..7727562 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -1416,6 +1416,17 @@ See also `multi-occur'."
buf))
(buffer-list))))))
+(defun occur-regexp-descr (regexp)
+ (format " for %s\"%s\""
+ (or (get-text-property 0 'isearch-regexp-function-descr regexp)
+ "")
+ (if (get-text-property 0 'isearch-string regexp)
+ (propertize
+ (query-replace-descr
+ (get-text-property 0 'isearch-string regexp))
+ 'help-echo regexp)
+ (query-replace-descr regexp))))
+
(defun occur-1 (regexp nlines bufs &optional buf-name)
(unless (and regexp (not (equal regexp "")))
(error "Occur doesn't work with the empty regexp"))
@@ -1484,9 +1495,11 @@ See also `multi-occur'."
(if (= count 1) "" "es")
;; Don't display regexp if with remaining text
;; it is longer than window-width.
- (if (> (+ (length regexp) 42) (window-width))
- "" (format-message
- " for `%s'" (query-replace-descr regexp)))))
+ (if (> (+ (length (or (get-text-property 0 'isearch-string
regexp)
+ regexp))
+ 42)
+ (window-width))
+ "" (occur-regexp-descr regexp))))
(setq occur-revert-arguments (list regexp nlines bufs))
(if (= count 0)
(kill-buffer occur-buf)
@@ -1647,8 +1660,7 @@ See also `multi-occur'."
lines (if (= lines 1) ""
"s")))
;; Don't display regexp for multi-buffer.
(if (> (length buffers) 1)
- "" (format " for \"%s\""
- (query-replace-descr regexp)))
+ "" (occur-regexp-descr regexp))
(buffer-name buf))
'read-only t))
(setq end (point))
@@ -1661,14 +1673,14 @@ See also `multi-occur'."
(goto-char (point-min))
(let ((beg (point))
end)
- (insert (format "%d match%s%s total for \"%s\":\n"
+ (insert (format "%d match%s%s total%s:\n"
global-matches (if (= global-matches 1) "" "es")
;; Don't display the same number of lines
;; and matches in case of 1 match per line.
(if (= global-lines global-matches)
"" (format " in %d line%s"
global-lines (if (= global-lines 1) ""
"s")))
- (query-replace-descr regexp)))
+ (occur-regexp-descr regexp)))
(setq end (point))
(when title-face
(add-face-text-property beg end title-face)))
diff --git a/lisp/simple.el b/lisp/simple.el
index dc19bd6..8b57bf0 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -458,15 +458,10 @@ A non-nil INTERACTIVE argument means to run the
`post-self-insert-hook'."
(put-text-property from (point) 'rear-nonsticky
(cons 'hard sticky)))))
-(declare-function electric-indent-just-newline "electric")
(defun open-line (n &optional interactive)
"Insert a newline and leave point before it.
-If `electric-indent-mode' is enabled, indent the new line if it's
-not empty.
If there is a fill prefix and/or a `left-margin', insert them on
-the new line. If the old line would have been blank, insert them
-on the old line as well.
-
+the new line if the line would have been blank.
With arg N, insert N newlines.
A non-nil INTERACTIVE argument means to run the `post-self-insert-hook'."
(interactive "*p\np")
@@ -475,10 +470,7 @@ A non-nil INTERACTIVE argument means to run the
`post-self-insert-hook'."
(loc (point-marker))
;; Don't expand an abbrev before point.
(abbrev-mode nil))
- (if (and interactive
- (looking-at-p "[[:space:]]*$"))
- (electric-indent-just-newline n)
- (newline n interactive))
+ (newline n interactive)
(goto-char loc)
(while (> n 0)
(cond ((bolp)
diff --git a/lisp/version.el b/lisp/version.el
index 43103fd..4207cb4 100644
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -113,17 +113,17 @@ or if we could not determine the revision.")
(looking-at "[0-9a-fA-F]\\{40\\}"))
(match-string 0)))))
-(defun emacs-repository--version-git-1 (file)
+(defun emacs-repository--version-git-1 (file dir)
"Internal subroutine of `emacs-repository-get-version'."
(when (file-readable-p file)
- (erase-buffer)
- (insert-file-contents file)
- (cond ((looking-at "[0-9a-fA-F]\\{40\\}")
- (match-string 0))
- ((looking-at "ref: \\(.*\\)")
- (emacs-repository--version-git-1
- (expand-file-name (match-string 1)
- (file-name-directory file)))))))
+ (with-temp-buffer
+ (insert-file-contents file)
+ (cond ((looking-at "[0-9a-fA-F]\\{40\\}")
+ (match-string 0))
+ ((looking-at "ref: \\(.*\\)")
+ (emacs-repository--version-git-1
+ (expand-file-name (match-string 1) dir)
+ dir))))))
(defun emacs-repository-get-version (&optional dir external)
"Try to return as a string the repository revision of the Emacs sources.
@@ -138,20 +138,38 @@ Optional argument EXTERNAL non-nil means to just ask the
VCS itself,
if the sources appear to be under version control. Otherwise only ask
the VCS if we cannot find any information ourselves."
(or dir (setq dir source-directory))
- (when (file-directory-p (expand-file-name ".git" dir))
- (if external
- (emacs-repository-version-git dir)
- (or (let ((files '("HEAD" "refs/heads/master"))
- file rev)
- (with-temp-buffer
- (while (and (not rev)
- (setq file (car files)))
- (setq file (expand-file-name (format ".git/%s" file) dir)
- files (cdr files)
- rev (emacs-repository--version-git-1 file))))
- rev)
- ;; AFAICS this doesn't work during dumping (bug#20799).
- (emacs-repository-version-git dir)))))
+ (let* ((base-dir (expand-file-name ".git" dir))
+ (in-main-worktree (file-directory-p base-dir))
+ (in-linked-worktree nil)
+ sub-dir)
+ ;; If the sources are in a linked worktree, .git is a file that points to
+ ;; the location of the main worktree and the repo's administrative files.
+ (when (and (not in-main-worktree)
+ (file-regular-p base-dir)
+ (file-readable-p base-dir))
+ (with-temp-buffer
+ (insert-file-contents base-dir)
+ (when (looking-at "gitdir: \\(.*\.git\\)\\(.*\\)$")
+ (setq base-dir (match-string 1)
+ sub-dir (concat base-dir (match-string 2))
+ in-linked-worktree t))))
+ ;; We've found a worktree, either main or linked.
+ (when (or in-main-worktree in-linked-worktree)
+ (if external
+ (emacs-repository-version-git dir)
+ (or (if in-linked-worktree
+ (emacs-repository--version-git-1
+ (expand-file-name "HEAD" sub-dir) base-dir)
+ (let ((files '("HEAD" "refs/heads/master"))
+ file rev)
+ (while (and (not rev)
+ (setq file (car files)))
+ (setq file (expand-file-name file base-dir)
+ files (cdr files)
+ rev (emacs-repository--version-git-1 file base-dir)))
+ rev))
+ ;; AFAICS this doesn't work during dumping (bug#20799).
+ (emacs-repository-version-git dir))))))
;; We put version info into the executable in the form that `ident' uses.
(purecopy (concat "\n$Id: " (subst-char-in-string ?\n ?\s (emacs-version))
diff --git a/modules/mod-test/Makefile b/modules/mod-test/Makefile
index 654c22a..1b74f47 100644
--- a/modules/mod-test/Makefile
+++ b/modules/mod-test/Makefile
@@ -18,16 +18,28 @@
# along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
ROOT = ../..
+EMACS = $(ROOT)/src/emacs
CC = gcc
LD = gcc
-CFLAGS = -ggdb3 -Wall
LDFLAGS =
-all: mod-test.so
+# On MS-Windows, say "make SO=.dll" to build the module
+SO = so
+# -fPIC is a no-op on Windows, but causes a compiler warning
+ifeq ($(SO),dll)
+CFLAGS = -std=gnu99 -ggdb3 -Wall
+else
+CFLAGS = -std=gnu99 -ggdb3 -Wall -fPIC
+endif
-%.so: %.o
+all: mod-test.$(SO)
+
+%.$(SO): %.o
$(LD) -shared $(LDFLAGS) -o $@ $<
%.o: %.c
- $(CC) $(CFLAGS) -I$(ROOT)/src -fPIC -c $<
+ $(CC) $(CFLAGS) -I$(ROOT)/src -c $<
+
+check:
+ $(EMACS) -batch -l ert -l test.el -f ert-run-tests-batch-and-exit
diff --git a/modules/mod-test/mod-test.c b/modules/mod-test/mod-test.c
index 04b6122..bae1967 100644
--- a/modules/mod-test/mod-test.c
+++ b/modules/mod-test/mod-test.c
@@ -19,70 +19,71 @@ along with GNU Emacs. If not, see
<http://www.gnu.org/licenses/>. */
#include <assert.h>
#include <stdio.h>
-#include <module.h>
+#include <stdlib.h>
+#include <emacs-module.h>
int plugin_is_GPL_compatible;
-/*
- * Always return symbol 't'
- */
-static emacs_value Fmod_test_return_t (emacs_env *env, int nargs, emacs_value
args[], void *data)
+/* Always return symbol 't'. */
+static emacs_value
+Fmod_test_return_t (emacs_env *env, int nargs, emacs_value args[], void *data)
{
return env->intern (env, "t");
}
-
-/*
- * Expose simple sum function
- */
-static int64_t sum (int64_t a, int64_t b)
+/* Expose simple sum function. */
+static intmax_t
+sum (intmax_t a, intmax_t b)
{
return a + b;
}
-static emacs_value Fmod_test_sum (emacs_env *env, int nargs, emacs_value
args[], void* data)
+static emacs_value
+Fmod_test_sum (emacs_env *env, int nargs, emacs_value args[], void *data)
{
- int64_t a = env->extract_integer (env, args[0]);
- int64_t b = env->extract_integer (env, args[1]);
+ intmax_t a = env->extract_integer (env, args[0]);
+ intmax_t b = env->extract_integer (env, args[1]);
- int64_t r = sum(a, b);
+ intmax_t r = sum (a, b);
return env->make_integer (env, r);
}
-/*
- * Signal '(error 56)
- */
-static emacs_value Fmod_test_signal (emacs_env *env, int nargs, emacs_value
args[], void* data)
+/* Signal '(error 56). */
+static emacs_value
+Fmod_test_signal (emacs_env *env, int nargs, emacs_value args[], void *data)
{
assert (env->non_local_exit_check (env) == emacs_funcall_exit_return);
- env->non_local_exit_signal (env, env->intern (env, "error"),
env->make_integer (env, 56));
+ env->non_local_exit_signal (env, env->intern (env, "error"),
+ env->make_integer (env, 56));
return NULL;
}
-/*
- * Throw '(tag 65)
- */
-static emacs_value Fmod_test_throw (emacs_env *env, int nargs, emacs_value
args[], void* data)
+/* Throw '(tag 65). */
+static emacs_value
+Fmod_test_throw (emacs_env *env, int nargs, emacs_value args[], void *data)
{
assert (env->non_local_exit_check (env) == emacs_funcall_exit_return);
- env->non_local_exit_throw (env, env->intern (env, "tag"), env->make_integer
(env, 65));
+ env->non_local_exit_throw (env, env->intern (env, "tag"),
+ env->make_integer (env, 65));
return NULL;
}
-/*
- * Call argument function, catch all non-local exists and return
- * either normal result or a list describing the non-local exit.
- */
-static emacs_value Fmod_test_non_local_exit_funcall (emacs_env *env, int
nargs, emacs_value args[], void* data)
+/* Call argument function, catch all non-local exists and return
+ either normal result or a list describing the non-local exit. */
+static emacs_value
+Fmod_test_non_local_exit_funcall (emacs_env *env, int nargs, emacs_value
args[],
+ void *data)
{
assert (nargs == 1);
- const emacs_value result = env->funcall (env, args[0], 0, NULL);
+ emacs_value result = env->funcall (env, args[0], 0, NULL);
emacs_value non_local_exit_symbol, non_local_exit_data;
- enum emacs_funcall_exit code = env->non_local_exit_get (env,
&non_local_exit_symbol, &non_local_exit_data);
+ enum emacs_funcall_exit code
+ = env->non_local_exit_get (env, &non_local_exit_symbol,
+ &non_local_exit_data);
switch (code)
{
case emacs_funcall_exit_return:
@@ -90,142 +91,134 @@ static emacs_value Fmod_test_non_local_exit_funcall
(emacs_env *env, int nargs,
case emacs_funcall_exit_signal:
{
env->non_local_exit_clear (env);
- const emacs_value Flist = env->intern (env, "list");
- emacs_value list_args[] = {env->intern (env, "signal"),
non_local_exit_symbol, non_local_exit_data};
+ emacs_value Flist = env->intern (env, "list");
+ emacs_value list_args[] = {env->intern (env, "signal"),
+ non_local_exit_symbol, non_local_exit_data};
return env->funcall (env, Flist, 3, list_args);
}
case emacs_funcall_exit_throw:
{
env->non_local_exit_clear (env);
- const emacs_value Flist = env->intern (env, "list");
- emacs_value list_args[] = {env->intern (env, "throw"),
non_local_exit_symbol, non_local_exit_data};
+ emacs_value Flist = env->intern (env, "list");
+ emacs_value list_args[] = {env->intern (env, "throw"),
+ non_local_exit_symbol, non_local_exit_data};
return env->funcall (env, Flist, 3, list_args);
}
}
- /* never reached */
+
+ /* Never reached. */
return env->intern (env, "nil");;
}
-/*
- * Return a global referrence
- */
-static emacs_value Fmod_test_globref_make (emacs_env *env, int nargs,
emacs_value args[], void* data)
+/* Return a global referrence. */
+static emacs_value
+Fmod_test_globref_make (emacs_env *env, int nargs, emacs_value args[],
+ void *data)
{
- /* make a big string and make it global */
- size_t i;
- char str[26*100];
-
- for (i = 0; i < sizeof (str); i++)
- {
- str[i] = 'a' + (i % 26);
- }
+ /* Make a big string and make it global. */
+ char str[26 * 100];
+ for (int i = 0; i < sizeof str; i++)
+ str[i] = 'a' + (i % 26);
- /* we don't need to null-terminate str */
- emacs_value lisp_str = env->make_string (env, str, sizeof (str));
+ /* We don't need to null-terminate str. */
+ emacs_value lisp_str = env->make_string (env, str, sizeof str);
return env->make_global_ref (env, lisp_str);
}
-/*
- * Return a copy of the argument string where every 'a' is replaced with 'b'.
- */
-static emacs_value Fmod_test_string_a_to_b (emacs_env *env, int nargs,
emacs_value args[], void* data)
+/* Return a copy of the argument string where every 'a' is replaced
+ with 'b'. */
+static emacs_value
+Fmod_test_string_a_to_b (emacs_env *env, int nargs, emacs_value args[],
+ void *data)
{
emacs_value lisp_str = args[0];
- size_t size = 0;
+ ptrdiff_t size = 0;
char * buf = NULL;
- size_t i;
env->copy_string_contents (env, lisp_str, buf, &size);
buf = malloc (size);
env->copy_string_contents (env, lisp_str, buf, &size);
- for (i = 0; i+1 < size; i++) {
+ for (ptrdiff_t i = 0; i + 1 < size; i++)
if (buf[i] == 'a')
buf[i] = 'b';
- }
- return env->make_string (env, buf, size-1);
+ return env->make_string (env, buf, size - 1);
}
-/*
- * Embedded pointers in lisp objects.
- */
+/* Embedded pointers in lisp objects. */
-/* C struct (pointer to) that will be embedded */
+/* C struct (pointer to) that will be embedded. */
struct super_struct
{
int amazing_int;
char large_unused_buffer[512];
};
-/* Associated finalizer */
-static void finalizer (void *p)
+/* Associated finalizer. */
+static void
+finalizer (void *p)
{
if (p)
free (p);
}
-/*
- * Return a new user-pointer to a super_struct, with amazing_int set
- * to the passed parameter.
- */
-static emacs_value Fmod_test_userptr_make (emacs_env *env, int nargs,
emacs_value args[], void *data)
+/* Return a new user-pointer to a super_struct, with amazing_int set
+ to the passed parameter. */
+static emacs_value
+Fmod_test_userptr_make (emacs_env *env, int nargs, emacs_value args[],
+ void *data)
{
- struct super_struct *p = calloc (1, sizeof(*p));
+ struct super_struct *p = calloc (1, sizeof *p);
p->amazing_int = env->extract_integer (env, args[0]);
- return env->make_user_ptr (env, finalizer, p);
+ return env->make_user_ptr (env, free, p);
}
-/*
- * Return the amazing_int of a passed 'user-pointer to a super_struct'.
- */
-static emacs_value Fmod_test_userptr_get (emacs_env *env, int nargs,
emacs_value args[], void *data)
+/* Return the amazing_int of a passed 'user-pointer to a super_struct'. */
+static emacs_value
+Fmod_test_userptr_get (emacs_env *env, int nargs, emacs_value args[], void
*data)
{
struct super_struct *p = env->get_user_ptr (env, args[0]);
return env->make_integer (env, p->amazing_int);
}
-/*
- * Fill vector in args[0] with value in args[1]
- */
-static emacs_value Fmod_test_vector_fill (emacs_env *env, int nargs,
emacs_value args[], void *data)
+/* Fill vector in args[0] with value in args[1]. */
+static emacs_value
+Fmod_test_vector_fill (emacs_env *env, int nargs, emacs_value args[], void
*data)
{
- size_t i;
emacs_value vec = args[0];
emacs_value val = args[1];
- const size_t size = env->vec_size (env, vec);
- for (i = 0; i < size; i++)
+ ptrdiff_t size = env->vec_size (env, vec);
+ for (ptrdiff_t i = 0; i < size; i++)
env->vec_set (env, vec, i, val);
return env->intern (env, "t");
}
-/*
- * Return whether all elements of vector in args[0] are 'eq' to value in
args[1]
- */
-static emacs_value Fmod_test_vector_eq (emacs_env *env, int nargs, emacs_value
args[], void *data)
+/* Return whether all elements of vector in args[0] are 'eq' to value
+ in args[1]. */
+static emacs_value
+Fmod_test_vector_eq (emacs_env *env, int nargs, emacs_value args[], void *data)
{
- size_t i;
emacs_value vec = args[0];
emacs_value val = args[1];
- const size_t size = env->vec_size (env, vec);
- for (i = 0; i < size; i++)
+ ptrdiff_t size = env->vec_size (env, vec);
+ for (ptrdiff_t i = 0; i < size; i++)
if (!env->eq (env, env->vec_get (env, vec, i), val))
return env->intern (env, "nil");
return env->intern (env, "t");
}
-/*
- * Lisp utilities for easier readability (simple wrappers)
- */
+/* Lisp utilities for easier readability (simple wrappers). */
-/* Provide FEATURE to Emacs */
-static void provide (emacs_env *env, const char *feature)
+/* Provide FEATURE to Emacs. */
+static void
+provide (emacs_env *env, const char *feature)
{
emacs_value Qfeat = env->intern (env, feature);
emacs_value Qprovide = env->intern (env, "provide");
@@ -234,8 +227,9 @@ static void provide (emacs_env *env, const char *feature)
env->funcall (env, Qprovide, 1, args);
}
-/* Binds NAME to FUN */
-static void bind_function (emacs_env *env, const char *name, emacs_value Sfun)
+/* Bind NAME to FUN. */
+static void
+bind_function (emacs_env *env, const char *name, emacs_value Sfun)
{
emacs_value Qfset = env->intern (env, "fset");
emacs_value Qsym = env->intern (env, name);
@@ -244,21 +238,22 @@ static void bind_function (emacs_env *env, const char
*name, emacs_value Sfun)
env->funcall (env, Qfset, 2, args);
}
-/*
- * Module init function.
- */
-int emacs_module_init (struct emacs_runtime *ert)
+/* Module init function. */
+int
+emacs_module_init (struct emacs_runtime *ert)
{
emacs_env *env = ert->get_environment (ert);
#define DEFUN(lsym, csym, amin, amax, doc, data) \
- bind_function (env, lsym, env->make_function (env, amin, amax, csym, doc,
data))
+ bind_function (env, lsym, \
+ env->make_function (env, amin, amax, csym, doc, data))
DEFUN ("mod-test-return-t", Fmod_test_return_t, 1, 1, NULL, NULL);
DEFUN ("mod-test-sum", Fmod_test_sum, 2, 2, "Return A + B", NULL);
DEFUN ("mod-test-signal", Fmod_test_signal, 0, 0, NULL, NULL);
DEFUN ("mod-test-throw", Fmod_test_throw, 0, 0, NULL, NULL);
- DEFUN ("mod-test-non-local-exit-funcall", Fmod_test_non_local_exit_funcall,
1, 1, NULL, NULL);
+ DEFUN ("mod-test-non-local-exit-funcall", Fmod_test_non_local_exit_funcall,
+ 1, 1, NULL, NULL);
DEFUN ("mod-test-globref-make", Fmod_test_globref_make, 0, 0, NULL, NULL);
DEFUN ("mod-test-string-a-to-b", Fmod_test_string_a_to_b, 1, 1, NULL, NULL);
DEFUN ("mod-test-userptr-make", Fmod_test_userptr_make, 1, 1, NULL, NULL);
diff --git a/modules/mod-test/test.el b/modules/mod-test/test.el
index ed584eb..98ce464 100644
--- a/modules/mod-test/test.el
+++ b/modules/mod-test/test.el
@@ -19,11 +19,12 @@
(require 'ert)
-(add-to-list 'load-path (file-name-directory (or #$ (expand-file-name
(buffer-file-name)))))
+(add-to-list 'load-path
+ (file-name-directory (or #$ (expand-file-name
(buffer-file-name)))))
(require 'mod-test)
;;
-;; basic tests
+;; Basic tests.
;;
(ert-deftest mod-test-sum-test ()
@@ -33,7 +34,7 @@
(should (string= (documentation 'mod-test-sum) "Return A + B")))
;;
-;; non-local exists (throw, signal)
+;; Non-local exists (throw, signal).
;;
(ert-deftest mod-test-non-local-exit-signal-test ()
@@ -51,7 +52,8 @@
23)))
(ert-deftest mod-test-non-local-exit-funcall-signal ()
- (should (equal (mod-test-non-local-exit-funcall (lambda () (signal 'error
'(32))))
+ (should (equal (mod-test-non-local-exit-funcall
+ (lambda () (signal 'error '(32))))
'(signal error (32)))))
(ert-deftest mod-test-non-local-exit-funcall-throw ()
@@ -59,7 +61,7 @@
'(throw tag 32))))
;;
-;; string
+;; String tests.
;;
(defun multiply-string (s n)
@@ -77,7 +79,7 @@
(should (string= (mod-test-string-a-to-b "aaa") "bbb")))
;;
-;; user-pointer
+;; User-pointer tests.
;;
(ert-deftest mod-test-userptr-fun-test ()
@@ -92,7 +94,7 @@
;; TODO: try to test finalizer
;;
-;; vectors
+;; Vector tests.
;;
(ert-deftest mod-test-vector-test ()
diff --git a/modules/modhelp.py b/modules/modhelp.py
index 5afe8f2..2210030 100755
--- a/modules/modhelp.py
+++ b/modules/modhelp.py
@@ -56,7 +56,8 @@ def cmd_test(args):
print '[*] %s: running test' % m
testpath = os.path.join(m, 'test.el')
if os.path.isfile(testpath):
- emacs_cmd = [EMACS, '-batch', '-L', '.', '-l', 'ert', '-l',
testpath, '-f', 'ert-run-tests-batch-and-exit']
+ emacs_cmd = [EMACS, '-batch', '-L', '.', '-l', 'ert',
+ '-l', testpath, '-f', 'ert-run-tests-batch-and-exit']
print ' '.join(emacs_cmd)
r = sp.call(emacs_cmd)
if r != 0:
@@ -111,13 +112,16 @@ def main():
subp = mainp.add_subparsers()
testp = subp.add_parser('test', help='run tests')
- testp.add_argument('-f', '--force', action='store_true', help='force
regeneration (make -B)')
- testp.add_argument('module', nargs='*', help='path to module to test
(default all)')
+ testp.add_argument('-f', '--force', action='store_true',
+ help='force regeneration (make -B)')
+ testp.add_argument('module', nargs='*',
+ help='path to module to test (default all)')
testp.set_defaults(func=cmd_test)
initp = subp.add_parser('init', help='create a test module from a
template')
initp.add_argument('module', help='name of the new module')
- initp.add_argument('-f', '--fun', default='fun', help='overide name of the
default function')
+ initp.add_argument('-f', '--fun', default='fun',
+ help='overide name of the default function')
initp.set_defaults(func=cmd_init)
args = mainp.parse_args()
@@ -145,17 +149,19 @@ all: ${module}.so ${module}.doc
'''),
string.Template('${c_file}'): string.Template('''
-#include <module.h>
+#include <emacs-module.h>
int plugin_is_GPL_compatible;
-static emacs_value ${c_func} (emacs_env *env, int nargs, emacs_value args[],
void *data)
+static emacs_value
+${c_func} (emacs_env *env, int nargs, emacs_value args[], void *data)
{
return env->intern (env, "t");
}
-/* Binds NAME to FUN */
-static void bind_function (emacs_env *env, const char *name, emacs_value Sfun)
+/* Bind NAME to FUN. */
+static void
+bind_function (emacs_env *env, const char *name, emacs_value Sfun)
{
emacs_value Qfset = env->intern (env, "fset");
emacs_value Qsym = env->intern (env, name);
@@ -164,8 +170,9 @@ static void bind_function (emacs_env *env, const char
*name, emacs_value Sfun)
env->funcall (env, Qfset, 2, args);
}
-/* Provide FEATURE to Emacs */
-static void provide (emacs_env *env, const char *feature)
+/* Provide FEATURE to Emacs. */
+static void
+provide (emacs_env *env, const char *feature)
{
emacs_value Qfeat = env->intern (env, feature);
emacs_value Qprovide = env->intern (env, "provide");
@@ -174,10 +181,12 @@ static void provide (emacs_env *env, const char *feature)
env->funcall (env, Qprovide, 1, args);
}
-int emacs_module_init (struct emacs_runtime *ert)
+int
+emacs_module_init (struct emacs_runtime *ert)
{
emacs_env *env = ert->get_environment (ert);
- bind_function (env, "${lisp_func}", env->make_function (env, 1, 1,
${c_func}, "doc", NULL));
+ bind_function (env, "${lisp_func}",
+ env->make_function (env, 1, 1, ${c_func}, "doc", NULL));
provide (env, "${module}");
return 0;
}
diff --git a/src/Makefile.in b/src/Makefile.in
index 15171d4..4fee1be 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -232,7 +232,7 @@ LIBZ = @LIBZ@
## system-specific libs for dynamic modules, else empty
LIBMODULES = @LIBMODULES@
-## dynlib.o module.o if modules enabled, else empty
+## dynlib.o emacs-module.o if modules enabled, else empty
MODULES_OBJ = @MODULES_OBJ@
XRANDR_LIBS = @XRANDR_LIBS@
diff --git a/src/bytecode.c b/src/bytecode.c
index 864db1a..464adc6 100644
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -1067,17 +1067,13 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object
vector, Lisp_Object maxdepth,
type = CATCHER;
goto pushhandler;
CASE (Bpushconditioncase): /* New in 24.4. */
+ type = CONDITION_CASE;
+ pushhandler:
{
- struct handler *c;
- Lisp_Object tag;
- int dest;
+ Lisp_Object tag = POP;
+ int dest = FETCH2;
- type = CONDITION_CASE;
- pushhandler:
- tag = POP;
- dest = FETCH2;
-
- PUSH_HANDLER (c, tag, type);
+ struct handler *c = push_handler (tag, type);
c->bytecode_dest = dest;
c->bytecode_top = top;
diff --git a/src/dynlib.c b/src/dynlib.c
index fbc5f9b..47ffb41 100644
--- a/src/dynlib.c
+++ b/src/dynlib.c
@@ -24,65 +24,158 @@ along with GNU Emacs. If not, see
<http://www.gnu.org/licenses/>. */
If you think the abstraction is too leaky use libltdl (libtool),
don't reinvent the wheel by fixing this one. */
+#include <config.h>
+
#include "dynlib.h"
-/*
- * Windows systems
- */
-#if defined(_WIN32)
+#ifdef WINDOWSNT
+
+/* MS-Windows systems. */
-#include <windows.h>
+#include <errno.h>
+#include "lisp.h"
+#include "w32.h"
-dynlib_handle_ptr dynlib_open (const char * path)
+static DWORD dynlib_last_err;
+
+/* This needs to be called at startup to countermand any non-zero
+ values recorded by temacs. */
+void
+dynlib_reset_last_error (void)
{
+ dynlib_last_err = 0;
+}
+
+dynlib_handle_ptr
+dynlib_open (const char *dll_fname)
+{
+ HMODULE hdll;
+ char dll_fname_local[MAX_UTF8_PATH];
+
+ if (!dll_fname)
+ {
+ errno = ENOTSUP;
+ return NULL;
+ }
- return (dynlib_handle_ptr) LoadLibrary (path);
+ if (!dll_fname)
+ hdll = GetModuleHandle (NULL);
+ else
+ {
+ /* LoadLibrary wants backslashes. */
+ strcpy (dll_fname_local, dll_fname);
+ unixtodos_filename (dll_fname_local);
+
+ if (w32_unicode_filenames)
+ {
+ wchar_t dll_fname_w[MAX_PATH];
+
+ filename_to_utf16 (dll_fname_local, dll_fname_w);
+ hdll = LoadLibraryW (dll_fname_w);
+ }
+ else
+ {
+ char dll_fname_a[MAX_PATH];
+
+ filename_to_ansi (dll_fname_local, dll_fname_a);
+ hdll = LoadLibraryA (dll_fname_a);
+ }
+ }
+
+ if (!hdll)
+ dynlib_last_err = GetLastError ();
+
+ return (dynlib_handle_ptr) hdll;
}
-void * dynlib_sym (dynlib_handle_ptr h, const char * sym)
+void *
+dynlib_sym (dynlib_handle_ptr h, const char *sym)
{
- return GetProcAddress ((HMODULE) h, sym);
+ FARPROC sym_addr = NULL;
+
+ if (!h || h == INVALID_HANDLE_VALUE || !sym)
+ {
+ dynlib_last_err = ERROR_INVALID_PARAMETER;
+ return NULL;
+ }
+
+ sym_addr = GetProcAddress ((HMODULE) h, sym);
+ if (!sym_addr)
+ dynlib_last_err = GetLastError ();
+
+ return (void *)sym_addr;
}
-bool dynlib_addr (void *ptr, const char **path, const char **sym)
+bool
+dynlib_addr (void *ptr, const char **path, const char **sym)
{
- return false; /* not implemented */
+ return false; /* Not implemented yet. */
}
-const char * dynlib_error (void)
+const char *
+dynlib_error (void)
{
- /* TODO: use GetLastError(), FormatMessage(), ... */
- return "Can't load DLL";
+ char *error_string = NULL;
+
+ if (dynlib_last_err)
+ {
+ error_string = w32_strerror (dynlib_last_err);
+ dynlib_last_err = 0;
+ }
+
+ return error_string;
}
-int dynlib_close (dynlib_handle_ptr h)
+int
+dynlib_close (dynlib_handle_ptr h)
{
- return FreeLibrary ((HMODULE) h) != 0;
+ if (!h || h == INVALID_HANDLE_VALUE)
+ {
+ dynlib_last_err = ERROR_INVALID_PARAMETER;
+ return -1;
+ }
+ /* If the handle is for the main module (the .exe file), it
+ shouldn't be passed to FreeLibrary, because GetModuleHandle
+ doesn't increment the refcount, but FreeLibrary does decrement
+ it. I don't think this should matter for the main module, but
+ just in case, we avoid the call here, relying on another call to
+ GetModuleHandle to return the same value. */
+ if (h == GetModuleHandle (NULL))
+ return 0;
+
+ if (!FreeLibrary ((HMODULE) h))
+ {
+ dynlib_last_err = GetLastError ();
+ return -1;
+ }
+
+ return 0;
}
+#elif defined HAVE_UNISTD_H
-/*
- * POSIX systems
- */
-#elif defined(HAVE_UNISTD_H)
+/* POSIX systems. */
#include <dlfcn.h>
-dynlib_handle_ptr dynlib_open (const char * path)
+dynlib_handle_ptr
+dynlib_open (const char *path)
{
return dlopen (path, RTLD_LAZY);
}
-void * dynlib_sym (dynlib_handle_ptr h, const char * sym)
+void *
+dynlib_sym (dynlib_handle_ptr h, const char *sym)
{
return dlsym (h, sym);
}
-bool dynlib_addr (void *ptr, const char **path, const char **sym)
+bool
+dynlib_addr (void *ptr, const char **path, const char **sym)
{
#ifdef HAVE_DLADDR
Dl_info info;
- if (dladdr (ptr, &info) != 0 && info.dli_fname != NULL && info.dli_sname !=
NULL)
+ if (dladdr (ptr, &info) && info.dli_fname && info.dli_sname)
{
*path = info.dli_fname;
*sym = info.dli_sname;
@@ -92,15 +185,21 @@ bool dynlib_addr (void *ptr, const char **path, const char
**sym)
return false;
}
-const char * dynlib_error (void)
+const char *
+dynlib_error (void)
{
return dlerror ();
}
-int dynlib_close (dynlib_handle_ptr h)
+/* FIXME: Currently there is no way to unload a module, so this
+ function is never used. */
+#if false
+int
+dynlib_close (dynlib_handle_ptr h)
{
return dlclose (h) == 0;
}
+#endif
#else
diff --git a/src/dynlib.h b/src/dynlib.h
index 852842d..1282c4f 100644
--- a/src/dynlib.h
+++ b/src/dynlib.h
@@ -20,14 +20,13 @@ along with GNU Emacs. If not, see
<http://www.gnu.org/licenses/>. */
#ifndef DYNLIB_H
#define DYNLIB_H
-#include <config.h>
#include <stdbool.h>
-typedef void* dynlib_handle_ptr;
-dynlib_handle_ptr dynlib_open (const char * path);
-void * dynlib_sym (dynlib_handle_ptr h, const char * sym);
+typedef void *dynlib_handle_ptr;
+dynlib_handle_ptr dynlib_open (const char *path);
+void *dynlib_sym (dynlib_handle_ptr h, const char *sym);
bool dynlib_addr (void *ptr, const char **path, const char **sym);
-const char * dynlib_error (void);
+const char *dynlib_error (void);
int dynlib_close (dynlib_handle_ptr h);
#endif /* DYNLIB_H */
diff --git a/src/emacs-module.c b/src/emacs-module.c
new file mode 100644
index 0000000..09b09d0
--- /dev/null
+++ b/src/emacs-module.c
@@ -0,0 +1,1137 @@
+/* emacs-module.c - Module loading and runtime implementation
+
+Copyright (C) 2015 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 <http://www.gnu.org/licenses/>. */
+
+#include <config.h>
+
+#include "emacs-module.h"
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
+
+#include "lisp.h"
+#include "dynlib.h"
+#include "coding.h"
+#include "verify.h"
+
+
+/* Feature tests. */
+
+/* True if __attribute__ ((cleanup (...))) works, false otherwise. */
+#ifdef HAVE_VAR_ATTRIBUTE_CLEANUP
+enum { module_has_cleanup = true };
+#else
+enum { module_has_cleanup = false };
+#endif
+
+/* Handle to the main thread. Used to verify that modules call us in
+ the right thread. */
+#ifdef HAVE_THREADS_H
+# include <threads.h>
+static thrd_t main_thread;
+#elif defined HAVE_PTHREAD
+# include <pthread.h>
+static pthread_t main_thread;
+#elif defined WINDOWSNT
+# include <windows.h>
+/* On Windows, store both a handle to the main thread and the
+ thread ID because the latter can be reused when a thread
+ terminates. */
+static HANDLE main_thread;
+static DWORD main_thread_id;
+#endif
+
+
+/* Memory management. */
+
+/* An `emacs_value' is just a pointer to a structure holding an
+ internal Lisp object. */
+struct emacs_value_tag { Lisp_Object v; };
+
+/* Local value objects use a simple fixed-sized block allocation
+ scheme without explicit deallocation. All local values are
+ deallocated when the lifetime of their environment ends. Keep
+ track of a current frame from which new values are allocated,
+ appending further dynamically-allocated frames if necessary. */
+
+enum { value_frame_size = 512 };
+
+/* A block from which `emacs_value' object can be allocated. */
+struct emacs_value_frame
+{
+ /* Storage for values. */
+ struct emacs_value_tag objects[value_frame_size];
+
+ /* Index of the next free value in `objects'. */
+ int offset;
+
+ /* Pointer to next frame, if any. */
+ struct emacs_value_frame *next;
+};
+
+/* A structure that holds an initial frame (so that the first local
+ values require no dynamic allocation) and keeps track of the
+ current frame. */
+static struct emacs_value_storage
+{
+ struct emacs_value_frame initial;
+ struct emacs_value_frame *current;
+} global_storage;
+
+
+/* Private runtime and environment members. */
+
+/* The private part of an environment stores the current non local exit state
+ and holds the `emacs_value' objects allocated during the lifetime
+ of the environment. */
+struct emacs_env_private
+{
+ enum emacs_funcall_exit pending_non_local_exit;
+
+ /* Dedicated storage for non-local exit symbol and data so that
+ storage is always available for them, even in an out-of-memory
+ situation. */
+ struct emacs_value_tag non_local_exit_symbol, non_local_exit_data;
+
+ struct emacs_value_storage storage;
+};
+
+/* Combine public and private parts in one structure. This structure
+ is used whenever an environment is created. */
+struct env_storage
+{
+ emacs_env pub;
+ struct emacs_env_private priv;
+};
+
+/* The private parts of an `emacs_runtime' object contain the initial
+ environment. */
+struct emacs_runtime_private
+{
+ struct env_storage environment;
+};
+
+
+
+/* Forward declarations. */
+
+struct module_fun_env;
+
+static Lisp_Object module_format_fun_env (const struct module_fun_env *);
+static Lisp_Object value_to_lisp (emacs_value);
+static emacs_value allocate_emacs_value (emacs_env *, struct
emacs_value_storage *, Lisp_Object);
+static emacs_value lisp_to_value (emacs_env *, Lisp_Object);
+static enum emacs_funcall_exit module_non_local_exit_check (emacs_env *);
+static void check_main_thread (void);
+static void finalize_environment (struct env_storage *);
+static void initialize_environment (struct env_storage *);
+static void module_args_out_of_range (emacs_env *, Lisp_Object, Lisp_Object);
+static void module_handle_signal (emacs_env *, Lisp_Object);
+static void module_handle_throw (emacs_env *, Lisp_Object);
+static void module_non_local_exit_signal_1 (emacs_env *, Lisp_Object,
Lisp_Object);
+static void module_non_local_exit_throw_1 (emacs_env *, Lisp_Object,
Lisp_Object);
+static void module_out_of_memory (emacs_env *);
+static void module_reset_handlerlist (const int *);
+static void module_wrong_type (emacs_env *, Lisp_Object, Lisp_Object);
+
+
+/* Convenience macros for non-local exit handling. */
+
+/* Emacs uses setjmp and longjmp for non-local exits, but
+ module frames cannot be skipped because they are in general
+ not prepared for long jumps (e.g., the behavior in C++ is undefined
+ if objects with nontrivial destructors would be skipped).
+ Therefore, catch all non-local exits. There are two kinds of
+ non-local exits: `signal' and `throw'. The macros in this section
+ can be used to catch both. Use macros to avoid additional variants
+ of `internal_condition_case' etc., and to avoid worrying about
+ passing information to the handler functions. */
+
+/* Place this macro at the beginning of a function returning a number
+ or a pointer to handle signals. The function must have an ENV
+ parameter. The function will return 0 (or NULL) if a signal is
+ caught. */
+#define MODULE_HANDLE_SIGNALS MODULE_HANDLE_SIGNALS_RETURN (0)
+
+/* Place this macro at the beginning of a function returning void to
+ handle signals. The function must have an ENV parameter. */
+#define MODULE_HANDLE_SIGNALS_VOID MODULE_HANDLE_SIGNALS_RETURN ()
+
+#define MODULE_HANDLE_SIGNALS_RETURN(retval)
\
+ MODULE_SETJMP (CONDITION_CASE, module_handle_signal, retval)
+
+/* Place this macro at the beginning of a function returning a pointer
+ to handle non-local exits via `throw'. The function must have an
+ ENV parameter. The function will return NULL if a `throw' is
+ caught. */
+#define MODULE_HANDLE_THROW
\
+ MODULE_SETJMP (CATCHER_ALL, module_handle_throw, NULL)
+
+#define MODULE_SETJMP(handlertype, handlerfunc, retval)
\
+ MODULE_SETJMP_1 (handlertype, handlerfunc, retval, \
+ internal_handler_##handlertype, \
+ internal_cleanup_##handlertype)
+
+/* It is very important that pushing the handler doesn't itself raise
+ a signal. Install the cleanup only after the handler has been
+ pushed. Use __attribute__ ((cleanup)) to avoid
+ non-local-exit-prone manual cleanup. */
+#define MODULE_SETJMP_1(handlertype, handlerfunc, retval, c, dummy) \
+ do { \
+ eassert (module_non_local_exit_check (env) == emacs_funcall_exit_return); \
+ struct handler *c = push_handler_nosignal (Qt, handlertype); \
+ if (!c) \
+ {
\
+ module_out_of_memory (env); \
+ return retval; \
+ }
\
+ verify (module_has_cleanup); \
+ int dummy __attribute__ ((cleanup (module_reset_handlerlist))); \
+ if (sys_setjmp (c->jmp)) \
+ {
\
+ (handlerfunc) (env, c->val); \
+ return retval; \
+ }
\
+ } while (false)
+
+
+/* Function environments. */
+
+/* A function environment is an auxiliary structure used by
+ `module_make_function' to store information about a module
+ function. It is stored in a save pointer and retrieved by
+ `module-call'. Its members correspond to the arguments given to
+ `module_make_function'. */
+
+struct module_fun_env
+{
+ ptrdiff_t min_arity, max_arity;
+ emacs_subr subr;
+ void *data;
+};
+
+/* The function definition of `module-call'. `module-call' is
+ uninterned because user code couldn't meaningfully use it, so keep
+ its definition around somewhere else. */
+static Lisp_Object module_call_func;
+
+
+/* Implementation of runtime and environment functions. */
+
+/* Catch signals and throws only if the code can actually signal or
+ throw. If checking is enabled, abort if the current thread is not
+ the Emacs main thread. */
+
+static emacs_env *
+module_get_environment (struct emacs_runtime *ert)
+{
+ check_main_thread ();
+ return &ert->private_members->environment.pub;
+}
+
+/* To make global refs (GC-protected global values) keep a hash that
+ maps global Lisp objects to reference counts. */
+
+static emacs_value
+module_make_global_ref (emacs_env *env, emacs_value ref)
+{
+ check_main_thread ();
+ eassert (module_non_local_exit_check (env) == emacs_funcall_exit_return);
+ MODULE_HANDLE_SIGNALS;
+ eassert (HASH_TABLE_P (Vmodule_refs_hash));
+ struct Lisp_Hash_Table *h = XHASH_TABLE (Vmodule_refs_hash);
+ Lisp_Object new_obj = value_to_lisp (ref);
+ EMACS_UINT hashcode;
+ ptrdiff_t i = hash_lookup (h, new_obj, &hashcode);
+
+ if (i >= 0)
+ {
+ Lisp_Object value = HASH_VALUE (h, i);
+ eassert (NATNUMP (value));
+ EMACS_INT refcount = XFASTINT (value) + 1;
+ if (refcount > MOST_POSITIVE_FIXNUM)
+ {
+ module_non_local_exit_signal_1 (env, Qoverflow_error, Qnil);
+ return NULL;
+ }
+ value = make_natnum (refcount);
+ set_hash_value_slot (h, i, value);
+ }
+ else
+ {
+ hash_put (h, new_obj, make_natnum (1), hashcode);
+ }
+
+ return allocate_emacs_value (env, &global_storage, new_obj);
+}
+
+static void
+module_free_global_ref (emacs_env *env, emacs_value ref)
+{
+ check_main_thread ();
+ eassert (module_non_local_exit_check (env) == emacs_funcall_exit_return);
+ /* TODO: This probably never signals. */
+ MODULE_HANDLE_SIGNALS_VOID;
+ eassert (HASH_TABLE_P (Vmodule_refs_hash));
+ struct Lisp_Hash_Table *h = XHASH_TABLE (Vmodule_refs_hash);
+ Lisp_Object obj = value_to_lisp (ref);
+ EMACS_UINT hashcode;
+ ptrdiff_t i = hash_lookup (h, obj, &hashcode);
+
+ if (i >= 0)
+ {
+ Lisp_Object value = HASH_VALUE (h, i);
+ eassert (NATNUMP (value));
+ EMACS_INT refcount = XFASTINT (value) - 1;
+ if (refcount > 0)
+ {
+ value = make_natnum (refcount - 1);
+ set_hash_value_slot (h, i, value);
+ }
+ else
+ {
+ eassert (refcount == 0);
+ hash_remove_from_table (h, value);
+ }
+ }
+}
+
+static enum emacs_funcall_exit
+module_non_local_exit_check (emacs_env *env)
+{
+ check_main_thread ();
+ return env->private_members->pending_non_local_exit;
+}
+
+static void
+module_non_local_exit_clear (emacs_env *env)
+{
+ check_main_thread ();
+ env->private_members->pending_non_local_exit = emacs_funcall_exit_return;
+}
+
+static enum emacs_funcall_exit
+module_non_local_exit_get (emacs_env *env, emacs_value *sym, emacs_value *data)
+{
+ check_main_thread ();
+ struct emacs_env_private *p = env->private_members;
+ if (p->pending_non_local_exit != emacs_funcall_exit_return)
+ {
+ *sym = &p->non_local_exit_symbol;
+ *data = &p->non_local_exit_data;
+ }
+ return p->pending_non_local_exit;
+}
+
+/* Like for `signal', DATA must be a list. */
+static void
+module_non_local_exit_signal (emacs_env *env, emacs_value sym, emacs_value
data)
+{
+ check_main_thread ();
+ eassert (module_non_local_exit_check (env) == emacs_funcall_exit_return);
+ module_non_local_exit_signal_1 (env, value_to_lisp (sym),
+ value_to_lisp (data));
+}
+
+static void
+module_non_local_exit_throw (emacs_env *env, emacs_value tag, emacs_value
value)
+{
+ check_main_thread ();
+ eassert (module_non_local_exit_check (env) == emacs_funcall_exit_return);
+ module_non_local_exit_throw_1 (env, value_to_lisp (tag),
+ value_to_lisp (value));
+}
+
+/* A module function is lambda function that calls `module-call',
+ passing the function pointer of the module function along with the
+ module emacs_env pointer as arguments.
+
+ (function (lambda (&rest arglist)
+ (module-call envobj arglist))) */
+
+static emacs_value
+module_make_function (emacs_env *env, ptrdiff_t min_arity, ptrdiff_t max_arity,
+ emacs_subr subr, const char *documentation,
+ void *data)
+{
+ check_main_thread ();
+ eassert (module_non_local_exit_check (env) == emacs_funcall_exit_return);
+ MODULE_HANDLE_SIGNALS;
+
+ if (! (0 <= min_arity
+ && (max_arity < 0
+ ? max_arity == emacs_variadic_function
+ : min_arity <= max_arity)))
+ xsignal2 (Qinvalid_arity, make_number (min_arity), make_number
(max_arity));
+
+ /* FIXME: This should be freed when envobj is GC'd. */
+ struct module_fun_env *envptr = xmalloc (sizeof *envptr);
+ envptr->min_arity = min_arity;
+ envptr->max_arity = max_arity;
+ envptr->subr = subr;
+ envptr->data = data;
+
+ Lisp_Object envobj = make_save_ptr (envptr);
+ Lisp_Object ret = list4 (Qlambda,
+ list2 (Qand_rest, Qargs),
+ documentation ? build_string (documentation) : Qnil,
+ list3 (module_call_func,
+ envobj,
+ Qargs));
+
+ return lisp_to_value (env, ret);
+}
+
+static emacs_value
+module_funcall (emacs_env *env, emacs_value fun, ptrdiff_t nargs,
+ emacs_value args[])
+{
+ check_main_thread ();
+ eassert (module_non_local_exit_check (env) == emacs_funcall_exit_return);
+ MODULE_HANDLE_SIGNALS;
+ MODULE_HANDLE_THROW;
+
+ /* Make a new Lisp_Object array starting with the function as the
+ first arg, because that's what Ffuncall takes. */
+ Lisp_Object *newargs;
+ USE_SAFE_ALLOCA;
+ SAFE_ALLOCA_LISP (newargs, nargs + 1);
+ newargs[0] = value_to_lisp (fun);
+ for (ptrdiff_t i = 0; i < nargs; i++)
+ newargs[1 + i] = value_to_lisp (args[i]);
+ emacs_value result = lisp_to_value (env, Ffuncall (nargs + 1, newargs));
+ SAFE_FREE ();
+ return result;
+}
+
+static emacs_value
+module_intern (emacs_env *env, const char *name)
+{
+ check_main_thread ();
+ eassert (module_non_local_exit_check (env) == emacs_funcall_exit_return);
+ MODULE_HANDLE_SIGNALS;
+ return lisp_to_value (env, intern (name));
+}
+
+static emacs_value
+module_type_of (emacs_env *env, emacs_value value)
+{
+ check_main_thread ();
+ eassert (module_non_local_exit_check (env) == emacs_funcall_exit_return);
+ return lisp_to_value (env, Ftype_of (value_to_lisp (value)));
+}
+
+static bool
+module_is_not_nil (emacs_env *env, emacs_value value)
+{
+ check_main_thread ();
+ eassert (module_non_local_exit_check (env) == emacs_funcall_exit_return);
+ return ! NILP (value_to_lisp (value));
+}
+
+static bool
+module_eq (emacs_env *env, emacs_value a, emacs_value b)
+{
+ check_main_thread ();
+ eassert (module_non_local_exit_check (env) == emacs_funcall_exit_return);
+ return EQ (value_to_lisp (a), value_to_lisp (b));
+}
+
+static intmax_t
+module_extract_integer (emacs_env *env, emacs_value n)
+{
+ check_main_thread ();
+ eassert (module_non_local_exit_check (env) == emacs_funcall_exit_return);
+ Lisp_Object l = value_to_lisp (n);
+ if (! INTEGERP (l))
+ {
+ module_wrong_type (env, Qintegerp, l);
+ return 0;
+ }
+ return XINT (l);
+}
+
+static emacs_value
+module_make_integer (emacs_env *env, intmax_t n)
+{
+ check_main_thread ();
+ eassert (module_non_local_exit_check (env) == emacs_funcall_exit_return);
+ if (! (MOST_NEGATIVE_FIXNUM <= n && n <= MOST_POSITIVE_FIXNUM))
+ {
+ module_non_local_exit_signal_1 (env, Qoverflow_error, Qnil);
+ return NULL;
+ }
+ return lisp_to_value (env, make_number (n));
+}
+
+static double
+module_extract_float (emacs_env *env, emacs_value f)
+{
+ check_main_thread ();
+ eassert (module_non_local_exit_check (env) == emacs_funcall_exit_return);
+ Lisp_Object lisp = value_to_lisp (f);
+ if (! FLOATP (lisp))
+ {
+ module_wrong_type (env, Qfloatp, lisp);
+ return 0;
+ }
+ return XFLOAT_DATA (lisp);
+}
+
+static emacs_value
+module_make_float (emacs_env *env, double d)
+{
+ check_main_thread ();
+ eassert (module_non_local_exit_check (env) == emacs_funcall_exit_return);
+ MODULE_HANDLE_SIGNALS;
+ return lisp_to_value (env, make_float (d));
+}
+
+static bool
+module_copy_string_contents (emacs_env *env, emacs_value value, char *buffer,
+ ptrdiff_t *length)
+{
+ check_main_thread ();
+ eassert (module_non_local_exit_check (env) == emacs_funcall_exit_return);
+ MODULE_HANDLE_SIGNALS;
+ Lisp_Object lisp_str = value_to_lisp (value);
+ if (! STRINGP (lisp_str))
+ {
+ module_wrong_type (env, Qstringp, lisp_str);
+ return false;
+ }
+
+ ptrdiff_t raw_size = SBYTES (lisp_str);
+
+ /* Emacs internal encoding is more-or-less UTF8, let's assume utf8
+ encoded emacs string are the same byte size. */
+
+ if (!buffer || length == 0 || *length-1 < raw_size)
+ {
+ *length = raw_size + 1;
+ return false;
+ }
+
+ Lisp_Object lisp_str_utf8 = ENCODE_UTF_8 (lisp_str);
+ eassert (raw_size == SBYTES (lisp_str_utf8));
+ *length = raw_size + 1;
+ memcpy (buffer, SDATA (lisp_str_utf8), SBYTES (lisp_str_utf8));
+ buffer[raw_size] = 0;
+
+ return true;
+}
+
+static emacs_value
+module_make_string (emacs_env *env, const char *str, ptrdiff_t length)
+{
+ check_main_thread ();
+ eassert (module_non_local_exit_check (env) == emacs_funcall_exit_return);
+ MODULE_HANDLE_SIGNALS;
+ if (length > PTRDIFF_MAX)
+ {
+ module_non_local_exit_signal_1 (env, Qoverflow_error, Qnil);
+ return NULL;
+ }
+ /* Assume STR is utf8 encoded. */
+ return lisp_to_value (env, make_string (str, length));
+}
+
+static emacs_value
+module_make_user_ptr (emacs_env *env, emacs_finalizer_function fin, void *ptr)
+{
+ check_main_thread ();
+ return lisp_to_value (env, make_user_ptr (fin, ptr));
+}
+
+static void *
+module_get_user_ptr (emacs_env *env, emacs_value uptr)
+{
+ check_main_thread ();
+ eassert (module_non_local_exit_check (env) == emacs_funcall_exit_return);
+ Lisp_Object lisp = value_to_lisp (uptr);
+ if (! USER_PTRP (lisp))
+ {
+ module_wrong_type (env, Quser_ptr, lisp);
+ return NULL;
+ }
+ return XUSER_PTR (lisp)->p;
+}
+
+static void
+module_set_user_ptr (emacs_env *env, emacs_value uptr, void *ptr)
+{
+ check_main_thread ();
+ eassert (module_non_local_exit_check (env) == emacs_funcall_exit_return);
+ Lisp_Object lisp = value_to_lisp (uptr);
+ if (! USER_PTRP (lisp))
+ module_wrong_type (env, Quser_ptr, lisp);
+ XUSER_PTR (lisp)->p = ptr;
+}
+
+static emacs_finalizer_function
+module_get_user_finalizer (emacs_env *env, emacs_value uptr)
+{
+ check_main_thread ();
+ eassert (module_non_local_exit_check (env) == emacs_funcall_exit_return);
+ Lisp_Object lisp = value_to_lisp (uptr);
+ if (! USER_PTRP (lisp))
+ {
+ module_wrong_type (env, Quser_ptr, lisp);
+ return NULL;
+ }
+ return XUSER_PTR (lisp)->finalizer;
+}
+
+static void
+module_set_user_finalizer (emacs_env *env, emacs_value uptr,
+ emacs_finalizer_function fin)
+{
+ check_main_thread ();
+ eassert (module_non_local_exit_check (env) == emacs_funcall_exit_return);
+ Lisp_Object lisp = value_to_lisp (uptr);
+ if (! USER_PTRP (lisp))
+ module_wrong_type (env, Quser_ptr, lisp);
+ XUSER_PTR (lisp)->finalizer = fin;
+}
+
+static void
+module_vec_set (emacs_env *env, emacs_value vec, ptrdiff_t i, emacs_value val)
+{
+ check_main_thread ();
+ eassert (module_non_local_exit_check (env) == emacs_funcall_exit_return);
+ Lisp_Object lvec = value_to_lisp (vec);
+ if (! VECTORP (lvec))
+ {
+ module_wrong_type (env, Qvectorp, lvec);
+ return;
+ }
+ if (! (0 <= i && i < ASIZE (lvec)))
+ {
+ if (MOST_NEGATIVE_FIXNUM <= i && i <= MOST_POSITIVE_FIXNUM)
+ module_args_out_of_range (env, lvec, make_number (i));
+ else
+ module_non_local_exit_signal_1 (env, Qoverflow_error, Qnil);
+ return;
+ }
+ ASET (lvec, i, value_to_lisp (val));
+}
+
+static emacs_value
+module_vec_get (emacs_env *env, emacs_value vec, ptrdiff_t i)
+{
+ check_main_thread ();
+ eassert (module_non_local_exit_check (env) == emacs_funcall_exit_return);
+ Lisp_Object lvec = value_to_lisp (vec);
+ if (! VECTORP (lvec))
+ {
+ module_wrong_type (env, Qvectorp, lvec);
+ return NULL;
+ }
+ if (! (0 <= i && i < ASIZE (lvec)))
+ {
+ if (MOST_NEGATIVE_FIXNUM <= i && i <= MOST_POSITIVE_FIXNUM)
+ module_args_out_of_range (env, lvec, make_number (i));
+ else
+ module_non_local_exit_signal_1 (env, Qoverflow_error, Qnil);
+ return NULL;
+ }
+ return lisp_to_value (env, AREF (lvec, i));
+}
+
+static ptrdiff_t
+module_vec_size (emacs_env *env, emacs_value vec)
+{
+ check_main_thread ();
+ eassert (module_non_local_exit_check (env) == emacs_funcall_exit_return);
+ Lisp_Object lvec = value_to_lisp (vec);
+ if (! VECTORP (lvec))
+ {
+ module_wrong_type (env, Qvectorp, lvec);
+ return 0;
+ }
+ eassert (ASIZE (lvec) >= 0);
+ return ASIZE (lvec);
+}
+
+
+/* Subroutines. */
+
+DEFUN ("module-load", Fmodule_load, Smodule_load, 1, 1, 0,
+ doc: /* Load module FILE. */)
+ (Lisp_Object file)
+{
+ dynlib_handle_ptr handle;
+ emacs_init_function module_init;
+ void *gpl_sym;
+
+ CHECK_STRING (file);
+ handle = dynlib_open (SSDATA (file));
+ if (!handle)
+ error ("Cannot load file %s: %s", SDATA (file), dynlib_error ());
+
+ gpl_sym = dynlib_sym (handle, "plugin_is_GPL_compatible");
+ if (!gpl_sym)
+ error ("Module %s is not GPL compatible", SDATA (file));
+
+ module_init = (emacs_init_function) dynlib_sym (handle, "emacs_module_init");
+ if (!module_init)
+ error ("Module %s does not have an init function.", SDATA (file));
+
+ struct emacs_runtime_private priv;
+ struct emacs_runtime pub =
+ {
+ .size = sizeof pub,
+ .private_members = &priv,
+ .get_environment = module_get_environment
+ };
+ initialize_environment (&priv.environment);
+ int r = module_init (&pub);
+ finalize_environment (&priv.environment);
+
+ if (r != 0)
+ {
+ if (! (MOST_NEGATIVE_FIXNUM <= r && r <= MOST_POSITIVE_FIXNUM))
+ xsignal0 (Qoverflow_error);
+ xsignal2 (Qmodule_load_failed, file, make_number (r));
+ }
+
+ return Qt;
+}
+
+DEFUN ("module-call", Fmodule_call, Smodule_call, 2, 2, 0,
+ doc: /* Internal function to call a module function.
+ENVOBJ is a save pointer to a module_fun_env structure.
+ARGLIST is a list of arguments passed to SUBRPTR. */)
+ (Lisp_Object envobj, Lisp_Object arglist)
+{
+ struct module_fun_env *envptr = XSAVE_POINTER (envobj, 0);
+ EMACS_INT len = XFASTINT (Flength (arglist));
+ eassume (0 <= envptr->min_arity);
+ if (! (envptr->min_arity <= len
+ && len <= (envptr->max_arity < 0 ? PTRDIFF_MAX : envptr->max_arity)))
+ xsignal2 (Qwrong_number_of_arguments, module_format_fun_env (envptr),
+ make_number (len));
+
+ struct env_storage env;
+ initialize_environment (&env);
+
+ emacs_value *args = xnmalloc (len, sizeof *args);
+
+ for (ptrdiff_t i = 0; i < len; i++)
+ {
+ args[i] = lisp_to_value (&env.pub, XCAR (arglist));
+ if (! args[i])
+ memory_full (sizeof *args[i]);
+ arglist = XCDR (arglist);
+ }
+
+ emacs_value ret = envptr->subr (&env.pub, len, args, envptr->data);
+ xfree (args);
+
+ switch (env.priv.pending_non_local_exit)
+ {
+ case emacs_funcall_exit_return:
+ finalize_environment (&env);
+ if (ret == NULL)
+ xsignal1 (Qinvalid_module_call, module_format_fun_env (envptr));
+ return value_to_lisp (ret);
+ case emacs_funcall_exit_signal:
+ {
+ Lisp_Object symbol = value_to_lisp (&env.priv.non_local_exit_symbol);
+ Lisp_Object data = value_to_lisp (&env.priv.non_local_exit_data);
+ finalize_environment (&env);
+ xsignal (symbol, data);
+ }
+ case emacs_funcall_exit_throw:
+ {
+ Lisp_Object tag = value_to_lisp (&env.priv.non_local_exit_symbol);
+ Lisp_Object value = value_to_lisp (&env.priv.non_local_exit_data);
+ finalize_environment (&env);
+ Fthrow (tag, value);
+ }
+ default:
+ eassume (false);
+ }
+}
+
+
+/* Helper functions. */
+
+static void
+check_main_thread (void)
+{
+#ifdef HAVE_THREADS_H
+ eassert (thrd_equal (thdr_current (), main_thread));
+#elif defined HAVE_PTHREAD
+ eassert (pthread_equal (pthread_self (), main_thread));
+#elif defined WINDOWSNT
+ /* CompareObjectHandles would be perfect, but is only available in
+ Windows 10. Also check whether the thread is still running to
+ protect against thread identifier reuse. */
+ eassert (GetCurrentThreadId () == main_thread_id
+ && WaitForSingleObject (main_thread, 0) == WAIT_TIMEOUT);
+#endif
+}
+
+static void
+module_non_local_exit_signal_1 (emacs_env *env, Lisp_Object sym,
+ Lisp_Object data)
+{
+ struct emacs_env_private *p = env->private_members;
+ eassert (p->pending_non_local_exit == emacs_funcall_exit_return);
+ p->pending_non_local_exit = emacs_funcall_exit_signal;
+ p->non_local_exit_symbol.v = sym;
+ p->non_local_exit_data.v = data;
+}
+
+static void
+module_non_local_exit_throw_1 (emacs_env *env, Lisp_Object tag,
+ Lisp_Object value)
+{
+ struct emacs_env_private *p = env->private_members;
+ eassert (p->pending_non_local_exit == emacs_funcall_exit_return);
+ p->pending_non_local_exit = emacs_funcall_exit_throw;
+ p->non_local_exit_symbol.v = tag;
+ p->non_local_exit_data.v = value;
+}
+
+/* Module version of `wrong_type_argument'. */
+static void
+module_wrong_type (emacs_env *env, Lisp_Object predicate, Lisp_Object value)
+{
+ module_non_local_exit_signal_1 (env, Qwrong_type_argument,
+ list2 (predicate, value));
+}
+
+/* Signal an out-of-memory condition to the caller. */
+static void
+module_out_of_memory (emacs_env *env)
+{
+ /* TODO: Reimplement this so it works even if memory-signal-data has
+ been modified. */
+ module_non_local_exit_signal_1 (env, XCAR (Vmemory_signal_data),
+ XCDR (Vmemory_signal_data));
+}
+
+/* Signal arguments are out of range. */
+static void
+module_args_out_of_range (emacs_env *env, Lisp_Object a1, Lisp_Object a2)
+{
+ module_non_local_exit_signal_1 (env, Qargs_out_of_range, list2 (a1, a2));
+}
+
+
+/* Value conversion. */
+
+/* Convert an `emacs_value' to the corresponding internal object.
+ Never fails. */
+static Lisp_Object
+value_to_lisp (emacs_value v)
+{
+ return v->v;
+}
+
+/* Convert an internal object to an `emacs_value'. Allocate storage
+ from the environment; return NULL if allocation fails. */
+static emacs_value
+lisp_to_value (emacs_env *env, Lisp_Object o)
+{
+ struct emacs_env_private *p = env->private_members;
+ if (p->pending_non_local_exit != emacs_funcall_exit_return)
+ return NULL;
+ return allocate_emacs_value (env, &p->storage, o);
+}
+
+
+/* Memory management. */
+
+/* Must be called for each frame before it can be used for allocation. */
+static void
+initialize_frame (struct emacs_value_frame *frame)
+{
+ frame->offset = 0;
+ frame->next = NULL;
+}
+
+/* Must be called for any storage object before it can be used for
+ allocation. */
+static void
+initialize_storage (struct emacs_value_storage *storage)
+{
+ initialize_frame (&storage->initial);
+ storage->current = &storage->initial;
+}
+
+/* Must be called for any initialized storage object before its
+ lifetime ends. Free all dynamically-allocated frames. */
+static void
+finalize_storage (struct emacs_value_storage *storage)
+{
+ struct emacs_value_frame *next = storage->initial.next;
+ while (next != NULL)
+ {
+ struct emacs_value_frame *current = next;
+ next = current->next;
+ free (current);
+ }
+}
+
+/* Allocate a new value from STORAGE and stores OBJ in it. Return
+ NULL if allocations fails and use ENV for non local exit reporting. */
+static emacs_value
+allocate_emacs_value (emacs_env *env, struct emacs_value_storage *storage,
+ Lisp_Object obj)
+{
+ eassert (storage->current);
+ eassert (storage->current->offset < value_frame_size);
+ eassert (! storage->current->next);
+ if (storage->current->offset == value_frame_size - 1)
+ {
+ storage->current->next = malloc (sizeof *storage->current->next);
+ if (! storage->current->next)
+ {
+ module_out_of_memory (env);
+ return NULL;
+ }
+ initialize_frame (storage->current->next);
+ storage->current = storage->current->next;
+ }
+ emacs_value value = storage->current->objects + storage->current->offset;
+ value->v = obj;
+ ++storage->current->offset;
+ return value;
+}
+
+/* Mark all objects allocated from local environments so that they
+ don't get garbage-collected. */
+void mark_modules (void)
+{
+ for (Lisp_Object tem = Vmodule_environments; CONSP (tem); tem = XCDR (tem))
+ {
+ struct env_storage *env = XSAVE_POINTER (tem, 0);
+ for (struct emacs_value_frame *frame = &env->priv.storage.initial;
+ frame != NULL;
+ frame = frame->next)
+ for (int i = 0; i < frame->offset; ++i)
+ mark_object (frame->objects[i].v);
+ }
+}
+
+
+/* Environment lifetime management. */
+
+/* Must be called before the environment can be used. */
+static void
+initialize_environment (struct env_storage *env)
+{
+ env->priv.pending_non_local_exit = emacs_funcall_exit_return;
+ initialize_storage (&env->priv.storage);
+ env->pub.size = sizeof env->pub;
+ env->pub.private_members = &env->priv;
+ env->pub.make_global_ref = module_make_global_ref;
+ env->pub.free_global_ref = module_free_global_ref;
+ env->pub.non_local_exit_check = module_non_local_exit_check;
+ env->pub.non_local_exit_clear = module_non_local_exit_clear;
+ env->pub.non_local_exit_get = module_non_local_exit_get;
+ env->pub.non_local_exit_signal = module_non_local_exit_signal;
+ env->pub.non_local_exit_throw = module_non_local_exit_throw;
+ env->pub.make_function = module_make_function;
+ env->pub.funcall = module_funcall;
+ env->pub.intern = module_intern;
+ env->pub.type_of = module_type_of;
+ env->pub.is_not_nil = module_is_not_nil;
+ env->pub.eq = module_eq;
+ env->pub.extract_integer = module_extract_integer;
+ env->pub.make_integer = module_make_integer;
+ env->pub.extract_float = module_extract_float;
+ env->pub.make_float = module_make_float;
+ env->pub.copy_string_contents = module_copy_string_contents;
+ env->pub.make_string = module_make_string;
+ env->pub.make_user_ptr = module_make_user_ptr;
+ env->pub.get_user_ptr = module_get_user_ptr;
+ env->pub.set_user_ptr = module_set_user_ptr;
+ env->pub.get_user_finalizer = module_get_user_finalizer;
+ env->pub.set_user_finalizer = module_set_user_finalizer;
+ env->pub.vec_set = module_vec_set;
+ env->pub.vec_get = module_vec_get;
+ env->pub.vec_size = module_vec_size;
+ Vmodule_environments = Fcons (make_save_ptr (env), Vmodule_environments);
+}
+
+/* Must be called before the lifetime of the environment object
+ ends. */
+static void
+finalize_environment (struct env_storage *env)
+{
+ finalize_storage (&env->priv.storage);
+ Vmodule_environments = XCDR (Vmodule_environments);
+}
+
+
+/* Non-local exit handling. */
+
+/* Must be called after setting up a handler immediately before
+ returning from the function. See the comments in lisp.h and the
+ code in eval.c for details. The macros below arrange for this
+ function to be called automatically. DUMMY is ignored. */
+static void
+module_reset_handlerlist (const int *dummy)
+{
+ handlerlist = handlerlist->next;
+}
+
+/* Called on `signal'. ERR is a pair (SYMBOL . DATA), which gets
+ stored in the environment. Set the pending non-local exit flag. */
+static void
+module_handle_signal (emacs_env *env, Lisp_Object err)
+{
+ module_non_local_exit_signal_1 (env, XCAR (err), XCDR (err));
+}
+
+/* Called on `throw'. TAG_VAL is a pair (TAG . VALUE), which gets
+ stored in the environment. Set the pending non-local exit flag. */
+static void
+module_handle_throw (emacs_env *env, Lisp_Object tag_val)
+{
+ module_non_local_exit_throw_1 (env, XCAR (tag_val), XCDR (tag_val));
+}
+
+
+/* Function environments. */
+
+/* Return a string object that contains a user-friendly
+ representation of the function environment. */
+static Lisp_Object
+module_format_fun_env (const struct module_fun_env *env)
+{
+ /* Try to print a function name if possible. */
+ const char *path, *sym;
+ if (dynlib_addr (env->subr, &path, &sym))
+ {
+ static char const format[] = "#<module function %s from %s>";
+ int size = snprintf (NULL, 0, format, sym, path);
+ eassert (size > 0);
+ char buffer[size + 1];
+ snprintf (buffer, sizeof buffer, format, sym, path);
+ return make_unibyte_string (buffer, size);
+ }
+ else
+ {
+ static char const format[] = "#<module function at %p>";
+ void *subr = env->subr;
+ int size = snprintf (NULL, 0, format, subr);
+ eassert (size > 0);
+ char buffer[size + 1];
+ snprintf (buffer, sizeof buffer, format, subr);
+ return make_unibyte_string (buffer, size);
+ }
+}
+
+
+/* Segment initializer. */
+
+void
+syms_of_module (void)
+{
+ DEFSYM (Qmodule_refs_hash, "module-refs-hash");
+ DEFVAR_LISP ("module-refs-hash", Vmodule_refs_hash,
+ doc: /* Module global referrence table. */);
+
+ Vmodule_refs_hash
+ = make_hash_table (hashtest_eq, make_number (DEFAULT_HASH_SIZE),
+ make_float (DEFAULT_REHASH_SIZE),
+ make_float (DEFAULT_REHASH_THRESHOLD),
+ Qnil);
+ Funintern (Qmodule_refs_hash, Qnil);
+
+ DEFSYM (Qmodule_environments, "module-environments");
+ DEFVAR_LISP ("module-environments", Vmodule_environments,
+ doc: /* List of active module environments. */);
+ Vmodule_environments = Qnil;
+ /* Unintern `module-environments' because it is only used
+ internally. */
+ Funintern (Qmodule_environments, Qnil);
+
+ DEFSYM (Qmodule_load_failed, "module-load-failed");
+ Fput (Qmodule_load_failed, Qerror_conditions,
+ listn (CONSTYPE_PURE, 2, Qmodule_load_failed, Qerror));
+ Fput (Qmodule_load_failed, Qerror_message,
+ build_pure_c_string ("Module load failed"));
+
+ DEFSYM (Qinvalid_module_call, "invalid-module-call");
+ Fput (Qinvalid_module_call, Qerror_conditions,
+ listn (CONSTYPE_PURE, 2, Qinvalid_module_call, Qerror));
+ Fput (Qinvalid_module_call, Qerror_message,
+ build_pure_c_string ("Invalid module call"));
+
+ DEFSYM (Qinvalid_arity, "invalid-arity");
+ Fput (Qinvalid_arity, Qerror_conditions,
+ listn (CONSTYPE_PURE, 2, Qinvalid_arity, Qerror));
+ Fput (Qinvalid_arity, Qerror_message,
+ build_pure_c_string ("Invalid function arity"));
+
+ initialize_storage (&global_storage);
+
+ /* Unintern `module-refs-hash' because it is internal-only and Lisp
+ code or modules should not access it. */
+ Funintern (Qmodule_refs_hash, Qnil);
+
+ defsubr (&Smodule_load);
+
+ /* Don't call defsubr on `module-call' because that would intern it,
+ but `module-call' is an internal function that users cannot
+ meaningfully use. Instead, assign its definition to a private
+ variable. */
+ XSETPVECTYPE (&Smodule_call, PVEC_SUBR);
+ XSETSUBR (module_call_func, &Smodule_call);
+}
+
+/* Unlike syms_of_module, this initializer is called even from an
+ initialized (dumped) Emacs. */
+
+void
+module_init (void)
+{
+ /* It is not guaranteed that dynamic initializers run in the main thread,
+ therefore detect the main thread here. */
+#ifdef HAVE_THREADS_H
+ main_thread = thrd_current ();
+#elif defined HAVE_PTHREAD
+ main_thread = pthread_self ();
+#elif defined WINDOWSNT
+ /* This calls APIs that are only available on Vista and later. */
+# if false
+ /* GetCurrentProcess returns a pseudohandle, which must be duplicated. */
+ if (! DuplicateHandle (GetCurrentProcess (), GetCurrentThread (),
+ GetCurrentProcess (), &main_thread,
+ SYNCHRONIZE | THREAD_QUERY_INFORMATION,
+ FALSE, 0))
+ emacs_abort ();
+# else
+ /* GetCurrentThread returns a pseudohandle, which must be duplicated. */
+ HANDLE th = GetCurrentThread ();
+ if (!DuplicateHandle (GetCurrentProcess (), th,
+ GetCurrentProcess (), &main_thread, 0, FALSE,
+ DUPLICATE_SAME_ACCESS))
+ emacs_abort ();
+ main_thread_id = GetCurrentThreadId ();
+# endif
+#endif
+}
diff --git a/src/emacs-module.h b/src/emacs-module.h
new file mode 100644
index 0000000..4d204d0
--- /dev/null
+++ b/src/emacs-module.h
@@ -0,0 +1,203 @@
+/* emacs-module.h - GNU Emacs module API.
+
+Copyright (C) 2015 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 <http://www.gnu.org/licenses/>. */
+
+#ifndef EMACS_MODULE_H
+#define EMACS_MODULE_H
+
+#include <stdint.h>
+#include <stddef.h>
+#include <stdbool.h>
+
+#if defined __cplusplus && __cplusplus >= 201103L
+# define EMACS_NOEXCEPT noexcept
+#else
+# define EMACS_NOEXCEPT
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Current environment. */
+typedef struct emacs_env_25 emacs_env;
+
+/* Opaque structure pointer representing an Emacs Lisp value. */
+typedef struct emacs_value_tag *emacs_value;
+
+enum emacs_arity { emacs_variadic_function = -2 };
+
+/* Struct passed to a module init function (emacs_module_init). */
+struct emacs_runtime
+{
+ /* Structure size (for version checking). */
+ ptrdiff_t size;
+
+ /* Private data; users should not touch this. */
+ struct emacs_runtime_private *private_members;
+
+ /* Return an environment pointer. */
+ emacs_env *(*get_environment) (struct emacs_runtime *ert);
+};
+
+
+/* Function prototype for the module init function. */
+typedef int (*emacs_init_function) (struct emacs_runtime *ert);
+
+/* Function prototype for the module Lisp functions. */
+typedef emacs_value (*emacs_subr) (emacs_env *env, ptrdiff_t nargs,
+ emacs_value args[], void *data);
+
+/* Function prototype for module user-pointer finalizers. */
+typedef void (*emacs_finalizer_function) (void *);
+
+/* Possible Emacs function call outcomes. */
+enum emacs_funcall_exit
+{
+ /* Function has returned normally. */
+ emacs_funcall_exit_return = 0,
+
+ /* Function has signaled an error using `signal'. */
+ emacs_funcall_exit_signal = 1,
+
+ /* Function has exit using `throw'. */
+ emacs_funcall_exit_throw = 2,
+};
+
+struct emacs_env_25
+{
+ /* Structure size (for version checking). */
+ ptrdiff_t size;
+
+ /* Private data; users should not touch this. */
+ struct emacs_env_private *private_members;
+
+ /* Memory management. */
+
+ emacs_value (*make_global_ref) (emacs_env *env,
+ emacs_value any_reference);
+
+ void (*free_global_ref) (emacs_env *env,
+ emacs_value global_reference);
+
+ /* Non-local exit handling. */
+
+ enum emacs_funcall_exit (*non_local_exit_check) (emacs_env *env);
+
+ void (*non_local_exit_clear) (emacs_env *env);
+
+ enum emacs_funcall_exit (*non_local_exit_get)
+ (emacs_env *env,
+ emacs_value *non_local_exit_symbol_out,
+ emacs_value *non_local_exit_data_out);
+
+ void (*non_local_exit_signal) (emacs_env *env,
+ emacs_value non_local_exit_symbol,
+ emacs_value non_local_exit_data);
+
+ void (*non_local_exit_throw) (emacs_env *env,
+ emacs_value tag,
+ emacs_value value);
+
+ /* Function registration. */
+
+ emacs_value (*make_function) (emacs_env *env,
+ ptrdiff_t min_arity,
+ ptrdiff_t max_arity,
+ emacs_value (*function) (emacs_env *env,
+ ptrdiff_t nargs,
+ emacs_value args[],
+ void *)
+ EMACS_NOEXCEPT,
+ const char *documentation,
+ void *data);
+
+ emacs_value (*funcall) (emacs_env *env,
+ emacs_value function,
+ ptrdiff_t nargs,
+ emacs_value args[]);
+
+ emacs_value (*intern) (emacs_env *env,
+ const char *symbol_name);
+
+ /* Type conversion. */
+
+ emacs_value (*type_of) (emacs_env *env,
+ emacs_value value);
+
+ bool (*is_not_nil) (emacs_env *env, emacs_value value);
+
+ bool (*eq) (emacs_env *env, emacs_value a, emacs_value b);
+
+ intmax_t (*extract_integer) (emacs_env *env, emacs_value value);
+
+ emacs_value (*make_integer) (emacs_env *env, intmax_t value);
+
+ double (*extract_float) (emacs_env *env, emacs_value value);
+
+ emacs_value (*make_float) (emacs_env *env, double value);
+
+ /* Copy the content of the Lisp string VALUE to BUFFER as an utf8
+ null-terminated string.
+
+ SIZE must point to the total size of the buffer. If BUFFER is
+ NULL or if SIZE is not big enough, write the required buffer size
+ to SIZE and return false.
+
+ Note that SIZE must include the last null byte (e.g. "abc" needs
+ a buffer of size 4).
+
+ Return true if the string was successfully copied. */
+
+ bool (*copy_string_contents) (emacs_env *env,
+ emacs_value value,
+ char *buffer,
+ ptrdiff_t *size_inout);
+
+ /* Create a Lisp string from a utf8 encoded string. */
+ emacs_value (*make_string) (emacs_env *env,
+ const char *contents, ptrdiff_t length);
+
+ /* Embedded pointer type. */
+ emacs_value (*make_user_ptr) (emacs_env *env,
+ void (*fin) (void *) EMACS_NOEXCEPT,
+ void *ptr);
+
+ void *(*get_user_ptr) (emacs_env *env, emacs_value uptr);
+ void (*set_user_ptr) (emacs_env *env, emacs_value uptr, void *ptr);
+
+ void (*(*get_user_finalizer) (emacs_env *env, emacs_value uptr))
+ (void *) EMACS_NOEXCEPT;
+ void (*set_user_finalizer) (emacs_env *env,
+ emacs_value uptr,
+ void (*fin) (void *) EMACS_NOEXCEPT);
+
+ /* Vector functions. */
+ emacs_value (*vec_get) (emacs_env *env, emacs_value vec, ptrdiff_t i);
+
+ void (*vec_set) (emacs_env *env, emacs_value vec, ptrdiff_t i,
+ emacs_value val);
+
+ ptrdiff_t (*vec_size) (emacs_env *env, emacs_value vec);
+};
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* EMACS_MODULE_H */
diff --git a/src/eval.c b/src/eval.c
index 396ca84..023c2ef 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -61,7 +61,7 @@ union specbinding *specpdl_ptr;
/* Depth in Lisp evaluations and function calls. */
-EMACS_INT lisp_eval_depth;
+static EMACS_INT lisp_eval_depth;
/* The value of num_nonmacro_input_events as of the last time we
started to enter the debugger. If we decide to enter the debugger
@@ -226,9 +226,8 @@ init_eval (void)
{ /* Put a dummy catcher at top-level so that handlerlist is never NULL.
This is important since handlerlist->nextfree holds the freelist
which would otherwise leak every time we unwind back to top-level. */
- struct handler *c;
handlerlist = handlerlist_sentinel.nextfree = &handlerlist_sentinel;
- PUSH_HANDLER (c, Qunbound, CATCHER);
+ struct handler *c = push_handler (Qunbound, CATCHER);
eassert (c == &handlerlist_sentinel);
handlerlist_sentinel.nextfree = NULL;
handlerlist_sentinel.next = NULL;
@@ -1059,18 +1058,16 @@ usage: (catch TAG BODY...) */)
This is how catches are done from within C code. */
Lisp_Object
-internal_catch (Lisp_Object tag, Lisp_Object (*func) (Lisp_Object),
Lisp_Object arg)
+internal_catch (Lisp_Object tag,
+ Lisp_Object (*func) (Lisp_Object), Lisp_Object arg)
{
/* This structure is made part of the chain `catchlist'. */
- struct handler *c;
-
- /* Fill in the components of c, and put it on the list. */
- PUSH_HANDLER (c, tag, CATCHER);
+ struct handler *c = push_handler (tag, CATCHER);
/* Call FUNC. */
if (! sys_setjmp (c->jmp))
{
- Lisp_Object val = (*func) (arg);
+ Lisp_Object val = func (arg);
clobbered_eassert (handlerlist == c);
handlerlist = handlerlist->next;
return val;
@@ -1147,7 +1144,7 @@ Both TAG and VALUE are evalled. */
{
if (c->type == CATCHER_ALL)
unwind_to_catch (c, Fcons (tag, value));
- if (c->type == CATCHER && EQ (c->tag_or_ch, tag))
+ if (c->type == CATCHER && EQ (c->tag_or_ch, tag))
unwind_to_catch (c, value);
}
xsignal2 (Qno_catch, tag, value);
@@ -1213,7 +1210,6 @@ internal_lisp_condition_case (volatile Lisp_Object var,
Lisp_Object bodyform,
Lisp_Object handlers)
{
Lisp_Object val;
- struct handler *c;
struct handler *oldhandlerlist = handlerlist;
int clausenb = 0;
@@ -1248,7 +1244,7 @@ internal_lisp_condition_case (volatile Lisp_Object var,
Lisp_Object bodyform,
Lisp_Object condition = XCAR (clause);
if (!CONSP (condition))
condition = Fcons (condition, Qnil);
- PUSH_HANDLER (c, condition, CONDITION_CASE);
+ struct handler *c = push_handler (condition, CONDITION_CASE);
if (sys_setjmp (c->jmp))
{
ptrdiff_t count = SPECPDL_INDEX ();
@@ -1296,46 +1292,45 @@ Lisp_Object
internal_condition_case (Lisp_Object (*bfun) (void), Lisp_Object handlers,
Lisp_Object (*hfun) (Lisp_Object))
{
- Lisp_Object val;
- struct handler *c;
-
- PUSH_HANDLER (c, handlers, CONDITION_CASE);
+ struct handler *c = push_handler (handlers, CONDITION_CASE);
if (sys_setjmp (c->jmp))
{
Lisp_Object val = handlerlist->val;
clobbered_eassert (handlerlist == c);
handlerlist = handlerlist->next;
- return (*hfun) (val);
+ return hfun (val);
+ }
+ else
+ {
+ Lisp_Object val = bfun ();
+ clobbered_eassert (handlerlist == c);
+ handlerlist = handlerlist->next;
+ return val;
}
-
- val = (*bfun) ();
- clobbered_eassert (handlerlist == c);
- handlerlist = handlerlist->next;
- return val;
}
/* Like internal_condition_case but call BFUN with ARG as its argument. */
Lisp_Object
internal_condition_case_1 (Lisp_Object (*bfun) (Lisp_Object), Lisp_Object arg,
- Lisp_Object handlers, Lisp_Object (*hfun)
(Lisp_Object))
+ Lisp_Object handlers,
+ Lisp_Object (*hfun) (Lisp_Object))
{
- Lisp_Object val;
- struct handler *c;
-
- PUSH_HANDLER (c, handlers, CONDITION_CASE);
+ struct handler *c = push_handler (handlers, CONDITION_CASE);
if (sys_setjmp (c->jmp))
{
Lisp_Object val = handlerlist->val;
clobbered_eassert (handlerlist == c);
handlerlist = handlerlist->next;
- return (*hfun) (val);
+ return hfun (val);
+ }
+ else
+ {
+ Lisp_Object val = bfun (arg);
+ clobbered_eassert (handlerlist == c);
+ handlerlist = handlerlist->next;
+ return val;
}
-
- val = (*bfun) (arg);
- clobbered_eassert (handlerlist == c);
- handlerlist = handlerlist->next;
- return val;
}
/* Like internal_condition_case_1 but call BFUN with ARG1 and ARG2 as
@@ -1348,22 +1343,21 @@ internal_condition_case_2 (Lisp_Object (*bfun)
(Lisp_Object, Lisp_Object),
Lisp_Object handlers,
Lisp_Object (*hfun) (Lisp_Object))
{
- Lisp_Object val;
- struct handler *c;
-
- PUSH_HANDLER (c, handlers, CONDITION_CASE);
+ struct handler *c = push_handler (handlers, CONDITION_CASE);
if (sys_setjmp (c->jmp))
{
Lisp_Object val = handlerlist->val;
clobbered_eassert (handlerlist == c);
handlerlist = handlerlist->next;
- return (*hfun) (val);
+ return hfun (val);
+ }
+ else
+ {
+ Lisp_Object val = bfun (arg1, arg2);
+ clobbered_eassert (handlerlist == c);
+ handlerlist = handlerlist->next;
+ return val;
}
-
- val = (*bfun) (arg1, arg2);
- clobbered_eassert (handlerlist == c);
- handlerlist = handlerlist->next;
- return val;
}
/* Like internal_condition_case but call BFUN with NARGS as first,
@@ -1378,61 +1372,46 @@ internal_condition_case_n (Lisp_Object (*bfun)
(ptrdiff_t, Lisp_Object *),
ptrdiff_t nargs,
Lisp_Object *args))
{
- Lisp_Object val;
- struct handler *c;
-
- PUSH_HANDLER (c, handlers, CONDITION_CASE);
+ struct handler *c = push_handler (handlers, CONDITION_CASE);
if (sys_setjmp (c->jmp))
{
Lisp_Object val = handlerlist->val;
clobbered_eassert (handlerlist == c);
handlerlist = handlerlist->next;
- return (*hfun) (val, nargs, args);
+ return hfun (val, nargs, args);
}
-
- val = (*bfun) (nargs, args);
- clobbered_eassert (handlerlist == c);
- handlerlist = handlerlist->next;
- return val;
-}
-
-static void init_handler (struct handler *c, Lisp_Object tag_ch_val,
- enum handlertype handlertype);
-
-void push_handler (struct handler **const c, const Lisp_Object tag_ch_val,
- const enum handlertype handlertype)
-{
- if (handlerlist->nextfree)
- *c = handlerlist->nextfree;
else
{
- *c = xmalloc (sizeof (struct handler));
- (*c)->nextfree = NULL;
- handlerlist->nextfree = *c;
+ Lisp_Object val = bfun (nargs, args);
+ clobbered_eassert (handlerlist == c);
+ handlerlist = handlerlist->next;
+ return val;
}
- init_handler (*c, tag_ch_val, handlertype);
}
-bool push_handler_nosignal (struct handler **const c, const Lisp_Object
tag_ch_val,
- const enum handlertype handlertype)
+struct handler *
+push_handler (Lisp_Object tag_ch_val, enum handlertype handlertype)
{
- if (handlerlist->nextfree)
- *c = handlerlist->nextfree;
- else
- {
- struct handler *const h = malloc (sizeof (struct handler));
- if (! h) return false;
- *c = h;
- h->nextfree = NULL;
- handlerlist->nextfree = h;
- }
- init_handler (*c, tag_ch_val, handlertype);
- return true;
+ struct handler *c = push_handler_nosignal (tag_ch_val, handlertype);
+ if (!c)
+ memory_full (sizeof *c);
+ return c;
}
-static void init_handler (struct handler *const c, const Lisp_Object
tag_ch_val,
- const enum handlertype handlertype)
+struct handler *
+push_handler_nosignal (Lisp_Object tag_ch_val, enum handlertype handlertype)
{
+ struct handler *c = handlerlist->nextfree;
+ if (!c)
+ {
+ c = malloc (sizeof *c);
+ if (!c)
+ return c;
+ if (profiler_memory_running)
+ malloc_probe (sizeof *c);
+ c->nextfree = NULL;
+ handlerlist->nextfree = c;
+ }
c->type = handlertype;
c->tag_or_ch = tag_ch_val;
c->val = Qnil;
@@ -1443,6 +1422,7 @@ static void init_handler (struct handler *const c, const
Lisp_Object tag_ch_val,
c->interrupt_input_blocked = interrupt_input_blocked;
c->byte_stack = byte_stack_list;
handlerlist = c;
+ return c;
}
diff --git a/src/lisp.h b/src/lisp.h
index 3b6ea76..71dca72 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2246,7 +2246,7 @@ struct Lisp_User_Ptr
bool_bf gcmarkbit : 1;
unsigned spacer : 15;
- void (*finalizer) (void*);
+ void (*finalizer) (void *);
void *p;
};
#endif
@@ -2347,7 +2347,6 @@ XUSER_PTR (Lisp_Object a)
}
#endif
-
/* Forwarding pointer to an int variable.
This is allowed only in the value cell of a symbol,
@@ -3184,18 +3183,6 @@ struct handler
struct byte_stack *byte_stack;
};
-/* Fill in the components of c, and put it on the list. */
-#define PUSH_HANDLER(c, tag_ch_val, handlertype) \
- push_handler(&(c), (tag_ch_val), (handlertype))
-
-extern void push_handler (struct handler **c, Lisp_Object tag_ch_val,
- enum handlertype handlertype);
-
-/* Like push_handler, but don't signal if the handler could not be
- allocated. Instead return false in that case. */
-extern bool push_handler_nosignal (struct handler **c, Lisp_Object tag_ch_val,
- enum handlertype handlertype);
-
extern Lisp_Object memory_signal_data;
/* An address near the bottom of the stack.
@@ -3838,7 +3825,6 @@ intern_c_string (const char *str)
}
/* Defined in eval.c. */
-extern EMACS_INT lisp_eval_depth;
extern Lisp_Object Vautoload_queue;
extern Lisp_Object Vrun_hooks;
extern Lisp_Object Vsignaling_function;
@@ -3882,6 +3868,8 @@ extern Lisp_Object internal_condition_case_2 (Lisp_Object
(*) (Lisp_Object, Lisp
extern Lisp_Object internal_condition_case_n
(Lisp_Object (*) (ptrdiff_t, Lisp_Object *), ptrdiff_t, Lisp_Object *,
Lisp_Object, Lisp_Object (*) (Lisp_Object, ptrdiff_t, Lisp_Object *));
+extern struct handler *push_handler (Lisp_Object, enum handlertype);
+extern struct handler *push_handler_nosignal (Lisp_Object, enum handlertype);
extern void specbind (Lisp_Object, Lisp_Object);
extern void record_unwind_protect (void (*) (Lisp_Object), Lisp_Object);
extern void record_unwind_protect_ptr (void (*) (void *), void *);
@@ -3916,7 +3904,7 @@ extern bool let_shadows_global_binding_p (Lisp_Object
symbol);
/* Defined in alloc.c. */
extern Lisp_Object make_user_ptr (void (*finalizer) (void*), void *p);
-/* Defined in module.c. */
+/* Defined in emacs-module.c. */
extern void module_init (void);
extern void mark_modules (void);
extern void syms_of_module (void);
diff --git a/src/lread.c b/src/lread.c
index c0fa0d0..43100d9 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -979,8 +979,8 @@ This uses the variables `load-suffixes' and
`load-file-rep-suffixes'. */)
static bool
suffix_p (Lisp_Object string, const char *suffix)
{
- const size_t suffix_len = strlen (suffix);
- const size_t string_len = SBYTES (string);
+ ptrdiff_t suffix_len = strlen (suffix);
+ ptrdiff_t string_len = SBYTES (string);
return string_len >= suffix_len && !strcmp (SSDATA (string) + string_len -
suffix_len, suffix);
}
diff --git a/src/module.c b/src/module.c
deleted file mode 100644
index 4069b88..0000000
--- a/src/module.c
+++ /dev/null
@@ -1,1197 +0,0 @@
-/* module.c - Module loading and runtime implementation
-
-Copyright (C) 2015 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 <http://www.gnu.org/licenses/>. */
-
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <stdio.h>
-
-#include <config.h>
-#include "lisp.h"
-#include "module.h"
-#include "dynlib.h"
-#include "coding.h"
-#include "verify.h"
-
-
-/* Feature tests */
-
-enum {
- /* 1 if we have __attribute__((cleanup(...))), 0 otherwise */
- module_has_cleanup =
-#ifdef HAVE_VAR_ATTRIBUTE_CLEANUP
- 1
-#else
- 0
-#endif
-};
-
-/* Handle to the main thread. Used to verify that modules call us in
- the right thread. */
-#if defined(HAVE_THREADS_H)
-#include <threads.h>
-static thrd_t main_thread;
-#elif defined(HAVE_PTHREAD)
-#include <pthread.h>
-static pthread_t main_thread;
-#elif defined(WINDOWSNT)
-#include <windows.h>
-/* On Windows, we store both a handle to the main thread and the
- thread ID because the latter can be reused when a thread
- terminates. */
-static HANDLE main_thread;
-static DWORD main_thread_id;
-#endif
-
-
-/* Implementation of runtime and environment functions */
-
-static emacs_env* module_get_environment (struct emacs_runtime *ert);
-
-static emacs_value module_make_global_ref (emacs_env *env,
- emacs_value ref);
-static void module_free_global_ref (emacs_env *env,
- emacs_value ref);
-static enum emacs_funcall_exit module_non_local_exit_check (emacs_env *env);
-static void module_non_local_exit_clear (emacs_env *env);
-static enum emacs_funcall_exit module_non_local_exit_get (emacs_env *env,
emacs_value *sym, emacs_value *data);
-static void module_non_local_exit_signal (emacs_env *env, emacs_value sym,
emacs_value data);
-static void module_non_local_exit_throw (emacs_env *env, emacs_value tag,
emacs_value value);
-static emacs_value module_make_function (emacs_env *env,
- int min_arity,
- int max_arity,
- emacs_subr subr,
- const char *documentation,
- void *data);
-static emacs_value module_funcall (emacs_env *env,
- emacs_value fun,
- int nargs,
- emacs_value args[]);
-static emacs_value module_intern (emacs_env *env, const char *name);
-static emacs_value module_type_of (emacs_env *env, emacs_value value);
-static bool module_is_not_nil (emacs_env *env, emacs_value value);
-static bool module_eq (emacs_env *env, emacs_value a, emacs_value b);
-static int64_t module_extract_integer (emacs_env *env, emacs_value n);
-static emacs_value module_make_integer (emacs_env *env, int64_t n);
-static emacs_value module_make_float (emacs_env *env, double d);
-static double module_extract_float (emacs_env *env, emacs_value f);
-static bool module_copy_string_contents (emacs_env *env,
- emacs_value value,
- char *buffer,
- size_t* length);
-static emacs_value module_make_string (emacs_env *env, const char *str, size_t
lenght);
-static emacs_value module_make_user_ptr (emacs_env *env,
- emacs_finalizer_function fin,
- void *ptr);
-static void* module_get_user_ptr (emacs_env *env, emacs_value uptr);
-static void module_set_user_ptr (emacs_env *env, emacs_value uptr, void *ptr);
-static emacs_finalizer_function module_get_user_finalizer (emacs_env *env,
emacs_value uptr);
-static void module_set_user_finalizer (emacs_env *env,
- emacs_value uptr,
- emacs_finalizer_function fin);
-
-
-/* Helper functions */
-
-/* If checking is enabled, abort if the current thread is not the
- Emacs main thread. */
-static void check_main_thread (void);
-
-/* Internal versions of `module_non_local_exit_signal' and
`module_non_local_exit_throw'. */
-static void module_non_local_exit_signal_1 (emacs_env *env, Lisp_Object sym,
Lisp_Object data);
-static void module_non_local_exit_throw_1 (emacs_env *env, Lisp_Object tag,
Lisp_Object value);
-
-/* Module version of `wrong_type_argument'. */
-static void module_wrong_type (emacs_env *env, Lisp_Object predicate,
Lisp_Object value);
-
-/* Signal an out-of-memory condition to the caller. */
-static void module_out_of_memory (emacs_env *env);
-
-/* Signal arguments are out of range. */
-static void module_args_out_of_range (emacs_env *env, Lisp_Object a1,
Lisp_Object a2);
-
-
-/* Value conversion */
-
-/* Converts an `emacs_value' to the corresponding internal object.
- Never fails. */
-static Lisp_Object value_to_lisp (emacs_value v);
-
-/* Converts an internal object to an `emacs_value'. Allocates storage
- from the environment; returns NULL if allocation fails. */
-static emacs_value lisp_to_value (emacs_env *env, Lisp_Object o);
-
-
-/* Memory management */
-
-/* An `emacs_value' is just a pointer to a structure holding an
- internal Lisp object. */
-struct emacs_value_tag { Lisp_Object v; };
-
-/* Local value objects use a simple fixed-sized block allocation
- scheme without explicit deallocation. All local values are
- deallocated when the lifetime of their environment ends. We keep
- track of a current frame from which new values are allocated,
- appending further dynamically-allocated frames if necessary. */
-
-enum { value_frame_size = 512 };
-
-/* A block from which `emacs_value' object can be allocated. */
-struct emacs_value_frame {
- /* Storage for values */
- struct emacs_value_tag objects[value_frame_size];
-
- /* Index of the next free value in `objects' */
- size_t offset;
-
- /* Pointer to next frame, if any */
- struct emacs_value_frame *next;
-};
-
-/* Must be called for each frame before it can be used for
- allocation. */
-static void initialize_frame (struct emacs_value_frame *frame);
-
-/* A structure that holds an initial frame (so that the first local
- values require no dynamic allocation) and keeps track of the
- current frame. */
-static struct emacs_value_storage {
- struct emacs_value_frame initial;
- struct emacs_value_frame *current;
-} global_storage;
-
-/* Must be called for any storage object before it can be used for
- allocation. */
-static void initialize_storage (struct emacs_value_storage *storage);
-
-/* Must be called for any initialized storage object before its
- lifetime ends. Frees all dynamically-allocated frames. */
-static void finalize_storage (struct emacs_value_storage *storage);
-
-/* Allocates a new value from STORAGE and stores OBJ in it. Returns
- NULL if allocations fails and uses ENV for non local exit reporting. */
-static emacs_value allocate_emacs_value (emacs_env *env, struct
emacs_value_storage *storage,
- Lisp_Object obj);
-
-
-/* Private runtime and environment members */
-
-/* The private part of an environment stores the current non local exit state
- and holds the `emacs_value' objects allocated during the lifetime
- of the environment. */
-struct emacs_env_private {
- enum emacs_funcall_exit pending_non_local_exit;
-
- /* Dedicated storage for non-local exit symbol and data so that we always
- have storage available for them, even in an out-of-memory
- situation. */
- struct emacs_value_tag non_local_exit_symbol, non_local_exit_data;
-
- struct emacs_value_storage storage;
-};
-
-/* Combines public and private parts in one structure. This structure
- is used whenever an environment is created. */
-struct env_storage {
- emacs_env pub;
- struct emacs_env_private priv;
-};
-
-/* Must be called before the environment can be used. */
-static void initialize_environment (struct env_storage *env);
-
-/* Must be called before the lifetime of the environment object
- ends. */
-static void finalize_environment (struct env_storage *env);
-
-/* The private parts of an `emacs_runtime' object contain the initial
- environment. */
-struct emacs_runtime_private {
- struct env_storage environment;
-};
-
-
-/* Convenience macros for non-local exit handling */
-
-/* Emacs uses setjmp(3) and longjmp(3) for non-local exits, but we
- can't allow module frames to be skipped because they are in general
- not prepared for long jumps (e.g. the behavior in C++ is undefined
- if objects with nontrivial destructors would be skipped).
- Therefore we catch all non-local exits. There are two kinds of
- non-local exits: `signal' and `throw'. The macros in this section
- can be used to catch both. We use macros so that we don't have to
- write lots of additional variants of `internal_condition_case'
- etc. and don't have to worry about passing information to the
- handler functions. */
-
-/* Called on `signal'. ERR will be a cons cell (SYMBOL . DATA), which
- gets stored in the environment. Sets the pending non-local exit flag. */
-static void module_handle_signal (emacs_env *env, Lisp_Object err);
-
-/* Called on `throw'. TAG_VAL will be a cons cell (TAG . VALUE),
- which gets stored in the environment. Sets the pending non-local exit
- flag. */
-static void module_handle_throw (emacs_env *env, Lisp_Object tag_val);
-
-/* Must be called after setting up a handler immediately before
- returning from the function. See the comments in lisp.h and the
- code in eval.c for details. The macros below arrange for this
- function to be called automatically. DUMMY is ignored. */
-static void module_reset_handlerlist (const int *dummy);
-
-/* Place this macro at the beginning of a function returning a number
- or a pointer to handle signals. The function must have an ENV
- parameter. The function will return 0 (or NULL) if a signal is
- caught. */
-#define MODULE_HANDLE_SIGNALS MODULE_HANDLE_SIGNALS_RETURN(0)
-
-/* Place this macro at the beginning of a function returning void to
- handle signals. The function must have an ENV parameter. */
-#define MODULE_HANDLE_SIGNALS_VOID MODULE_HANDLE_SIGNALS_RETURN()
-
-#define MODULE_HANDLE_SIGNALS_RETURN(retval)
\
- MODULE_SETJMP(CONDITION_CASE, module_handle_signal, retval)
-
-/* Place this macro at the beginning of a function returning a pointer
- to handle non-local exits via `throw'. The function must have an
- ENV parameter. The function will return NULL if a `throw' is
- caught. */
-#define MODULE_HANDLE_THROW
\
- MODULE_SETJMP(CATCHER_ALL, module_handle_throw, NULL)
-
-#define MODULE_SETJMP(handlertype, handlerfunc, retval)
\
- MODULE_SETJMP_1(handlertype, handlerfunc, retval,
\
- internal_handler_##handlertype,
\
- internal_cleanup_##handlertype)
-
-#define MODULE_SETJMP_1(handlertype, handlerfunc, retval, c, dummy)
\
- eassert (module_non_local_exit_check (env) == emacs_funcall_exit_return);
\
- struct handler *c;
\
- /* It is very important that pushing the handler doesn't itself raise a
\
- signal. */
\
- if (!push_handler_nosignal(&c, Qt, handlertype)) {
\
- module_out_of_memory(env);
\
- return retval;
\
- }
\
- verify(module_has_cleanup);
\
- /* We can install the cleanup only after the handler has been pushed. Use
\
- __attribute__((cleanup)) to avoid non-local-exit-prone manual cleanup. */
\
- const int dummy __attribute__((cleanup(module_reset_handlerlist)));
\
- if (sys_setjmp(c->jmp)) {
\
- (handlerfunc)(env, c->val);
\
- return retval;
\
- }
\
- /* Force the macro to be followed by a semicolon. */
\
- do {
\
- } while (0)
-
-
-/* Function environments */
-
-/* A function environment is an auxiliary structure used by
- `module_make_function' to store information about a module
- function. It is stored in a save pointer and retrieved by
- `module-call'. Its members correspond to the arguments given to
- `module_make_function'. */
-
-struct module_fun_env
-{
- int min_arity, max_arity;
- emacs_subr subr;
- void *data;
-};
-
-/* Returns a string object that contains a user-friendly
- representation of the function environment. */
-static Lisp_Object module_format_fun_env (const struct module_fun_env *env);
-
-/* Holds the function definition of `module-call'. `module-call' is
- uninterned because user code couldn't meaningfully use it, so we
- have to keep its definition around somewhere else. */
-static Lisp_Object module_call_func;
-
-
-/* Implementation of runtime and environment functions */
-
-/* We catch signals and throws only if the code can actually signal or
- throw. */
-
-static emacs_env* module_get_environment (struct emacs_runtime *ert)
-{
- check_main_thread ();
- return &ert->private_members->environment.pub;
-}
-
-/*
- * To make global refs (GC-protected global values) we keep a hash
- * that maps global Lisp objects to reference counts.
- */
-
-static emacs_value module_make_global_ref (emacs_env *env,
- emacs_value ref)
-{
- check_main_thread ();
- eassert (module_non_local_exit_check (env) == emacs_funcall_exit_return);
- MODULE_HANDLE_SIGNALS;
- eassert (HASH_TABLE_P (Vmodule_refs_hash));
- struct Lisp_Hash_Table *h = XHASH_TABLE (Vmodule_refs_hash);
- Lisp_Object new_obj = value_to_lisp (ref);
- EMACS_UINT hashcode;
- ptrdiff_t i = hash_lookup (h, new_obj, &hashcode);
-
- if (i >= 0)
- {
- Lisp_Object value = HASH_VALUE (h, i);
- eassert (NATNUMP (value));
- const EMACS_UINT refcount = XFASTINT (value);
- if (refcount >= MOST_POSITIVE_FIXNUM)
- {
- module_non_local_exit_signal_1 (env, Qoverflow_error, Qnil);
- return NULL;
- }
- XSETFASTINT (value, refcount + 1);
- set_hash_value_slot (h, i, value);
- }
- else
- {
- hash_put (h, new_obj, make_natnum (1), hashcode);
- }
-
- return allocate_emacs_value (env, &global_storage, new_obj);
-}
-
-static void module_free_global_ref (emacs_env *env,
- emacs_value ref)
-{
- check_main_thread ();
- eassert (module_non_local_exit_check (env) == emacs_funcall_exit_return);
- /* TODO: This probably never signals. */
- MODULE_HANDLE_SIGNALS_VOID;
- eassert (HASH_TABLE_P (Vmodule_refs_hash));
- struct Lisp_Hash_Table *h = XHASH_TABLE (Vmodule_refs_hash);
- Lisp_Object obj = value_to_lisp (ref);
- EMACS_UINT hashcode;
- ptrdiff_t i = hash_lookup (h, obj, &hashcode);
-
- if (i >= 0)
- {
- Lisp_Object value = HASH_VALUE (h, i);
- eassert (NATNUMP (value));
- const EMACS_UINT refcount = XFASTINT (value);
- eassert (refcount > 0);
- if (refcount > 1)
- {
- XSETFASTINT (value, refcount - 1);
- set_hash_value_slot (h, i, value);
- }
- else
- {
- hash_remove_from_table (h, value);
- }
- }
-}
-
-static enum emacs_funcall_exit module_non_local_exit_check (emacs_env *env)
-{
- check_main_thread ();
- return env->private_members->pending_non_local_exit;
-}
-
-static void module_non_local_exit_clear (emacs_env *env)
-{
- check_main_thread ();
- env->private_members->pending_non_local_exit = emacs_funcall_exit_return;
-}
-
-static enum emacs_funcall_exit module_non_local_exit_get (emacs_env *env,
emacs_value *sym, emacs_value *data)
-{
- check_main_thread ();
- struct emacs_env_private *const p = env->private_members;
- if (p->pending_non_local_exit != emacs_funcall_exit_return)
- {
- *sym = &p->non_local_exit_symbol;
- *data = &p->non_local_exit_data;
- }
- return p->pending_non_local_exit;
-}
-
-/*
- * Like for `signal', DATA must be a list
- */
-static void module_non_local_exit_signal (emacs_env *env, emacs_value sym,
emacs_value data)
-{
- check_main_thread ();
- eassert (module_non_local_exit_check (env) == emacs_funcall_exit_return);
- module_non_local_exit_signal_1 (env, value_to_lisp (sym), value_to_lisp
(data));
-}
-
-static void module_non_local_exit_throw (emacs_env *env, emacs_value tag,
emacs_value value)
-{
- check_main_thread ();
- eassert (module_non_local_exit_check (env) == emacs_funcall_exit_return);
- module_non_local_exit_throw_1 (env, value_to_lisp (tag), value_to_lisp
(value));
-}
-
-/*
- * A module function is lambda function that calls `module-call',
- * passing the function pointer of the module function along with the
- * module emacs_env pointer as arguments.
- *
- * (function
- * (lambda
- * (&rest arglist)
- * (module-call
- * envobj
- * arglist)))
- *
- */
-static emacs_value module_make_function (emacs_env *env,
- int min_arity,
- int max_arity,
- emacs_subr subr,
- const char *const documentation,
- void *data)
-{
- check_main_thread ();
- eassert (module_non_local_exit_check (env) == emacs_funcall_exit_return);
- MODULE_HANDLE_SIGNALS;
-
- if (min_arity > MOST_POSITIVE_FIXNUM || max_arity > MOST_POSITIVE_FIXNUM)
- xsignal0 (Qoverflow_error);
-
- if (min_arity < 0 ||
- (max_arity >= 0 && max_arity < min_arity) ||
- (max_arity < 0 && max_arity != emacs_variadic_function))
- xsignal2 (Qinvalid_arity, make_number (min_arity), make_number
(max_arity));
-
- Lisp_Object envobj;
-
- /* XXX: This should need to be freed when envobj is GC'd */
- struct module_fun_env *envptr = xzalloc (sizeof (*envptr));
- envptr->min_arity = min_arity;
- envptr->max_arity = max_arity;
- envptr->subr = subr;
- envptr->data = data;
- envobj = make_save_ptr (envptr);
-
- Lisp_Object ret = list4 (Qlambda,
- list2 (Qand_rest, Qargs),
- documentation ? build_string (documentation) : Qnil,
- list3 (module_call_func,
- envobj,
- Qargs));
-
- return lisp_to_value (env, ret);
-}
-
-static emacs_value module_funcall (emacs_env *env,
- emacs_value fun,
- int nargs,
- emacs_value args[])
-{
- check_main_thread ();
- eassert (module_non_local_exit_check (env) == emacs_funcall_exit_return);
- MODULE_HANDLE_SIGNALS;
- MODULE_HANDLE_THROW;
-
- /*
- * Make a new Lisp_Object array starting with the function as the
- * first arg, because that's what Ffuncall takes
- */
- Lisp_Object newargs[nargs + 1];
- newargs[0] = value_to_lisp (fun);
- for (int i = 0; i < nargs; i++)
- newargs[1 + i] = value_to_lisp (args[i]);
- return lisp_to_value (env, Ffuncall (nargs + 1, newargs));
-}
-
-static emacs_value module_intern (emacs_env *env, const char *name)
-{
- check_main_thread ();
- eassert (module_non_local_exit_check (env) == emacs_funcall_exit_return);
- MODULE_HANDLE_SIGNALS;
- return lisp_to_value (env, intern (name));
-}
-
-static emacs_value module_type_of (emacs_env *env, emacs_value value)
-{
- check_main_thread ();
- eassert (module_non_local_exit_check (env) == emacs_funcall_exit_return);
- return lisp_to_value (env, Ftype_of (value_to_lisp (value)));
-}
-
-static bool module_is_not_nil (emacs_env *env, emacs_value value)
-{
- check_main_thread ();
- eassert (module_non_local_exit_check (env) == emacs_funcall_exit_return);
- return ! NILP (value_to_lisp (value));
-}
-
-static bool module_eq (emacs_env *env, emacs_value a, emacs_value b)
-{
- check_main_thread ();
- eassert (module_non_local_exit_check (env) == emacs_funcall_exit_return);
- return EQ (value_to_lisp (a), value_to_lisp (b));
-}
-
-static int64_t module_extract_integer (emacs_env *env, emacs_value n)
-{
- verify (INT64_MIN <= MOST_NEGATIVE_FIXNUM);
- verify (INT64_MAX >= MOST_POSITIVE_FIXNUM);
- check_main_thread ();
- eassert (module_non_local_exit_check (env) == emacs_funcall_exit_return);
- const Lisp_Object l = value_to_lisp (n);
- if (! INTEGERP (l))
- {
- module_wrong_type (env, Qintegerp, l);
- return 0;
- }
- return XINT (l);
-}
-
-static emacs_value module_make_integer (emacs_env *env, int64_t n)
-{
- check_main_thread ();
- eassert (module_non_local_exit_check (env) == emacs_funcall_exit_return);
- if (n < MOST_NEGATIVE_FIXNUM)
- {
- module_non_local_exit_signal_1 (env, Qunderflow_error, Qnil);
- return NULL;
- }
- if (n > MOST_POSITIVE_FIXNUM)
- {
- module_non_local_exit_signal_1 (env, Qoverflow_error, Qnil);
- return NULL;
- }
- return lisp_to_value (env, make_number (n));
-}
-
-static double module_extract_float (emacs_env *env, emacs_value f)
-{
- check_main_thread ();
- eassert (module_non_local_exit_check (env) == emacs_funcall_exit_return);
- const Lisp_Object lisp = value_to_lisp (f);
- if (! FLOATP (lisp))
- {
- module_wrong_type (env, Qfloatp, lisp);
- return 0;
- }
- return XFLOAT_DATA (lisp);
-}
-
-static emacs_value module_make_float (emacs_env *env, double d)
-{
- check_main_thread ();
- eassert (module_non_local_exit_check (env) == emacs_funcall_exit_return);
- MODULE_HANDLE_SIGNALS;
- return lisp_to_value (env, make_float (d));
-}
-
-static bool module_copy_string_contents (emacs_env *env,
- emacs_value value,
- char *buffer,
- size_t* length)
-{
- check_main_thread ();
- eassert (module_non_local_exit_check (env) == emacs_funcall_exit_return);
- MODULE_HANDLE_SIGNALS;
- Lisp_Object lisp_str = value_to_lisp (value);
- if (! STRINGP (lisp_str))
- {
- module_wrong_type (env, Qstringp, lisp_str);
- return false;
- }
-
- size_t raw_size = SBYTES (lisp_str);
-
- /*
- * Emacs internal encoding is more-or-less UTF8, let's assume utf8
- * encoded emacs string are the same byte size.
- */
-
- if (!buffer || length == 0 || *length-1 < raw_size)
- {
- *length = raw_size + 1;
- return false;
- }
-
- Lisp_Object lisp_str_utf8 = ENCODE_UTF_8 (lisp_str);
- eassert (raw_size == SBYTES (lisp_str_utf8));
- *length = raw_size + 1;
- memcpy (buffer, SDATA (lisp_str_utf8), SBYTES (lisp_str_utf8));
- buffer[raw_size] = 0;
-
- return true;
-}
-
-static emacs_value module_make_string (emacs_env *env, const char *str, size_t
length)
-{
- check_main_thread ();
- eassert (module_non_local_exit_check (env) == emacs_funcall_exit_return);
- MODULE_HANDLE_SIGNALS;
- if (length > PTRDIFF_MAX)
- {
- module_non_local_exit_signal_1 (env, Qoverflow_error, Qnil);
- return NULL;
- }
- /* Assume STR is utf8 encoded */
- return lisp_to_value (env, make_string (str, length));
-}
-
-static emacs_value module_make_user_ptr (emacs_env *env,
- emacs_finalizer_function fin,
- void *ptr)
-{
- check_main_thread ();
- return lisp_to_value (env, make_user_ptr (fin, ptr));
-}
-
-static void* module_get_user_ptr (emacs_env *env, emacs_value uptr)
-{
- check_main_thread ();
- eassert (module_non_local_exit_check (env) == emacs_funcall_exit_return);
- const Lisp_Object lisp = value_to_lisp (uptr);
- if (! USER_PTRP (lisp))
- {
- module_wrong_type (env, Quser_ptr, lisp);
- return NULL;
- }
- return XUSER_PTR (lisp)->p;
-}
-
-static void module_set_user_ptr (emacs_env *env, emacs_value uptr, void *ptr)
-{
- check_main_thread ();
- eassert (module_non_local_exit_check (env) == emacs_funcall_exit_return);
- const Lisp_Object lisp = value_to_lisp (uptr);
- if (! USER_PTRP (lisp)) module_wrong_type (env, Quser_ptr, lisp);
- XUSER_PTR (lisp)->p = ptr;
-}
-
-static emacs_finalizer_function module_get_user_finalizer (emacs_env *env,
emacs_value uptr)
-{
- check_main_thread ();
- eassert (module_non_local_exit_check (env) == emacs_funcall_exit_return);
- const Lisp_Object lisp = value_to_lisp (uptr);
- if (! USER_PTRP (lisp))
- {
- module_wrong_type (env, Quser_ptr, lisp);
- return NULL;
- }
- return XUSER_PTR (lisp)->finalizer;
-}
-
-static void module_set_user_finalizer (emacs_env *env,
- emacs_value uptr,
- emacs_finalizer_function fin)
-{
- check_main_thread ();
- eassert (module_non_local_exit_check (env) == emacs_funcall_exit_return);
- const Lisp_Object lisp = value_to_lisp (uptr);
- if (! USER_PTRP (lisp)) module_wrong_type (env, Quser_ptr, lisp);
- XUSER_PTR (lisp)->finalizer = fin;
-}
-
-static void module_vec_set (emacs_env *env,
- emacs_value vec,
- size_t i,
- emacs_value val)
-{
- check_main_thread ();
- eassert (module_non_local_exit_check (env) == emacs_funcall_exit_return);
- if (i > MOST_POSITIVE_FIXNUM)
- {
- module_non_local_exit_signal_1 (env, Qoverflow_error, Qnil);
- return;
- }
- Lisp_Object lvec = value_to_lisp (vec);
- if (! VECTORP (lvec))
- {
- module_wrong_type (env, Qvectorp, lvec);
- return;
- }
- if (i >= ASIZE (lvec))
- {
- module_args_out_of_range (env, lvec, make_number (i));
- return;
- }
- ASET (lvec, i, value_to_lisp (val));
-}
-
-static emacs_value module_vec_get (emacs_env *env,
- emacs_value vec,
- size_t i)
-{
- /* Type of ASIZE (lvec) is ptrdiff_t, make sure it fits */
- verify (PTRDIFF_MAX <= SIZE_MAX);
- check_main_thread ();
- eassert (module_non_local_exit_check (env) == emacs_funcall_exit_return);
- if (i > MOST_POSITIVE_FIXNUM)
- {
- module_non_local_exit_signal_1 (env, Qoverflow_error, Qnil);
- return NULL;
- }
- Lisp_Object lvec = value_to_lisp (vec);
- if (! VECTORP (lvec))
- {
- module_wrong_type (env, Qvectorp, lvec);
- return NULL;
- }
- /* Prevent error-prone comparison between types of different signedness. */
- const size_t size = ASIZE (lvec);
- eassert (size >= 0);
- if (i >= size)
- {
- if (i > MOST_POSITIVE_FIXNUM)
- i = (size_t) MOST_POSITIVE_FIXNUM;
- module_args_out_of_range (env, lvec, make_number (i));
- return NULL;
- }
- return lisp_to_value (env, AREF (lvec, i));
-}
-
-static size_t module_vec_size (emacs_env *env,
- emacs_value vec)
-{
- /* Type of ASIZE (lvec) is ptrdiff_t, make sure it fits */
- verify (PTRDIFF_MAX <= SIZE_MAX);
- check_main_thread ();
- eassert (module_non_local_exit_check (env) == emacs_funcall_exit_return);
- Lisp_Object lvec = value_to_lisp (vec);
- if (! VECTORP (lvec))
- {
- module_wrong_type (env, Qvectorp, lvec);
- return 0;
- }
- eassert (ASIZE (lvec) >= 0);
- return ASIZE (lvec);
-}
-
-
-/* Subroutines */
-
-DEFUN ("module-load", Fmodule_load, Smodule_load, 1, 1, 0,
- doc: /* Load module FILE. */)
- (Lisp_Object file)
-{
- dynlib_handle_ptr handle;
- emacs_init_function module_init;
- void *gpl_sym;
-
- CHECK_STRING (file);
- handle = dynlib_open (SDATA (file));
- if (!handle)
- error ("Cannot load file %s: %s", SDATA (file), dynlib_error ());
-
- gpl_sym = dynlib_sym (handle, "plugin_is_GPL_compatible");
- if (!gpl_sym)
- error ("Module %s is not GPL compatible", SDATA (file));
-
- module_init = (emacs_init_function) dynlib_sym (handle, "emacs_module_init");
- if (!module_init)
- error ("Module %s does not have an init function.", SDATA (file));
-
- struct {
- struct emacs_runtime pub;
- struct emacs_runtime_private priv;
- } runtime = {
- .pub = {
- .size = sizeof runtime.pub,
- .get_environment = module_get_environment,
- .private_members = &runtime.priv
- }
- };
- initialize_environment (&runtime.priv.environment);
- int r = module_init (&runtime.pub);
- finalize_environment (&runtime.priv.environment);
-
- if (r != 0)
- {
- if (r < MOST_NEGATIVE_FIXNUM)
- xsignal0 (Qunderflow_error);
- if (r > MOST_POSITIVE_FIXNUM)
- xsignal0 (Qoverflow_error);
- xsignal2 (Qmodule_load_failed, file, make_number (r));
- }
-
- return Qt;
-}
-
-DEFUN ("module-call", Fmodule_call, Smodule_call, 2, 2, 0,
- doc: /* Internal function to call a module function.
-ENVOBJ is a save pointer to a module_fun_env structure.
-ARGLIST is a list of arguments passed to SUBRPTR. */)
- (Lisp_Object envobj, Lisp_Object arglist)
-{
- const struct module_fun_env *const envptr =
- (const struct module_fun_env *) XSAVE_POINTER (envobj, 0);
- const EMACS_INT len = XINT (Flength (arglist));
- eassert (len >= 0);
- if (len > MOST_POSITIVE_FIXNUM)
- xsignal0 (Qoverflow_error);
- if (len > INT_MAX || len < envptr->min_arity || (envptr->max_arity >= 0 &&
len > envptr->max_arity))
- xsignal2 (Qwrong_number_of_arguments, module_format_fun_env (envptr),
make_number (len));
-
- struct env_storage env;
- initialize_environment (&env);
-
- emacs_value *args = xzalloc (len * sizeof (*args));
- int i;
-
- for (i = 0; i < len; i++)
- {
- args[i] = lisp_to_value (&env.pub, XCAR (arglist));
- if (! args[i]) memory_full (sizeof *args[i]);
- arglist = XCDR (arglist);
- }
-
- emacs_value ret = envptr->subr (&env.pub, len, args, envptr->data);
- xfree (args);
-
- switch (env.priv.pending_non_local_exit)
- {
- case emacs_funcall_exit_return:
- finalize_environment (&env);
- if (ret == NULL) xsignal1 (Qinvalid_module_call, module_format_fun_env
(envptr));
- return value_to_lisp (ret);
- case emacs_funcall_exit_signal:
- {
- const Lisp_Object symbol = value_to_lisp
(&env.priv.non_local_exit_symbol);
- const Lisp_Object data = value_to_lisp (&env.priv.non_local_exit_data);
- finalize_environment (&env);
- xsignal (symbol, data);
- }
- case emacs_funcall_exit_throw:
- {
- const Lisp_Object tag = value_to_lisp
(&env.priv.non_local_exit_symbol);
- const Lisp_Object value = value_to_lisp
(&env.priv.non_local_exit_data);
- finalize_environment (&env);
- Fthrow (tag, value);
- }
- }
-}
-
-
-/* Helper functions */
-
-static void check_main_thread (void)
-{
-#if defined(HAVE_THREADS_H)
- eassert (thrd_equal (thdr_current (), main_thread);
-#elif defined(HAVE_PTHREAD)
- eassert (pthread_equal (pthread_self (), main_thread));
-#elif defined(WINDOWSNT)
- /* CompareObjectHandles would be perfect, but is only available in
- Windows 10. Also check whether the thread is still running to
- protect against thread identifier reuse. */
- eassert (GetCurrentThreadId () == main_thread_id
- && WaitForSingleObject (main_thread, 0) == WAIT_TIMEOUT);
-#endif
-}
-
-static void module_non_local_exit_signal_1 (emacs_env *env, Lisp_Object sym,
Lisp_Object data)
-{
- struct emacs_env_private *const p = env->private_members;
- eassert (p->pending_non_local_exit == emacs_funcall_exit_return);
- p->pending_non_local_exit = emacs_funcall_exit_signal;
- p->non_local_exit_symbol.v = sym;
- p->non_local_exit_data.v = data;
-}
-
-static void module_non_local_exit_throw_1 (emacs_env *env, Lisp_Object tag,
Lisp_Object value)
-{
- struct emacs_env_private *const p = env->private_members;
- eassert (p->pending_non_local_exit == emacs_funcall_exit_return);
- p->pending_non_local_exit = emacs_funcall_exit_throw;
- p->non_local_exit_symbol.v = tag;
- p->non_local_exit_data.v = value;
-}
-
-static void module_wrong_type (emacs_env *env, Lisp_Object predicate,
Lisp_Object value)
-{
- module_non_local_exit_signal_1 (env, Qwrong_type_argument, list2 (predicate,
value));
-}
-
-static void module_out_of_memory (emacs_env *env)
-{
- // TODO: Reimplement this so it works even if memory-signal-data has been
modified.
- module_non_local_exit_signal_1 (env, XCAR (Vmemory_signal_data), XCDR
(Vmemory_signal_data));
-}
-
-static void module_args_out_of_range (emacs_env *env, Lisp_Object a1,
Lisp_Object a2)
-{
- module_non_local_exit_signal_1 (env, Qargs_out_of_range, list2 (a1, a2));
-}
-
-
-/* Value conversion */
-
-static Lisp_Object value_to_lisp (emacs_value v)
-{
- return v->v;
-}
-
-static emacs_value lisp_to_value (emacs_env *env, Lisp_Object o)
-{
- struct emacs_env_private *const p = env->private_members;
- if (p->pending_non_local_exit != emacs_funcall_exit_return) return NULL;
- return allocate_emacs_value (env, &p->storage, o);
-}
-
-
-/* Memory management */
-
-static void initialize_frame (struct emacs_value_frame *frame)
-{
- frame->offset = 0;
- frame->next = NULL;
-}
-
-static void initialize_storage (struct emacs_value_storage *storage)
-{
- initialize_frame (&storage->initial);
- storage->current = &storage->initial;
-}
-
-static void finalize_storage (struct emacs_value_storage *storage)
-{
- struct emacs_value_frame *next = storage->initial.next;
- while (next != NULL)
- {
- struct emacs_value_frame *const current = next;
- next = current->next;
- free (current);
- }
-}
-
-static emacs_value allocate_emacs_value (emacs_env *env, struct
emacs_value_storage *storage,
- Lisp_Object obj)
-{
- eassert (storage->current);
- eassert (storage->current->offset < value_frame_size);
- eassert (! storage->current->next);
- if (storage->current->offset == value_frame_size - 1)
- {
- storage->current->next = malloc (sizeof *storage->current->next);
- if (! storage->current->next)
- {
- module_out_of_memory (env);
- return NULL;
- }
- initialize_frame (storage->current->next);
- storage->current = storage->current->next;
- }
- const emacs_value value = storage->current->objects +
storage->current->offset;
- value->v = obj;
- ++storage->current->offset;
- return value;
-}
-
-/* Mark all objects allocated from local environments so that they
- don't get garbage-collected. */
-void mark_modules (void)
-{
- for (Lisp_Object tem = Vmodule_environments; CONSP (tem); tem = XCDR (tem))
- {
- const struct env_storage *const env = XSAVE_POINTER (tem, 0);
- for (const struct emacs_value_frame *frame = &env->priv.storage.initial;
frame != NULL; frame = frame->next)
- for (size_t i = 0; i < frame->offset; ++i)
- mark_object (frame->objects[i].v);
- }
-}
-
-
-/* Environment lifetime management */
-
-static void initialize_environment (struct env_storage *env)
-{
- env->priv.pending_non_local_exit = emacs_funcall_exit_return;
- initialize_storage (&env->priv.storage);
- env->pub.size = sizeof env->pub;
- env->pub.private_members = &env->priv;
- env->pub.make_global_ref = module_make_global_ref;
- env->pub.free_global_ref = module_free_global_ref;
- env->pub.non_local_exit_check = module_non_local_exit_check;
- env->pub.non_local_exit_clear = module_non_local_exit_clear;
- env->pub.non_local_exit_get = module_non_local_exit_get;
- env->pub.non_local_exit_signal = module_non_local_exit_signal;
- env->pub.non_local_exit_throw = module_non_local_exit_throw;
- env->pub.make_function = module_make_function;
- env->pub.funcall = module_funcall;
- env->pub.intern = module_intern;
- env->pub.type_of = module_type_of;
- env->pub.is_not_nil = module_is_not_nil;
- env->pub.eq = module_eq;
- env->pub.extract_integer = module_extract_integer;
- env->pub.make_integer = module_make_integer;
- env->pub.extract_float = module_extract_float;
- env->pub.make_float = module_make_float;
- env->pub.copy_string_contents = module_copy_string_contents;
- env->pub.make_string = module_make_string;
- env->pub.make_user_ptr = module_make_user_ptr;
- env->pub.get_user_ptr = module_get_user_ptr;
- env->pub.set_user_ptr = module_set_user_ptr;
- env->pub.get_user_finalizer = module_get_user_finalizer;
- env->pub.set_user_finalizer = module_set_user_finalizer;
- env->pub.vec_set = module_vec_set;
- env->pub.vec_get = module_vec_get;
- env->pub.vec_size = module_vec_size;
- Vmodule_environments = Fcons (make_save_ptr (env), Vmodule_environments);
-}
-
-static void finalize_environment (struct env_storage *env)
-{
- finalize_storage (&env->priv.storage);
- Vmodule_environments = XCDR (Vmodule_environments);
-}
-
-
-/* Non-local exit handling */
-
-static void module_reset_handlerlist(const int *dummy)
-{
- handlerlist = handlerlist->next;
-}
-
-static void module_handle_signal (emacs_env *const env, const Lisp_Object err)
-{
- module_non_local_exit_signal_1 (env, XCAR (err), XCDR (err));
-}
-
-static void module_handle_throw (emacs_env *const env, const Lisp_Object
tag_val)
-{
- module_non_local_exit_throw_1 (env, XCAR (tag_val), XCDR (tag_val));
-}
-
-
-/* Function environments */
-
-static Lisp_Object module_format_fun_env (const struct module_fun_env *const
env)
-{
- /* Try to print a function name if possible. */
- const char *path, *sym;
- if (dynlib_addr (env->subr, &path, &sym))
- {
- const char *const format = "#<module function %s from %s>";
- const int size = snprintf (NULL, 0, format, sym, path);
- eassert (size > 0);
- char buffer[size + 1];
- snprintf (buffer, sizeof buffer, format, sym, path);
- return make_unibyte_string (buffer, size);
- }
- else
- {
- const char *const format = "#<module function at %p>";
- const void *const subr = env->subr;
- const int size = snprintf (NULL, 0, format, subr);
- eassert (size > 0);
- char buffer[size + 1];
- snprintf (buffer, sizeof buffer, format, subr);
- return make_unibyte_string (buffer, size);
- }
-}
-
-
-/* Segment initializer */
-
-void syms_of_module (void)
-{
- DEFSYM (Qmodule_refs_hash, "module-refs-hash");
- DEFVAR_LISP ("module-refs-hash", Vmodule_refs_hash,
- doc: /* Module global referrence table. */);
-
- Vmodule_refs_hash = make_hash_table (hashtest_eq, make_number
(DEFAULT_HASH_SIZE),
- make_float (DEFAULT_REHASH_SIZE),
- make_float (DEFAULT_REHASH_THRESHOLD),
- Qnil);
- Funintern (Qmodule_refs_hash, Qnil);
-
- DEFSYM (Qmodule_environments, "module-environments");
- DEFVAR_LISP ("module-environments", Vmodule_environments,
- doc: /* List of active module environments. */);
- Vmodule_environments = Qnil;
- /* Unintern `module-environments' because it is only used
- internally. */
- Funintern (Qmodule_environments, Qnil);
-
- DEFSYM (Qmodule_load_failed, "module-load-failed");
- Fput (Qmodule_load_failed, Qerror_conditions,
- listn (CONSTYPE_PURE, 2, Qmodule_load_failed, Qerror));
- Fput (Qmodule_load_failed, Qerror_message,
- build_pure_c_string ("Module load failed"));
-
- DEFSYM (Qinvalid_module_call, "invalid-module-call");
- Fput (Qinvalid_module_call, Qerror_conditions,
- listn (CONSTYPE_PURE, 2, Qinvalid_module_call, Qerror));
- Fput (Qinvalid_module_call, Qerror_message,
- build_pure_c_string ("Invalid module call"));
-
- DEFSYM (Qinvalid_arity, "invalid-arity");
- Fput (Qinvalid_arity, Qerror_conditions,
- listn (CONSTYPE_PURE, 2, Qinvalid_arity, Qerror));
- Fput (Qinvalid_arity, Qerror_message,
- build_pure_c_string ("Invalid function arity"));
-
- initialize_storage (&global_storage);
-
- /* Unintern `module-refs-hash' because it is internal-only and Lisp
- code or modules should not access it. */
- Funintern (Qmodule_refs_hash, Qnil);
-
- defsubr (&Smodule_load);
-
- /* Don't call defsubr on `module-call' because that would intern it,
- but `module-call' is an internal function that users cannot
- meaningfully use. Instead, assign its definition to a private
- variable. */
- XSETPVECTYPE (&Smodule_call, PVEC_SUBR);
- XSETSUBR (module_call_func, &Smodule_call);
-}
-
-/* Unlike syms_of_module, this initializer is called even from an
- * initialized (dumped) Emacs. */
-
-void module_init (void)
-{
- /* It is not guaranteed that dynamic initializers run in the main thread,
- therefore we detect the main thread here. */
-#if defined(HAVE_THREADS_H)
- main_thread = thrd_current ();
-#elif defined(HAVE_PTHREAD)
- main_thread = pthread_self ();
-#elif defined(WINDOWSNT)
- /* This calls APIs that are only available on Vista and later. */
-#if 0
- /* GetCurrentProcess returns a pseudohandle, which we have to duplicate. */
- if (! DuplicateHandle (GetCurrentProcess(), GetCurrentThread(),
- GetCurrentProcess(), &main_thread,
- SYNCHRONIZE | THREAD_QUERY_INFORMATION,
- FALSE, 0))
- emacs_abort ();
-#else
- /* GetCurrentThread returns a pseudohandle, which we have to duplicate. */
- HANDLE th = GetCurrentThread ();
- if (!DuplicateHandle (GetCurrentProcess (), th,
- GetCurrentProcess (), &main_thread, 0, FALSE,
- DUPLICATE_SAME_ACCESS))
- emacs_abort ();
- main_thread_id = GetCurrentThreadId ();
-#endif
-#endif
-}
diff --git a/src/module.h b/src/module.h
deleted file mode 100644
index 9f43c89..0000000
--- a/src/module.h
+++ /dev/null
@@ -1,229 +0,0 @@
-/* module.h - GNU Emacs module API.
-
-Copyright (C) 2015 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 <http://www.gnu.org/licenses/>. */
-
-#ifndef EMACS_MODULE_H
-#define EMACS_MODULE_H
-
-#include <stdint.h>
-#include <stdlib.h>
-#include <stdbool.h>
-
-#ifdef __cplusplus
-#define EMACS_EXTERN_C_BEGIN extern "C" {
-#define EMACS_EXTERN_C_END }
-#else
-#define EMACS_EXTERN_C_BEGIN
-#define EMACS_EXTERN_C_END
-#endif
-
-#if defined(__cplusplus) && __cplusplus >= 201103L
-#define EMACS_NOEXCEPT noexcept
-#else
-#define EMACS_NOEXCEPT
-#endif
-
-EMACS_EXTERN_C_BEGIN
-
-/* Current environement */
-typedef struct emacs_env_25 emacs_env;
-
-/* Opaque structure pointer representing an Emacs Lisp value */
-typedef struct emacs_value_tag* emacs_value;
-
-enum emacs_arity {
- emacs_variadic_function = -2
-};
-
-/* Struct passed to a module init function (emacs_module_init) */
-struct emacs_runtime {
- /* Structure size (for version checking) */
- size_t size;
-
- /* Private data; users should not touch this */
- struct emacs_runtime_private *private_members;
-
- /* Returns an environment pointer. */
- emacs_env* (*get_environment)(struct emacs_runtime *ert);
-};
-
-
-/* Function prototype for the module init function */
-typedef int (*emacs_init_function)(struct emacs_runtime *ert);
-
-/* Function prototype for the module Lisp functions */
-typedef emacs_value (*emacs_subr)(emacs_env *env,
- int nargs,
- emacs_value args[],
- void *data);
-
-/* Function prototype for module user-pointer finalizers */
-typedef void (*emacs_finalizer_function)(void*);
-
-/* Possible Emacs function call outcomes. */
-enum emacs_funcall_exit {
- /* Function has returned normally. */
- emacs_funcall_exit_return = 0,
- /* Function has signaled an error using `signal'. */
- emacs_funcall_exit_signal = 1,
- /* Function has exit using `throw'. */
- emacs_funcall_exit_throw = 2,
-};
-
-struct emacs_env_25 {
- /*
- * Structure size (for version checking)
- */
-
- size_t size;
-
- /* Private data; users should not touch this */
- struct emacs_env_private *private_members;
-
- /*
- * Memory management
- */
-
-
- emacs_value (*make_global_ref)(emacs_env *env,
- emacs_value any_reference);
-
- void (*free_global_ref)(emacs_env *env,
- emacs_value global_reference);
-
- /*
- * Non-local exit handling
- */
-
- enum emacs_funcall_exit (*non_local_exit_check)(emacs_env *env);
-
- void (*non_local_exit_clear)(emacs_env *env);
-
- enum emacs_funcall_exit (*non_local_exit_get)(emacs_env *env,
- emacs_value *non_local_exit_symbol_out,
- emacs_value *non_local_exit_data_out);
-
- void (*non_local_exit_signal)(emacs_env *env,
- emacs_value non_local_exit_symbol,
- emacs_value non_local_exit_data);
-
- void (*non_local_exit_throw)(emacs_env *env,
- emacs_value tag,
- emacs_value value);
-
- /*
- * Function registration
- */
-
- emacs_value (*make_function)(emacs_env *env,
- int min_arity,
- int max_arity,
- emacs_value (*function)(emacs_env*, int,
emacs_value*, void*) EMACS_NOEXCEPT,
- const char *documentation,
- void *data);
-
- emacs_value (*funcall)(emacs_env *env,
- emacs_value function,
- int nargs,
- emacs_value args[]);
-
- emacs_value (*intern)(emacs_env *env,
- const char *symbol_name);
-
- /*
- * Type conversion
- */
-
- emacs_value (*type_of)(emacs_env *env,
- emacs_value value);
-
- bool (*is_not_nil)(emacs_env *env, emacs_value value);
-
- bool (*eq)(emacs_env *env, emacs_value a, emacs_value b);
-
- int64_t (*extract_integer)(emacs_env *env,
- emacs_value value);
-
- emacs_value (*make_integer)(emacs_env *env,
- int64_t value);
-
- double (*extract_float)(emacs_env *env,
- emacs_value value);
-
- emacs_value (*make_float)(emacs_env *env,
- double value);
-
- /*
- * Copy the content of the lisp string VALUE to BUFFER as an utf8
- * null-terminated string.
- *
- * SIZE must point to the total size of the buffer. If BUFFER is
- * NULL or if SIZE is not big enough, write the required buffer size
- * to SIZE and return false.
- *
- * Note that SIZE must include the last null byte (e.g. "abc" needs
- * a buffer of size 4).
- *
- * Returns true if the string was successfully copied.
- */
-
- bool (*copy_string_contents)(emacs_env *env,
- emacs_value value,
- char *buffer,
- size_t *size_inout);
-
- /*
- * Create a lisp string from a utf8 encoded string.
- */
- emacs_value (*make_string)(emacs_env *env,
- const char *contents, size_t length);
-
- /*
- * Embedded pointer type
- */
- emacs_value (*make_user_ptr)(emacs_env *env,
- void (*fin)(void *) EMACS_NOEXCEPT,
- void *ptr);
-
- void* (*get_user_ptr)(emacs_env *env, emacs_value uptr);
- void (*set_user_ptr)(emacs_env *env, emacs_value uptr, void *ptr);
-
- void (*(*get_user_finalizer)(emacs_env *env, emacs_value uptr))(void *)
EMACS_NOEXCEPT;
- void (*set_user_finalizer)(emacs_env *env,
- emacs_value uptr,
- void (*fin)(void *) EMACS_NOEXCEPT);
-
- /*
- * Vector functions
- */
- emacs_value (*vec_get) (emacs_env *env,
- emacs_value vec,
- size_t i);
-
- void (*vec_set) (emacs_env *env,
- emacs_value vec,
- size_t i,
- emacs_value val);
-
- size_t (*vec_size) (emacs_env *env,
- emacs_value vec);
-};
-
-EMACS_EXTERN_C_END
-
-#endif /* EMACS_MODULE_H */
diff --git a/src/w32.c b/src/w32.c
index 15cfd92..9601012 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -9379,6 +9379,11 @@ globals_of_w32 (void)
w32_unicode_filenames = 0;
else
w32_unicode_filenames = 1;
+
+#ifdef HAVE_MODULES
+ extern void dynlib_reset_last_error (void);
+ dynlib_reset_last_error ();
+#endif
}
/* For make-serial-process */
diff --git a/test/automated/simple-test.el b/test/automated/simple-test.el
index 07b5eaa..7e0dbb7 100644
--- a/test/automated/simple-test.el
+++ b/test/automated/simple-test.el
@@ -138,6 +138,21 @@
(open-line 1)))
'("- - " . "\n(a b c d)"))))
+;; For a while, from 24 Oct - 19 Nov 2015, `open-line' in the Emacs
+;; development tree became sensitive to `electric-indent-mode', which
+;; it had not been before. This sensitivity was reverted for the
+;; Emacs 25 release, so it could be discussed further (see thread
+;; "Questioning the new behavior of `open-line'." on the Emacs Devel
+;; mailing list). The only test case here that started failing after
+;; the reversion is the third one, the one that currently expects
+;; `("(a b" . "\n \n c d)")'. If `open-line' were again sensitive
+;; to electric indent, then the three spaces between the two newlines
+;; would go away, leaving `("(a b" . "\n\n c d)")'.
+;;
+;; If electric indent sensitivity were re-enabled, we might also want
+;; to make the test cases below a bit stricter, or add some more test
+;; cases that are specific to `electric-indent-mode', since right now
+;; all but one of the cases pass with or without electric indent.
(ert-deftest open-line-indent ()
(should (equal (simple-test--dummy-buffer
(electric-indent-local-mode 1)
@@ -152,7 +167,7 @@
(let ((current-prefix-arg nil))
(call-interactively #'open-line)
(call-interactively #'open-line)))
- '("(a b" . "\n\n c d)")))
+ '("(a b" . "\n \n c d)")))
(should (equal (simple-test--dummy-buffer
(electric-indent-local-mode 1)
(open-line 5 'interactive))
- [Emacs-diffs] branch coverity created (now c1e1aaa), John Wiegley, 2015/12/14
- [Emacs-diffs] coverity 976c775 1/9: .travis.yml: Initial integration hook for TravisCI, John Wiegley, 2015/12/14
- [Emacs-diffs] coverity 3abe629 2/9: .travis.yml: Initial integration hook for TravisCI, John Wiegley, 2015/12/14
- [Emacs-diffs] coverity 50f7079 7/9: Merge remote-tracking branch 'remotes/hub/pr/1/head' into coverity, John Wiegley, 2015/12/14
- [Emacs-diffs] coverity ae8078f 6/9: .travis.yml: Add coverity block, John Wiegley, 2015/12/14
- [Emacs-diffs] coverity c1e1aaa 9/9: Update the branch_pattern in .travis.yml, John Wiegley, 2015/12/14
- [Emacs-diffs] coverity 4a157e8 4/9: Merge remote-tracking branch 'origin/emacs-25' into coverity, John Wiegley, 2015/12/14
- [Emacs-diffs] coverity 0cb1759 5/9: Merge remote-tracking branch 'origin/emacs-25' into coverity,
John Wiegley <=
- [Emacs-diffs] coverity 5a9164b 3/9: Merge remote-tracking branch 'origin/emacs-25' into coverity, John Wiegley, 2015/12/14
- [Emacs-diffs] coverity 54617ad 8/9: Merge remote-tracking branch 'origin/emacs-25' into coverity, John Wiegley, 2015/12/14