Mercurial > hg > xemacs-beta
annotate lisp/byte-optimize.el @ 5353:38e24b8be4ea
Improve the lexical scoping in #'block, #'return-from.
lisp/ChangeLog addition:
2011-02-07 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el:
* bytecomp.el (byte-compile-initial-macro-environment):
Shadow `block', `return-from' here, we implement them differently
when byte-compiling.
* bytecomp.el (byte-compile-active-blocks): New.
* bytecomp.el (byte-compile-block-1): New.
* bytecomp.el (byte-compile-return-from-1): New.
* bytecomp.el (return-from-1): New.
* bytecomp.el (block-1): New.
These are two aliases that exist to have their own associated
byte-compile functions, which functions implement `block' and
`return-from'.
* cl-extra.el (cl-macroexpand-all):
Fix a bug here when macros in the environment have been compiled.
* cl-macs.el (block):
* cl-macs.el (return):
* cl-macs.el (return-from):
Be more careful about lexical scope in these macros.
* cl.el:
* cl.el ('cl-block-wrapper): Removed.
* cl.el ('cl-block-throw): Removed.
These aren't needed in code generated by this XEmacs. They
shouldn't be needed in code generated by XEmacs 21.4, but if it
turns out the packages do need them, we can put them back.
2011-01-30 Mike Sperber <mike@xemacs.org>
* font-lock.el (font-lock-fontify-pending-extents): Don't fail if
`font-lock-mode' is unset, which can happen in the middle of
`revert-buffer'.
2011-01-23 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (delete):
* cl-macs.el (delq):
* cl-macs.el (remove):
* cl-macs.el (remq):
Don't use the compiler macro if these functions were given the
wrong number of arguments, as happens in lisp-tests.el.
* cl-seq.el (remove, remq): Removed.
I added these to subr.el, and forgot to remove them from here.
2011-01-22 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-setq, byte-compile-set):
Remove kludge allowing keywords' values to be set, all the code
that does that is gone.
* cl-compat.el (elt-satisfies-test-p):
* faces.el (set-face-parent):
* faces.el (face-doc-string):
* gtk-font-menu.el:
* gtk-font-menu.el (gtk-reset-device-font-menus):
* msw-font-menu.el:
* msw-font-menu.el (mswindows-reset-device-font-menus):
* package-get.el (package-get-installedp):
* select.el (select-convert-from-image-data):
* sound.el:
* sound.el (load-sound-file):
* x-font-menu.el (x-reset-device-font-menus-core):
Don't quote keywords, they're self-quoting, and the
win from backward-compatibility is sufficiently small now that the
style problem overrides it.
2011-01-22 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (block, return-from): Require that NAME be a symbol
in these macros, as always documented in the #'block docstring and
as required by Common Lisp.
* descr-text.el (unidata-initialize-unihan-database):
Correct the use of non-symbols in #'block and #'return-from in
this function.
2011-01-15 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (concatenate): Accept more complicated TYPEs in this
function, handing the sequences over to #'coerce if we don't
understand them here.
* cl-macs.el (inline): Don't proclaim #'concatenate as inline, its
compiler macro is more useful than doing that.
2011-01-11 Aidan Kehoe <kehoea@parhasard.net>
* subr.el (delete, delq, remove, remq): Move #'remove, #'remq
here, they don't belong in cl-seq.el; move #'delete, #'delq here
from fns.c, implement them in terms of #'delete*, allowing support
for sequences generally.
* update-elc.el (do-autoload-commands): Use #'delete*, not #'delq
here, now the latter's no longer dumped.
* cl-macs.el (delete, delq): Add compiler macros transforming
#'delete and #'delq to #'delete* calls.
2011-01-10 Aidan Kehoe <kehoea@parhasard.net>
* dialog.el (make-dialog-box): Correct a misplaced parenthesis
here, thank you Mats Lidell in 87zkr9gqrh.fsf@mail.contactor.se !
2011-01-02 Aidan Kehoe <kehoea@parhasard.net>
* dialog.el (make-dialog-box):
* list-mode.el (display-completion-list):
These functions used to use cl-parsing-keywords; change them to
use defun* instead, fixing the build. (Not sure what led to me
not including this change in d1b17a33450b!)
2011-01-02 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (define-star-compiler-macros):
Make sure the form has ITEM and LIST specified before attempting
to change to calls with explicit tests; necessary for some tests
in lisp-tests.el to compile correctly.
(stable-union, stable-intersection): Add compiler macros for these
functions, in the same way we do for most of the other functions
in cl-seq.el.
2011-01-01 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (dolist, dotimes, do-symbols, macrolet)
(symbol-macrolet):
Define these macros with defmacro* instead of parsing the argument
list by hand, for the sake of style and readability; use backquote
where appropriate, instead of calling #'list and and friends, for
the same reason.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* x-misc.el (device-x-display):
Provide this function, documented in the Lispref for years, but
not existing previously. Thank you Julian Bradfield, thank you
Jeff Mincy.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* cl-seq.el:
Move the heavy lifting from this file to C. Dump the
cl-parsing-keywords macro, but don't use defun* for the functions
we define that do take keywords, dynamic scope lossage makes that
not practical.
* subr.el (sort, fillarray): Move these aliases here.
(map-plist): #'nsublis is now built-in, but at this point #'eql
isn't necessarily available as a test; use #'eq.
* obsolete.el (cl-delete-duplicates): Make this available for old
compiler macros and old code.
(memql): Document that this is equivalent to #'member*, and worse.
* cl.el (adjoin, subst): Removed. These are in C.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* simple.el (assoc-ignore-case): Remove a duplicate definition of
this function (it's already in subr.el).
* iso8859-1.el (char-width):
On non-Mule, make this function equivalent to that produced by
(constantly 1), but preserve its docstring.
* subr.el (subst-char-in-string): Define this in terms of
#'substitute, #'nsubstitute.
(string-width): Define this using #'reduce and #'char-width.
(char-width): Give this a simpler definition, it makes far more
sense to check for mule at load time and redefine, as we do in
iso8859-1.el.
(store-substring): Implement this in terms of #'replace, now
#'replace is cheap.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* update-elc.el (lisp-files-needed-for-byte-compilation)
(lisp-files-needing-early-byte-compilation):
cl-macs belongs in the former, not the latter, it is as
fundamental as bytecomp.el.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* cl.el:
Provde the Common Lisp program-error, type-error as error
symbols. This doesn't nearly go far enough for anyone using the
Common Lisp errors.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (delete-duplicates):
If the form has an incorrect number of arguments, don't attempt a
compiler macroexpansion.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (cl-safe-expr-p):
Forms that start with the symbol lambda are also safe.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (= < > <= >=):
For these functions' compiler macros, the optimisation is safe
even if the first and the last arguments have side effects, since
they're only used the once.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (inline-side-effect-free-compiler-macros):
Unroll a loop here at macro-expansion time, so these compiler
macros are compiled. Use #'eql instead of #'eq in a couple of
places for better style.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (notany, notevery): Avoid some dynamic scope
stupidity with local variable names in these functions, when they
weren't prefixed with cl-; go into some more detail in the doc
strings.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (side-effect-free-fns): #'remove, #'remq are
free of side-effects.
(side-effect-and-error-free-fns):
Drop dot, dot-marker from the list.
2010-11-17 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (coerce):
In the argument list, name the first argument OBJECT, not X; the
former name was always used in the doc string and is clearer.
Handle vector type specifications which include the length of the
target sequence, error if there's a mismatch.
* cl-macs.el (cl-make-type-test): Handle type specifications
starting with the symbol 'eql.
2010-11-14 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (eql): Don't remove the byte-compile property of this
symbol. That was necessary to override a bug in bytecomp.el where
#'eql was confused with #'eq, which bug we no longer have.
If neither expression is constant, don't attempt to handle the
expression in this compiler macro, leave it to byte-compile-eql,
which produces better code anyway.
* bytecomp.el (eq): #'eql is not the function associated with the
byte-eq byte code.
(byte-compile-eql): Add an explicit compile method for this
function, for cases where the cl-macs compiler macro hasn't
reduced it to #'eq or #'equal.
2010-10-25 Aidan Kehoe <kehoea@parhasard.net>
Add compiler macros and compilation sanity-checking for various
functions that take keywords.
* byte-optimize.el (side-effect-free-fns): #'symbol-value is
side-effect free and not error free.
* bytecomp.el (byte-compile-normal-call): Check keyword argument
lists for sanity; store information about the positions where
keyword arguments start using the new byte-compile-keyword-start
property.
* cl-macs.el (cl-const-expr-val): Take a new optional argument,
cl-not-constant, defaulting to nil, in this function; return it if
the expression is not constant.
(cl-non-fixnum-number-p): Make this into a separate function, we
want to pass it to #'every.
(eql): Use it.
(define-star-compiler-macros): Use the same code to generate the
member*, assoc* and rassoc* compiler macros; special-case some
code in #'add-to-list in subr.el.
(remove, remq): Add compiler macros for these two functions, in
preparation for #'remove being in C.
(define-foo-if-compiler-macros): Transform (remove-if-not ...) calls to
(remove ... :if-not) at compile time, which will be a real win
once the latter is in C.
(define-substitute-if-compiler-macros)
(define-subst-if-compiler-macros): Similarly for these functions.
(delete-duplicates): Change this compiler macro to use
#'plists-equal; if we don't have information about the type of
SEQUENCE at compile time, don't bother attempting to inline the
call, the function will be in C soon enough.
(equalp): Remove an old commented-out compiler macro for this, if
we want to see it it's in version control.
(subst-char-in-string): Transform this to a call to nsubstitute or
nsubstitute, if that is appropriate.
* cl.el (ldiff): Don't call setf here, this makes for a load-time
dependency problem in cl-macs.el
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* term/vt100.el:
Refer to XEmacs, not GNU Emacs, in permissions.
* term/bg-mouse.el:
* term/sup-mouse.el:
Put copyright notice in canonical "Copyright DATE AUTHOR" form.
Refer to XEmacs, not GNU Emacs, in permissions.
* site-load.el:
Add permission boilerplate.
* mule/canna-leim.el:
* alist.el:
Refer to XEmacs, not APEL/this program, in permissions.
* mule/canna-leim.el:
Remove my copyright, I've assigned it to the FSF.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* gtk.el:
* gtk-widget-accessors.el:
* gtk-package.el:
* gtk-marshal.el:
* gtk-compose.el:
* gnome.el:
Add copyright notice based on internal evidence.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* easymenu.el: Add reference to COPYING to permission notice.
* gutter.el:
* gutter-items.el:
* menubar-items.el:
Fix typo "Xmacs" in permissions notice.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* auto-save.el:
* font.el:
* fontconfig.el:
* mule/kinsoku.el:
Add "part of XEmacs" text to permission notice.
2010-10-14 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (side-effect-free-fns):
* cl-macs.el (remf, getf):
* cl-extra.el (tailp, cl-set-getf, cl-do-remf):
* cl.el (ldiff, endp):
Tighten up Common Lisp compatibility for #'ldiff, #'endp, #'tailp;
add circularity checking for the first two.
#'cl-set-getf and #'cl-do-remf were Lisp implementations of
#'plist-put and #'plist-remprop; change the names to aliases,
changes the macros that use them to using #'plist-put and
#'plist-remprop directly.
2010-10-12 Aidan Kehoe <kehoea@parhasard.net>
* abbrev.el (fundamental-mode-abbrev-table, global-abbrev-table):
Create both these abbrev tables using the usual
#'define-abbrev-table calls, rather than attempting to
special-case them.
* cl-extra.el: Force cl-macs to be loaded here, if cl-extra.el is
being loaded interpreted. Previously other, later files would
redundantly call (load "cl-macs") when interpreted, it's more
reasonable to do it here, once.
* cmdloop.el (read-quoted-char-radix): Use defcustom here, we
don't have any dump-order dependencies that would prevent that.
* custom.el (eval-when-compile): Don't load cl-macs when
interpreted or when byte-compiling, rely on cl-extra.el in the
former case and the appropriate entry in bytecomp-load-hook in the
latter. Get rid of custom-declare-variable-list, we have no
dump-time dependencies that would require it.
* faces.el (eval-when-compile): Don't load cl-macs when
interpreted or when byte-compiling.
* packages.el: Remove some inaccurate comments.
* post-gc.el (cleanup-simple-finalizers): Use #'delete-if-not
here, now the order of preloaded-file-list has been changed to
make it available.
* subr.el (custom-declare-variable-list): Remove. No need for it.
Also remove a stub define-abbrev-table from this file, given the
current order of preloaded-file-list there's no need for it.
2010-10-10 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-constp) Forms quoted with FUNCTION are
also constant.
(byte-compile-initial-macro-environment): In #'the, if FORM is
constant and does not match TYPE, warn at byte-compile time.
2010-10-10 Aidan Kehoe <kehoea@parhasard.net>
* backquote.el (bq-vector-contents, bq-list*): Remove; the former
is equivalent to (append VECTOR nil), the latter to (list* ...).
(bq-process-2): Use (append VECTOR nil) instead of using
#'bq-vector-contents to convert to a list.
(bq-process-1): Now we use list* instead of bq-list
* subr.el (list*): Moved from cl.el, since it is now required to
be available the first time a backquoted form is encountered.
* cl.el (list*): Move to subr.el.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* test-harness.el (Check-Message):
Add an omitted comma here, thank you the buildbot.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* hash-table.el (hash-table-key-list, hash-table-value-list)
(hash-table-key-value-alist, hash-table-key-value-plist):
Remove some useless #'nreverse calls in these files; our hash
tables have no order, it's not helpful to pretend they do.
* behavior.el (read-behavior):
Do the same in this file, in some code evidently copied from
hash-table.el.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* info.el (Info-insert-dir):
* format.el (format-deannotate-region):
* files.el (cd, save-buffers-kill-emacs):
Use #'some, #'every and related functions for applying boolean
operations to lists, instead of rolling our own ones that cons and
don't short-circuit.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-initial-macro-environment):
* cl-macs.el (the):
Rephrase the docstring, make its implementation when compiling
files a little nicer.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* descr-text.el (unidata-initialize-unicodedata-database)
(unidata-initialize-unihan-database, describe-char-unicode-data)
(describe-char-unicode-data):
Wrap calls to the database functions with (with-fboundp ...),
avoiding byte compile warnings on builds without support for the
database functions.
(describe-char): (reduce #'max ...), not (apply #'max ...), no
need to cons needlessly.
(describe-char): Remove a redundant lambda wrapping
#'extent-properties.
(describe-char-unicode-data): Call #'nsubst when replacing "" with
nil in the result of #'split-string, instead of consing inside
mapcar.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* x-faces.el (x-available-font-sizes):
* specifier.el (let-specifier):
* package-ui.el (pui-add-required-packages):
* msw-faces.el (mswindows-available-font-sizes):
* modeline.el (modeline-minor-mode-menu):
* minibuf.el (minibuf-directory-files):
Replace the O2N (delq nil (mapcar (lambda (W) (and X Y)) Z)) with
the ON (mapcan (lambda (W) (and X (list Y))) Z) in these files.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (= < > <= >=):
When these functions are handed more than two arguments, and those
arguments have no side effects, transform to a series of two
argument calls, avoiding funcall in the byte-compiled code.
* mule/mule-cmds.el (finish-set-language-environment):
Take advantage of this change in a function called 256 times at
startup.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-function-form, byte-compile-quote)
(byte-compile-quote-form):
Warn at compile time, and error at runtime, if a (quote ...) or a
(function ...) form attempts to quote more than one object.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (byte-optimize-apply): Transform (apply 'nconc
(mapcar ...)) to (mapcan ...); warn about use of the first idiom.
* update-elc.el (do-autoload-commands):
* packages.el (packages-find-package-library-path):
* frame.el (frame-list):
* extents.el (extent-descendants):
* etags.el (buffer-tag-table-files):
* dumped-lisp.el (preloaded-file-list):
* device.el (device-list):
* bytecomp-runtime.el (proclaim-inline, proclaim-notinline)
Use #'mapcan, not (apply #'nconc (mapcar ...) in all these files.
* bytecomp-runtime.el (eval-when-compile, eval-and-compile):
In passing, mention that these macros also evaluate the body when
interpreted.
tests/ChangeLog addition:
2011-02-07 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-tests.el:
Test lexical scope for `block', `return-from'; add a
Known-Bug-Expect-Failure for a contorted example that fails when
byte-compiled.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Mon, 07 Feb 2011 12:01:24 +0000 |
| parents | 07d24b1f27a7 |
| children | f00192e1cd49 6506fcb40fcf |
| rev | line source |
|---|---|
| 428 | 1 ;;; byte-optimize.el --- the optimization passes of the emacs-lisp byte compiler. |
| 2 | |
| 3 ;;; Copyright (c) 1991, 1994 Free Software Foundation, Inc. | |
| 4 | |
| 446 | 5 ;; Authors: Jamie Zawinski <jwz@jwz.org> |
| 6 ;; Hallvard Furuseth <hbf@ulrik.uio.no> | |
| 7 ;; Martin Buchholz <martin@xemacs.org> | |
| 428 | 8 ;; Keywords: internal |
| 9 | |
| 10 ;; This file is part of XEmacs. | |
| 11 | |
| 12 ;; XEmacs is free software; you can redistribute it and/or modify it | |
| 13 ;; under the terms of the GNU General Public License as published by | |
| 14 ;; the Free Software Foundation; either version 2, or (at your option) | |
| 15 ;; any later version. | |
| 16 | |
| 17 ;; XEmacs is distributed in the hope that it will be useful, but | |
| 18 ;; WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 20 ;; General Public License for more details. | |
| 21 | |
| 22 ;; You should have received a copy of the GNU General Public License | |
| 440 | 23 ;; along with XEmacs; see the file COPYING. If not, write to the |
| 428 | 24 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
| 25 ;; Boston, MA 02111-1307, USA. | |
| 26 | |
| 1297 | 27 ;;; Synched up with: FSF 20.7 except where marked. |
| 28 ;;; [[ Synched up with: FSF 20.7. ]] | |
| 29 ;;; DO NOT PUT IN AN INVALID SYNC MESSAGE WHEN YOU DO A PARTIAL SYNC. --ben | |
| 30 | |
| 31 ;; BEGIN SYNC WITH 20.7. | |
| 428 | 32 |
| 33 ;;; Commentary: | |
| 34 | |
| 35 ;; ======================================================================== | |
| 36 ;; "No matter how hard you try, you can't make a racehorse out of a pig. | |
| 37 ;; You can, however, make a faster pig." | |
| 38 ;; | |
| 39 ;; Or, to put it another way, the emacs byte compiler is a VW Bug. This code | |
| 440 | 40 ;; makes it be a VW Bug with fuel injection and a turbocharger... You're |
| 428 | 41 ;; still not going to make it go faster than 70 mph, but it might be easier |
| 42 ;; to get it there. | |
| 43 ;; | |
| 44 | |
| 45 ;; TO DO: | |
| 46 ;; | |
| 47 ;; (apply #'(lambda (x &rest y) ...) 1 (foo)) | |
| 48 ;; | |
| 49 ;; maintain a list of functions known not to access any global variables | |
| 50 ;; (actually, give them a 'dynamically-safe property) and then | |
| 51 ;; (let ( v1 v2 ... vM vN ) <...dynamically-safe...> ) ==> | |
| 52 ;; (let ( v1 v2 ... vM ) vN <...dynamically-safe...> ) | |
| 53 ;; by recursing on this, we might be able to eliminate the entire let. | |
| 54 ;; However certain variables should never have their bindings optimized | |
| 55 ;; away, because they affect everything. | |
| 56 ;; (put 'debug-on-error 'binding-is-magic t) | |
| 57 ;; (put 'debug-on-abort 'binding-is-magic t) | |
| 58 ;; (put 'debug-on-next-call 'binding-is-magic t) | |
| 59 ;; (put 'inhibit-quit 'binding-is-magic t) | |
| 60 ;; (put 'quit-flag 'binding-is-magic t) | |
| 61 ;; (put 't 'binding-is-magic t) | |
| 62 ;; (put 'nil 'binding-is-magic t) | |
| 63 ;; possibly also | |
| 64 ;; (put 'gc-cons-threshold 'binding-is-magic t) | |
| 65 ;; (put 'track-mouse 'binding-is-magic t) | |
| 66 ;; others? | |
| 67 ;; | |
| 68 ;; Simple defsubsts often produce forms like | |
| 69 ;; (let ((v1 (f1)) (v2 (f2)) ...) | |
| 70 ;; (FN v1 v2 ...)) | |
| 440 | 71 ;; It would be nice if we could optimize this to |
| 428 | 72 ;; (FN (f1) (f2) ...) |
| 73 ;; but we can't unless FN is dynamically-safe (it might be dynamically | |
| 74 ;; referring to the bindings that the lambda arglist established.) | |
| 75 ;; One of the uncountable lossages introduced by dynamic scope... | |
| 76 ;; | |
| 440 | 77 ;; Maybe there should be a control-structure that says "turn on |
| 428 | 78 ;; fast-and-loose type-assumptive optimizations here." Then when |
| 79 ;; we see a form like (car foo) we can from then on assume that | |
| 80 ;; the variable foo is of type cons, and optimize based on that. | |
| 440 | 81 ;; But, this won't win much because of (you guessed it) dynamic |
| 428 | 82 ;; scope. Anything down the stack could change the value. |
| 83 ;; (Another reason it doesn't work is that it is perfectly valid | |
| 84 ;; to call car with a null argument.) A better approach might | |
| 85 ;; be to allow type-specification of the form | |
| 86 ;; (put 'foo 'arg-types '(float (list integer) dynamic)) | |
| 87 ;; (put 'foo 'result-type 'bool) | |
| 88 ;; It should be possible to have these types checked to a certain | |
| 89 ;; degree. | |
| 90 ;; | |
| 91 ;; collapse common subexpressions | |
| 92 ;; | |
| 93 ;; It would be nice if redundant sequences could be factored out as well, | |
| 94 ;; when they are known to have no side-effects: | |
| 95 ;; (list (+ a b c) (+ a b c)) --> a b add c add dup list-2 | |
| 96 ;; but beware of traps like | |
| 97 ;; (cons (list x y) (list x y)) | |
| 98 ;; | |
| 99 ;; Tail-recursion elimination is not really possible in Emacs Lisp. | |
| 100 ;; Tail-recursion elimination is almost always impossible when all variables | |
| 101 ;; have dynamic scope, but given that the "return" byteop requires the | |
| 102 ;; binding stack to be empty (rather than emptying it itself), there can be | |
| 103 ;; no truly tail-recursive Emacs Lisp functions that take any arguments or | |
| 104 ;; make any bindings. | |
| 105 ;; | |
| 106 ;; Here is an example of an Emacs Lisp function which could safely be | |
| 107 ;; byte-compiled tail-recursively: | |
| 108 ;; | |
| 109 ;; (defun tail-map (fn list) | |
| 110 ;; (cond (list | |
| 111 ;; (funcall fn (car list)) | |
| 112 ;; (tail-map fn (cdr list))))) | |
| 113 ;; | |
| 114 ;; However, if there was even a single let-binding around the COND, | |
| 115 ;; it could not be byte-compiled, because there would be an "unbind" | |
| 440 | 116 ;; byte-op between the final "call" and "return." Adding a |
| 428 | 117 ;; Bunbind_all byteop would fix this. |
| 118 ;; | |
| 119 ;; (defun foo (x y z) ... (foo a b c)) | |
| 120 ;; ... (const foo) (varref a) (varref b) (varref c) (call 3) END: (return) | |
| 121 ;; ... (varref a) (varbind x) (varref b) (varbind y) (varref c) (varbind z) (goto 0) END: (unbind-all) (return) | |
| 122 ;; ... (varref a) (varset x) (varref b) (varset y) (varref c) (varset z) (goto 0) END: (return) | |
| 123 ;; | |
| 124 ;; this also can be considered tail recursion: | |
| 125 ;; | |
| 126 ;; ... (const foo) (varref a) (call 1) (goto X) ... X: (return) | |
| 127 ;; could generalize this by doing the optimization | |
| 128 ;; (goto X) ... X: (return) --> (return) | |
| 129 ;; | |
| 130 ;; But this doesn't solve all of the problems: although by doing tail- | |
| 131 ;; recursion elimination in this way, the call-stack does not grow, the | |
| 132 ;; binding-stack would grow with each recursive step, and would eventually | |
| 133 ;; overflow. I don't believe there is any way around this without lexical | |
| 134 ;; scope. | |
| 135 ;; | |
| 136 ;; Wouldn't it be nice if Emacs Lisp had lexical scope. | |
| 137 ;; | |
| 440 | 138 ;; Idea: the form (lexical-scope) in a file means that the file may be |
| 139 ;; compiled lexically. This proclamation is file-local. Then, within | |
| 428 | 140 ;; that file, "let" would establish lexical bindings, and "let-dynamic" |
| 141 ;; would do things the old way. (Or we could use CL "declare" forms.) | |
| 142 ;; We'd have to notice defvars and defconsts, since those variables should | |
| 143 ;; always be dynamic, and attempting to do a lexical binding of them | |
| 144 ;; should simply do a dynamic binding instead. | |
| 145 ;; But! We need to know about variables that were not necessarily defvarred | |
| 146 ;; in the file being compiled (doing a boundp check isn't good enough.) | |
| 147 ;; Fdefvar() would have to be modified to add something to the plist. | |
| 148 ;; | |
| 440 | 149 ;; A major disadvantage of this scheme is that the interpreter and compiler |
| 150 ;; would have different semantics for files compiled with (dynamic-scope). | |
| 428 | 151 ;; Since this would be a file-local optimization, there would be no way to |
| 440 | 152 ;; modify the interpreter to obey this (unless the loader was hacked |
| 428 | 153 ;; in some grody way, but that's a really bad idea.) |
| 154 ;; | |
| 155 ;; HA! RMS removed the following paragraph from his version of | |
| 156 ;; byte-optimize.el. | |
| 157 ;; | |
| 158 ;; Really the Right Thing is to make lexical scope the default across | |
| 440 | 159 ;; the board, in the interpreter and compiler, and just FIX all of |
| 428 | 160 ;; the code that relies on dynamic scope of non-defvarred variables. |
| 161 | |
| 162 ;; Other things to consider: | |
| 163 | |
| 164 ;; Associative math should recognize subcalls to identical function: | |
| 165 ;;(disassemble #'(lambda (x) (+ (+ (foo) 1) (+ (bar) 2)))) | |
| 166 ;; This should generate the same as (1+ x) and (1- x) | |
| 167 | |
| 168 ;;(disassemble #'(lambda (x) (cons (+ x 1) (- x 1)))) | |
| 169 ;; An awful lot of functions always return a non-nil value. If they're | |
| 170 ;; error free also they may act as true-constants. | |
| 171 | |
| 172 ;;(disassemble #'(lambda (x) (and (point) (foo)))) | |
| 440 | 173 ;; When |
| 428 | 174 ;; - all but one arguments to a function are constant |
| 175 ;; - the non-constant argument is an if-expression (cond-expression?) | |
| 176 ;; then the outer function can be distributed. If the guarding | |
| 177 ;; condition is side-effect-free [assignment-free] then the other | |
| 178 ;; arguments may be any expressions. Since, however, the code size | |
| 179 ;; can increase this way they should be "simple". Compare: | |
| 180 | |
| 181 ;;(disassemble #'(lambda (x) (eq (if (point) 'a 'b) 'c))) | |
| 182 ;;(disassemble #'(lambda (x) (if (point) (eq 'a 'c) (eq 'b 'c)))) | |
| 183 | |
| 444 | 184 ;; (car (cons A B)) -> (prog1 A B) |
| 428 | 185 ;;(disassemble #'(lambda (x) (car (cons (foo) 42)))) |
| 186 | |
| 187 ;; (cdr (cons A B)) -> (progn A B) | |
| 188 ;;(disassemble #'(lambda (x) (cdr (cons 42 (foo))))) | |
| 189 | |
| 444 | 190 ;; (car (list A B ...)) -> (prog1 A ... B) |
| 428 | 191 ;;(disassemble #'(lambda (x) (car (list (foo) 42 (bar))))) |
| 192 | |
| 193 ;; (cdr (list A B ...)) -> (progn A (list B ...)) | |
| 194 ;;(disassemble #'(lambda (x) (cdr (list 42 (foo) (bar))))) | |
| 195 | |
| 196 | |
| 197 ;;; Code: | |
| 198 | |
| 199 (require 'byte-compile "bytecomp") | |
| 200 | |
| 201 (defun byte-compile-log-lap-1 (format &rest args) | |
| 202 (if (aref byte-code-vector 0) | |
| 203 (error "The old version of the disassembler is loaded. Reload new-bytecomp as well.")) | |
| 204 (byte-compile-log-1 | |
| 205 (apply 'format format | |
| 206 (let (c a) | |
| 207 (mapcar | |
| 208 #'(lambda (arg) | |
| 209 (if (not (consp arg)) | |
| 210 (if (and (symbolp arg) | |
| 211 (string-match "^byte-" (symbol-name arg))) | |
| 212 (intern (substring (symbol-name arg) 5)) | |
| 213 arg) | |
| 214 (if (integerp (setq c (car arg))) | |
| 215 (error "non-symbolic byte-op %s" c)) | |
| 216 (if (eq c 'TAG) | |
| 217 (setq c arg) | |
| 218 (setq a (cond ((memq c byte-goto-ops) | |
| 219 (car (cdr (cdr arg)))) | |
| 220 ((memq c byte-constref-ops) | |
| 221 (car (cdr arg))) | |
| 222 (t (cdr arg)))) | |
| 223 (setq c (symbol-name c)) | |
| 224 (if (string-match "^byte-." c) | |
| 225 (setq c (intern (substring c 5))))) | |
| 226 (if (eq c 'constant) (setq c 'const)) | |
| 227 (if (and (eq (cdr arg) 0) | |
| 228 (not (memq c '(unbind call const)))) | |
| 229 c | |
| 230 (format "(%s %s)" c a)))) | |
| 231 args))))) | |
| 232 | |
| 233 (defmacro byte-compile-log-lap (format-string &rest args) | |
| 234 (list 'and | |
| 235 '(memq byte-optimize-log '(t byte)) | |
| 236 (cons 'byte-compile-log-lap-1 | |
| 237 (cons format-string args)))) | |
| 238 | |
| 239 | |
| 240 ;;; byte-compile optimizers to support inlining | |
| 241 | |
| 242 (put 'inline 'byte-optimizer 'byte-optimize-inline-handler) | |
| 243 | |
| 244 (defun byte-optimize-inline-handler (form) | |
| 245 "byte-optimize-handler for the `inline' special-form." | |
| 246 (cons | |
| 247 'progn | |
| 248 (mapcar | |
| 249 #'(lambda (sexp) | |
| 250 (let ((fn (car-safe sexp))) | |
| 251 (if (and (symbolp fn) | |
| 252 (or (cdr (assq fn byte-compile-function-environment)) | |
| 253 (and (fboundp fn) | |
| 254 (not (or (cdr (assq fn byte-compile-macro-environment)) | |
| 255 (and (consp (setq fn (symbol-function fn))) | |
| 256 (eq (car fn) 'macro)) | |
| 257 (subrp fn)))))) | |
| 258 (byte-compile-inline-expand sexp) | |
| 259 sexp))) | |
| 260 (cdr form)))) | |
| 261 | |
| 262 | |
| 263 ;; Splice the given lap code into the current instruction stream. | |
| 264 ;; If it has any labels in it, you're responsible for making sure there | |
| 265 ;; are no collisions, and that byte-compile-tag-number is reasonable | |
| 266 ;; after this is spliced in. The provided list is destroyed. | |
| 267 (defun byte-inline-lapcode (lap) | |
| 268 (setq byte-compile-output (nconc (nreverse lap) byte-compile-output))) | |
| 269 | |
| 270 | |
| 271 (defun byte-compile-inline-expand (form) | |
| 272 (let* ((name (car form)) | |
| 273 (fn (or (cdr (assq name byte-compile-function-environment)) | |
| 274 (and (fboundp name) (symbol-function name))))) | |
| 275 (if (null fn) | |
| 276 (progn | |
| 277 (byte-compile-warn "attempt to inline %s before it was defined" name) | |
| 278 form) | |
| 279 ;; else | |
| 280 (if (and (consp fn) (eq (car fn) 'autoload)) | |
| 281 (progn | |
| 282 (load (nth 1 fn)) | |
| 283 (setq fn (or (cdr (assq name byte-compile-function-environment)) | |
| 284 (and (fboundp name) (symbol-function name)))))) | |
| 285 (if (and (consp fn) (eq (car fn) 'autoload)) | |
| 286 (error "file \"%s\" didn't define \"%s\"" (nth 1 fn) name)) | |
| 287 (if (symbolp fn) | |
| 288 (byte-compile-inline-expand (cons fn (cdr form))) | |
| 289 (if (compiled-function-p fn) | |
| 290 (progn | |
| 291 (fetch-bytecode fn) | |
| 292 (cons (list 'lambda (compiled-function-arglist fn) | |
| 293 (list 'byte-code | |
| 294 (compiled-function-instructions fn) | |
| 295 (compiled-function-constants fn) | |
| 296 (compiled-function-stack-depth fn))) | |
| 297 (cdr form))) | |
| 1297 | 298 (if (eq (car-safe fn) 'lambda) |
| 299 (cons fn (cdr form)) | |
| 300 ;; Give up on inlining. | |
| 301 form)))))) | |
| 428 | 302 |
| 303 ;;; ((lambda ...) ...) | |
| 440 | 304 ;;; |
| 428 | 305 (defun byte-compile-unfold-lambda (form &optional name) |
| 306 (or name (setq name "anonymous lambda")) | |
| 307 (let ((lambda (car form)) | |
| 308 (values (cdr form))) | |
| 309 (if (compiled-function-p lambda) | |
| 310 (setq lambda (list 'lambda (compiled-function-arglist lambda) | |
| 311 (list 'byte-code | |
| 312 (compiled-function-instructions lambda) | |
| 313 (compiled-function-constants lambda) | |
| 314 (compiled-function-stack-depth lambda))))) | |
| 315 (let ((arglist (nth 1 lambda)) | |
| 316 (body (cdr (cdr lambda))) | |
| 317 optionalp restp | |
| 318 bindings) | |
| 319 (if (and (stringp (car body)) (cdr body)) | |
| 320 (setq body (cdr body))) | |
| 321 (if (and (consp (car body)) (eq 'interactive (car (car body)))) | |
| 322 (setq body (cdr body))) | |
| 323 (while arglist | |
| 324 (cond ((eq (car arglist) '&optional) | |
| 325 ;; ok, I'll let this slide because funcall_lambda() does... | |
| 326 ;; (if optionalp (error "multiple &optional keywords in %s" name)) | |
| 327 (if restp (error "&optional found after &rest in %s" name)) | |
| 328 (if (null (cdr arglist)) | |
| 329 (error "nothing after &optional in %s" name)) | |
| 330 (setq optionalp t)) | |
| 331 ((eq (car arglist) '&rest) | |
| 332 ;; ...but it is by no stretch of the imagination a reasonable | |
| 333 ;; thing that funcall_lambda() allows (&rest x y) and | |
| 334 ;; (&rest x &optional y) in arglists. | |
| 335 (if (null (cdr arglist)) | |
| 336 (error "nothing after &rest in %s" name)) | |
| 337 (if (cdr (cdr arglist)) | |
| 338 (error "multiple vars after &rest in %s" name)) | |
| 339 (setq restp t)) | |
| 340 (restp | |
| 341 (setq bindings (cons (list (car arglist) | |
| 342 (and values (cons 'list values))) | |
| 343 bindings) | |
| 344 values nil)) | |
| 345 ((and (not optionalp) (null values)) | |
| 346 (byte-compile-warn "attempt to open-code %s with too few arguments" name) | |
| 347 (setq arglist nil values 'too-few)) | |
| 348 (t | |
| 349 (setq bindings (cons (list (car arglist) (car values)) | |
| 350 bindings) | |
| 351 values (cdr values)))) | |
| 352 (setq arglist (cdr arglist))) | |
| 353 (if values | |
| 354 (progn | |
| 355 (or (eq values 'too-few) | |
| 356 (byte-compile-warn | |
| 357 "attempt to open-code %s with too many arguments" name)) | |
| 358 form) | |
| 1297 | 359 (setq body (mapcar 'byte-optimize-form body)) |
| 440 | 360 (let ((newform |
| 428 | 361 (if bindings |
| 362 (cons 'let (cons (nreverse bindings) body)) | |
| 363 (cons 'progn body)))) | |
| 364 (byte-compile-log " %s\t==>\t%s" form newform) | |
| 365 newform))))) | |
| 366 | |
| 367 | |
| 368 ;;; implementing source-level optimizers | |
| 369 | |
| 370 (defun byte-optimize-form-code-walker (form for-effect) | |
| 371 ;; | |
| 372 ;; For normal function calls, We can just mapcar the optimizer the cdr. But | |
|
4905
755ae5b97edb
Change "special form" to "special operator" in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4885
diff
changeset
|
373 ;; we need to have special knowledge of the syntax of the special operators |
|
755ae5b97edb
Change "special form" to "special operator" in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4885
diff
changeset
|
374 ;; like let and defun (that's why they're special operators :-). (Actually, |
| 428 | 375 ;; the important aspect is that they are subrs that don't evaluate all of |
| 376 ;; their args.) | |
| 377 ;; | |
| 378 (let ((fn (car-safe form)) | |
| 379 tmp) | |
| 380 (cond ((not (consp form)) | |
| 381 (if (not (and for-effect | |
| 382 (or byte-compile-delete-errors | |
| 383 (not (symbolp form)) | |
| 384 (eq form t)))) | |
| 385 form)) | |
| 386 ((eq fn 'quote) | |
| 387 (if (cdr (cdr form)) | |
| 388 (byte-compile-warn "malformed quote form: %s" | |
| 389 (prin1-to-string form))) | |
| 390 ;; map (quote nil) to nil to simplify optimizer logic. | |
| 391 ;; map quoted constants to nil if for-effect (just because). | |
| 392 (and (nth 1 form) | |
| 393 (not for-effect) | |
| 394 form)) | |
| 395 ((or (compiled-function-p fn) | |
| 396 (eq 'lambda (car-safe fn))) | |
| 397 (byte-compile-unfold-lambda form)) | |
| 398 ((memq fn '(let let*)) | |
| 399 ;; recursively enter the optimizer for the bindings and body | |
| 400 ;; of a let or let*. This for depth-firstness: forms that | |
| 401 ;; are more deeply nested are optimized first. | |
| 402 (cons fn | |
| 403 (cons | |
| 404 (mapcar | |
| 405 #'(lambda (binding) | |
| 406 (if (symbolp binding) | |
| 407 binding | |
| 408 (if (cdr (cdr binding)) | |
| 409 (byte-compile-warn "malformed let binding: %s" | |
| 410 (prin1-to-string binding))) | |
| 411 (list (car binding) | |
| 412 (byte-optimize-form (nth 1 binding) nil)))) | |
| 413 (nth 1 form)) | |
| 414 (byte-optimize-body (cdr (cdr form)) for-effect)))) | |
| 415 ((eq fn 'cond) | |
| 416 (cons fn | |
| 417 (mapcar | |
| 418 #'(lambda (clause) | |
| 419 (if (consp clause) | |
| 420 (cons | |
| 421 (byte-optimize-form (car clause) nil) | |
| 422 (byte-optimize-body (cdr clause) for-effect)) | |
| 423 (byte-compile-warn "malformed cond form: %s" | |
| 424 (prin1-to-string clause)) | |
| 425 clause)) | |
| 426 (cdr form)))) | |
| 427 ((eq fn 'progn) | |
| 428 ;; as an extra added bonus, this simplifies (progn <x>) --> <x> | |
| 429 (if (cdr (cdr form)) | |
| 430 (progn | |
| 431 (setq tmp (byte-optimize-body (cdr form) for-effect)) | |
| 432 (if (cdr tmp) (cons 'progn tmp) (car tmp))) | |
| 433 (byte-optimize-form (nth 1 form) for-effect))) | |
| 434 ((eq fn 'prog1) | |
| 435 (if (cdr (cdr form)) | |
| 436 (cons 'prog1 | |
| 437 (cons (byte-optimize-form (nth 1 form) for-effect) | |
| 438 (byte-optimize-body (cdr (cdr form)) t))) | |
|
4686
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4677
diff
changeset
|
439 (byte-optimize-form `(or ,(nth 1 form) nil) for-effect))) |
| 428 | 440 ((eq fn 'prog2) |
| 441 (cons 'prog2 | |
| 442 (cons (byte-optimize-form (nth 1 form) t) | |
| 443 (cons (byte-optimize-form (nth 2 form) for-effect) | |
| 444 (byte-optimize-body (cdr (cdr (cdr form))) t))))) | |
| 440 | 445 |
| 428 | 446 ((memq fn '(save-excursion save-restriction save-current-buffer)) |
| 447 ;; those subrs which have an implicit progn; it's not quite good | |
| 448 ;; enough to treat these like normal function calls. | |
| 449 ;; This can turn (save-excursion ...) into (save-excursion) which | |
| 450 ;; will be optimized away in the lap-optimize pass. | |
| 451 (cons fn (byte-optimize-body (cdr form) for-effect))) | |
| 440 | 452 |
| 428 | 453 ((eq fn 'with-output-to-temp-buffer) |
| 454 ;; this is just like the above, except for the first argument. | |
| 455 (cons fn | |
| 456 (cons | |
| 457 (byte-optimize-form (nth 1 form) nil) | |
| 458 (byte-optimize-body (cdr (cdr form)) for-effect)))) | |
| 440 | 459 |
| 428 | 460 ((eq fn 'if) |
| 461 (cons fn | |
| 462 (cons (byte-optimize-form (nth 1 form) nil) | |
| 463 (cons | |
| 464 (byte-optimize-form (nth 2 form) for-effect) | |
| 465 (byte-optimize-body (nthcdr 3 form) for-effect))))) | |
| 440 | 466 |
| 428 | 467 ((memq fn '(and or)) ; remember, and/or are control structures. |
| 468 ;; take forms off the back until we can't any more. | |
| 469 ;; In the future it could conceivably be a problem that the | |
| 470 ;; subexpressions of these forms are optimized in the reverse | |
| 471 ;; order, but it's ok for now. | |
| 472 (if for-effect | |
| 473 (let ((backwards (reverse (cdr form)))) | |
| 474 (while (and backwards | |
| 475 (null (setcar backwards | |
| 476 (byte-optimize-form (car backwards) | |
| 477 for-effect)))) | |
| 478 (setq backwards (cdr backwards))) | |
| 479 (if (and (cdr form) (null backwards)) | |
| 480 (byte-compile-log | |
| 481 " all subforms of %s called for effect; deleted" form)) | |
| 452 | 482 (when backwards |
| 483 ;; Now optimize the rest of the forms. We need the return | |
| 484 ;; values. We already did the car. | |
| 485 (setcdr backwards | |
| 486 (mapcar 'byte-optimize-form (cdr backwards)))) | |
| 487 (cons fn (nreverse backwards))) | |
| 428 | 488 (cons fn (mapcar 'byte-optimize-form (cdr form))))) |
| 489 | |
| 490 ((eq fn 'interactive) | |
| 491 (byte-compile-warn "misplaced interactive spec: %s" | |
| 492 (prin1-to-string form)) | |
| 493 nil) | |
| 440 | 494 |
| 428 | 495 ((memq fn '(defun defmacro function |
| 496 condition-case save-window-excursion)) | |
| 497 ;; These forms are compiled as constants or by breaking out | |
| 498 ;; all the subexpressions and compiling them separately. | |
| 499 form) | |
| 500 | |
| 501 ((eq fn 'unwind-protect) | |
| 502 ;; the "protected" part of an unwind-protect is compiled (and thus | |
| 503 ;; optimized) as a top-level form, so don't do it here. But the | |
| 504 ;; non-protected part has the same for-effect status as the | |
| 505 ;; unwind-protect itself. (The protected part is always for effect, | |
| 506 ;; but that isn't handled properly yet.) | |
| 507 (cons fn | |
| 508 (cons (byte-optimize-form (nth 1 form) for-effect) | |
| 509 (cdr (cdr form))))) | |
| 440 | 510 |
| 428 | 511 ((eq fn 'catch) |
| 512 ;; the body of a catch is compiled (and thus optimized) as a | |
| 513 ;; top-level form, so don't do it here. The tag is never | |
| 514 ;; for-effect. The body should have the same for-effect status | |
| 515 ;; as the catch form itself, but that isn't handled properly yet. | |
| 516 (cons fn | |
| 517 (cons (byte-optimize-form (nth 1 form) nil) | |
| 518 (cdr (cdr form))))) | |
| 519 | |
| 520 ;; If optimization is on, this is the only place that macros are | |
| 521 ;; expanded. If optimization is off, then macroexpansion happens | |
| 522 ;; in byte-compile-form. Otherwise, the macros are already expanded | |
| 523 ;; by the time that is reached. | |
| 524 ((not (eq form | |
| 525 (setq form (macroexpand form | |
| 526 byte-compile-macro-environment)))) | |
| 527 (byte-optimize-form form for-effect)) | |
| 440 | 528 |
| 1297 | 529 ;; Support compiler macros as in cl.el. |
| 530 ((and (fboundp 'compiler-macroexpand) | |
| 531 (symbolp (car-safe form)) | |
| 532 (get (car-safe form) 'cl-compiler-macro) | |
| 533 (not (eq form | |
| 534 (setq form (compiler-macroexpand form))))) | |
| 535 (byte-optimize-form form for-effect)) | |
| 536 | |
| 428 | 537 ((not (symbolp fn)) |
| 538 (or (eq 'mocklisp (car-safe fn)) ; ha! | |
| 539 (byte-compile-warn "%s is a malformed function" | |
| 540 (prin1-to-string fn))) | |
| 541 form) | |
| 542 | |
| 543 ((and for-effect (setq tmp (get fn 'side-effect-free)) | |
| 544 (or byte-compile-delete-errors | |
| 545 (eq tmp 'error-free) | |
| 546 (progn | |
| 547 (byte-compile-warn "%s called for effect" | |
| 548 (prin1-to-string form)) | |
| 549 nil))) | |
| 550 (byte-compile-log " %s called for effect; deleted" fn) | |
| 551 ;; appending a nil here might not be necessary, but it can't hurt. | |
| 552 (byte-optimize-form | |
| 553 (cons 'progn (append (cdr form) '(nil))) t)) | |
| 440 | 554 |
| 428 | 555 (t |
| 556 ;; Otherwise, no args can be considered to be for-effect, | |
| 557 ;; even if the called function is for-effect, because we | |
| 558 ;; don't know anything about that function. | |
| 559 (cons fn (mapcar 'byte-optimize-form (cdr form))))))) | |
| 560 | |
| 561 | |
| 562 (defun byte-optimize-form (form &optional for-effect) | |
| 563 "The source-level pass of the optimizer." | |
| 564 ;; | |
| 565 ;; First, optimize all sub-forms of this one. | |
| 566 (setq form (byte-optimize-form-code-walker form for-effect)) | |
| 567 ;; | |
| 568 ;; After optimizing all subforms, optimize this form until it doesn't | |
| 569 ;; optimize any further. This means that some forms will be passed through | |
| 570 ;; the optimizer many times, but that's necessary to make the for-effect | |
| 571 ;; processing do as much as possible. | |
| 572 ;; | |
| 573 (let (opt new) | |
| 574 (if (and (consp form) | |
| 575 (symbolp (car form)) | |
| 576 (or (and for-effect | |
| 577 ;; we don't have any of these yet, but we might. | |
| 578 (setq opt (get (car form) 'byte-for-effect-optimizer))) | |
| 579 (setq opt (get (car form) 'byte-optimizer))) | |
| 580 (not (eq form (setq new (funcall opt form))))) | |
| 581 (progn | |
| 582 ;; (if (equal form new) (error "bogus optimizer -- %s" opt)) | |
| 583 (byte-compile-log " %s\t==>\t%s" form new) | |
| 1297 | 584 (setq new (byte-optimize-form new for-effect)) |
| 585 new) | |
| 428 | 586 form))) |
| 587 | |
| 588 | |
| 589 (defun byte-optimize-body (forms all-for-effect) | |
| 590 ;; Optimize the cdr of a progn or implicit progn; `forms' is a list of | |
| 591 ;; forms, all but the last of which are optimized with the assumption that | |
| 592 ;; they are being called for effect. The last is for-effect as well if | |
| 593 ;; all-for-effect is true. Returns a new list of forms. | |
| 594 (let ((rest forms) | |
| 595 (result nil) | |
| 596 fe new) | |
| 597 (while rest | |
| 598 (setq fe (or all-for-effect (cdr rest))) | |
| 599 (setq new (and (car rest) (byte-optimize-form (car rest) fe))) | |
| 600 (if (or new (not fe)) | |
| 601 (setq result (cons new result))) | |
| 602 (setq rest (cdr rest))) | |
| 603 (nreverse result))) | |
| 604 | |
| 605 | |
| 606 ;;; some source-level optimizers | |
| 607 ;;; | |
| 608 ;;; when writing optimizers, be VERY careful that the optimizer returns | |
| 609 ;;; something not EQ to its argument if and ONLY if it has made a change. | |
| 610 ;;; This implies that you cannot simply destructively modify the list; | |
| 611 ;;; you must return something not EQ to it if you make an optimization. | |
| 612 ;;; | |
| 613 ;;; It is now safe to optimize code such that it introduces new bindings. | |
| 614 | |
| 615 ;; I'd like this to be a defsubst, but let's not be self-referential... | |
| 616 (defmacro byte-compile-trueconstp (form) | |
| 617 ;; Returns non-nil if FORM is a non-nil constant. | |
| 618 `(cond ((consp ,form) (eq (car ,form) 'quote)) | |
| 619 ((not (symbolp ,form))) | |
| 620 ((eq ,form t)) | |
| 621 ((keywordp ,form)))) | |
| 622 | |
| 623 ;; If the function is being called with constant numeric args, | |
| 440 | 624 ;; evaluate as much as possible at compile-time. This optimizer |
| 428 | 625 ;; assumes that the function is associative, like + or *. |
| 626 (defun byte-optimize-associative-math (form) | |
| 627 (let ((args nil) | |
| 628 (constants nil) | |
| 629 (rest (cdr form))) | |
| 630 (while rest | |
| 631 (if (numberp (car rest)) | |
| 632 (setq constants (cons (car rest) constants)) | |
| 633 (setq args (cons (car rest) args))) | |
| 634 (setq rest (cdr rest))) | |
| 635 (if (cdr constants) | |
| 636 (if args | |
| 637 (list (car form) | |
| 638 (apply (car form) constants) | |
| 639 (if (cdr args) | |
| 640 (cons (car form) (nreverse args)) | |
| 641 (car args))) | |
| 642 (apply (car form) constants)) | |
| 643 form))) | |
| 644 | |
| 645 ;; If the function is being called with constant numeric args, | |
| 646 ;; evaluate as much as possible at compile-time. This optimizer | |
| 647 ;; assumes that the function satisfies | |
| 648 ;; (op x1 x2 ... xn) == (op ...(op (op x1 x2) x3) ...xn) | |
| 649 ;; like - and /. | |
| 650 (defun byte-optimize-nonassociative-math (form) | |
| 651 (if (or (not (numberp (car (cdr form)))) | |
| 652 (not (numberp (car (cdr (cdr form)))))) | |
| 653 form | |
| 654 (let ((constant (car (cdr form))) | |
| 655 (rest (cdr (cdr form)))) | |
| 656 (while (numberp (car rest)) | |
| 657 (setq constant (funcall (car form) constant (car rest)) | |
| 658 rest (cdr rest))) | |
| 659 (if rest | |
| 660 (cons (car form) (cons constant rest)) | |
| 661 constant)))) | |
| 662 | |
| 663 ;;(defun byte-optimize-associative-two-args-math (form) | |
| 664 ;; (setq form (byte-optimize-associative-math form)) | |
| 665 ;; (if (consp form) | |
| 666 ;; (byte-optimize-two-args-left form) | |
| 667 ;; form)) | |
| 668 | |
| 669 ;;(defun byte-optimize-nonassociative-two-args-math (form) | |
| 670 ;; (setq form (byte-optimize-nonassociative-math form)) | |
| 671 ;; (if (consp form) | |
| 672 ;; (byte-optimize-two-args-right form) | |
| 673 ;; form)) | |
| 674 | |
| 675 ;; jwz: (byte-optimize-approx-equal 0.0 0.0) was returning nil | |
| 676 ;; in xemacs 19.15 because it used < instead of <=. | |
| 677 (defun byte-optimize-approx-equal (x y) | |
| 678 (<= (* (abs (- x y)) 100) (abs (+ x y)))) | |
| 679 | |
| 680 ;; Collect all the constants from FORM, after the STARTth arg, | |
| 681 ;; and apply FUN to them to make one argument at the end. | |
| 682 ;; For functions that can handle floats, that optimization | |
| 683 ;; can be incorrect because reordering can cause an overflow | |
| 684 ;; that would otherwise be avoided by encountering an arg that is a float. | |
| 685 ;; We avoid this problem by (1) not moving float constants and | |
| 686 ;; (2) not moving anything if it would cause an overflow. | |
| 687 (defun byte-optimize-delay-constants-math (form start fun) | |
| 688 ;; Merge all FORM's constants from number START, call FUN on them | |
| 689 ;; and put the result at the end. | |
| 690 (let ((rest (nthcdr (1- start) form)) | |
| 691 (orig form) | |
| 692 ;; t means we must check for overflow. | |
| 693 (overflow (memq fun '(+ *)))) | |
| 694 (while (cdr (setq rest (cdr rest))) | |
| 695 (if (integerp (car rest)) | |
| 696 (let (constants) | |
| 697 (setq form (copy-sequence form) | |
| 698 rest (nthcdr (1- start) form)) | |
| 699 (while (setq rest (cdr rest)) | |
| 700 (cond ((integerp (car rest)) | |
| 701 (setq constants (cons (car rest) constants)) | |
| 702 (setcar rest nil)))) | |
| 703 ;; If necessary, check now for overflow | |
| 704 ;; that might be caused by reordering. | |
| 705 (if (and overflow | |
| 706 ;; We have overflow if the result of doing the arithmetic | |
| 707 ;; on floats is not even close to the result | |
| 708 ;; of doing it on integers. | |
| 709 (not (byte-optimize-approx-equal | |
| 710 (apply fun (mapcar 'float constants)) | |
| 711 (float (apply fun constants))))) | |
| 712 (setq form orig) | |
| 713 (setq form (nconc (delq nil form) | |
| 714 (list (apply fun (nreverse constants))))))))) | |
| 715 form)) | |
| 716 | |
| 1297 | 717 ;; END SYNC WITH 20.7. |
| 718 | |
| 446 | 719 ;;; It is not safe to optimize calls to arithmetic ops with one arg |
| 720 ;;; away entirely (actually, it would be safe if we know the sole arg | |
| 721 ;;; is not a marker or if it appears in other arithmetic). | |
| 428 | 722 |
| 446 | 723 ;;; But this degree of paranoia is normally unjustified, so optimize unless |
| 547 | 724 ;;; the user has done (declaim (optimize (safety 3))). See bytecomp.el. |
| 442 | 725 |
| 446 | 726 (defun byte-optimize-plus (form) |
| 727 (byte-optimize-predicate (byte-optimize-delay-constants-math form 1 '+))) | |
| 428 | 728 |
| 729 (defun byte-optimize-multiply (form) | |
| 730 (setq form (byte-optimize-delay-constants-math form 1 '*)) | |
| 442 | 731 ;; If there is a constant integer in FORM, it is now the last element. |
| 446 | 732 |
| 733 (case (car (last form)) | |
| 734 ;; (* x y 0) --> (progn x y 0) | |
| 735 (0 (cons 'progn (cdr form))) | |
| 736 (t (byte-optimize-predicate form)))) | |
| 737 | |
| 738 (defun byte-optimize-minus (form) | |
| 739 ;; Put constants at the end, except the first arg. | |
| 740 (setq form (byte-optimize-delay-constants-math form 2 '+)) | |
| 741 ;; Now only the first and last args can be integers. | |
| 742 (let ((last (car (last (nthcdr 3 form))))) | |
| 743 (cond | |
| 744 ;; If form is (- CONST foo... CONST), merge first and last. | |
| 745 ((and (numberp (nth 1 form)) (numberp last)) | |
| 746 (decf (nth 1 form) last) | |
| 747 (butlast form)) | |
| 748 | |
| 464 | 749 ;; (- 0 ...) --> |
| 750 ((eq 0 (nth 1 form)) | |
| 751 (case (length form) | |
| 752 ;; (- 0) --> 0 | |
| 753 (2 0) | |
| 754 ;; (- 0 x) --> (- x) | |
| 755 (3 `(- ,(nth 2 form))) | |
| 756 ;; (- 0 x y ...) --> (- (- x) y ...) | |
| 757 (t `(- (- ,(nth 2 form)) ,@(nthcdr 3 form))))) | |
| 446 | 758 |
| 759 (t (byte-optimize-predicate form))))) | |
| 428 | 760 |
| 761 (defun byte-optimize-divide (form) | |
| 446 | 762 ;; Put constants at the end, except the first arg. |
| 428 | 763 (setq form (byte-optimize-delay-constants-math form 2 '*)) |
| 446 | 764 ;; Now only the first and last args can be integers. |
| 765 (let ((last (car (last (nthcdr 3 form))))) | |
| 440 | 766 (cond |
| 446 | 767 ;; If form is (/ CONST foo... CONST), merge first and last. |
| 768 ((and (numberp (nth 1 form)) (numberp last)) | |
| 769 (condition-case nil | |
| 770 (cons (nth 0 form) | |
| 771 (cons (/ (nth 1 form) last) | |
| 772 (butlast (cdr (cdr form))))) | |
| 773 (error form))) | |
| 774 | |
| 775 ;; (/ 0 x y) --> (progn x y 0) | |
| 442 | 776 ((eq (nth 1 form) 0) |
| 777 (append '(progn) (cdr (cdr form)) '(0))) | |
| 446 | 778 |
| 779 ;; We don't have to check for divide-by-zero because `/' does. | |
| 780 (t (byte-optimize-predicate form))))) | |
| 428 | 781 |
| 1297 | 782 ;; BEGIN SYNC WITH 20.7. |
| 783 | |
| 428 | 784 (defun byte-optimize-logmumble (form) |
| 785 (setq form (byte-optimize-delay-constants-math form 1 (car form))) | |
| 786 (byte-optimize-predicate | |
| 787 (cond ((memq 0 form) | |
| 788 (setq form (if (eq (car form) 'logand) | |
| 789 (cons 'progn (cdr form)) | |
| 790 (delq 0 (copy-sequence form))))) | |
| 791 ((and (eq (car-safe form) 'logior) | |
| 792 (memq -1 form)) | |
| 793 (cons 'progn (cdr form))) | |
| 794 (form)))) | |
| 795 | |
| 796 | |
| 797 (defun byte-optimize-binary-predicate (form) | |
| 798 (if (byte-compile-constp (nth 1 form)) | |
| 799 (if (byte-compile-constp (nth 2 form)) | |
| 800 (condition-case () | |
| 801 (list 'quote (eval form)) | |
| 802 (error form)) | |
| 803 ;; This can enable some lapcode optimizations. | |
| 804 (list (car form) (nth 2 form) (nth 1 form))) | |
| 805 form)) | |
| 806 | |
| 807 (defun byte-optimize-predicate (form) | |
| 808 (let ((ok t) | |
| 809 (rest (cdr form))) | |
| 810 (while (and rest ok) | |
| 811 (setq ok (byte-compile-constp (car rest)) | |
| 812 rest (cdr rest))) | |
| 813 (if ok | |
| 446 | 814 (condition-case err |
| 428 | 815 (list 'quote (eval form)) |
| 446 | 816 (error |
| 817 (byte-compile-warn "evaluating %s: %s" form err) | |
| 818 form)) | |
| 428 | 819 form))) |
| 820 | |
| 821 (defun byte-optimize-identity (form) | |
| 822 (if (and (cdr form) (null (cdr (cdr form)))) | |
| 823 (nth 1 form) | |
| 824 (byte-compile-warn "identity called with %d arg%s, but requires 1" | |
| 825 (length (cdr form)) | |
| 826 (if (= 1 (length (cdr form))) "" "s")) | |
| 827 form)) | |
| 828 | |
| 444 | 829 (defun byte-optimize-car (form) |
| 830 (let ((arg (cadr form))) | |
| 831 (cond | |
| 832 ((and (byte-compile-trueconstp arg) | |
| 833 (not (and (consp arg) | |
| 834 (eq (car arg) 'quote) | |
| 835 (listp (cadr arg))))) | |
| 836 (byte-compile-warn | |
| 837 "taking car of a constant: %s" arg) | |
| 838 form) | |
| 839 ((and (eq (car-safe arg) 'cons) | |
| 840 (eq (length arg) 3)) | |
| 841 `(prog1 ,(nth 1 arg) ,(nth 2 arg))) | |
| 842 ((eq (car-safe arg) 'list) | |
| 843 `(prog1 ,@(cdr arg))) | |
| 844 (t | |
| 845 (byte-optimize-predicate form))))) | |
| 846 | |
| 847 (defun byte-optimize-cdr (form) | |
| 848 (let ((arg (cadr form))) | |
| 849 (cond | |
| 850 ((and (byte-compile-trueconstp arg) | |
| 851 (not (and (consp arg) | |
| 852 (eq (car arg) 'quote) | |
| 853 (listp (cadr arg))))) | |
| 854 (byte-compile-warn | |
| 855 "taking cdr of a constant: %s" arg) | |
| 856 form) | |
| 857 ((and (eq (car-safe arg) 'cons) | |
| 858 (eq (length arg) 3)) | |
| 859 `(progn ,(nth 1 arg) ,(nth 2 arg))) | |
| 860 ((eq (car-safe arg) 'list) | |
| 861 (if (> (length arg) 2) | |
| 862 `(progn ,(cadr arg) (list ,@(cddr arg))) | |
| 863 (cadr arg))) | |
| 864 (t | |
| 865 (byte-optimize-predicate form))))) | |
| 866 | |
| 428 | 867 (put 'identity 'byte-optimizer 'byte-optimize-identity) |
| 868 | |
| 869 (put '+ 'byte-optimizer 'byte-optimize-plus) | |
| 870 (put '* 'byte-optimizer 'byte-optimize-multiply) | |
| 871 (put '- 'byte-optimizer 'byte-optimize-minus) | |
| 872 (put '/ 'byte-optimizer 'byte-optimize-divide) | |
| 446 | 873 (put '% 'byte-optimizer 'byte-optimize-predicate) |
| 428 | 874 (put 'max 'byte-optimizer 'byte-optimize-associative-math) |
| 875 (put 'min 'byte-optimizer 'byte-optimize-associative-math) | |
| 876 | |
| 877 (put 'eq 'byte-optimizer 'byte-optimize-binary-predicate) | |
| 878 (put 'eql 'byte-optimizer 'byte-optimize-binary-predicate) | |
| 879 (put 'equal 'byte-optimizer 'byte-optimize-binary-predicate) | |
|
5219
2d0937dc83cf
Tidying of CL files; make docstrings read better, remove commented-out code
Aidan Kehoe <kehoea@parhasard.net>
parents:
4905
diff
changeset
|
880 (put 'equalp 'byte-optimizer 'byte-optimize-binary-predicate) |
| 428 | 881 (put 'string= 'byte-optimizer 'byte-optimize-binary-predicate) |
| 882 (put 'string-equal 'byte-optimizer 'byte-optimize-binary-predicate) | |
| 883 | |
| 550 | 884 (put '= 'byte-optimizer 'byte-optimize-predicate) |
| 428 | 885 (put '< 'byte-optimizer 'byte-optimize-predicate) |
| 886 (put '> 'byte-optimizer 'byte-optimize-predicate) | |
| 887 (put '<= 'byte-optimizer 'byte-optimize-predicate) | |
| 888 (put '>= 'byte-optimizer 'byte-optimize-predicate) | |
| 889 (put '1+ 'byte-optimizer 'byte-optimize-predicate) | |
| 890 (put '1- 'byte-optimizer 'byte-optimize-predicate) | |
| 891 (put 'not 'byte-optimizer 'byte-optimize-predicate) | |
| 892 (put 'null 'byte-optimizer 'byte-optimize-predicate) | |
| 893 (put 'memq 'byte-optimizer 'byte-optimize-predicate) | |
| 894 (put 'consp 'byte-optimizer 'byte-optimize-predicate) | |
| 895 (put 'listp 'byte-optimizer 'byte-optimize-predicate) | |
| 896 (put 'symbolp 'byte-optimizer 'byte-optimize-predicate) | |
| 897 (put 'stringp 'byte-optimizer 'byte-optimize-predicate) | |
| 898 (put 'string< 'byte-optimizer 'byte-optimize-predicate) | |
| 899 (put 'string-lessp 'byte-optimizer 'byte-optimize-predicate) | |
| 440 | 900 (put 'length 'byte-optimizer 'byte-optimize-predicate) |
| 428 | 901 |
| 902 (put 'logand 'byte-optimizer 'byte-optimize-logmumble) | |
| 903 (put 'logior 'byte-optimizer 'byte-optimize-logmumble) | |
| 904 (put 'logxor 'byte-optimizer 'byte-optimize-logmumble) | |
| 905 (put 'lognot 'byte-optimizer 'byte-optimize-predicate) | |
| 906 | |
| 444 | 907 (put 'car 'byte-optimizer 'byte-optimize-car) |
| 908 (put 'cdr 'byte-optimizer 'byte-optimize-cdr) | |
| 428 | 909 (put 'car-safe 'byte-optimizer 'byte-optimize-predicate) |
| 910 (put 'cdr-safe 'byte-optimizer 'byte-optimize-predicate) | |
| 911 | |
| 912 | |
| 440 | 913 ;; I'm not convinced that this is necessary. Doesn't the optimizer loop |
| 428 | 914 ;; take care of this? - Jamie |
| 915 ;; I think this may some times be necessary to reduce eg. (quote 5) to 5, | |
| 916 ;; so arithmetic optimizers recognize the numeric constant. - Hallvard | |
| 917 (put 'quote 'byte-optimizer 'byte-optimize-quote) | |
| 918 (defun byte-optimize-quote (form) | |
| 919 (if (or (consp (nth 1 form)) | |
| 920 (and (symbolp (nth 1 form)) | |
| 921 ;; XEmacs addition: | |
| 922 (not (keywordp (nth 1 form))) | |
| 923 (not (memq (nth 1 form) '(nil t))))) | |
| 924 form | |
| 925 (nth 1 form))) | |
| 926 | |
| 927 (defun byte-optimize-zerop (form) | |
| 928 (cond ((numberp (nth 1 form)) | |
| 929 (eval form)) | |
| 930 (byte-compile-delete-errors | |
| 931 (list '= (nth 1 form) 0)) | |
| 932 (form))) | |
| 933 | |
| 934 (put 'zerop 'byte-optimizer 'byte-optimize-zerop) | |
| 935 | |
| 936 (defun byte-optimize-and (form) | |
| 937 ;; Simplify if less than 2 args. | |
| 938 ;; if there is a literal nil in the args to `and', throw it and following | |
| 939 ;; forms away, and surround the `and' with (progn ... nil). | |
| 940 (cond ((null (cdr form))) | |
| 941 ((memq nil form) | |
| 942 (list 'progn | |
| 943 (byte-optimize-and | |
| 944 (prog1 (setq form (copy-sequence form)) | |
| 945 (while (nth 1 form) | |
| 946 (setq form (cdr form))) | |
| 947 (setcdr form nil))) | |
| 948 nil)) | |
| 949 ((null (cdr (cdr form))) | |
| 950 (nth 1 form)) | |
| 951 ((byte-optimize-predicate form)))) | |
| 952 | |
| 953 (defun byte-optimize-or (form) | |
|
4686
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4677
diff
changeset
|
954 ;; Throw away unneeded nils, and simplify if less than 2 args. |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4677
diff
changeset
|
955 ;; XEmacs; change to be more careful about discarding multiple values. |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4677
diff
changeset
|
956 (let* ((memqueued (memq nil form)) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4677
diff
changeset
|
957 (trailing-nil (and (cdr memqueued) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4677
diff
changeset
|
958 (equal '(nil) (last form)))) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4677
diff
changeset
|
959 rest) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4677
diff
changeset
|
960 ;; A trailing nil indicates to discard multiple values, and we need to |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4677
diff
changeset
|
961 ;; respect that: |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4677
diff
changeset
|
962 (when (and memqueued (cdr memqueued)) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4677
diff
changeset
|
963 (setq form (delq nil (copy-sequence form))) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4677
diff
changeset
|
964 (when trailing-nil |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4677
diff
changeset
|
965 (setcdr (last form) '(nil)))) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4677
diff
changeset
|
966 (setq rest form) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4677
diff
changeset
|
967 ;; If there is a literal non-nil constant in the args to `or', throw |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4677
diff
changeset
|
968 ;; away all following forms. We can do this because a literal non-nil |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4677
diff
changeset
|
969 ;; constant cannot be multiple. |
| 428 | 970 (while (cdr (setq rest (cdr rest))) |
| 971 (if (byte-compile-trueconstp (car rest)) | |
| 972 (setq form (copy-sequence form) | |
| 973 rest (setcdr (memq (car rest) form) nil)))) | |
| 974 (if (cdr (cdr form)) | |
| 975 (byte-optimize-predicate form) | |
| 976 (nth 1 form)))) | |
| 977 | |
| 1297 | 978 ;; END SYNC WITH 20.7. |
| 979 | |
| 448 | 980 ;;; For the byte optimizer, `cond' is just overly sweet syntactic sugar. |
| 981 ;;; So we rewrite (cond ...) in terms of `if' and `or', | |
| 982 ;;; which are easier to optimize. | |
| 428 | 983 (defun byte-optimize-cond (form) |
| 448 | 984 (byte-optimize-cond-1 (cdr form))) |
| 985 | |
| 986 (defun byte-optimize-cond-1 (clauses) | |
| 987 (cond | |
| 988 ((null clauses) nil) | |
| 989 ((consp (car clauses)) | |
| 990 (nconc | |
| 991 (case (length (car clauses)) | |
|
4686
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4677
diff
changeset
|
992 (1 (if (cdr clauses) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4677
diff
changeset
|
993 `(or ,(nth 0 (car clauses))) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4677
diff
changeset
|
994 ;; XEmacs: don't pass any multiple values back: |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4677
diff
changeset
|
995 `(or ,(nth 0 (car clauses)) nil))) |
| 448 | 996 (2 `(if ,(nth 0 (car clauses)) ,(nth 1 (car clauses)))) |
| 997 (t `(if ,(nth 0 (car clauses)) (progn ,@(cdr (car clauses)))))) | |
| 998 (when (cdr clauses) (list (byte-optimize-cond-1 (cdr clauses)))))) | |
| 999 (t (error "malformed cond clause %s" (car clauses))))) | |
| 428 | 1000 |
| 1297 | 1001 ;; BEGIN SYNC WITH 20.7. |
| 1002 | |
| 428 | 1003 (defun byte-optimize-if (form) |
| 1004 ;; (if <true-constant> <then> <else...>) ==> <then> | |
| 1005 ;; (if <false-constant> <then> <else...>) ==> (progn <else...>) | |
| 1006 ;; (if <test> nil <else...>) ==> (if (not <test>) (progn <else...>)) | |
| 1007 ;; (if <test> <then> nil) ==> (if <test> <then>) | |
| 1008 (let ((clause (nth 1 form))) | |
| 1009 (cond ((byte-compile-trueconstp clause) | |
| 1010 (nth 2 form)) | |
| 1011 ((null clause) | |
| 1012 (if (nthcdr 4 form) | |
| 1013 (cons 'progn (nthcdr 3 form)) | |
| 1014 (nth 3 form))) | |
| 1015 ((nth 2 form) | |
| 1016 (if (equal '(nil) (nthcdr 3 form)) | |
| 1017 (list 'if clause (nth 2 form)) | |
| 1018 form)) | |
| 1019 ((or (nth 3 form) (nthcdr 4 form)) | |
| 1020 (list 'if | |
| 1021 ;; Don't make a double negative; | |
| 1022 ;; instead, take away the one that is there. | |
| 1023 (if (and (consp clause) (memq (car clause) '(not null)) | |
| 1024 (= (length clause) 2)) ; (not xxxx) or (not (xxxx)) | |
| 1025 (nth 1 clause) | |
| 1026 (list 'not clause)) | |
| 1027 (if (nthcdr 4 form) | |
| 1028 (cons 'progn (nthcdr 3 form)) | |
| 1029 (nth 3 form)))) | |
| 1030 (t | |
| 1031 (list 'progn clause nil))))) | |
| 1032 | |
| 1033 (defun byte-optimize-while (form) | |
| 1034 (if (nth 1 form) | |
| 1035 form)) | |
| 1036 | |
| 1037 (put 'and 'byte-optimizer 'byte-optimize-and) | |
| 1038 (put 'or 'byte-optimizer 'byte-optimize-or) | |
| 1039 (put 'cond 'byte-optimizer 'byte-optimize-cond) | |
| 1040 (put 'if 'byte-optimizer 'byte-optimize-if) | |
| 1041 (put 'while 'byte-optimizer 'byte-optimize-while) | |
| 1042 | |
| 446 | 1043 ;; The supply of bytecodes is small and constrained by backward compatibility. |
| 1044 ;; Several functions have byte-coded versions and hence are very efficient. | |
| 1045 ;; Related functions which can be expressed in terms of the byte-coded | |
| 1046 ;; ones should be transformed into bytecoded calls for efficiency. | |
| 1047 ;; This is especially the case for functions with a backward- and | |
| 1048 ;; forward- version, but with a bytecode only for the forward one. | |
| 1049 | |
| 1050 ;; Some programmers have hand-optimized calls like (backward-char) | |
| 1051 ;; into the call (forward-char -1). | |
| 1052 ;; But it's so much nicer for the byte-compiler to do this automatically! | |
| 1053 | |
| 1054 ;; (char-before) ==> (char-after (1- (point))) | |
| 1055 (put 'char-before 'byte-optimizer 'byte-optimize-char-before) | |
| 434 | 1056 (defun byte-optimize-char-before (form) |
| 446 | 1057 `(char-after |
| 1058 ,(cond | |
| 1059 ((null (nth 1 form)) | |
| 1060 '(1- (point))) | |
| 1061 ((equal '(point) (nth 1 form)) | |
| 1062 '(1- (point))) | |
| 1063 (t `(1- (or ,(nth 1 form) (point))))) | |
| 1064 ,@(cdr (cdr form)))) | |
| 1065 | |
| 1066 ;; (backward-char n) ==> (forward-char (- n)) | |
| 1067 (put 'backward-char 'byte-optimizer 'byte-optimize-backward-char) | |
| 1068 (defun byte-optimize-backward-char (form) | |
| 1069 `(forward-char | |
| 1070 ,(typecase (nth 1 form) | |
| 1071 (null -1) | |
| 1072 (integer (- (nth 1 form))) | |
| 1073 (t `(- (or ,(nth 1 form) 1)))) | |
| 1074 ,@(cdr (cdr form)))) | |
| 440 | 1075 |
| 446 | 1076 ;; (backward-word n) ==> (forward-word (- n)) |
| 1077 (put 'backward-word 'byte-optimizer 'byte-optimize-backward-word) | |
| 1078 (defun byte-optimize-backward-word (form) | |
| 1079 `(forward-word | |
| 1080 ,(typecase (nth 1 form) | |
| 1081 (null -1) | |
| 1082 (integer (- (nth 1 form))) | |
| 1083 (t `(- (or ,(nth 1 form) 1)))) | |
| 1084 ,@(cdr (cdr form)))) | |
| 1085 | |
| 1086 ;; The following would be a valid optimization of the above kind, but | |
| 1087 ;; the gain in performance is very small, since the saved funcall is | |
| 1088 ;; counterbalanced by the necessity of adding a bytecode for (point). | |
| 1089 ;; | |
| 1090 ;; Also, users are more likely to have modified the behavior of | |
| 1091 ;; delete-char via advice or some similar mechanism. This is much | |
| 1092 ;; less of a problem for the previous functions because it wouldn't | |
| 1093 ;; make sense to modify the behaviour of `backward-char' without also | |
| 1094 ;; modifying `forward-char', for example. | |
| 1095 | |
| 1096 ;; (delete-char n) ==> (delete-region (point) (+ (point) n)) | |
| 1097 ;; (put 'delete-char 'byte-optimizer 'byte-optimize-delete-char) | |
| 1098 ;; (defun byte-optimize-delete-char (form) | |
| 1099 ;; (case (length (cdr form)) | |
| 1100 ;; (0 `(delete-region (point) (1+ (point)))) | |
| 1101 ;; (1 `(delete-region (point) (+ (point) ,(nth 1 form)))) | |
| 1102 ;; (t form))) | |
| 434 | 1103 |
| 428 | 1104 ;; byte-compile-negation-optimizer lives in bytecomp.el |
| 1105 ;(put '/= 'byte-optimizer 'byte-compile-negation-optimizer) | |
| 1106 (put 'atom 'byte-optimizer 'byte-compile-negation-optimizer) | |
| 1107 (put 'nlistp 'byte-optimizer 'byte-compile-negation-optimizer) | |
| 1108 | |
| 1109 (defun byte-optimize-funcall (form) | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4601
diff
changeset
|
1110 ;; (funcall #'(lambda ...) ...) ==> ((lambda ...) ...) |
| 428 | 1111 ;; (funcall 'foo ...) ==> (foo ...) |
| 1112 (let ((fn (nth 1 form))) | |
| 1113 (if (memq (car-safe fn) '(quote function)) | |
| 1114 (cons (nth 1 fn) (cdr (cdr form))) | |
| 1115 form))) | |
| 1116 | |
| 1117 (defun byte-optimize-apply (form) | |
| 1118 ;; If the last arg is a literal constant, turn this into a funcall. | |
| 1119 ;; The funcall optimizer can then transform (funcall 'foo ...) -> (foo ...). | |
| 1120 (let ((fn (nth 1 form)) | |
| 1121 (last (nth (1- (length form)) form))) ; I think this really is fastest | |
|
5264
0d43872986b6
Change (apply 'nconc (mapcar ...)) to (mapcan ...); warn about first form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5219
diff
changeset
|
1122 (if (and (eq last (third form)) |
|
0d43872986b6
Change (apply 'nconc (mapcar ...)) to (mapcan ...); warn about first form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5219
diff
changeset
|
1123 (consp last) |
|
0d43872986b6
Change (apply 'nconc (mapcar ...)) to (mapcan ...); warn about first form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5219
diff
changeset
|
1124 (eq 'mapcar (car last)) |
|
0d43872986b6
Change (apply 'nconc (mapcar ...)) to (mapcan ...); warn about first form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5219
diff
changeset
|
1125 (equal fn ''nconc)) |
|
0d43872986b6
Change (apply 'nconc (mapcar ...)) to (mapcan ...); warn about first form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5219
diff
changeset
|
1126 (progn |
|
0d43872986b6
Change (apply 'nconc (mapcar ...)) to (mapcan ...); warn about first form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5219
diff
changeset
|
1127 (byte-compile-warn |
|
0d43872986b6
Change (apply 'nconc (mapcar ...)) to (mapcan ...); warn about first form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5219
diff
changeset
|
1128 "(apply 'nconc (mapcar ..)), use #'mapcan instead: %s" last) |
|
0d43872986b6
Change (apply 'nconc (mapcar ...)) to (mapcan ...); warn about first form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5219
diff
changeset
|
1129 (cons 'mapcan (cdr last))) |
|
0d43872986b6
Change (apply 'nconc (mapcar ...)) to (mapcan ...); warn about first form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5219
diff
changeset
|
1130 (or (if (or (null last) |
|
0d43872986b6
Change (apply 'nconc (mapcar ...)) to (mapcan ...); warn about first form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5219
diff
changeset
|
1131 (eq (car-safe last) 'quote)) |
|
0d43872986b6
Change (apply 'nconc (mapcar ...)) to (mapcan ...); warn about first form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5219
diff
changeset
|
1132 (if (listp (nth 1 last)) |
|
0d43872986b6
Change (apply 'nconc (mapcar ...)) to (mapcan ...); warn about first form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5219
diff
changeset
|
1133 (let ((butlast (nreverse (cdr (reverse (cdr (cdr form))))))) |
|
0d43872986b6
Change (apply 'nconc (mapcar ...)) to (mapcan ...); warn about first form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5219
diff
changeset
|
1134 (nconc (list 'funcall fn) butlast |
|
0d43872986b6
Change (apply 'nconc (mapcar ...)) to (mapcan ...); warn about first form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5219
diff
changeset
|
1135 (mapcar #'(lambda (x) (list 'quote x)) |
|
0d43872986b6
Change (apply 'nconc (mapcar ...)) to (mapcan ...); warn about first form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5219
diff
changeset
|
1136 (nth 1 last)))) |
|
0d43872986b6
Change (apply 'nconc (mapcar ...)) to (mapcan ...); warn about first form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5219
diff
changeset
|
1137 (byte-compile-warn |
|
0d43872986b6
Change (apply 'nconc (mapcar ...)) to (mapcan ...); warn about first form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5219
diff
changeset
|
1138 "last arg to apply can't be a literal atom: %s" |
|
0d43872986b6
Change (apply 'nconc (mapcar ...)) to (mapcan ...); warn about first form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5219
diff
changeset
|
1139 (prin1-to-string last)) |
|
0d43872986b6
Change (apply 'nconc (mapcar ...)) to (mapcan ...); warn about first form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5219
diff
changeset
|
1140 nil)) |
|
0d43872986b6
Change (apply 'nconc (mapcar ...)) to (mapcan ...); warn about first form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5219
diff
changeset
|
1141 form)))) |
| 428 | 1142 |
| 1143 (put 'funcall 'byte-optimizer 'byte-optimize-funcall) | |
| 1144 (put 'apply 'byte-optimizer 'byte-optimize-apply) | |
| 1145 | |
| 1146 | |
| 1147 (put 'let 'byte-optimizer 'byte-optimize-letX) | |
| 1148 (put 'let* 'byte-optimizer 'byte-optimize-letX) | |
| 1149 (defun byte-optimize-letX (form) | |
| 1150 (cond ((null (nth 1 form)) | |
| 1151 ;; No bindings | |
| 1152 (cons 'progn (cdr (cdr form)))) | |
| 1153 ((or (nth 2 form) (nthcdr 3 form)) | |
| 1154 form) | |
| 1155 ;; The body is nil | |
| 1156 ((eq (car form) 'let) | |
| 1157 (append '(progn) (mapcar 'car-safe (mapcar 'cdr-safe (nth 1 form))) | |
| 1158 '(nil))) | |
| 1159 (t | |
| 1160 (let ((binds (reverse (nth 1 form)))) | |
| 1161 (list 'let* (reverse (cdr binds)) (nth 1 (car binds)) nil))))) | |
| 1162 | |
| 1163 | |
| 1164 (put 'nth 'byte-optimizer 'byte-optimize-nth) | |
| 1165 (defun byte-optimize-nth (form) | |
| 1166 (if (and (= (safe-length form) 3) (memq (nth 1 form) '(0 1))) | |
| 1167 (list 'car (if (zerop (nth 1 form)) | |
| 1168 (nth 2 form) | |
| 1169 (list 'cdr (nth 2 form)))) | |
| 1170 (byte-optimize-predicate form))) | |
| 1171 | |
| 1172 (put 'nthcdr 'byte-optimizer 'byte-optimize-nthcdr) | |
| 1173 (defun byte-optimize-nthcdr (form) | |
| 1174 (if (and (= (safe-length form) 3) (not (memq (nth 1 form) '(0 1 2)))) | |
| 1175 (byte-optimize-predicate form) | |
| 1176 (let ((count (nth 1 form))) | |
| 1177 (setq form (nth 2 form)) | |
| 1178 (while (>= (setq count (1- count)) 0) | |
| 1179 (setq form (list 'cdr form))) | |
| 1180 form))) | |
| 444 | 1181 |
| 1182 (put 'concat 'byte-optimizer 'byte-optimize-concat) | |
| 1183 (defun byte-optimize-concat (form) | |
| 1184 (let ((args (cdr form)) | |
| 1185 (constant t)) | |
| 1186 (while (and args constant) | |
| 1187 (or (byte-compile-constp (car args)) | |
| 1188 (setq constant nil)) | |
| 1189 (setq args (cdr args))) | |
| 1190 (if constant | |
| 1191 (eval form) | |
| 1192 form))) | |
| 4160 | 1193 |
| 4228 | 1194 (defvar byte-optimize-ever-present-features |
| 1195 '(xemacs cl cl-extra cl-19 backquote)) | |
| 1196 | |
| 1197 (put 'featurep 'byte-optimizer 'byte-optimize-featurep) | |
| 1198 (defun byte-optimize-featurep (form) | |
| 4288 | 1199 (if (memq (car-safe |
| 1200 (cdr-safe | |
| 1201 (car-safe | |
| 1202 (cdr-safe | |
| 1203 form)))) | |
| 1204 byte-optimize-ever-present-features) | |
| 1205 t | |
| 1206 form)) | |
| 4228 | 1207 |
| 428 | 1208 |
| 440 | 1209 ;;; enumerating those functions which need not be called if the returned |
| 428 | 1210 ;;; value is not used. That is, something like |
| 1211 ;;; (progn (list (something-with-side-effects) (yow)) | |
| 1212 ;;; (foo)) | |
| 1213 ;;; may safely be turned into | |
| 1214 ;;; (progn (progn (something-with-side-effects) (yow)) | |
| 1215 ;;; (foo)) | |
| 1216 ;;; Further optimizations will turn (progn (list 1 2 3) 'foo) into 'foo. | |
| 1217 | |
| 1218 ;;; I wonder if I missed any :-\) | |
| 1219 (let ((side-effect-free-fns | |
| 1220 '(% * + - / /= 1+ 1- < <= = > >= abs acos append aref ash asin atan | |
| 1221 assoc assq | |
|
4885
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4686
diff
changeset
|
1222 bigfloat-get-precision boundp buffer-file-name buffer-local-variables |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4686
diff
changeset
|
1223 buffer-modified-p buffer-substring |
| 428 | 1224 capitalize car-less-than-car car cdr ceiling concat |
| 1225 ;; coordinates-in-window-p not in XEmacs | |
| 1226 copy-marker cos count-lines | |
|
4885
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4686
diff
changeset
|
1227 default-boundp default-value denominator documentation downcase |
|
5285
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5264
diff
changeset
|
1228 elt endp exp expt fboundp featurep |
| 428 | 1229 file-directory-p file-exists-p file-locked-p file-name-absolute-p |
| 1230 file-newer-than-file-p file-readable-p file-symlink-p file-writable-p | |
| 1231 float floor format | |
| 1232 get get-buffer get-buffer-window getenv get-file-buffer | |
| 1233 ;; hash-table functions | |
| 1234 make-hash-table copy-hash-table | |
| 1235 gethash | |
| 1236 hash-table-count | |
| 1237 hash-table-rehash-size | |
| 1238 hash-table-rehash-threshold | |
| 1239 hash-table-size | |
| 1240 hash-table-test | |
| 1241 hash-table-type | |
| 1242 ;; | |
| 1243 int-to-string | |
| 1244 length log log10 logand logb logior lognot logxor lsh | |
| 1245 marker-buffer max member memq min mod | |
|
4885
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4686
diff
changeset
|
1246 next-window nth nthcdr number-to-string numerator |
| 440 | 1247 parse-colon-path plist-get previous-window |
|
5311
07d24b1f27a7
Mark #'remove, #'remq as free of side-effects.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5294
diff
changeset
|
1248 radians-to-degrees rassq rassoc remove remq regexp-quote reverse round |
| 428 | 1249 sin sqrt string< string= string-equal string-lessp string-to-char |
|
5294
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5285
diff
changeset
|
1250 string-to-int string-to-number substring symbol-plist symbol-value |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5285
diff
changeset
|
1251 symbol-name symbol-function symbol |
| 428 | 1252 tan upcase user-variable-p vconcat |
| 1253 ;; XEmacs change: window-edges -> window-pixel-edges | |
| 1254 window-buffer window-dedicated-p window-pixel-edges window-height | |
| 1255 window-hscroll window-minibuffer-p window-width | |
| 1256 zerop | |
| 1257 ;; functions defined by cl | |
| 1258 oddp evenp plusp minusp | |
| 1259 abs expt signum last butlast ldiff | |
| 1260 pairlis gcd lcm | |
| 1261 isqrt floor* ceiling* truncate* round* mod* rem* subseq | |
| 440 | 1262 list-length getf |
| 428 | 1263 )) |
| 1264 (side-effect-and-error-free-fns | |
| 1265 '(arrayp atom | |
|
4885
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4686
diff
changeset
|
1266 bigfloatp bignump bobp bolp buffer-end buffer-list buffer-size |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4686
diff
changeset
|
1267 buffer-string bufferp |
| 428 | 1268 car-safe case-table-p cdr-safe char-or-string-p char-table-p |
| 1269 characterp commandp cons | |
| 1270 consolep console-live-p consp | |
| 1271 current-buffer | |
| 1272 ;; XEmacs: extent functions, frame-live-p, various other stuff | |
| 1273 devicep device-live-p | |
|
5311
07d24b1f27a7
Mark #'remove, #'remq as free of side-effects.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5294
diff
changeset
|
1274 eobp eolp eq eql equal eventp extentp |
|
4885
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4686
diff
changeset
|
1275 extent-live-p fixnump floatingp floatp framep frame-live-p |
| 428 | 1276 get-largest-window get-lru-window |
| 1277 hash-table-p | |
| 1278 identity ignore integerp integer-or-marker-p interactive-p | |
| 1279 invocation-directory invocation-name | |
| 444 | 1280 keymapp list listp |
| 428 | 1281 make-marker mark mark-marker markerp memory-limit minibuffer-window |
| 1282 ;; mouse-movement-p not in XEmacs | |
| 1283 natnump nlistp not null number-or-marker-p numberp | |
| 1284 one-window-p ;; overlayp not in XEmacs | |
| 1285 point point-marker point-min point-max processp | |
|
4885
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4686
diff
changeset
|
1286 rationalp ratiop range-table-p realp |
| 428 | 1287 selected-window sequencep stringp subrp symbolp syntax-table-p |
| 1288 user-full-name user-login-name user-original-login-name | |
| 1289 user-real-login-name user-real-uid user-uid | |
| 1290 vector vectorp | |
| 1291 window-configuration-p window-live-p windowp | |
| 1292 ;; Functions defined by cl | |
|
4885
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4686
diff
changeset
|
1293 eql list* subst acons equalp random-state-p |
| 428 | 1294 copy-tree sublis |
| 1295 ))) | |
| 1296 (dolist (fn side-effect-free-fns) | |
| 1297 (put fn 'side-effect-free t)) | |
| 1298 (dolist (fn side-effect-and-error-free-fns) | |
| 1299 (put fn 'side-effect-free 'error-free))) | |
| 1300 | |
| 1301 | |
| 1302 (defun byte-compile-splice-in-already-compiled-code (form) | |
| 1303 ;; form is (byte-code "..." [...] n) | |
| 446 | 1304 (if (not (memq byte-optimize '(t byte))) |
| 428 | 1305 (byte-compile-normal-call form) |
| 1306 (byte-inline-lapcode | |
| 1307 (byte-decompile-bytecode-1 (nth 1 form) (nth 2 form) t)) | |
| 1308 (setq byte-compile-maxdepth (max (+ byte-compile-depth (nth 3 form)) | |
| 1309 byte-compile-maxdepth)) | |
| 1310 (setq byte-compile-depth (1+ byte-compile-depth)))) | |
| 1311 | |
| 1312 (put 'byte-code 'byte-compile 'byte-compile-splice-in-already-compiled-code) | |
| 1313 | |
| 1314 | |
| 1315 (defconst byte-constref-ops | |
| 1316 '(byte-constant byte-constant2 byte-varref byte-varset byte-varbind)) | |
| 1317 | |
| 1318 ;;; This function extracts the bitfields from variable-length opcodes. | |
| 1319 ;;; Originally defined in disass.el (which no longer uses it.) | |
| 1320 | |
| 1321 (defun disassemble-offset () | |
| 1322 "Don't call this!" | |
| 1323 ;; fetch and return the offset for the current opcode. | |
| 1324 ;; return NIL if this opcode has no offset | |
| 1325 ;; OP, PTR and BYTES are used and set dynamically | |
| 442 | 1326 (declare (special op ptr bytes)) |
| 428 | 1327 (cond ((< op byte-nth) |
| 1328 (let ((tem (logand op 7))) | |
| 1329 (setq op (logand op 248)) | |
| 1330 (cond ((eq tem 6) | |
| 1331 (setq ptr (1+ ptr)) ;offset in next byte | |
| 1332 ;; char-to-int to avoid downstream problems | |
| 1333 ;; caused by chars appearing where ints are | |
| 1334 ;; expected. In bytecode the bytes in the | |
| 1335 ;; opcode string are always interpreted as ints. | |
| 1336 (char-to-int (aref bytes ptr))) | |
| 1337 ((eq tem 7) | |
| 1338 (setq ptr (1+ ptr)) ;offset in next 2 bytes | |
| 1339 (+ (aref bytes ptr) | |
| 1340 (progn (setq ptr (1+ ptr)) | |
| 1341 (lsh (aref bytes ptr) 8)))) | |
| 1342 (t tem)))) ;offset was in opcode | |
| 1343 ((>= op byte-constant) | |
| 1344 (prog1 (- op byte-constant) ;offset in opcode | |
| 1345 (setq op byte-constant))) | |
| 1346 ((and (>= op byte-constant2) | |
| 1347 (<= op byte-goto-if-not-nil-else-pop)) | |
| 1348 (setq ptr (1+ ptr)) ;offset in next 2 bytes | |
| 1349 (+ (aref bytes ptr) | |
| 1350 (progn (setq ptr (1+ ptr)) | |
| 1351 (lsh (aref bytes ptr) 8)))) | |
| 1352 ;; XEmacs: this code was here before. FSF's first comparison | |
| 1353 ;; is (>= op byte-listN). It appears that the rel-goto stuff | |
| 1354 ;; does not exist in FSF 19.30. It doesn't exist in 19.28 | |
| 1355 ;; either, so I'm going to assume that this is an improvement | |
| 1356 ;; on our part and leave it in. --ben | |
| 1357 ((and (>= op byte-rel-goto) | |
| 1358 (<= op byte-insertN)) | |
| 1359 (setq ptr (1+ ptr)) ;offset in next byte | |
| 1360 ;; Use char-to-int to avoid downstream problems caused by | |
| 1361 ;; chars appearing where ints are expected. In bytecode | |
| 1362 ;; the bytes in the opcode string are always interpreted as | |
| 1363 ;; ints. | |
| 1364 (char-to-int (aref bytes ptr))))) | |
| 1365 | |
| 1366 | |
| 1367 ;;; This de-compiler is used for inline expansion of compiled functions, | |
| 1368 ;;; and by the disassembler. | |
| 1369 ;;; | |
| 1370 ;;; This list contains numbers, which are pc values, | |
| 1371 ;;; before each instruction. | |
| 1372 (defun byte-decompile-bytecode (bytes constvec) | |
| 1373 "Turns BYTECODE into lapcode, referring to CONSTVEC." | |
| 1374 (let ((byte-compile-constants nil) | |
| 1375 (byte-compile-variables nil) | |
| 1376 (byte-compile-tag-number 0)) | |
| 1377 (byte-decompile-bytecode-1 bytes constvec))) | |
| 1378 | |
| 1379 ;; As byte-decompile-bytecode, but updates | |
| 1380 ;; byte-compile-{constants, variables, tag-number}. | |
| 1381 ;; If MAKE-SPLICEABLE is true, then `return' opcodes are replaced | |
| 1382 ;; with `goto's destined for the end of the code. | |
| 1383 ;; That is for use by the compiler. | |
| 1384 ;; If MAKE-SPLICEABLE is nil, we are being called for the disassembler. | |
| 1385 ;; In that case, we put a pc value into the list | |
| 1386 ;; before each insn (or its label). | |
| 1387 (defun byte-decompile-bytecode-1 (bytes constvec &optional make-spliceable) | |
| 1388 (let ((length (length bytes)) | |
| 1389 (ptr 0) optr tags op offset | |
| 1390 ;; tag unused | |
| 1391 lap tmp | |
| 1392 endtag | |
| 1393 ;; (retcount 0) unused | |
| 1394 ) | |
| 1395 (while (not (= ptr length)) | |
| 1396 (or make-spliceable | |
| 1397 (setq lap (cons ptr lap))) | |
| 1398 (setq op (aref bytes ptr) | |
| 1399 optr ptr | |
| 1400 offset (disassemble-offset)) ; this does dynamic-scope magic | |
| 1401 (setq op (aref byte-code-vector op)) | |
| 1402 ;; XEmacs: the next line in FSF 19.30 reads | |
| 1403 ;; (cond ((memq op byte-goto-ops) | |
| 1404 ;; see the comment above about byte-rel-goto in XEmacs. | |
| 1405 (cond ((or (memq op byte-goto-ops) | |
| 1406 (cond ((memq op byte-rel-goto-ops) | |
| 1407 (setq op (aref byte-code-vector | |
| 1408 (- (symbol-value op) | |
| 1409 (- byte-rel-goto byte-goto)))) | |
| 1410 (setq offset (+ ptr (- offset 127))) | |
| 1411 t))) | |
| 1412 ;; it's a pc | |
| 1413 (setq offset | |
| 1414 (cdr (or (assq offset tags) | |
| 1415 (car (setq tags | |
| 1416 (cons (cons offset | |
| 1417 (byte-compile-make-tag)) | |
| 1418 tags))))))) | |
| 1419 ((cond ((eq op 'byte-constant2) (setq op 'byte-constant) t) | |
| 1420 ((memq op byte-constref-ops))) | |
| 1297 | 1421 (setq tmp (if (>= offset (length constvec)) |
| 1422 (list 'out-of-range offset) | |
| 1423 (aref constvec offset)) | |
| 428 | 1424 offset (if (eq op 'byte-constant) |
| 1425 (byte-compile-get-constant tmp) | |
| 1426 (or (assq tmp byte-compile-variables) | |
| 1427 (car (setq byte-compile-variables | |
| 1428 (cons (list tmp) | |
| 1429 byte-compile-variables))))))) | |
| 1430 ((and make-spliceable | |
| 1431 (eq op 'byte-return)) | |
| 1432 (if (= ptr (1- length)) | |
| 1433 (setq op nil) | |
| 1434 (setq offset (or endtag (setq endtag (byte-compile-make-tag))) | |
| 1435 op 'byte-goto)))) | |
| 1436 ;; lap = ( [ (pc . (op . arg)) ]* ) | |
| 1437 (setq lap (cons (cons optr (cons op (or offset 0))) | |
| 1438 lap)) | |
| 1439 (setq ptr (1+ ptr))) | |
| 1440 ;; take off the dummy nil op that we replaced a trailing "return" with. | |
| 1441 (let ((rest lap)) | |
| 1442 (while rest | |
| 1443 (cond ((numberp (car rest))) | |
| 1444 ((setq tmp (assq (car (car rest)) tags)) | |
| 1445 ;; this addr is jumped to | |
| 1446 (setcdr rest (cons (cons nil (cdr tmp)) | |
| 1447 (cdr rest))) | |
| 1448 (setq tags (delq tmp tags)) | |
| 1449 (setq rest (cdr rest)))) | |
| 1450 (setq rest (cdr rest)))) | |
| 1451 (if tags (error "optimizer error: missed tags %s" tags)) | |
| 1452 (if (null (car (cdr (car lap)))) | |
| 1453 (setq lap (cdr lap))) | |
| 1454 (if endtag | |
| 1455 (setq lap (cons (cons nil endtag) lap))) | |
| 1456 ;; remove addrs, lap = ( [ (op . arg) | (TAG tagno) ]* ) | |
| 1457 (mapcar #'(lambda (elt) (if (numberp elt) elt (cdr elt))) | |
| 1458 (nreverse lap)))) | |
| 1459 | |
| 1460 | |
| 1461 ;;; peephole optimizer | |
| 1462 | |
| 1463 (defconst byte-tagref-ops (cons 'TAG byte-goto-ops)) | |
| 1464 | |
| 1465 (defconst byte-conditional-ops | |
| 1466 '(byte-goto-if-nil byte-goto-if-not-nil byte-goto-if-nil-else-pop | |
| 1467 byte-goto-if-not-nil-else-pop)) | |
| 1468 | |
| 1469 (defconst byte-after-unbind-ops | |
| 1470 '(byte-constant byte-dup | |
|
4885
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4686
diff
changeset
|
1471 byte-symbolp byte-consp byte-stringp byte-listp byte-numberp byte-fixnump |
| 444 | 1472 byte-eq byte-not |
| 428 | 1473 byte-cons byte-list1 byte-list2 ; byte-list3 byte-list4 |
| 1474 byte-interactive-p) | |
| 1475 ;; How about other side-effect-free-ops? Is it safe to move an | |
| 1476 ;; error invocation (such as from nth) out of an unwind-protect? | |
| 444 | 1477 ;; No, it is not, because the unwind-protect forms can alter |
| 1478 ;; the inside of the object to which nth would apply. | |
| 1479 ;; For the same reason, byte-equal was deleted from this list. | |
| 428 | 1480 "Byte-codes that can be moved past an unbind.") |
| 1481 | |
| 1482 (defconst byte-compile-side-effect-and-error-free-ops | |
| 1483 '(byte-constant byte-dup byte-symbolp byte-consp byte-stringp byte-listp | |
|
4885
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4686
diff
changeset
|
1484 byte-fixnump byte-numberp byte-eq byte-equal byte-not byte-car-safe |
| 428 | 1485 byte-cdr-safe byte-cons byte-list1 byte-list2 byte-point byte-point-max |
| 1486 byte-point-min byte-following-char byte-preceding-char | |
| 1487 byte-current-column byte-eolp byte-eobp byte-bolp byte-bobp | |
| 1488 byte-current-buffer byte-interactive-p)) | |
| 1489 | |
| 1490 (defconst byte-compile-side-effect-free-ops | |
| 440 | 1491 (nconc |
| 428 | 1492 '(byte-varref byte-nth byte-memq byte-car byte-cdr byte-length byte-aref |
| 1493 byte-symbol-value byte-get byte-concat2 byte-concat3 byte-sub1 byte-add1 | |
| 1494 byte-eqlsign byte-gtr byte-lss byte-leq byte-geq byte-diff byte-negate | |
| 1495 byte-plus byte-max byte-min byte-mult byte-char-after byte-char-syntax | |
| 1496 byte-buffer-substring byte-string= byte-string< byte-nthcdr byte-elt | |
| 1497 byte-member byte-assq byte-quo byte-rem) | |
| 1498 byte-compile-side-effect-and-error-free-ops)) | |
| 1499 | |
| 1500 ;;; This piece of shit is because of the way DEFVAR_BOOL() variables work. | |
| 1501 ;;; Consider the code | |
| 1502 ;;; | |
| 1503 ;;; (defun foo (flag) | |
| 1504 ;;; (let ((old-pop-ups pop-up-windows) | |
| 1505 ;;; (pop-up-windows flag)) | |
| 1506 ;;; (cond ((not (eq pop-up-windows old-pop-ups)) | |
| 1507 ;;; (setq old-pop-ups pop-up-windows) | |
| 1508 ;;; ...)))) | |
| 1509 ;;; | |
| 1510 ;;; Uncompiled, old-pop-ups will always be set to nil or t, even if FLAG is | |
| 1511 ;;; something else. But if we optimize | |
| 1512 ;;; | |
| 1513 ;;; varref flag | |
| 1514 ;;; varbind pop-up-windows | |
| 1515 ;;; varref pop-up-windows | |
| 1516 ;;; not | |
| 1517 ;;; to | |
| 1518 ;;; varref flag | |
| 1519 ;;; dup | |
| 1520 ;;; varbind pop-up-windows | |
| 1521 ;;; not | |
| 1522 ;;; | |
| 440 | 1523 ;;; we break the program, because it will appear that pop-up-windows and |
| 428 | 1524 ;;; old-pop-ups are not EQ when really they are. So we have to know what |
| 1525 ;;; the BOOL variables are, and not perform this optimization on them. | |
| 1526 ;;; | |
| 1527 | |
| 1528 ;;; This used to hold a large list of boolean variables, which had to | |
| 1529 ;;; be updated every time a new DEFVAR_BOOL is added, making it very | |
| 1530 ;;; hard to maintain. Such a list is not necessary under XEmacs, | |
| 1531 ;;; where we can use `built-in-variable-type' to query for boolean | |
| 1532 ;;; variables. | |
| 1533 | |
| 1534 ;(defconst byte-boolean-vars | |
| 1297 | 1535 ; ...) |
| 428 | 1536 |
| 1537 (defun byte-optimize-lapcode (lap &optional for-effect) | |
| 1538 "Simple peephole optimizer. LAP is both modified and returned." | |
| 442 | 1539 (let (lap0 |
| 1540 lap1 | |
| 1541 lap2 | |
| 1542 variable-frequency | |
| 428 | 1543 (keep-going 'first-time) |
| 1544 (add-depth 0) | |
| 1545 rest tmp tmp2 tmp3 | |
| 1546 (side-effect-free (if byte-compile-delete-errors | |
| 1547 byte-compile-side-effect-free-ops | |
| 1548 byte-compile-side-effect-and-error-free-ops))) | |
| 1549 (while keep-going | |
| 1550 (or (eq keep-going 'first-time) | |
| 1551 (byte-compile-log-lap " ---- next pass")) | |
| 1552 (setq rest lap | |
| 1553 keep-going nil) | |
| 1554 (while rest | |
| 1555 (setq lap0 (car rest) | |
| 1556 lap1 (nth 1 rest) | |
| 1557 lap2 (nth 2 rest)) | |
| 1558 | |
| 1559 ;; You may notice that sequences like "dup varset discard" are | |
| 1560 ;; optimized but sequences like "dup varset TAG1: discard" are not. | |
| 1561 ;; You may be tempted to change this; resist that temptation. | |
| 1562 (cond ;; | |
| 1563 ;; <side-effect-free> pop --> <deleted> | |
| 1564 ;; ...including: | |
| 1565 ;; const-X pop --> <deleted> | |
| 1566 ;; varref-X pop --> <deleted> | |
| 1567 ;; dup pop --> <deleted> | |
| 1568 ;; | |
| 1569 ((and (eq 'byte-discard (car lap1)) | |
| 1570 (memq (car lap0) side-effect-free)) | |
| 1571 (setq keep-going t) | |
| 1572 (setq tmp (aref byte-stack+-info (symbol-value (car lap0)))) | |
| 1573 (setq rest (cdr rest)) | |
| 1574 (cond ((= tmp 1) | |
| 1575 (byte-compile-log-lap | |
| 1576 " %s discard\t-->\t<deleted>" lap0) | |
| 1577 (setq lap (delq lap0 (delq lap1 lap)))) | |
| 1578 ((= tmp 0) | |
| 1579 (byte-compile-log-lap | |
| 1580 " %s discard\t-->\t<deleted> discard" lap0) | |
| 1581 (setq lap (delq lap0 lap))) | |
| 1582 ((= tmp -1) | |
| 1583 (byte-compile-log-lap | |
| 1584 " %s discard\t-->\tdiscard discard" lap0) | |
| 1585 (setcar lap0 'byte-discard) | |
| 1586 (setcdr lap0 0)) | |
| 1587 ((error "Optimizer error: too much on the stack")))) | |
| 1588 ;; | |
| 1589 ;; goto*-X X: --> X: | |
| 1590 ;; | |
| 1591 ((and (memq (car lap0) byte-goto-ops) | |
| 1592 (eq (cdr lap0) lap1)) | |
| 1593 (cond ((eq (car lap0) 'byte-goto) | |
| 1594 (setq lap (delq lap0 lap)) | |
| 1595 (setq tmp "<deleted>")) | |
| 1596 ((memq (car lap0) byte-goto-always-pop-ops) | |
| 1597 (setcar lap0 (setq tmp 'byte-discard)) | |
| 1598 (setcdr lap0 0)) | |
| 1599 ((error "Depth conflict at tag %d" (nth 2 lap0)))) | |
| 1600 (and (memq byte-optimize-log '(t byte)) | |
| 1601 (byte-compile-log " (goto %s) %s:\t-->\t%s %s:" | |
| 1602 (nth 1 lap1) (nth 1 lap1) | |
| 1603 tmp (nth 1 lap1))) | |
| 1604 (setq keep-going t)) | |
| 1605 ;; | |
| 1606 ;; varset-X varref-X --> dup varset-X | |
| 1607 ;; varbind-X varref-X --> dup varbind-X | |
| 1608 ;; const/dup varset-X varref-X --> const/dup varset-X const/dup | |
| 1609 ;; const/dup varbind-X varref-X --> const/dup varbind-X const/dup | |
| 1610 ;; The latter two can enable other optimizations. | |
| 1611 ;; | |
| 1612 ((and (eq 'byte-varref (car lap2)) | |
| 1613 (eq (cdr lap1) (cdr lap2)) | |
| 1614 (memq (car lap1) '(byte-varset byte-varbind))) | |
| 1615 (if (and (setq tmp (eq (built-in-variable-type (car (cdr lap2))) | |
| 1616 'boolean)) | |
| 1617 (not (eq (car lap0) 'byte-constant))) | |
| 1618 nil | |
| 1619 (setq keep-going t) | |
| 1620 (if (memq (car lap0) '(byte-constant byte-dup)) | |
| 1621 (progn | |
| 1622 (setq tmp (if (or (not tmp) | |
| 1623 (memq (car (cdr lap0)) '(nil t))) | |
| 1624 (cdr lap0) | |
| 1625 (byte-compile-get-constant t))) | |
| 1626 (byte-compile-log-lap " %s %s %s\t-->\t%s %s %s" | |
| 1627 lap0 lap1 lap2 lap0 lap1 | |
| 1628 (cons (car lap0) tmp)) | |
| 1629 (setcar lap2 (car lap0)) | |
| 1630 (setcdr lap2 tmp)) | |
| 1631 (byte-compile-log-lap " %s %s\t-->\tdup %s" lap1 lap2 lap1) | |
| 1632 (setcar lap2 (car lap1)) | |
| 1633 (setcar lap1 'byte-dup) | |
| 1634 (setcdr lap1 0) | |
| 1635 ;; The stack depth gets locally increased, so we will | |
| 1636 ;; increase maxdepth in case depth = maxdepth here. | |
| 1637 ;; This can cause the third argument to byte-code to | |
| 1638 ;; be larger than necessary. | |
| 1639 (setq add-depth 1)))) | |
| 1640 ;; | |
| 1641 ;; dup varset-X discard --> varset-X | |
| 1642 ;; dup varbind-X discard --> varbind-X | |
| 1643 ;; (the varbind variant can emerge from other optimizations) | |
| 1644 ;; | |
| 1645 ((and (eq 'byte-dup (car lap0)) | |
| 1646 (eq 'byte-discard (car lap2)) | |
| 1647 (memq (car lap1) '(byte-varset byte-varbind))) | |
| 1648 (byte-compile-log-lap " dup %s discard\t-->\t%s" lap1 lap1) | |
| 1649 (setq keep-going t | |
| 1650 rest (cdr rest)) | |
| 1651 (setq lap (delq lap0 (delq lap2 lap)))) | |
| 1652 ;; | |
| 1653 ;; not goto-X-if-nil --> goto-X-if-non-nil | |
| 1654 ;; not goto-X-if-non-nil --> goto-X-if-nil | |
| 1655 ;; | |
| 1656 ;; it is wrong to do the same thing for the -else-pop variants. | |
| 1657 ;; | |
| 1658 ((and (eq 'byte-not (car lap0)) | |
| 1659 (or (eq 'byte-goto-if-nil (car lap1)) | |
| 1660 (eq 'byte-goto-if-not-nil (car lap1)))) | |
| 1661 (byte-compile-log-lap " not %s\t-->\t%s" | |
| 1662 lap1 | |
| 1663 (cons | |
| 1664 (if (eq (car lap1) 'byte-goto-if-nil) | |
| 1665 'byte-goto-if-not-nil | |
| 1666 'byte-goto-if-nil) | |
| 1667 (cdr lap1))) | |
| 1668 (setcar lap1 (if (eq (car lap1) 'byte-goto-if-nil) | |
| 1669 'byte-goto-if-not-nil | |
| 1670 'byte-goto-if-nil)) | |
| 1671 (setq lap (delq lap0 lap)) | |
| 1672 (setq keep-going t)) | |
| 1673 ;; | |
| 1674 ;; goto-X-if-nil goto-Y X: --> goto-Y-if-non-nil X: | |
| 1675 ;; goto-X-if-non-nil goto-Y X: --> goto-Y-if-nil X: | |
| 1676 ;; | |
| 1677 ;; it is wrong to do the same thing for the -else-pop variants. | |
| 440 | 1678 ;; |
| 428 | 1679 ((and (or (eq 'byte-goto-if-nil (car lap0)) |
| 1680 (eq 'byte-goto-if-not-nil (car lap0))) ; gotoX | |
| 1681 (eq 'byte-goto (car lap1)) ; gotoY | |
| 1682 (eq (cdr lap0) lap2)) ; TAG X | |
| 1683 (let ((inverse (if (eq 'byte-goto-if-nil (car lap0)) | |
| 1684 'byte-goto-if-not-nil 'byte-goto-if-nil))) | |
| 1685 (byte-compile-log-lap " %s %s %s:\t-->\t%s %s:" | |
| 1686 lap0 lap1 lap2 | |
| 1687 (cons inverse (cdr lap1)) lap2) | |
| 1688 (setq lap (delq lap0 lap)) | |
| 1689 (setcar lap1 inverse) | |
| 1690 (setq keep-going t))) | |
| 1691 ;; | |
| 1692 ;; const goto-if-* --> whatever | |
| 1693 ;; | |
| 1694 ((and (eq 'byte-constant (car lap0)) | |
| 1695 (memq (car lap1) byte-conditional-ops)) | |
| 1696 (cond ((if (or (eq (car lap1) 'byte-goto-if-nil) | |
| 1697 (eq (car lap1) 'byte-goto-if-nil-else-pop)) | |
| 1698 (car (cdr lap0)) | |
| 1699 (not (car (cdr lap0)))) | |
| 1700 (byte-compile-log-lap " %s %s\t-->\t<deleted>" | |
| 1701 lap0 lap1) | |
| 1702 (setq rest (cdr rest) | |
| 1703 lap (delq lap0 (delq lap1 lap)))) | |
| 1704 (t | |
| 1705 (if (memq (car lap1) byte-goto-always-pop-ops) | |
| 1706 (progn | |
| 1707 (byte-compile-log-lap " %s %s\t-->\t%s" | |
| 1708 lap0 lap1 (cons 'byte-goto (cdr lap1))) | |
| 1709 (setq lap (delq lap0 lap))) | |
| 1710 (byte-compile-log-lap " %s %s\t-->\t%s" lap0 lap1 | |
| 1711 (cons 'byte-goto (cdr lap1)))) | |
| 1712 (setcar lap1 'byte-goto))) | |
| 1713 (setq keep-going t)) | |
| 1714 ;; | |
| 1715 ;; varref-X varref-X --> varref-X dup | |
| 1716 ;; varref-X [dup ...] varref-X --> varref-X [dup ...] dup | |
| 1717 ;; We don't optimize the const-X variations on this here, | |
| 1718 ;; because that would inhibit some goto optimizations; we | |
| 1719 ;; optimize the const-X case after all other optimizations. | |
| 1720 ;; | |
| 1721 ((and (eq 'byte-varref (car lap0)) | |
| 1722 (progn | |
| 1723 (setq tmp (cdr rest)) | |
| 1724 (while (eq (car (car tmp)) 'byte-dup) | |
| 1725 (setq tmp (cdr tmp))) | |
| 1726 t) | |
| 1727 (eq (cdr lap0) (cdr (car tmp))) | |
| 1728 (eq 'byte-varref (car (car tmp)))) | |
| 1729 (if (memq byte-optimize-log '(t byte)) | |
| 1730 (let ((str "")) | |
| 1731 (setq tmp2 (cdr rest)) | |
| 1732 (while (not (eq tmp tmp2)) | |
| 1733 (setq tmp2 (cdr tmp2) | |
| 1734 str (concat str " dup"))) | |
| 1735 (byte-compile-log-lap " %s%s %s\t-->\t%s%s dup" | |
| 1736 lap0 str lap0 lap0 str))) | |
| 1737 (setq keep-going t) | |
| 1738 (setcar (car tmp) 'byte-dup) | |
| 1739 (setcdr (car tmp) 0) | |
| 1740 (setq rest tmp)) | |
| 1741 ;; | |
| 1742 ;; TAG1: TAG2: --> TAG1: <deleted> | |
| 1743 ;; (and other references to TAG2 are replaced with TAG1) | |
| 1744 ;; | |
| 1745 ((and (eq (car lap0) 'TAG) | |
| 1746 (eq (car lap1) 'TAG)) | |
| 1747 (and (memq byte-optimize-log '(t byte)) | |
| 1748 (byte-compile-log " adjacent tags %d and %d merged" | |
| 1749 (nth 1 lap1) (nth 1 lap0))) | |
| 1750 (setq tmp3 lap) | |
| 1751 (while (setq tmp2 (rassq lap0 tmp3)) | |
| 1752 (setcdr tmp2 lap1) | |
| 1753 (setq tmp3 (cdr (memq tmp2 tmp3)))) | |
| 1754 (setq lap (delq lap0 lap) | |
| 1755 keep-going t)) | |
| 1756 ;; | |
| 1757 ;; unused-TAG: --> <deleted> | |
| 1758 ;; | |
| 1759 ((and (eq 'TAG (car lap0)) | |
| 1760 (not (rassq lap0 lap))) | |
| 1761 (and (memq byte-optimize-log '(t byte)) | |
| 1762 (byte-compile-log " unused tag %d removed" (nth 1 lap0))) | |
| 1763 (setq lap (delq lap0 lap) | |
| 1764 keep-going t)) | |
| 1765 ;; | |
| 1766 ;; goto ... --> goto <delete until TAG or end> | |
| 1767 ;; return ... --> return <delete until TAG or end> | |
| 1768 ;; | |
| 1769 ((and (memq (car lap0) '(byte-goto byte-return)) | |
| 1770 (not (memq (car lap1) '(TAG nil)))) | |
| 1771 (setq tmp rest) | |
| 1772 (let ((i 0) | |
| 1773 (opt-p (memq byte-optimize-log '(t lap))) | |
| 1774 str deleted) | |
| 1775 (while (and (setq tmp (cdr tmp)) | |
| 1776 (not (eq 'TAG (car (car tmp))))) | |
| 1777 (if opt-p (setq deleted (cons (car tmp) deleted) | |
| 1778 str (concat str " %s") | |
| 1779 i (1+ i)))) | |
| 1780 (if opt-p | |
| 440 | 1781 (let ((tagstr |
| 428 | 1782 (if (eq 'TAG (car (car tmp))) |
| 1783 (format "%d:" (car (cdr (car tmp)))) | |
| 1784 (or (car tmp) "")))) | |
| 1785 (if (< i 6) | |
| 1786 (apply 'byte-compile-log-lap-1 | |
| 1787 (concat " %s" str | |
| 1788 " %s\t-->\t%s <deleted> %s") | |
| 1789 lap0 | |
| 1790 (nconc (nreverse deleted) | |
| 1791 (list tagstr lap0 tagstr))) | |
| 1792 (byte-compile-log-lap | |
| 1793 " %s <%d unreachable op%s> %s\t-->\t%s <deleted> %s" | |
| 1794 lap0 i (if (= i 1) "" "s") | |
| 1795 tagstr lap0 tagstr)))) | |
| 1796 (rplacd rest tmp)) | |
| 1797 (setq keep-going t)) | |
| 1798 ;; | |
| 1799 ;; <safe-op> unbind --> unbind <safe-op> | |
| 1800 ;; (this may enable other optimizations.) | |
| 1801 ;; | |
| 1802 ((and (eq 'byte-unbind (car lap1)) | |
| 1803 (memq (car lap0) byte-after-unbind-ops)) | |
| 1804 (byte-compile-log-lap " %s %s\t-->\t%s %s" lap0 lap1 lap1 lap0) | |
| 1805 (setcar rest lap1) | |
| 1806 (setcar (cdr rest) lap0) | |
| 1807 (setq keep-going t)) | |
| 1808 ;; | |
| 1809 ;; varbind-X unbind-N --> discard unbind-(N-1) | |
| 1810 ;; save-excursion unbind-N --> unbind-(N-1) | |
| 1811 ;; save-restriction unbind-N --> unbind-(N-1) | |
| 1812 ;; | |
| 1813 ((and (eq 'byte-unbind (car lap1)) | |
| 1814 (memq (car lap0) '(byte-varbind byte-save-excursion | |
| 1815 byte-save-restriction)) | |
| 1816 (< 0 (cdr lap1))) | |
| 1817 (if (zerop (setcdr lap1 (1- (cdr lap1)))) | |
| 1818 (delq lap1 rest)) | |
| 1819 (if (eq (car lap0) 'byte-varbind) | |
| 1820 (setcar rest (cons 'byte-discard 0)) | |
| 1821 (setq lap (delq lap0 lap))) | |
| 1822 (byte-compile-log-lap " %s %s\t-->\t%s %s" | |
| 1823 lap0 (cons (car lap1) (1+ (cdr lap1))) | |
| 1824 (if (eq (car lap0) 'byte-varbind) | |
| 1825 (car rest) | |
| 1826 (car (cdr rest))) | |
| 1827 (if (and (/= 0 (cdr lap1)) | |
| 1828 (eq (car lap0) 'byte-varbind)) | |
| 1829 (car (cdr rest)) | |
| 1830 "")) | |
| 1831 (setq keep-going t)) | |
| 1832 ;; | |
| 1833 ;; goto*-X ... X: goto-Y --> goto*-Y | |
| 1834 ;; goto-X ... X: return --> return | |
| 1835 ;; | |
| 1836 ((and (memq (car lap0) byte-goto-ops) | |
| 1837 (memq (car (setq tmp (nth 1 (memq (cdr lap0) lap)))) | |
| 1838 '(byte-goto byte-return))) | |
| 1839 (cond ((and (not (eq tmp lap0)) | |
| 1840 (or (eq (car lap0) 'byte-goto) | |
| 1841 (eq (car tmp) 'byte-goto))) | |
| 1842 (byte-compile-log-lap " %s [%s]\t-->\t%s" | |
| 1843 (car lap0) tmp tmp) | |
| 1844 (if (eq (car tmp) 'byte-return) | |
| 1845 (setcar lap0 'byte-return)) | |
| 1846 (setcdr lap0 (cdr tmp)) | |
| 1847 (setq keep-going t)))) | |
| 1848 ;; | |
| 1849 ;; goto-*-else-pop X ... X: goto-if-* --> whatever | |
| 1850 ;; goto-*-else-pop X ... X: discard --> whatever | |
| 1851 ;; | |
| 1852 ((and (memq (car lap0) '(byte-goto-if-nil-else-pop | |
| 1853 byte-goto-if-not-nil-else-pop)) | |
| 1854 (memq (car (car (setq tmp (cdr (memq (cdr lap0) lap))))) | |
| 1855 (eval-when-compile | |
| 1856 (cons 'byte-discard byte-conditional-ops))) | |
| 1857 (not (eq lap0 (car tmp)))) | |
| 1858 (setq tmp2 (car tmp)) | |
| 1859 (setq tmp3 (assq (car lap0) '((byte-goto-if-nil-else-pop | |
| 1860 byte-goto-if-nil) | |
| 1861 (byte-goto-if-not-nil-else-pop | |
| 1862 byte-goto-if-not-nil)))) | |
| 1863 (if (memq (car tmp2) tmp3) | |
| 1864 (progn (setcar lap0 (car tmp2)) | |
| 1865 (setcdr lap0 (cdr tmp2)) | |
| 1866 (byte-compile-log-lap " %s-else-pop [%s]\t-->\t%s" | |
| 1867 (car lap0) tmp2 lap0)) | |
| 1868 ;; Get rid of the -else-pop's and jump one step further. | |
| 1869 (or (eq 'TAG (car (nth 1 tmp))) | |
| 1870 (setcdr tmp (cons (byte-compile-make-tag) | |
| 1871 (cdr tmp)))) | |
| 1872 (byte-compile-log-lap " %s [%s]\t-->\t%s <skip>" | |
| 1873 (car lap0) tmp2 (nth 1 tmp3)) | |
| 1874 (setcar lap0 (nth 1 tmp3)) | |
| 1875 (setcdr lap0 (nth 1 tmp))) | |
| 1876 (setq keep-going t)) | |
| 1877 ;; | |
| 1878 ;; const goto-X ... X: goto-if-* --> whatever | |
| 1879 ;; const goto-X ... X: discard --> whatever | |
| 1880 ;; | |
| 1881 ((and (eq (car lap0) 'byte-constant) | |
| 1882 (eq (car lap1) 'byte-goto) | |
| 1883 (memq (car (car (setq tmp (cdr (memq (cdr lap1) lap))))) | |
| 1884 (eval-when-compile | |
| 1885 (cons 'byte-discard byte-conditional-ops))) | |
| 1886 (not (eq lap1 (car tmp)))) | |
| 1887 (setq tmp2 (car tmp)) | |
| 1888 (cond ((memq (car tmp2) | |
| 1889 (if (null (car (cdr lap0))) | |
| 1890 '(byte-goto-if-nil byte-goto-if-nil-else-pop) | |
| 1891 '(byte-goto-if-not-nil | |
| 1892 byte-goto-if-not-nil-else-pop))) | |
| 1893 (byte-compile-log-lap " %s goto [%s]\t-->\t%s %s" | |
| 1894 lap0 tmp2 lap0 tmp2) | |
| 1895 (setcar lap1 (car tmp2)) | |
| 1896 (setcdr lap1 (cdr tmp2)) | |
| 1897 ;; Let next step fix the (const,goto-if*) sequence. | |
| 1898 (setq rest (cons nil rest))) | |
| 1899 (t | |
| 1900 ;; Jump one step further | |
| 1901 (byte-compile-log-lap | |
| 1902 " %s goto [%s]\t-->\t<deleted> goto <skip>" | |
| 1903 lap0 tmp2) | |
| 1904 (or (eq 'TAG (car (nth 1 tmp))) | |
| 1905 (setcdr tmp (cons (byte-compile-make-tag) | |
| 1906 (cdr tmp)))) | |
| 1907 (setcdr lap1 (car (cdr tmp))) | |
| 1908 (setq lap (delq lap0 lap)))) | |
| 1909 (setq keep-going t)) | |
| 1910 ;; | |
| 1911 ;; X: varref-Y ... varset-Y goto-X --> | |
| 1912 ;; X: varref-Y Z: ... dup varset-Y goto-Z | |
| 1913 ;; (varset-X goto-BACK, BACK: varref-X --> copy the varref down.) | |
| 1914 ;; (This is so usual for while loops that it is worth handling). | |
| 1915 ;; | |
| 1916 ((and (eq (car lap1) 'byte-varset) | |
| 1917 (eq (car lap2) 'byte-goto) | |
| 1918 (not (memq (cdr lap2) rest)) ;Backwards jump | |
| 1919 (eq (car (car (setq tmp (cdr (memq (cdr lap2) lap))))) | |
| 1920 'byte-varref) | |
| 1921 (eq (cdr (car tmp)) (cdr lap1)) | |
| 1922 (not (eq (built-in-variable-type (car (cdr lap1))) | |
| 1923 'boolean))) | |
| 1924 ;;(byte-compile-log-lap " Pulled %s to end of loop" (car tmp)) | |
| 1925 (let ((newtag (byte-compile-make-tag))) | |
| 1926 (byte-compile-log-lap | |
| 1927 " %s: %s ... %s %s\t-->\t%s: %s %s: ... %s %s %s" | |
| 1928 (nth 1 (cdr lap2)) (car tmp) | |
| 1929 lap1 lap2 | |
| 1930 (nth 1 (cdr lap2)) (car tmp) | |
| 1931 (nth 1 newtag) 'byte-dup lap1 | |
| 1932 (cons 'byte-goto newtag) | |
| 1933 ) | |
| 1934 (setcdr rest (cons (cons 'byte-dup 0) (cdr rest))) | |
| 1935 (setcdr tmp (cons (setcdr lap2 newtag) (cdr tmp)))) | |
| 1936 (setq add-depth 1) | |
| 1937 (setq keep-going t)) | |
| 1938 ;; | |
| 1939 ;; goto-X Y: ... X: goto-if*-Y --> goto-if-not-*-X+1 Y: | |
| 1940 ;; (This can pull the loop test to the end of the loop) | |
| 1941 ;; | |
| 1942 ((and (eq (car lap0) 'byte-goto) | |
| 1943 (eq (car lap1) 'TAG) | |
| 1944 (eq lap1 | |
| 1945 (cdr (car (setq tmp (cdr (memq (cdr lap0) lap)))))) | |
| 1946 (memq (car (car tmp)) | |
| 1947 '(byte-goto byte-goto-if-nil byte-goto-if-not-nil | |
| 1948 byte-goto-if-nil-else-pop))) | |
| 1949 ;; (byte-compile-log-lap " %s %s, %s %s --> moved conditional" | |
| 1950 ;; lap0 lap1 (cdr lap0) (car tmp)) | |
| 1951 (let ((newtag (byte-compile-make-tag))) | |
| 1952 (byte-compile-log-lap | |
| 1953 "%s %s: ... %s: %s\t-->\t%s ... %s:" | |
| 1954 lap0 (nth 1 lap1) (nth 1 (cdr lap0)) (car tmp) | |
| 1955 (cons (cdr (assq (car (car tmp)) | |
| 1956 '((byte-goto-if-nil . byte-goto-if-not-nil) | |
| 1957 (byte-goto-if-not-nil . byte-goto-if-nil) | |
| 1958 (byte-goto-if-nil-else-pop . | |
| 1959 byte-goto-if-not-nil-else-pop) | |
| 1960 (byte-goto-if-not-nil-else-pop . | |
| 1961 byte-goto-if-nil-else-pop)))) | |
| 1962 newtag) | |
| 440 | 1963 |
| 428 | 1964 (nth 1 newtag) |
| 1965 ) | |
| 1966 (setcdr tmp (cons (setcdr lap0 newtag) (cdr tmp))) | |
| 1967 (if (eq (car (car tmp)) 'byte-goto-if-nil-else-pop) | |
| 1968 ;; We can handle this case but not the -if-not-nil case, | |
| 1969 ;; because we won't know which non-nil constant to push. | |
| 1970 (setcdr rest (cons (cons 'byte-constant | |
| 1971 (byte-compile-get-constant nil)) | |
| 1972 (cdr rest)))) | |
| 1973 (setcar lap0 (nth 1 (memq (car (car tmp)) | |
| 1974 '(byte-goto-if-nil-else-pop | |
| 1975 byte-goto-if-not-nil | |
| 1976 byte-goto-if-nil | |
| 1977 byte-goto-if-not-nil | |
| 1978 byte-goto byte-goto)))) | |
| 1979 ) | |
| 1980 (setq keep-going t)) | |
| 1981 ) | |
| 1982 (setq rest (cdr rest))) | |
| 1983 ) | |
| 1984 ;; Cleanup stage: | |
| 1985 ;; Rebuild byte-compile-constants / byte-compile-variables. | |
| 1986 ;; Simple optimizations that would inhibit other optimizations if they | |
| 1987 ;; were done in the optimizing loop, and optimizations which there is no | |
| 442 | 1988 ;; need to do more than once. |
| 428 | 1989 (setq byte-compile-constants nil |
| 442 | 1990 byte-compile-variables nil |
| 1991 variable-frequency (make-hash-table :test 'eq)) | |
| 428 | 1992 (setq rest lap) |
| 1993 (while rest | |
| 1994 (setq lap0 (car rest) | |
| 1995 lap1 (nth 1 rest)) | |
| 1297 | 1996 (if (memq (car lap0) byte-constref-ops) |
| 1997 (if (not (eq (car lap0) 'byte-constant)) | |
| 1998 (progn | |
| 1999 (incf (gethash (cdr lap0) variable-frequency 0)) | |
| 2000 (or (memq (cdr lap0) byte-compile-variables) | |
| 2001 (setq byte-compile-variables | |
| 2002 (cons (cdr lap0) byte-compile-variables)))) | |
| 2003 (or (memq (cdr lap0) byte-compile-constants) | |
| 2004 (setq byte-compile-constants (cons (cdr lap0) | |
| 2005 byte-compile-constants))))) | |
| 428 | 2006 (cond (;; |
| 442 | 2007 ;; const-C varset-X const-C --> const-C dup varset-X |
| 428 | 2008 ;; const-C varbind-X const-C --> const-C dup varbind-X |
| 2009 ;; | |
| 2010 (and (eq (car lap0) 'byte-constant) | |
| 2011 (eq (car (nth 2 rest)) 'byte-constant) | |
| 442 | 2012 (eq (cdr lap0) (cdr (nth 2 rest))) |
| 428 | 2013 (memq (car lap1) '(byte-varbind byte-varset))) |
| 2014 (byte-compile-log-lap " %s %s %s\t-->\t%s dup %s" | |
| 2015 lap0 lap1 lap0 lap0 lap1) | |
| 2016 (setcar (cdr (cdr rest)) (cons (car lap1) (cdr lap1))) | |
| 2017 (setcar (cdr rest) (cons 'byte-dup 0)) | |
| 2018 (setq add-depth 1)) | |
| 2019 ;; | |
| 2020 ;; const-X [dup/const-X ...] --> const-X [dup ...] dup | |
| 2021 ;; varref-X [dup/varref-X ...] --> varref-X [dup ...] dup | |
| 2022 ;; | |
| 2023 ((memq (car lap0) '(byte-constant byte-varref)) | |
| 2024 (setq tmp rest | |
| 2025 tmp2 nil) | |
| 2026 (while (progn | |
| 2027 (while (eq 'byte-dup (car (car (setq tmp (cdr tmp)))))) | |
| 2028 (and (eq (cdr lap0) (cdr (car tmp))) | |
| 2029 (eq (car lap0) (car (car tmp))))) | |
| 2030 (setcar tmp (cons 'byte-dup 0)) | |
| 2031 (setq tmp2 t)) | |
| 2032 (if tmp2 | |
| 2033 (byte-compile-log-lap | |
| 2034 " %s [dup/%s]...\t-->\t%s dup..." lap0 lap0 lap0))) | |
| 2035 ;; | |
| 2036 ;; unbind-N unbind-M --> unbind-(N+M) | |
| 2037 ;; | |
| 2038 ((and (eq 'byte-unbind (car lap0)) | |
| 2039 (eq 'byte-unbind (car lap1))) | |
| 2040 (byte-compile-log-lap " %s %s\t-->\t%s" lap0 lap1 | |
| 2041 (cons 'byte-unbind | |
| 2042 (+ (cdr lap0) (cdr lap1)))) | |
| 2043 (setq keep-going t) | |
| 2044 (setq lap (delq lap0 lap)) | |
| 2045 (setcdr lap1 (+ (cdr lap1) (cdr lap0)))) | |
| 2046 ) | |
| 2047 (setq rest (cdr rest))) | |
| 442 | 2048 ;; Since the first 6 entries of the compiled-function constants |
| 2049 ;; vector are most efficient for varref/set/bind ops, we sort by | |
| 2050 ;; reference count. This generates maximally space efficient and | |
| 2051 ;; pretty time-efficient byte-code. See `byte-compile-constants-vector'. | |
| 2052 (setq byte-compile-variables | |
| 2053 (sort byte-compile-variables | |
| 2054 #'(lambda (v1 v2) | |
| 2055 (< (gethash v1 variable-frequency) | |
| 2056 (gethash v2 variable-frequency))))) | |
| 2057 ;; Another hack - put the most used variable in position 6, for | |
| 2058 ;; better locality of reference with adjoining constants. | |
| 2059 (let ((tail (last byte-compile-variables 6))) | |
| 2060 (setq byte-compile-variables | |
| 2061 (append (nbutlast byte-compile-variables 6) | |
| 2062 (nreverse tail)))) | |
| 428 | 2063 (setq byte-compile-maxdepth (+ byte-compile-maxdepth add-depth))) |
| 2064 lap) | |
| 2065 | |
| 2066 (provide 'byte-optimize) | |
| 2067 | |
| 2068 | |
| 2069 ;; To avoid "lisp nesting exceeds max-lisp-eval-depth" when this file compiles | |
| 2070 ;; itself, compile some of its most used recursive functions (at load time). | |
| 2071 ;; | |
| 2072 (eval-when-compile | |
| 2073 (or (compiled-function-p (symbol-function 'byte-optimize-form)) | |
| 2074 (assq 'byte-code (symbol-function 'byte-optimize-form)) | |
| 2075 (let ((byte-optimize nil) | |
| 2076 (byte-compile-warnings nil)) | |
| 2077 (mapcar | |
| 2078 #'(lambda (x) | |
| 2079 (or noninteractive (message "compiling %s..." x)) | |
| 2080 (byte-compile x) | |
| 2081 (or noninteractive (message "compiling %s...done" x))) | |
| 2082 '(byte-optimize-form | |
| 2083 byte-optimize-body | |
| 2084 byte-optimize-predicate | |
| 2085 byte-optimize-binary-predicate | |
| 2086 ;; Inserted some more than necessary, to speed it up. | |
| 2087 byte-optimize-form-code-walker | |
| 2088 byte-optimize-lapcode)))) | |
| 2089 nil) | |
| 2090 | |
| 1297 | 2091 ;; END SYNC WITH 20.7. |
| 2092 | |
| 428 | 2093 ;;; byte-optimize.el ends here |