mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-26 07:33:47 +00:00
Code Issues Releases Activity

better scratch slot support

Browse Source
This commit is contained in:
Andrea Corallo 2019-12-19 10:46:45 +01:00
parent ee4feb005f
commit a647a97320
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lisp/emacs-lisp/comp.el
View File

@ -257,9 +257,8 @@ structure.")
(cl-defstruct (comp-mvar (:constructor make--comp-mvar))
"A meta-variable being a slot in the meta-stack."
(slot nil :type fixnum
:documentation "Slot number.
-1 is a special value and indicates the scratch slot.")
(slot nil :type (or fixnum symbol)
:documentation "Slot number if a number or 'scratch' for scratch slot.")
(id nil :type (or null number)
:documentation "SSA number when in SSA form.")
(const-vld nil :type boolean
@ -732,10 +731,10 @@ Return value is the fall through block name."
else
;; Store the result of the comparison into the scratch slot before
;; emitting the conditional jump.
do (comp-emit (list 'set (make-comp-mvar :slot -1)
do (comp-emit (list 'set (make-comp-mvar :slot 'scratch)
(comp-call test-func var m-test)))
(comp-emit (list 'cond-jump
(make-comp-mvar :slot -1)
(make-comp-mvar :slot 'scratch)
(make-comp-mvar :constant nil)
target-name ff-bb-name))
do (unless last
@ -1180,7 +1179,7 @@ This will be called at load-time."
(defun comp-limplify (lap-funcs)
"Compute the LIMPLE ir for LAP-FUNCS.
Top level forms for the current context are rendered too."
Top-level forms for the current context are rendered too."
(mapc #'comp-add-func-to-ctxt (mapcar #'comp-limplify-function lap-funcs))
(comp-add-func-to-ctxt (comp-limplify-top-level)))
@ -1342,7 +1341,7 @@ Top level forms for the current context are rendered too."
;; Return t if a SLOT-N was assigned within BB.
(cl-loop for insn in (comp-block-insns bb)
when (and (comp-assign-op-p (car insn))
(= slot-n (comp-mvar-slot (cadr insn))))
(eql slot-n (comp-mvar-slot (cadr insn))))
return t)))
(cl-loop for i from 0 below (comp-func-frame-size comp-func)

7
src/comp.c
View File

@ -297,8 +297,9 @@ declare_block (Lisp_Object block_name)
static gcc_jit_lvalue *
get_slot (Lisp_Object mvar)
{
EMACS_INT slot_n = XFIXNUM (CALL1I (comp-mvar-slot, mvar));
if (slot_n == -1)
Lisp_Object mvar_slot = CALL1I (comp-mvar-slot, mvar);
if (EQ (mvar_slot, Qscratch))
{
if (!comp.scratch)
comp.scratch = gcc_jit_function_new_local (comp.func,
@ -307,6 +308,7 @@ get_slot (Lisp_Object mvar)
"scratch");
return comp.scratch;
}
EMACS_INT slot_n = XFIXNUM (mvar_slot);
gcc_jit_lvalue **frame =
(CALL1I (comp-mvar-ref, mvar) || SPEED < 2)
? comp.frame : comp.f_frame;
@ -3366,6 +3368,7 @@ syms_of_comp (void)
/* Others. */
DEFSYM (Qfixnum, "fixnum");
DEFSYM (Qscratch, "scratch");
/* To be signaled by the compiler. */
DEFSYM (Qnative_compiler_error, "native-compiler-error");