aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Kangas2020-11-20 20:34:32 +0100
committerStefan Kangas2020-11-20 20:35:44 +0100
commitcf436db285bd27dae35fecfa9038c9ce48953853 (patch)
treecc601af265b28a0f66d9d3257097a844cb9e68a6
parenta55415af7ea8ddc09dfda32ccb866c6556bb71c1 (diff)
downloademacs-cf436db285bd27dae35fecfa9038c9ce48953853.tar.gz
emacs-cf436db285bd27dae35fecfa9038c9ce48953853.zip
; Fix trivial typos
-rw-r--r--lisp/emacs-lisp/bytecomp.el2
-rw-r--r--lisp/emacs-lisp/comp.el24
-rw-r--r--src/comp.c12
-rw-r--r--src/comp.h2
-rw-r--r--src/pdumper.c2
-rw-r--r--test/src/comp-tests.el4
6 files changed, 23 insertions, 23 deletions
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 5508a60c444..6d2bff103e7 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -602,7 +602,7 @@ Each element is (INDEX . VALUE)")
602 "To spill default qualities from the compiled file.") 602 "To spill default qualities from the compiled file.")
603(defvar byte-native-for-bootstrap nil 603(defvar byte-native-for-bootstrap nil
604 "Non nil while compiling for bootstrap." 604 "Non nil while compiling for bootstrap."
605 ;; During boostrap we produce both the .eln and the .elc together. 605 ;; During bootstrap we produce both the .eln and the .elc together.
606 ;; Because the make target is the later this has to be produced as 606 ;; Because the make target is the later this has to be produced as
607 ;; last to be resilient against build interruptions. 607 ;; last to be resilient against build interruptions.
608) 608)
diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
index cc5922c61c6..633ededebe4 100644
--- a/lisp/emacs-lisp/comp.el
+++ b/lisp/emacs-lisp/comp.el
@@ -118,7 +118,7 @@ compilation input."
118 :type 'hook) 118 :type 'hook)
119 119
120(defcustom comp-async-env-modifier-form nil 120(defcustom comp-async-env-modifier-form nil
121 "Form evaluated before compilation by each asyncronous compilation worker. 121 "Form evaluated before compilation by each asynchronous compilation worker.
122Usable to modify the compiler environment." 122Usable to modify the compiler environment."
123 :type 'list) 123 :type 'list)
124 124
@@ -352,7 +352,7 @@ Needed to replace immediate byte-compiled lambdas with the compiled reference.")
352 :documentation "Standard data relocated in use by functions.") 352 :documentation "Standard data relocated in use by functions.")
353 (d-impure (make-comp-data-container) :type comp-data-container 353 (d-impure (make-comp-data-container) :type comp-data-container
354 :documentation "Relocated data that cannot be moved into pure space. 354 :documentation "Relocated data that cannot be moved into pure space.
355This is tipically for top-level forms other than defun.") 355This is typically for top-level forms other than defun.")
356 (d-ephemeral (make-comp-data-container) :type comp-data-container 356 (d-ephemeral (make-comp-data-container) :type comp-data-container
357 :documentation "Relocated data not necessary after load.") 357 :documentation "Relocated data not necessary after load.")
358 (with-late-load nil :type boolean 358 (with-late-load nil :type boolean
@@ -389,7 +389,7 @@ To be used when ncall-conv is nil."))
389 :documentation "List of instructions.") 389 :documentation "List of instructions.")
390 (closed nil :type boolean 390 (closed nil :type boolean
391 :documentation "t if closed.") 391 :documentation "t if closed.")
392 ;; All the followings are for SSA and CGF analysis. 392 ;; All the following are for SSA and CGF analysis.
393 ;; Keep in sync with `comp-clean-ssa'!! 393 ;; Keep in sync with `comp-clean-ssa'!!
394 (in-edges () :type list 394 (in-edges () :type list
395 :documentation "List of incoming edges.") 395 :documentation "List of incoming edges.")
@@ -461,7 +461,7 @@ CFG is mutated by a pass.")
461 (blocks (make-hash-table) :type hash-table 461 (blocks (make-hash-table) :type hash-table
462 :documentation "Basic block name -> basic block.") 462 :documentation "Basic block name -> basic block.")
463 (lap-block (make-hash-table :test #'equal) :type hash-table 463 (lap-block (make-hash-table :test #'equal) :type hash-table
464 :documentation "LAP lable -> LIMPLE basic block name.") 464 :documentation "LAP label -> LIMPLE basic block name.")
465 (edges-h (make-hash-table) :type hash-table 465 (edges-h (make-hash-table) :type hash-table
466 :documentation "Hash edge-num -> edge connecting basic two blocks.") 466 :documentation "Hash edge-num -> edge connecting basic two blocks.")
467 (block-cnt-gen (funcall #'comp-gen-counter) :type function 467 (block-cnt-gen (funcall #'comp-gen-counter) :type function
@@ -749,7 +749,7 @@ Assume allocation class 'd-default as default."
749 comp-curr-allocation-class)))) 749 comp-curr-allocation-class))))
750 750
751 751
752;;; Log rountines. 752;;; Log routines.
753 753
754(defconst comp-limple-lock-keywords 754(defconst comp-limple-lock-keywords
755 `((,(rx bol "(comment" (1+ not-newline)) . font-lock-comment-face) 755 `((,(rx bol "(comment" (1+ not-newline)) . font-lock-comment-face)
@@ -873,7 +873,7 @@ instruction."
873Add PREFIX in front of it. If FIRST is not nil, pick the first 873Add PREFIX in front of it. If FIRST is not nil, pick the first
874available name ignoring compilation context and potential name 874available name ignoring compilation context and potential name
875clashes." 875clashes."
876 ;; Unfortunatelly not all symbol names are valid as C function names... 876 ;; Unfortunately not all symbol names are valid as C function names...
877 ;; Nassi's algorithm here: 877 ;; Nassi's algorithm here:
878 (let* ((orig-name (if (symbolp name) (symbol-name name) name)) 878 (let* ((orig-name (if (symbolp name) (symbol-name name) name))
879 (crypted (cl-loop with str = (make-string (* 2 (length orig-name)) 0) 879 (crypted (cl-loop with str = (make-string (* 2 (length orig-name)) 0)
@@ -2008,7 +2008,7 @@ Return the corresponding rhs slot number."
2008(defun comp-cond-rw (_) 2008(defun comp-cond-rw (_)
2009 "Rewrite conditional branches adding appropriate 'assume' insns. 2009 "Rewrite conditional branches adding appropriate 'assume' insns.
2010This is introducing and placing 'assume' insns in use by fwprop 2010This is introducing and placing 'assume' insns in use by fwprop
2011to propagate conditional branch test informations on target basic 2011to propagate conditional branch test information on target basic
2012blocks." 2012blocks."
2013 (maphash (lambda (_ f) 2013 (maphash (lambda (_ f)
2014 (when (and (>= (comp-func-speed f) 1) 2014 (when (and (>= (comp-func-speed f) 1)
@@ -2051,7 +2051,7 @@ blocks."
2051 f)))) 2051 f))))
2052 2052
2053(defun comp-pure-infer-func (f) 2053(defun comp-pure-infer-func (f)
2054 "If all funtions called by F are pure then F is pure too." 2054 "If all functions called by F are pure then F is pure too."
2055 (when (and (cl-every (lambda (x) 2055 (when (and (cl-every (lambda (x)
2056 (or (comp-function-pure-p x) 2056 (or (comp-function-pure-p x)
2057 (eq x (comp-func-name f)))) 2057 (eq x (comp-func-name f))))
@@ -2094,7 +2094,7 @@ blocks."
2094 mvar)) 2094 mvar))
2095 2095
2096(defun comp-clean-ssa (f) 2096(defun comp-clean-ssa (f)
2097 "Clean-up SSA for funtion F." 2097 "Clean-up SSA for function F."
2098 (setf (comp-func-edges-h f) (make-hash-table)) 2098 (setf (comp-func-edges-h f) (make-hash-table))
2099 (cl-loop 2099 (cl-loop
2100 for b being each hash-value of (comp-func-blocks f) 2100 for b being each hash-value of (comp-func-blocks f)
@@ -2367,7 +2367,7 @@ PRE-LAMBDA and POST-LAMBDA are called in pre or post-order if non-nil."
2367 do (finalize-phi args b))))) 2367 do (finalize-phi args b)))))
2368 2368
2369(defun comp-ssa () 2369(defun comp-ssa ()
2370 "Port all functions into mininal SSA form." 2370 "Port all functions into minimal SSA form."
2371 (maphash (lambda (_ f) 2371 (maphash (lambda (_ f)
2372 (let* ((comp-func f) 2372 (let* ((comp-func f)
2373 (ssa-status (comp-func-ssa-status f))) 2373 (ssa-status (comp-func-ssa-status f)))
@@ -3139,7 +3139,7 @@ Prepare every function for final compilation and drive the C back-end."
3139 x) 3139 x)
3140 3140
3141 3141
3142;; Primitive funciton advice machinery 3142;; Primitive function advice machinery
3143 3143
3144(defun comp-trampoline-filename (subr-name) 3144(defun comp-trampoline-filename (subr-name)
3145 "Given SUBR-NAME return the filename containing the trampoline." 3145 "Given SUBR-NAME return the filename containing the trampoline."
@@ -3445,7 +3445,7 @@ load once finished compiling."
3445;;;###autoload 3445;;;###autoload
3446(defun native-compile (function-or-file &optional output) 3446(defun native-compile (function-or-file &optional output)
3447 "Compile FUNCTION-OR-FILE into native code. 3447 "Compile FUNCTION-OR-FILE into native code.
3448This is the syncronous entry-point for the Emacs Lisp native 3448This is the synchronous entry-point for the Emacs Lisp native
3449compiler. 3449compiler.
3450FUNCTION-OR-FILE is a function symbol, a form or the filename of 3450FUNCTION-OR-FILE is a function symbol, a form or the filename of
3451an Emacs Lisp source file. 3451an Emacs Lisp source file.
diff --git a/src/comp.c b/src/comp.c
index 292f0e7e707..6ddfad528b4 100644
--- a/src/comp.c
+++ b/src/comp.c
@@ -1517,7 +1517,7 @@ emit_XFIXNUM (gcc_jit_rvalue *obj)
1517 emit_comment ("XFIXNUM"); 1517 emit_comment ("XFIXNUM");
1518 gcc_jit_rvalue *i = emit_coerce (comp.emacs_uint_type, emit_XLI (obj)); 1518 gcc_jit_rvalue *i = emit_coerce (comp.emacs_uint_type, emit_XLI (obj));
1519 1519
1520 /* FIXME: Implementation dependent (both RSHIFT are arithmetics). */ 1520 /* FIXME: Implementation dependent (both RSHIFT are arithmetic). */
1521 1521
1522 if (!USE_LSB_TAG) 1522 if (!USE_LSB_TAG)
1523 { 1523 {
@@ -3780,7 +3780,7 @@ define_maybe_gc_or_quit (void)
3780 /* 9 translates into checking for GC or quit every 512 calls to 3780 /* 9 translates into checking for GC or quit every 512 calls to
3781 'maybe_gc_quit'. This is the smallest value I could find with 3781 'maybe_gc_quit'. This is the smallest value I could find with
3782 no performance impact running elisp-banechmarks and the same 3782 no performance impact running elisp-banechmarks and the same
3783 used by the byte intepreter (see 'exec_byte_code'). */ 3783 used by the byte interpreter (see 'exec_byte_code'). */
3784 maybe_do_it_block, 3784 maybe_do_it_block,
3785 pass_block); 3785 pass_block);
3786 3786
@@ -4067,7 +4067,7 @@ If BASE-DIR is nil use the first entry in `comp-eln-load-path'. */)
4067 included in the hashing algorithm. 4067 included in the hashing algorithm.
4068 4068
4069 As at any point in time no more then one file can exist with the 4069 As at any point in time no more then one file can exist with the
4070 same filename, should be possibile to clean up all 4070 same filename, should be possible to clean up all
4071 filename-path_hash-* except the most recent one (or the new one 4071 filename-path_hash-* except the most recent one (or the new one
4072 being recompiled). 4072 being recompiled).
4073 4073
@@ -4617,7 +4617,7 @@ register_native_comp_unit (Lisp_Object comp_u)
4617 loaded the compiler and its dependencies. */ 4617 loaded the compiler and its dependencies. */
4618static Lisp_Object delayed_sources; 4618static Lisp_Object delayed_sources;
4619 4619
4620/* Queue an asyncronous compilation for the source file defining 4620/* Queue an asynchronous compilation for the source file defining
4621 FUNCTION_NAME and perform a late load. 4621 FUNCTION_NAME and perform a late load.
4622 4622
4623 NOTE: ideally would be nice to move its call simply into Fload but 4623 NOTE: ideally would be nice to move its call simply into Fload but
@@ -4671,7 +4671,7 @@ maybe_defer_native_compilation (Lisp_Object function_name,
4671 } 4671 }
4672 4672
4673 /* This is to have deferred compilaiton able to compile comp 4673 /* This is to have deferred compilaiton able to compile comp
4674 dependecies breaking circularity. */ 4674 dependencies breaking circularity. */
4675 if (!NILP (Ffeaturep (Qcomp, Qnil))) 4675 if (!NILP (Ffeaturep (Qcomp, Qnil)))
4676 { 4676 {
4677 /* Comp already loaded. */ 4677 /* Comp already loaded. */
@@ -5297,7 +5297,7 @@ If a directory is non absolute is assumed to be relative to
5297`invocation-directory'. 5297`invocation-directory'.
5298The last directory of this list is assumed to be the system one. */); 5298The last directory of this list is assumed to be the system one. */);
5299 5299
5300 /* Temporary value in use for boostrap. We can't do better as 5300 /* Temporary value in use for bootstrap. We can't do better as
5301 `invocation-directory' is still unset, will be fixed up during 5301 `invocation-directory' is still unset, will be fixed up during
5302 dump reload. */ 5302 dump reload. */
5303 Vcomp_eln_load_path = Fcons (build_string ("../native-lisp/"), Qnil); 5303 Vcomp_eln_load_path = Fcons (build_string ("../native-lisp/"), Qnil);
diff --git a/src/comp.h b/src/comp.h
index 077250ea869..f7d17f398c7 100644
--- a/src/comp.h
+++ b/src/comp.h
@@ -42,7 +42,7 @@ struct Lisp_Native_Comp_Unit
42 Lisp_Object lambda_gc_guard_h; 42 Lisp_Object lambda_gc_guard_h;
43 /* Hash c_name -> d_reloc_imp index. */ 43 /* Hash c_name -> d_reloc_imp index. */
44 Lisp_Object lambda_c_name_idx_h; 44 Lisp_Object lambda_c_name_idx_h;
45 /* Hash doc-idx -> function documentaiton. */ 45 /* Hash doc-idx -> function documentation. */
46 Lisp_Object data_fdoc_v; 46 Lisp_Object data_fdoc_v;
47 /* Analogous to the constant vector but per compilation unit. */ 47 /* Analogous to the constant vector but per compilation unit. */
48 Lisp_Object data_vec; 48 Lisp_Object data_vec;
diff --git a/src/pdumper.c b/src/pdumper.c
index c253fc53c47..e0f8f5577ed 100644
--- a/src/pdumper.c
+++ b/src/pdumper.c
@@ -326,7 +326,7 @@ dump_fingerprint (char const *label,
326/* To be used if some order in the relocation process has to be enforced. */ 326/* To be used if some order in the relocation process has to be enforced. */
327enum reloc_phase 327enum reloc_phase
328 { 328 {
329 /* First to run. Place here every relocation with no dependecy. */ 329 /* First to run. Place every relocation with no dependency here. */
330 EARLY_RELOCS, 330 EARLY_RELOCS,
331 /* Late and very late relocs are relocated at the very last after 331 /* Late and very late relocs are relocated at the very last after
332 all hooks has been run. All lisp machinery is at disposal 332 all hooks has been run. All lisp machinery is at disposal
diff --git a/test/src/comp-tests.el b/test/src/comp-tests.el
index bf3f57a85e3..fffc72015b8 100644
--- a/test/src/comp-tests.el
+++ b/test/src/comp-tests.el
@@ -393,7 +393,7 @@ https://lists.gnu.org/archive/html/bug-gnu-emacs/2020-03/msg00914.html."
393 393
394(defvar comp-test-primitive-advice) 394(defvar comp-test-primitive-advice)
395(comp-deftest primitive-advice () 395(comp-deftest primitive-advice ()
396 "Test effectiveness of primitve advicing." 396 "Test effectiveness of primitive advicing."
397 (let (comp-test-primitive-advice 397 (let (comp-test-primitive-advice
398 (f (lambda (&rest args) 398 (f (lambda (&rest args)
399 (setq comp-test-primitive-advice args)))) 399 (setq comp-test-primitive-advice args))))
@@ -406,7 +406,7 @@ https://lists.gnu.org/archive/html/bug-gnu-emacs/2020-03/msg00914.html."
406 406
407(defvar comp-test-primitive-redefine-args) 407(defvar comp-test-primitive-redefine-args)
408(comp-deftest primitive-redefine () 408(comp-deftest primitive-redefine ()
409 "Test effectiveness of primitve redefinition." 409 "Test effectiveness of primitive redefinition."
410 (cl-letf ((comp-test-primitive-redefine-args nil) 410 (cl-letf ((comp-test-primitive-redefine-args nil)
411 ((symbol-function #'-) 411 ((symbol-function #'-)
412 (lambda (&rest args) 412 (lambda (&rest args)