diff options
| author | Nickolas Lloyd | 2016-12-22 20:05:16 -0500 |
|---|---|---|
| committer | Nickolas Lloyd | 2016-12-22 20:05:16 -0500 |
| commit | ca2e32dcc4ed8bba25a700cd7c8fa8aba6c94ae5 (patch) | |
| tree | bfb09bc34f6de7c34a930d9bbeaddb6f82048cc5 /src/eval.c | |
| parent | 52a3e81487641cd81cef777540fa5791fdd93ddb (diff) | |
| download | emacs-ca2e32dcc4ed8bba25a700cd7c8fa8aba6c94ae5.tar.gz emacs-ca2e32dcc4ed8bba25a700cd7c8fa8aba6c94ae5.zip | |
; Minor reorg of bytecode interpreter/JIT compiler
; * src/bytecode.c (exec_byte_code, exec_byte_code__): Use exec_byte_code as
the single entrypoint for both the interpreter and JIT compiler.
; * src/bytecode-jit.c (jit_byte_code): Remove jit_byte_code to be replaced
by exec_byte_code.
; * src/bytecode.h: Add function prototypes.
; * src/eval.c (funcall_lambda): Use exec_byte_code instead of jit_byte_code.
; * src/lisp.h: Update function prototypes.
Diffstat (limited to 'src/eval.c')
| -rw-r--r-- | src/eval.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/eval.c b/src/eval.c index 7d32daf0e4e..f2e6ba85214 100644 --- a/src/eval.c +++ b/src/eval.c | |||
| @@ -2954,8 +2954,8 @@ funcall_lambda (Lisp_Object fun, ptrdiff_t nargs, | |||
| 2954 | and constants vector yet, fetch them from the file. */ | 2954 | and constants vector yet, fetch them from the file. */ |
| 2955 | if (CONSP (AREF (fun, COMPILED_BYTECODE))) | 2955 | if (CONSP (AREF (fun, COMPILED_BYTECODE))) |
| 2956 | Ffetch_bytecode (fun); | 2956 | Ffetch_bytecode (fun); |
| 2957 | return jit_byte_code (fun, syms_left, | 2957 | return exec_byte_code (fun, syms_left, |
| 2958 | nargs, arg_vector); | 2958 | nargs, arg_vector); |
| 2959 | } | 2959 | } |
| 2960 | lexenv = Qnil; | 2960 | lexenv = Qnil; |
| 2961 | } | 2961 | } |
| @@ -3029,7 +3029,7 @@ funcall_lambda (Lisp_Object fun, ptrdiff_t nargs, | |||
| 3029 | and constants vector yet, fetch them from the file. */ | 3029 | and constants vector yet, fetch them from the file. */ |
| 3030 | if (CONSP (AREF (fun, COMPILED_BYTECODE))) | 3030 | if (CONSP (AREF (fun, COMPILED_BYTECODE))) |
| 3031 | Ffetch_bytecode (fun); | 3031 | Ffetch_bytecode (fun); |
| 3032 | val = jit_byte_code (fun, Qnil, 0, 0); | 3032 | val = exec_byte_code (fun, Qnil, 0, 0); |
| 3033 | } | 3033 | } |
| 3034 | 3034 | ||
| 3035 | return unbind_to (count, val); | 3035 | return unbind_to (count, val); |