Mercurial > emacs
annotate lisp/emacs-lisp/byte-opt.el @ 10590:9f68d8d6357b
(menu-bar-update-yank-menu): If string is too long,
show start and end, with ... between them.
(yank-menu-length): Default value 20.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Mon, 30 Jan 1995 00:37:22 +0000 |
parents | 3cca823100db |
children | 31b8e30c1afb |
rev | line source |
---|---|
848 | 1 ;;; byte-opt.el --- the optimization passes of the emacs-lisp byte compiler. |
2 | |
7298 | 3 ;;; Copyright (c) 1991, 1994 Free Software Foundation, Inc. |
848 | 4 |
5 ;; Author: Jamie Zawinski <jwz@lucid.com> | |
6 ;; Hallvard Furuseth <hbf@ulrik.uio.no> | |
7 ;; Keywords: internal | |
757 | 8 |
9 ;; This file is part of GNU Emacs. | |
10 | |
11 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
12 ;; it under the terms of the GNU General Public License as published by | |
848 | 13 ;; the Free Software Foundation; either version 2, or (at your option) |
757 | 14 ;; any later version. |
15 | |
16 ;; GNU Emacs is distributed in the hope that it will be useful, | |
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
19 ;; GNU General Public License for more details. | |
20 | |
21 ;; You should have received a copy of the GNU General Public License | |
22 ;; along with GNU Emacs; see the file COPYING. If not, write to | |
23 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. | |
24 | |
848 | 25 ;;; Commentary: |
26 | |
757 | 27 ;;; ======================================================================== |
28 ;;; "No matter how hard you try, you can't make a racehorse out of a pig. | |
29 ;;; you can, however, make a faster pig." | |
30 ;;; | |
31 ;;; Or, to put it another way, the emacs byte compiler is a VW Bug. This code | |
32 ;;; makes it be a VW Bug with fuel injection and a turbocharger... You're | |
33 ;;; still not going to make it go faster than 70 mph, but it might be easier | |
34 ;;; to get it there. | |
35 ;;; | |
36 | |
37 ;;; TO DO: | |
38 ;;; | |
39 ;;; (apply '(lambda (x &rest y) ...) 1 (foo)) | |
40 ;;; | |
41 ;;; collapse common subexpressions | |
42 ;;; | |
43 ;;; maintain a list of functions known not to access any global variables | |
44 ;;; (actually, give them a 'dynamically-safe property) and then | |
45 ;;; (let ( v1 v2 ... vM vN ) <...dynamically-safe...> ) ==> | |
46 ;;; (let ( v1 v2 ... vM ) vN <...dynamically-safe...> ) | |
47 ;;; by recursing on this, we might be able to eliminate the entire let. | |
48 ;;; However certain variables should never have their bindings optimized | |
49 ;;; away, because they affect everything. | |
50 ;;; (put 'debug-on-error 'binding-is-magic t) | |
51 ;;; (put 'debug-on-abort 'binding-is-magic t) | |
52 ;;; (put 'inhibit-quit 'binding-is-magic t) | |
53 ;;; (put 'quit-flag 'binding-is-magic t) | |
54 ;;; others? | |
55 ;;; | |
56 ;;; Simple defsubsts often produce forms like | |
57 ;;; (let ((v1 (f1)) (v2 (f2)) ...) | |
58 ;;; (FN v1 v2 ...)) | |
59 ;;; It would be nice if we could optimize this to | |
60 ;;; (FN (f1) (f2) ...) | |
61 ;;; but we can't unless FN is dynamically-safe (it might be dynamically | |
62 ;;; referring to the bindings that the lambda arglist established.) | |
63 ;;; One of the uncountable lossages introduced by dynamic scope... | |
64 ;;; | |
65 ;;; Maybe there should be a control-structure that says "turn on | |
66 ;;; fast-and-loose type-assumptive optimizations here." Then when | |
67 ;;; we see a form like (car foo) we can from then on assume that | |
68 ;;; the variable foo is of type cons, and optimize based on that. | |
69 ;;; But, this won't win much because of (you guessed it) dynamic | |
70 ;;; scope. Anything down the stack could change the value. | |
71 ;;; | |
72 ;;; It would be nice if redundant sequences could be factored out as well, | |
73 ;;; when they are known to have no side-effects: | |
74 ;;; (list (+ a b c) (+ a b c)) --> a b add c add dup list-2 | |
75 ;;; but beware of traps like | |
76 ;;; (cons (list x y) (list x y)) | |
77 ;;; | |
848 | 78 ;;; Tail-recursion elimination is not really possible in Emacs Lisp. |
79 ;;; Tail-recursion elimination is almost always impossible when all variables | |
80 ;;; have dynamic scope, but given that the "return" byteop requires the | |
81 ;;; binding stack to be empty (rather than emptying it itself), there can be | |
82 ;;; no truly tail-recursive Emacs Lisp functions that take any arguments or | |
83 ;;; make any bindings. | |
757 | 84 ;;; |
848 | 85 ;;; Here is an example of an Emacs Lisp function which could safely be |
757 | 86 ;;; byte-compiled tail-recursively: |
87 ;;; | |
88 ;;; (defun tail-map (fn list) | |
89 ;;; (cond (list | |
90 ;;; (funcall fn (car list)) | |
91 ;;; (tail-map fn (cdr list))))) | |
92 ;;; | |
93 ;;; However, if there was even a single let-binding around the COND, | |
94 ;;; it could not be byte-compiled, because there would be an "unbind" | |
95 ;;; byte-op between the final "call" and "return." Adding a | |
96 ;;; Bunbind_all byteop would fix this. | |
97 ;;; | |
98 ;;; (defun foo (x y z) ... (foo a b c)) | |
99 ;;; ... (const foo) (varref a) (varref b) (varref c) (call 3) END: (return) | |
100 ;;; ... (varref a) (varbind x) (varref b) (varbind y) (varref c) (varbind z) (goto 0) END: (unbind-all) (return) | |
101 ;;; ... (varref a) (varset x) (varref b) (varset y) (varref c) (varset z) (goto 0) END: (return) | |
102 ;;; | |
103 ;;; this also can be considered tail recursion: | |
104 ;;; | |
105 ;;; ... (const foo) (varref a) (call 1) (goto X) ... X: (return) | |
106 ;;; could generalize this by doing the optimization | |
107 ;;; (goto X) ... X: (return) --> (return) | |
108 ;;; | |
109 ;;; But this doesn't solve all of the problems: although by doing tail- | |
110 ;;; recursion elimination in this way, the call-stack does not grow, the | |
111 ;;; binding-stack would grow with each recursive step, and would eventually | |
112 ;;; overflow. I don't believe there is any way around this without lexical | |
113 ;;; scope. | |
114 ;;; | |
848 | 115 ;;; Wouldn't it be nice if Emacs Lisp had lexical scope. |
757 | 116 ;;; |
117 ;;; Idea: the form (lexical-scope) in a file means that the file may be | |
118 ;;; compiled lexically. This proclamation is file-local. Then, within | |
119 ;;; that file, "let" would establish lexical bindings, and "let-dynamic" | |
120 ;;; would do things the old way. (Or we could use CL "declare" forms.) | |
121 ;;; We'd have to notice defvars and defconsts, since those variables should | |
122 ;;; always be dynamic, and attempting to do a lexical binding of them | |
123 ;;; should simply do a dynamic binding instead. | |
124 ;;; But! We need to know about variables that were not necessarily defvarred | |
125 ;;; in the file being compiled (doing a boundp check isn't good enough.) | |
126 ;;; Fdefvar() would have to be modified to add something to the plist. | |
127 ;;; | |
128 ;;; A major disadvantage of this scheme is that the interpreter and compiler | |
129 ;;; would have different semantics for files compiled with (dynamic-scope). | |
130 ;;; Since this would be a file-local optimization, there would be no way to | |
131 ;;; modify the interpreter to obey this (unless the loader was hacked | |
132 ;;; in some grody way, but that's a really bad idea.) | |
133 ;;; | |
134 ;;; Really the Right Thing is to make lexical scope the default across | |
135 ;;; the board, in the interpreter and compiler, and just FIX all of | |
136 ;;; the code that relies on dynamic scope of non-defvarred variables. | |
137 | |
848 | 138 ;;; Code: |
757 | 139 |
140 (defun byte-compile-log-lap-1 (format &rest args) | |
141 (if (aref byte-code-vector 0) | |
142 (error "The old version of the disassembler is loaded. Reload new-bytecomp as well.")) | |
143 (byte-compile-log-1 | |
144 (apply 'format format | |
145 (let (c a) | |
146 (mapcar '(lambda (arg) | |
147 (if (not (consp arg)) | |
148 (if (and (symbolp arg) | |
149 (string-match "^byte-" (symbol-name arg))) | |
150 (intern (substring (symbol-name arg) 5)) | |
151 arg) | |
152 (if (integerp (setq c (car arg))) | |
153 (error "non-symbolic byte-op %s" c)) | |
154 (if (eq c 'TAG) | |
155 (setq c arg) | |
156 (setq a (cond ((memq c byte-goto-ops) | |
157 (car (cdr (cdr arg)))) | |
158 ((memq c byte-constref-ops) | |
159 (car (cdr arg))) | |
160 (t (cdr arg)))) | |
161 (setq c (symbol-name c)) | |
162 (if (string-match "^byte-." c) | |
163 (setq c (intern (substring c 5))))) | |
164 (if (eq c 'constant) (setq c 'const)) | |
165 (if (and (eq (cdr arg) 0) | |
166 (not (memq c '(unbind call const)))) | |
167 c | |
168 (format "(%s %s)" c a)))) | |
169 args))))) | |
170 | |
171 (defmacro byte-compile-log-lap (format-string &rest args) | |
172 (list 'and | |
173 '(memq byte-optimize-log '(t byte)) | |
174 (cons 'byte-compile-log-lap-1 | |
175 (cons format-string args)))) | |
176 | |
177 | |
178 ;;; byte-compile optimizers to support inlining | |
179 | |
180 (put 'inline 'byte-optimizer 'byte-optimize-inline-handler) | |
181 | |
182 (defun byte-optimize-inline-handler (form) | |
183 "byte-optimize-handler for the `inline' special-form." | |
184 (cons 'progn | |
185 (mapcar | |
186 '(lambda (sexp) | |
187 (let ((fn (car-safe sexp))) | |
188 (if (and (symbolp fn) | |
189 (or (cdr (assq fn byte-compile-function-environment)) | |
190 (and (fboundp fn) | |
191 (not (or (cdr (assq fn byte-compile-macro-environment)) | |
192 (and (consp (setq fn (symbol-function fn))) | |
193 (eq (car fn) 'macro)) | |
194 (subrp fn)))))) | |
195 (byte-compile-inline-expand sexp) | |
196 sexp))) | |
197 (cdr form)))) | |
198 | |
199 | |
767
02bfc9709961
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
200 ;; Splice the given lap code into the current instruction stream. |
02bfc9709961
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
201 ;; If it has any labels in it, you're responsible for making sure there |
02bfc9709961
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
202 ;; are no collisions, and that byte-compile-tag-number is reasonable |
02bfc9709961
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
203 ;; after this is spliced in. The provided list is destroyed. |
757 | 204 (defun byte-inline-lapcode (lap) |
205 (setq byte-compile-output (nconc (nreverse lap) byte-compile-output))) | |
206 | |
207 | |
208 (defun byte-compile-inline-expand (form) | |
209 (let* ((name (car form)) | |
210 (fn (or (cdr (assq name byte-compile-function-environment)) | |
211 (and (fboundp name) (symbol-function name))))) | |
212 (if (null fn) | |
213 (progn | |
214 (byte-compile-warn "attempt to inline %s before it was defined" name) | |
215 form) | |
216 ;; else | |
217 (if (and (consp fn) (eq (car fn) 'autoload)) | |
218 (load (nth 1 fn))) | |
219 (if (and (consp fn) (eq (car fn) 'autoload)) | |
220 (error "file \"%s\" didn't define \"%s\"" (nth 1 fn) name)) | |
221 (if (symbolp fn) | |
222 (byte-compile-inline-expand (cons fn (cdr form))) | |
1818
7e3322619e46
compiled-function-p has been renamed to byte-code-function-p.
Jim Blandy <jimb@redhat.com>
parents:
957
diff
changeset
|
223 (if (byte-code-function-p fn) |
757 | 224 (cons (list 'lambda (aref fn 0) |
225 (list 'byte-code (aref fn 1) (aref fn 2) (aref fn 3))) | |
226 (cdr form)) | |
227 (if (not (eq (car fn) 'lambda)) (error "%s is not a lambda" name)) | |
228 (cons fn (cdr form))))))) | |
229 | |
230 ;;; ((lambda ...) ...) | |
231 ;;; | |
232 (defun byte-compile-unfold-lambda (form &optional name) | |
233 (or name (setq name "anonymous lambda")) | |
234 (let ((lambda (car form)) | |
235 (values (cdr form))) | |
1818
7e3322619e46
compiled-function-p has been renamed to byte-code-function-p.
Jim Blandy <jimb@redhat.com>
parents:
957
diff
changeset
|
236 (if (byte-code-function-p lambda) |
957 | 237 (setq lambda (list 'lambda (aref lambda 0) |
238 (list 'byte-code (aref lambda 1) | |
239 (aref lambda 2) (aref lambda 3))))) | |
757 | 240 (let ((arglist (nth 1 lambda)) |
241 (body (cdr (cdr lambda))) | |
242 optionalp restp | |
243 bindings) | |
244 (if (and (stringp (car body)) (cdr body)) | |
245 (setq body (cdr body))) | |
246 (if (and (consp (car body)) (eq 'interactive (car (car body)))) | |
247 (setq body (cdr body))) | |
248 (while arglist | |
249 (cond ((eq (car arglist) '&optional) | |
250 ;; ok, I'll let this slide because funcall_lambda() does... | |
251 ;; (if optionalp (error "multiple &optional keywords in %s" name)) | |
252 (if restp (error "&optional found after &rest in %s" name)) | |
253 (if (null (cdr arglist)) | |
254 (error "nothing after &optional in %s" name)) | |
255 (setq optionalp t)) | |
256 ((eq (car arglist) '&rest) | |
257 ;; ...but it is by no stretch of the imagination a reasonable | |
258 ;; thing that funcall_lambda() allows (&rest x y) and | |
259 ;; (&rest x &optional y) in arglists. | |
260 (if (null (cdr arglist)) | |
261 (error "nothing after &rest in %s" name)) | |
262 (if (cdr (cdr arglist)) | |
263 (error "multiple vars after &rest in %s" name)) | |
264 (setq restp t)) | |
265 (restp | |
266 (setq bindings (cons (list (car arglist) | |
267 (and values (cons 'list values))) | |
268 bindings) | |
269 values nil)) | |
270 ((and (not optionalp) (null values)) | |
271 (byte-compile-warn "attempt to open-code %s with too few arguments" name) | |
272 (setq arglist nil values 'too-few)) | |
273 (t | |
274 (setq bindings (cons (list (car arglist) (car values)) | |
275 bindings) | |
276 values (cdr values)))) | |
277 (setq arglist (cdr arglist))) | |
278 (if values | |
279 (progn | |
280 (or (eq values 'too-few) | |
281 (byte-compile-warn | |
282 "attempt to open-code %s with too many arguments" name)) | |
283 form) | |
284 (let ((newform | |
285 (if bindings | |
286 (cons 'let (cons (nreverse bindings) body)) | |
287 (cons 'progn body)))) | |
288 (byte-compile-log " %s\t==>\t%s" form newform) | |
289 newform))))) | |
290 | |
291 | |
292 ;;; implementing source-level optimizers | |
293 | |
294 (defun byte-optimize-form-code-walker (form for-effect) | |
295 ;; | |
296 ;; For normal function calls, We can just mapcar the optimizer the cdr. But | |
297 ;; we need to have special knowledge of the syntax of the special forms | |
298 ;; like let and defun (that's why they're special forms :-). (Actually, | |
299 ;; the important aspect is that they are subrs that don't evaluate all of | |
300 ;; their args.) | |
301 ;; | |
302 (let ((fn (car-safe form)) | |
303 tmp) | |
304 (cond ((not (consp form)) | |
305 (if (not (and for-effect | |
306 (or byte-compile-delete-errors | |
307 (not (symbolp form)) | |
308 (eq form t)))) | |
309 form)) | |
310 ((eq fn 'quote) | |
311 (if (cdr (cdr form)) | |
312 (byte-compile-warn "malformed quote form: %s" | |
313 (prin1-to-string form))) | |
314 ;; map (quote nil) to nil to simplify optimizer logic. | |
315 ;; map quoted constants to nil if for-effect (just because). | |
316 (and (nth 1 form) | |
317 (not for-effect) | |
318 form)) | |
1818
7e3322619e46
compiled-function-p has been renamed to byte-code-function-p.
Jim Blandy <jimb@redhat.com>
parents:
957
diff
changeset
|
319 ((or (byte-code-function-p fn) |
757 | 320 (eq 'lambda (car-safe fn))) |
321 (byte-compile-unfold-lambda form)) | |
322 ((memq fn '(let let*)) | |
323 ;; recursively enter the optimizer for the bindings and body | |
324 ;; of a let or let*. This for depth-firstness: forms that | |
325 ;; are more deeply nested are optimized first. | |
326 (cons fn | |
327 (cons | |
328 (mapcar '(lambda (binding) | |
329 (if (symbolp binding) | |
330 binding | |
331 (if (cdr (cdr binding)) | |
332 (byte-compile-warn "malformed let binding: %s" | |
333 (prin1-to-string binding))) | |
334 (list (car binding) | |
335 (byte-optimize-form (nth 1 binding) nil)))) | |
336 (nth 1 form)) | |
337 (byte-optimize-body (cdr (cdr form)) for-effect)))) | |
338 ((eq fn 'cond) | |
339 (cons fn | |
340 (mapcar '(lambda (clause) | |
341 (if (consp clause) | |
342 (cons | |
343 (byte-optimize-form (car clause) nil) | |
344 (byte-optimize-body (cdr clause) for-effect)) | |
345 (byte-compile-warn "malformed cond form: %s" | |
346 (prin1-to-string clause)) | |
347 clause)) | |
348 (cdr form)))) | |
349 ((eq fn 'progn) | |
350 ;; as an extra added bonus, this simplifies (progn <x>) --> <x> | |
351 (if (cdr (cdr form)) | |
352 (progn | |
353 (setq tmp (byte-optimize-body (cdr form) for-effect)) | |
354 (if (cdr tmp) (cons 'progn tmp) (car tmp))) | |
355 (byte-optimize-form (nth 1 form) for-effect))) | |
356 ((eq fn 'prog1) | |
357 (if (cdr (cdr form)) | |
358 (cons 'prog1 | |
359 (cons (byte-optimize-form (nth 1 form) for-effect) | |
360 (byte-optimize-body (cdr (cdr form)) t))) | |
361 (byte-optimize-form (nth 1 form) for-effect))) | |
362 ((eq fn 'prog2) | |
363 (cons 'prog2 | |
364 (cons (byte-optimize-form (nth 1 form) t) | |
365 (cons (byte-optimize-form (nth 2 form) for-effect) | |
366 (byte-optimize-body (cdr (cdr (cdr form))) t))))) | |
367 | |
368 ((memq fn '(save-excursion save-restriction)) | |
369 ;; those subrs which have an implicit progn; it's not quite good | |
370 ;; enough to treat these like normal function calls. | |
371 ;; This can turn (save-excursion ...) into (save-excursion) which | |
372 ;; will be optimized away in the lap-optimize pass. | |
373 (cons fn (byte-optimize-body (cdr form) for-effect))) | |
374 | |
375 ((eq fn 'with-output-to-temp-buffer) | |
376 ;; this is just like the above, except for the first argument. | |
377 (cons fn | |
378 (cons | |
379 (byte-optimize-form (nth 1 form) nil) | |
380 (byte-optimize-body (cdr (cdr form)) for-effect)))) | |
381 | |
382 ((eq fn 'if) | |
383 (cons fn | |
384 (cons (byte-optimize-form (nth 1 form) nil) | |
385 (cons | |
386 (byte-optimize-form (nth 2 form) for-effect) | |
387 (byte-optimize-body (nthcdr 3 form) for-effect))))) | |
388 | |
389 ((memq fn '(and or)) ; remember, and/or are control structures. | |
390 ;; take forms off the back until we can't any more. | |
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3138
diff
changeset
|
391 ;; In the future it could conceivably be a problem that the |
757 | 392 ;; subexpressions of these forms are optimized in the reverse |
393 ;; order, but it's ok for now. | |
394 (if for-effect | |
395 (let ((backwards (reverse (cdr form)))) | |
396 (while (and backwards | |
397 (null (setcar backwards | |
398 (byte-optimize-form (car backwards) | |
399 for-effect)))) | |
400 (setq backwards (cdr backwards))) | |
401 (if (and (cdr form) (null backwards)) | |
402 (byte-compile-log | |
403 " all subforms of %s called for effect; deleted" form)) | |
404 (and backwards | |
405 (cons fn (nreverse backwards)))) | |
406 (cons fn (mapcar 'byte-optimize-form (cdr form))))) | |
407 | |
408 ((eq fn 'interactive) | |
409 (byte-compile-warn "misplaced interactive spec: %s" | |
410 (prin1-to-string form)) | |
411 nil) | |
412 | |
413 ((memq fn '(defun defmacro function | |
414 condition-case save-window-excursion)) | |
415 ;; These forms are compiled as constants or by breaking out | |
416 ;; all the subexpressions and compiling them separately. | |
417 form) | |
418 | |
419 ((eq fn 'unwind-protect) | |
420 ;; the "protected" part of an unwind-protect is compiled (and thus | |
421 ;; optimized) as a top-level form, so don't do it here. But the | |
422 ;; non-protected part has the same for-effect status as the | |
423 ;; unwind-protect itself. (The protected part is always for effect, | |
424 ;; but that isn't handled properly yet.) | |
425 (cons fn | |
426 (cons (byte-optimize-form (nth 1 form) for-effect) | |
427 (cdr (cdr form))))) | |
428 | |
429 ((eq fn 'catch) | |
430 ;; the body of a catch is compiled (and thus optimized) as a | |
431 ;; top-level form, so don't do it here. The tag is never | |
432 ;; for-effect. The body should have the same for-effect status | |
433 ;; as the catch form itself, but that isn't handled properly yet. | |
434 (cons fn | |
435 (cons (byte-optimize-form (nth 1 form) nil) | |
436 (cdr (cdr form))))) | |
437 | |
438 ;; If optimization is on, this is the only place that macros are | |
439 ;; expanded. If optimization is off, then macroexpansion happens | |
440 ;; in byte-compile-form. Otherwise, the macros are already expanded | |
441 ;; by the time that is reached. | |
442 ((not (eq form | |
443 (setq form (macroexpand form | |
444 byte-compile-macro-environment)))) | |
445 (byte-optimize-form form for-effect)) | |
446 | |
447 ((not (symbolp fn)) | |
448 (or (eq 'mocklisp (car-safe fn)) ; ha! | |
449 (byte-compile-warn "%s is a malformed function" | |
450 (prin1-to-string fn))) | |
451 form) | |
452 | |
453 ((and for-effect (setq tmp (get fn 'side-effect-free)) | |
454 (or byte-compile-delete-errors | |
455 (eq tmp 'error-free) | |
456 (progn | |
457 (byte-compile-warn "%s called for effect" | |
458 (prin1-to-string form)) | |
459 nil))) | |
460 (byte-compile-log " %s called for effect; deleted" fn) | |
461 ;; appending a nil here might not be necessary, but it can't hurt. | |
462 (byte-optimize-form | |
463 (cons 'progn (append (cdr form) '(nil))) t)) | |
464 | |
465 (t | |
466 ;; Otherwise, no args can be considered to be for-effect, | |
467 ;; even if the called function is for-effect, because we | |
468 ;; don't know anything about that function. | |
469 (cons fn (mapcar 'byte-optimize-form (cdr form))))))) | |
470 | |
471 | |
472 (defun byte-optimize-form (form &optional for-effect) | |
473 "The source-level pass of the optimizer." | |
474 ;; | |
475 ;; First, optimize all sub-forms of this one. | |
476 (setq form (byte-optimize-form-code-walker form for-effect)) | |
477 ;; | |
478 ;; after optimizing all subforms, optimize this form until it doesn't | |
479 ;; optimize any further. This means that some forms will be passed through | |
480 ;; the optimizer many times, but that's necessary to make the for-effect | |
481 ;; processing do as much as possible. | |
482 ;; | |
483 (let (opt new) | |
484 (if (and (consp form) | |
485 (symbolp (car form)) | |
486 (or (and for-effect | |
487 ;; we don't have any of these yet, but we might. | |
488 (setq opt (get (car form) 'byte-for-effect-optimizer))) | |
489 (setq opt (get (car form) 'byte-optimizer))) | |
490 (not (eq form (setq new (funcall opt form))))) | |
491 (progn | |
492 ;; (if (equal form new) (error "bogus optimizer -- %s" opt)) | |
493 (byte-compile-log " %s\t==>\t%s" form new) | |
494 (setq new (byte-optimize-form new for-effect)) | |
495 new) | |
496 form))) | |
497 | |
498 | |
499 (defun byte-optimize-body (forms all-for-effect) | |
500 ;; optimize the cdr of a progn or implicit progn; all forms is a list of | |
501 ;; forms, all but the last of which are optimized with the assumption that | |
502 ;; they are being called for effect. the last is for-effect as well if | |
503 ;; all-for-effect is true. returns a new list of forms. | |
504 (let ((rest forms) | |
505 (result nil) | |
506 fe new) | |
507 (while rest | |
508 (setq fe (or all-for-effect (cdr rest))) | |
509 (setq new (and (car rest) (byte-optimize-form (car rest) fe))) | |
510 (if (or new (not fe)) | |
511 (setq result (cons new result))) | |
512 (setq rest (cdr rest))) | |
513 (nreverse result))) | |
514 | |
515 | |
516 ;;; some source-level optimizers | |
517 ;;; | |
518 ;;; when writing optimizers, be VERY careful that the optimizer returns | |
519 ;;; something not EQ to its argument if and ONLY if it has made a change. | |
520 ;;; This implies that you cannot simply destructively modify the list; | |
521 ;;; you must return something not EQ to it if you make an optimization. | |
522 ;;; | |
523 ;;; It is now safe to optimize code such that it introduces new bindings. | |
524 | |
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3138
diff
changeset
|
525 ;; I'd like this to be a defsubst, but let's not be self-referential... |
757 | 526 (defmacro byte-compile-trueconstp (form) |
527 ;; Returns non-nil if FORM is a non-nil constant. | |
528 (` (cond ((consp (, form)) (eq (car (, form)) 'quote)) | |
529 ((not (symbolp (, form)))) | |
530 ((eq (, form) t))))) | |
531 | |
767
02bfc9709961
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
532 ;; If the function is being called with constant numeric args, |
02bfc9709961
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
533 ;; evaluate as much as possible at compile-time. This optimizer |
02bfc9709961
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
534 ;; assumes that the function is associative, like + or *. |
757 | 535 (defun byte-optimize-associative-math (form) |
536 (let ((args nil) | |
537 (constants nil) | |
538 (rest (cdr form))) | |
539 (while rest | |
540 (if (numberp (car rest)) | |
541 (setq constants (cons (car rest) constants)) | |
542 (setq args (cons (car rest) args))) | |
543 (setq rest (cdr rest))) | |
544 (if (cdr constants) | |
545 (if args | |
546 (list (car form) | |
547 (apply (car form) constants) | |
548 (if (cdr args) | |
549 (cons (car form) (nreverse args)) | |
550 (car args))) | |
551 (apply (car form) constants)) | |
552 form))) | |
553 | |
767
02bfc9709961
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
554 ;; If the function is being called with constant numeric args, |
02bfc9709961
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
555 ;; evaluate as much as possible at compile-time. This optimizer |
02bfc9709961
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
556 ;; assumes that the function is nonassociative, like - or /. |
757 | 557 (defun byte-optimize-nonassociative-math (form) |
558 (if (or (not (numberp (car (cdr form)))) | |
559 (not (numberp (car (cdr (cdr form)))))) | |
560 form | |
561 (let ((constant (car (cdr form))) | |
562 (rest (cdr (cdr form)))) | |
563 (while (numberp (car rest)) | |
564 (setq constant (funcall (car form) constant (car rest)) | |
565 rest (cdr rest))) | |
566 (if rest | |
567 (cons (car form) (cons constant rest)) | |
568 constant)))) | |
569 | |
570 ;;(defun byte-optimize-associative-two-args-math (form) | |
571 ;; (setq form (byte-optimize-associative-math form)) | |
572 ;; (if (consp form) | |
573 ;; (byte-optimize-two-args-left form) | |
574 ;; form)) | |
575 | |
576 ;;(defun byte-optimize-nonassociative-two-args-math (form) | |
577 ;; (setq form (byte-optimize-nonassociative-math form)) | |
578 ;; (if (consp form) | |
579 ;; (byte-optimize-two-args-right form) | |
580 ;; form)) | |
581 | |
582 (defun byte-optimize-delay-constants-math (form start fun) | |
583 ;; Merge all FORM's constants from number START, call FUN on them | |
584 ;; and put the result at the end. | |
585 (let ((rest (nthcdr (1- start) form))) | |
586 (while (cdr (setq rest (cdr rest))) | |
587 (if (numberp (car rest)) | |
588 (let (constants) | |
589 (setq form (copy-sequence form) | |
590 rest (nthcdr (1- start) form)) | |
591 (while (setq rest (cdr rest)) | |
592 (cond ((numberp (car rest)) | |
593 (setq constants (cons (car rest) constants)) | |
594 (setcar rest nil)))) | |
595 (setq form (nconc (delq nil form) | |
596 (list (apply fun (nreverse constants)))))))) | |
597 form)) | |
598 | |
599 (defun byte-optimize-plus (form) | |
600 (setq form (byte-optimize-delay-constants-math form 1 '+)) | |
601 (if (memq 0 form) (setq form (delq 0 (copy-sequence form)))) | |
602 ;;(setq form (byte-optimize-associative-two-args-math form)) | |
603 (cond ((null (cdr form)) | |
604 (condition-case () | |
605 (eval form) | |
606 (error form))) | |
902
c81d26e85bef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
848
diff
changeset
|
607 ;;; It is not safe to delete the function entirely |
c81d26e85bef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
848
diff
changeset
|
608 ;;; (actually, it would be safe if we know the sole arg |
c81d26e85bef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
848
diff
changeset
|
609 ;;; is not a marker). |
c81d26e85bef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
848
diff
changeset
|
610 ;; ((null (cdr (cdr form))) (nth 1 form)) |
757 | 611 (t form))) |
612 | |
613 (defun byte-optimize-minus (form) | |
614 ;; Put constants at the end, except the last constant. | |
615 (setq form (byte-optimize-delay-constants-math form 2 '+)) | |
616 ;; Now only first and last element can be a number. | |
617 (let ((last (car (reverse (nthcdr 3 form))))) | |
618 (cond ((eq 0 last) | |
619 ;; (- x y ... 0) --> (- x y ...) | |
620 (setq form (copy-sequence form)) | |
621 (setcdr (cdr (cdr form)) (delq 0 (nthcdr 3 form)))) | |
622 ;; If form is (- CONST foo... CONST), merge first and last. | |
623 ((and (numberp (nth 1 form)) | |
624 (numberp last)) | |
625 (setq form (nconc (list '- (- (nth 1 form) last) (nth 2 form)) | |
626 (delq last (copy-sequence (nthcdr 3 form)))))))) | |
902
c81d26e85bef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
848
diff
changeset
|
627 ;;; It is not safe to delete the function entirely |
c81d26e85bef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
848
diff
changeset
|
628 ;;; (actually, it would be safe if we know the sole arg |
c81d26e85bef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
848
diff
changeset
|
629 ;;; is not a marker). |
c81d26e85bef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
848
diff
changeset
|
630 ;;; (if (eq (nth 2 form) 0) |
c81d26e85bef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
848
diff
changeset
|
631 ;;; (nth 1 form) ; (- x 0) --> x |
757 | 632 (byte-optimize-predicate |
633 (if (and (null (cdr (cdr (cdr form)))) | |
634 (eq (nth 1 form) 0)) ; (- 0 x) --> (- x) | |
635 (cons (car form) (cdr (cdr form))) | |
902
c81d26e85bef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
848
diff
changeset
|
636 form)) |
c81d26e85bef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
848
diff
changeset
|
637 ;;; ) |
c81d26e85bef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
848
diff
changeset
|
638 ) |
757 | 639 |
640 (defun byte-optimize-multiply (form) | |
641 (setq form (byte-optimize-delay-constants-math form 1 '*)) | |
642 ;; If there is a constant in FORM, it is now the last element. | |
643 (cond ((null (cdr form)) 1) | |
902
c81d26e85bef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
848
diff
changeset
|
644 ;;; It is not safe to delete the function entirely |
c81d26e85bef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
848
diff
changeset
|
645 ;;; (actually, it would be safe if we know the sole arg |
c81d26e85bef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
848
diff
changeset
|
646 ;;; is not a marker or if it appears in other arithmetic). |
c81d26e85bef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
848
diff
changeset
|
647 ;;; ((null (cdr (cdr form))) (nth 1 form)) |
757 | 648 ((let ((last (car (reverse form)))) |
649 (cond ((eq 0 last) (list 'progn (cdr form))) | |
650 ((eq 1 last) (delq 1 (copy-sequence form))) | |
651 ((eq -1 last) (list '- (delq -1 (copy-sequence form)))) | |
652 ((and (eq 2 last) | |
653 (memq t (mapcar 'symbolp (cdr form)))) | |
654 (prog1 (setq form (delq 2 (copy-sequence form))) | |
655 (while (not (symbolp (car (setq form (cdr form)))))) | |
656 (setcar form (list '+ (car form) (car form))))) | |
657 (form)))))) | |
658 | |
659 (defsubst byte-compile-butlast (form) | |
660 (nreverse (cdr (reverse form)))) | |
661 | |
662 (defun byte-optimize-divide (form) | |
663 (setq form (byte-optimize-delay-constants-math form 2 '*)) | |
664 (let ((last (car (reverse (cdr (cdr form)))))) | |
665 (if (numberp last) | |
3138
80ce80f189f7
(byte-optimize-divide): Don't optimize to less than two arguments.
Richard M. Stallman <rms@gnu.org>
parents:
1818
diff
changeset
|
666 (cond ((= (length form) 3) |
80ce80f189f7
(byte-optimize-divide): Don't optimize to less than two arguments.
Richard M. Stallman <rms@gnu.org>
parents:
1818
diff
changeset
|
667 ;; Don't shrink to less than two arguments--would get an error. |
80ce80f189f7
(byte-optimize-divide): Don't optimize to less than two arguments.
Richard M. Stallman <rms@gnu.org>
parents:
1818
diff
changeset
|
668 nil) |
80ce80f189f7
(byte-optimize-divide): Don't optimize to less than two arguments.
Richard M. Stallman <rms@gnu.org>
parents:
1818
diff
changeset
|
669 ((= last 1) |
757 | 670 (setq form (byte-compile-butlast form))) |
671 ((numberp (nth 1 form)) | |
672 (setq form (cons (car form) | |
673 (cons (/ (nth 1 form) last) | |
674 (byte-compile-butlast (cdr (cdr form))))) | |
675 last nil)))) | |
902
c81d26e85bef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
848
diff
changeset
|
676 (cond |
c81d26e85bef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
848
diff
changeset
|
677 ;;; ((null (cdr (cdr form))) |
c81d26e85bef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
848
diff
changeset
|
678 ;;; (nth 1 form)) |
757 | 679 ((eq (nth 1 form) 0) |
680 (append '(progn) (cdr (cdr form)) '(0))) | |
681 ((eq last -1) | |
682 (list '- (if (nthcdr 3 form) | |
683 (byte-compile-butlast form) | |
684 (nth 1 form)))) | |
685 (form)))) | |
686 | |
687 (defun byte-optimize-logmumble (form) | |
688 (setq form (byte-optimize-delay-constants-math form 1 (car form))) | |
689 (byte-optimize-predicate | |
690 (cond ((memq 0 form) | |
691 (setq form (if (eq (car form) 'logand) | |
692 (cons 'progn (cdr form)) | |
693 (delq 0 (copy-sequence form))))) | |
694 ((and (eq (car-safe form) 'logior) | |
695 (memq -1 form)) | |
696 (delq -1 (copy-sequence form))) | |
697 (form)))) | |
698 | |
699 | |
700 (defun byte-optimize-binary-predicate (form) | |
701 (if (byte-compile-constp (nth 1 form)) | |
702 (if (byte-compile-constp (nth 2 form)) | |
703 (condition-case () | |
704 (list 'quote (eval form)) | |
705 (error form)) | |
706 ;; This can enable some lapcode optimizations. | |
707 (list (car form) (nth 2 form) (nth 1 form))) | |
708 form)) | |
709 | |
710 (defun byte-optimize-predicate (form) | |
711 (let ((ok t) | |
712 (rest (cdr form))) | |
713 (while (and rest ok) | |
714 (setq ok (byte-compile-constp (car rest)) | |
715 rest (cdr rest))) | |
716 (if ok | |
717 (condition-case () | |
718 (list 'quote (eval form)) | |
719 (error form)) | |
720 form))) | |
721 | |
722 (defun byte-optimize-identity (form) | |
723 (if (and (cdr form) (null (cdr (cdr form)))) | |
724 (nth 1 form) | |
725 (byte-compile-warn "identity called with %d arg%s, but requires 1" | |
726 (length (cdr form)) | |
727 (if (= 1 (length (cdr form))) "" "s")) | |
728 form)) | |
729 | |
730 (put 'identity 'byte-optimizer 'byte-optimize-identity) | |
731 | |
732 (put '+ 'byte-optimizer 'byte-optimize-plus) | |
733 (put '* 'byte-optimizer 'byte-optimize-multiply) | |
734 (put '- 'byte-optimizer 'byte-optimize-minus) | |
735 (put '/ 'byte-optimizer 'byte-optimize-divide) | |
736 (put 'max 'byte-optimizer 'byte-optimize-associative-math) | |
737 (put 'min 'byte-optimizer 'byte-optimize-associative-math) | |
738 | |
739 (put '= 'byte-optimizer 'byte-optimize-binary-predicate) | |
740 (put 'eq 'byte-optimizer 'byte-optimize-binary-predicate) | |
741 (put 'eql 'byte-optimizer 'byte-optimize-binary-predicate) | |
742 (put 'equal 'byte-optimizer 'byte-optimize-binary-predicate) | |
743 (put 'string= 'byte-optimizer 'byte-optimize-binary-predicate) | |
744 (put 'string-equal 'byte-optimizer 'byte-optimize-binary-predicate) | |
745 | |
746 (put '< 'byte-optimizer 'byte-optimize-predicate) | |
747 (put '> 'byte-optimizer 'byte-optimize-predicate) | |
748 (put '<= 'byte-optimizer 'byte-optimize-predicate) | |
749 (put '>= 'byte-optimizer 'byte-optimize-predicate) | |
750 (put '1+ 'byte-optimizer 'byte-optimize-predicate) | |
751 (put '1- 'byte-optimizer 'byte-optimize-predicate) | |
752 (put 'not 'byte-optimizer 'byte-optimize-predicate) | |
753 (put 'null 'byte-optimizer 'byte-optimize-predicate) | |
754 (put 'memq 'byte-optimizer 'byte-optimize-predicate) | |
755 (put 'consp 'byte-optimizer 'byte-optimize-predicate) | |
756 (put 'listp 'byte-optimizer 'byte-optimize-predicate) | |
757 (put 'symbolp 'byte-optimizer 'byte-optimize-predicate) | |
758 (put 'stringp 'byte-optimizer 'byte-optimize-predicate) | |
759 (put 'string< 'byte-optimizer 'byte-optimize-predicate) | |
760 (put 'string-lessp 'byte-optimizer 'byte-optimize-predicate) | |
761 | |
762 (put 'logand 'byte-optimizer 'byte-optimize-logmumble) | |
763 (put 'logior 'byte-optimizer 'byte-optimize-logmumble) | |
764 (put 'logxor 'byte-optimizer 'byte-optimize-logmumble) | |
765 (put 'lognot 'byte-optimizer 'byte-optimize-predicate) | |
766 | |
767 (put 'car 'byte-optimizer 'byte-optimize-predicate) | |
768 (put 'cdr 'byte-optimizer 'byte-optimize-predicate) | |
769 (put 'car-safe 'byte-optimizer 'byte-optimize-predicate) | |
770 (put 'cdr-safe 'byte-optimizer 'byte-optimize-predicate) | |
771 | |
772 | |
773 ;; I'm not convinced that this is necessary. Doesn't the optimizer loop | |
774 ;; take care of this? - Jamie | |
775 ;; I think this may some times be necessary to reduce ie (quote 5) to 5, | |
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3138
diff
changeset
|
776 ;; so arithmetic optimizers recognize the numeric constant. - Hallvard |
757 | 777 (put 'quote 'byte-optimizer 'byte-optimize-quote) |
778 (defun byte-optimize-quote (form) | |
779 (if (or (consp (nth 1 form)) | |
780 (and (symbolp (nth 1 form)) | |
781 (not (memq (nth 1 form) '(nil t))))) | |
782 form | |
783 (nth 1 form))) | |
784 | |
785 (defun byte-optimize-zerop (form) | |
786 (cond ((numberp (nth 1 form)) | |
787 (eval form)) | |
788 (byte-compile-delete-errors | |
789 (list '= (nth 1 form) 0)) | |
790 (form))) | |
791 | |
792 (put 'zerop 'byte-optimizer 'byte-optimize-zerop) | |
793 | |
794 (defun byte-optimize-and (form) | |
795 ;; Simplify if less than 2 args. | |
796 ;; if there is a literal nil in the args to `and', throw it and following | |
797 ;; forms away, and surround the `and' with (progn ... nil). | |
798 (cond ((null (cdr form))) | |
799 ((memq nil form) | |
800 (list 'progn | |
801 (byte-optimize-and | |
802 (prog1 (setq form (copy-sequence form)) | |
803 (while (nth 1 form) | |
804 (setq form (cdr form))) | |
805 (setcdr form nil))) | |
806 nil)) | |
807 ((null (cdr (cdr form))) | |
808 (nth 1 form)) | |
809 ((byte-optimize-predicate form)))) | |
810 | |
811 (defun byte-optimize-or (form) | |
812 ;; Throw away nil's, and simplify if less than 2 args. | |
813 ;; If there is a literal non-nil constant in the args to `or', throw away all | |
814 ;; following forms. | |
815 (if (memq nil form) | |
816 (setq form (delq nil (copy-sequence form)))) | |
817 (let ((rest form)) | |
818 (while (cdr (setq rest (cdr rest))) | |
819 (if (byte-compile-trueconstp (car rest)) | |
820 (setq form (copy-sequence form) | |
821 rest (setcdr (memq (car rest) form) nil)))) | |
822 (if (cdr (cdr form)) | |
823 (byte-optimize-predicate form) | |
824 (nth 1 form)))) | |
825 | |
826 (defun byte-optimize-cond (form) | |
827 ;; if any clauses have a literal nil as their test, throw them away. | |
828 ;; if any clause has a literal non-nil constant as its test, throw | |
829 ;; away all following clauses. | |
830 (let (rest) | |
831 ;; This must be first, to reduce (cond (t ...) (nil)) to (progn t ...) | |
832 (while (setq rest (assq nil (cdr form))) | |
833 (setq form (delq rest (copy-sequence form)))) | |
834 (if (memq nil (cdr form)) | |
835 (setq form (delq nil (copy-sequence form)))) | |
836 (setq rest form) | |
837 (while (setq rest (cdr rest)) | |
838 (cond ((byte-compile-trueconstp (car-safe (car rest))) | |
839 (cond ((eq rest (cdr form)) | |
840 (setq form | |
841 (if (cdr (car rest)) | |
842 (if (cdr (cdr (car rest))) | |
843 (cons 'progn (cdr (car rest))) | |
844 (nth 1 (car rest))) | |
845 (car (car rest))))) | |
846 ((cdr rest) | |
847 (setq form (copy-sequence form)) | |
848 (setcdr (memq (car rest) form) nil))) | |
849 (setq rest nil))))) | |
850 ;; | |
851 ;; Turn (cond (( <x> )) ... ) into (or <x> (cond ... )) | |
852 (if (eq 'cond (car-safe form)) | |
853 (let ((clauses (cdr form))) | |
854 (if (and (consp (car clauses)) | |
855 (null (cdr (car clauses)))) | |
856 (list 'or (car (car clauses)) | |
857 (byte-optimize-cond | |
858 (cons (car form) (cdr (cdr form))))) | |
859 form)) | |
860 form)) | |
861 | |
862 (defun byte-optimize-if (form) | |
863 ;; (if <true-constant> <then> <else...>) ==> <then> | |
864 ;; (if <false-constant> <then> <else...>) ==> (progn <else...>) | |
865 ;; (if <test> nil <else...>) ==> (if (not <test>) (progn <else...>)) | |
866 ;; (if <test> <then> nil) ==> (if <test> <then>) | |
867 (let ((clause (nth 1 form))) | |
868 (cond ((byte-compile-trueconstp clause) | |
869 (nth 2 form)) | |
870 ((null clause) | |
871 (if (nthcdr 4 form) | |
872 (cons 'progn (nthcdr 3 form)) | |
873 (nth 3 form))) | |
874 ((nth 2 form) | |
875 (if (equal '(nil) (nthcdr 3 form)) | |
876 (list 'if clause (nth 2 form)) | |
877 form)) | |
878 ((or (nth 3 form) (nthcdr 4 form)) | |
879 (list 'if (list 'not clause) | |
880 (if (nthcdr 4 form) | |
881 (cons 'progn (nthcdr 3 form)) | |
882 (nth 3 form)))) | |
883 (t | |
884 (list 'progn clause nil))))) | |
885 | |
886 (defun byte-optimize-while (form) | |
887 (if (nth 1 form) | |
888 form)) | |
889 | |
890 (put 'and 'byte-optimizer 'byte-optimize-and) | |
891 (put 'or 'byte-optimizer 'byte-optimize-or) | |
892 (put 'cond 'byte-optimizer 'byte-optimize-cond) | |
893 (put 'if 'byte-optimizer 'byte-optimize-if) | |
894 (put 'while 'byte-optimizer 'byte-optimize-while) | |
895 | |
896 ;; byte-compile-negation-optimizer lives in bytecomp.el | |
897 (put '/= 'byte-optimizer 'byte-compile-negation-optimizer) | |
898 (put 'atom 'byte-optimizer 'byte-compile-negation-optimizer) | |
899 (put 'nlistp 'byte-optimizer 'byte-compile-negation-optimizer) | |
900 | |
901 | |
902 (defun byte-optimize-funcall (form) | |
903 ;; (funcall '(lambda ...) ...) ==> ((lambda ...) ...) | |
904 ;; (funcall 'foo ...) ==> (foo ...) | |
905 (let ((fn (nth 1 form))) | |
906 (if (memq (car-safe fn) '(quote function)) | |
907 (cons (nth 1 fn) (cdr (cdr form))) | |
908 form))) | |
909 | |
910 (defun byte-optimize-apply (form) | |
911 ;; If the last arg is a literal constant, turn this into a funcall. | |
912 ;; The funcall optimizer can then transform (funcall 'foo ...) -> (foo ...). | |
913 (let ((fn (nth 1 form)) | |
914 (last (nth (1- (length form)) form))) ; I think this really is fastest | |
915 (or (if (or (null last) | |
916 (eq (car-safe last) 'quote)) | |
917 (if (listp (nth 1 last)) | |
918 (let ((butlast (nreverse (cdr (reverse (cdr (cdr form))))))) | |
957 | 919 (nconc (list 'funcall fn) butlast |
920 (mapcar '(lambda (x) (list 'quote x)) (nth 1 last)))) | |
757 | 921 (byte-compile-warn |
922 "last arg to apply can't be a literal atom: %s" | |
923 (prin1-to-string last)) | |
924 nil)) | |
925 form))) | |
926 | |
927 (put 'funcall 'byte-optimizer 'byte-optimize-funcall) | |
928 (put 'apply 'byte-optimizer 'byte-optimize-apply) | |
929 | |
930 | |
931 (put 'let 'byte-optimizer 'byte-optimize-letX) | |
932 (put 'let* 'byte-optimizer 'byte-optimize-letX) | |
933 (defun byte-optimize-letX (form) | |
934 (cond ((null (nth 1 form)) | |
935 ;; No bindings | |
936 (cons 'progn (cdr (cdr form)))) | |
937 ((or (nth 2 form) (nthcdr 3 form)) | |
938 form) | |
939 ;; The body is nil | |
940 ((eq (car form) 'let) | |
941 (append '(progn) (mapcar 'car (mapcar 'cdr (nth 1 form))) '(nil))) | |
942 (t | |
943 (let ((binds (reverse (nth 1 form)))) | |
944 (list 'let* (reverse (cdr binds)) (nth 1 (car binds)) nil))))) | |
945 | |
946 | |
947 (put 'nth 'byte-optimizer 'byte-optimize-nth) | |
948 (defun byte-optimize-nth (form) | |
949 (if (memq (nth 1 form) '(0 1)) | |
950 (list 'car (if (zerop (nth 1 form)) | |
951 (nth 2 form) | |
952 (list 'cdr (nth 2 form)))) | |
953 (byte-optimize-predicate form))) | |
954 | |
955 (put 'nthcdr 'byte-optimizer 'byte-optimize-nthcdr) | |
956 (defun byte-optimize-nthcdr (form) | |
957 (let ((count (nth 1 form))) | |
958 (if (not (memq count '(0 1 2))) | |
959 (byte-optimize-predicate form) | |
960 (setq form (nth 2 form)) | |
961 (while (natnump (setq count (1- count))) | |
962 (setq form (list 'cdr form))) | |
963 form))) | |
964 | |
965 ;;; enumerating those functions which need not be called if the returned | |
966 ;;; value is not used. That is, something like | |
967 ;;; (progn (list (something-with-side-effects) (yow)) | |
968 ;;; (foo)) | |
969 ;;; may safely be turned into | |
970 ;;; (progn (progn (something-with-side-effects) (yow)) | |
971 ;;; (foo)) | |
972 ;;; Further optimizations will turn (progn (list 1 2 3) 'foo) into 'foo. | |
973 | |
974 ;;; I wonder if I missed any :-\) | |
975 (let ((side-effect-free-fns | |
5315
55a8d59088c1
Add side-effect-free props for many functions.
Richard M. Stallman <rms@gnu.org>
parents:
4755
diff
changeset
|
976 '(% * + - / /= 1+ 1- < <= = > >= abs acos append aref ash asin atan |
55a8d59088c1
Add side-effect-free props for many functions.
Richard M. Stallman <rms@gnu.org>
parents:
4755
diff
changeset
|
977 assoc assq |
55a8d59088c1
Add side-effect-free props for many functions.
Richard M. Stallman <rms@gnu.org>
parents:
4755
diff
changeset
|
978 boundp buffer-file-name buffer-local-variables buffer-modified-p |
55a8d59088c1
Add side-effect-free props for many functions.
Richard M. Stallman <rms@gnu.org>
parents:
4755
diff
changeset
|
979 buffer-substring |
55a8d59088c1
Add side-effect-free props for many functions.
Richard M. Stallman <rms@gnu.org>
parents:
4755
diff
changeset
|
980 capitalize car-less-than-car car cdr ceiling concat coordinates-in-window-p |
55a8d59088c1
Add side-effect-free props for many functions.
Richard M. Stallman <rms@gnu.org>
parents:
4755
diff
changeset
|
981 copy-marker cos count-lines |
55a8d59088c1
Add side-effect-free props for many functions.
Richard M. Stallman <rms@gnu.org>
parents:
4755
diff
changeset
|
982 default-boundp default-value documentation downcase |
55a8d59088c1
Add side-effect-free props for many functions.
Richard M. Stallman <rms@gnu.org>
parents:
4755
diff
changeset
|
983 elt exp expt fboundp featurep |
757 | 984 file-directory-p file-exists-p file-locked-p file-name-absolute-p |
985 file-newer-than-file-p file-readable-p file-symlink-p file-writable-p | |
5315
55a8d59088c1
Add side-effect-free props for many functions.
Richard M. Stallman <rms@gnu.org>
parents:
4755
diff
changeset
|
986 float floor format |
55a8d59088c1
Add side-effect-free props for many functions.
Richard M. Stallman <rms@gnu.org>
parents:
4755
diff
changeset
|
987 get get-buffer get-buffer-window getenv get-file-buffer |
55a8d59088c1
Add side-effect-free props for many functions.
Richard M. Stallman <rms@gnu.org>
parents:
4755
diff
changeset
|
988 int-to-string |
55a8d59088c1
Add side-effect-free props for many functions.
Richard M. Stallman <rms@gnu.org>
parents:
4755
diff
changeset
|
989 length log log10 logand logb logior lognot logxor lsh |
55a8d59088c1
Add side-effect-free props for many functions.
Richard M. Stallman <rms@gnu.org>
parents:
4755
diff
changeset
|
990 marker-buffer max member memq min mod |
55a8d59088c1
Add side-effect-free props for many functions.
Richard M. Stallman <rms@gnu.org>
parents:
4755
diff
changeset
|
991 next-window nth nthcdr number-to-string |
55a8d59088c1
Add side-effect-free props for many functions.
Richard M. Stallman <rms@gnu.org>
parents:
4755
diff
changeset
|
992 parse-colon-path previous-window |
55a8d59088c1
Add side-effect-free props for many functions.
Richard M. Stallman <rms@gnu.org>
parents:
4755
diff
changeset
|
993 radians-to-degrees rassq regexp-quote reverse round |
55a8d59088c1
Add side-effect-free props for many functions.
Richard M. Stallman <rms@gnu.org>
parents:
4755
diff
changeset
|
994 sin sqrt string< string= string-equal string-lessp string-to-char |
55a8d59088c1
Add side-effect-free props for many functions.
Richard M. Stallman <rms@gnu.org>
parents:
4755
diff
changeset
|
995 string-to-int string-to-number substring symbol-plist |
55a8d59088c1
Add side-effect-free props for many functions.
Richard M. Stallman <rms@gnu.org>
parents:
4755
diff
changeset
|
996 tan upcase user-variable-p vconcat |
55a8d59088c1
Add side-effect-free props for many functions.
Richard M. Stallman <rms@gnu.org>
parents:
4755
diff
changeset
|
997 window-buffer window-dedicated-p window-edges window-height |
55a8d59088c1
Add side-effect-free props for many functions.
Richard M. Stallman <rms@gnu.org>
parents:
4755
diff
changeset
|
998 window-hscroll window-minibuffer-p window-width |
757 | 999 zerop)) |
1000 (side-effect-and-error-free-fns | |
5315
55a8d59088c1
Add side-effect-free props for many functions.
Richard M. Stallman <rms@gnu.org>
parents:
4755
diff
changeset
|
1001 '(arrayp atom |
55a8d59088c1
Add side-effect-free props for many functions.
Richard M. Stallman <rms@gnu.org>
parents:
4755
diff
changeset
|
1002 bobp bolp buffer-end buffer-list buffer-size buffer-string bufferp |
55a8d59088c1
Add side-effect-free props for many functions.
Richard M. Stallman <rms@gnu.org>
parents:
4755
diff
changeset
|
1003 car-safe case-table-p cdr-safe char-or-string-p commandp cons consp |
55a8d59088c1
Add side-effect-free props for many functions.
Richard M. Stallman <rms@gnu.org>
parents:
4755
diff
changeset
|
1004 current-buffer |
55a8d59088c1
Add side-effect-free props for many functions.
Richard M. Stallman <rms@gnu.org>
parents:
4755
diff
changeset
|
1005 dot dot-marker eobp eolp eq eql equal eventp floatp framep |
55a8d59088c1
Add side-effect-free props for many functions.
Richard M. Stallman <rms@gnu.org>
parents:
4755
diff
changeset
|
1006 get-largest-window get-lru-window |
55a8d59088c1
Add side-effect-free props for many functions.
Richard M. Stallman <rms@gnu.org>
parents:
4755
diff
changeset
|
1007 identity ignore integerp integer-or-marker-p interactive-p |
55a8d59088c1
Add side-effect-free props for many functions.
Richard M. Stallman <rms@gnu.org>
parents:
4755
diff
changeset
|
1008 invocation-directory invocation-name |
55a8d59088c1
Add side-effect-free props for many functions.
Richard M. Stallman <rms@gnu.org>
parents:
4755
diff
changeset
|
1009 keymapp list listp |
55a8d59088c1
Add side-effect-free props for many functions.
Richard M. Stallman <rms@gnu.org>
parents:
4755
diff
changeset
|
1010 make-marker mark mark-marker markerp memory-limit minibuffer-window |
55a8d59088c1
Add side-effect-free props for many functions.
Richard M. Stallman <rms@gnu.org>
parents:
4755
diff
changeset
|
1011 mouse-movement-p |
55a8d59088c1
Add side-effect-free props for many functions.
Richard M. Stallman <rms@gnu.org>
parents:
4755
diff
changeset
|
1012 natnump nlistp not null number-or-marker-p numberp |
55a8d59088c1
Add side-effect-free props for many functions.
Richard M. Stallman <rms@gnu.org>
parents:
4755
diff
changeset
|
1013 one-window-p overlayp |
55a8d59088c1
Add side-effect-free props for many functions.
Richard M. Stallman <rms@gnu.org>
parents:
4755
diff
changeset
|
1014 point point-marker point-min point-max processp |
55a8d59088c1
Add side-effect-free props for many functions.
Richard M. Stallman <rms@gnu.org>
parents:
4755
diff
changeset
|
1015 selected-window sequencep stringp subrp symbolp syntax-table-p |
55a8d59088c1
Add side-effect-free props for many functions.
Richard M. Stallman <rms@gnu.org>
parents:
4755
diff
changeset
|
1016 user-full-name user-login-name user-original-login-name |
55a8d59088c1
Add side-effect-free props for many functions.
Richard M. Stallman <rms@gnu.org>
parents:
4755
diff
changeset
|
1017 user-real-login-name user-real-uid user-uid |
55a8d59088c1
Add side-effect-free props for many functions.
Richard M. Stallman <rms@gnu.org>
parents:
4755
diff
changeset
|
1018 vector vectorp |
55a8d59088c1
Add side-effect-free props for many functions.
Richard M. Stallman <rms@gnu.org>
parents:
4755
diff
changeset
|
1019 window-configuration-p window-live-p windowp))) |
757 | 1020 (while side-effect-free-fns |
1021 (put (car side-effect-free-fns) 'side-effect-free t) | |
1022 (setq side-effect-free-fns (cdr side-effect-free-fns))) | |
1023 (while side-effect-and-error-free-fns | |
1024 (put (car side-effect-and-error-free-fns) 'side-effect-free 'error-free) | |
1025 (setq side-effect-and-error-free-fns (cdr side-effect-and-error-free-fns))) | |
1026 nil) | |
1027 | |
1028 | |
1029 (defun byte-compile-splice-in-already-compiled-code (form) | |
1030 ;; form is (byte-code "..." [...] n) | |
1031 (if (not (memq byte-optimize '(t lap))) | |
1032 (byte-compile-normal-call form) | |
1033 (byte-inline-lapcode | |
1034 (byte-decompile-bytecode-1 (nth 1 form) (nth 2 form) t)) | |
1035 (setq byte-compile-maxdepth (max (+ byte-compile-depth (nth 3 form)) | |
1036 byte-compile-maxdepth)) | |
1037 (setq byte-compile-depth (1+ byte-compile-depth)))) | |
1038 | |
1039 (put 'byte-code 'byte-compile 'byte-compile-splice-in-already-compiled-code) | |
1040 | |
1041 | |
1042 (defconst byte-constref-ops | |
1043 '(byte-constant byte-constant2 byte-varref byte-varset byte-varbind)) | |
1044 | |
1045 ;;; This function extracts the bitfields from variable-length opcodes. | |
1046 ;;; Originally defined in disass.el (which no longer uses it.) | |
1047 | |
1048 (defun disassemble-offset () | |
1049 "Don't call this!" | |
1050 ;; fetch and return the offset for the current opcode. | |
1051 ;; return NIL if this opcode has no offset | |
1052 ;; OP, PTR and BYTES are used and set dynamically | |
1053 (defvar op) | |
1054 (defvar ptr) | |
1055 (defvar bytes) | |
1056 (cond ((< op byte-nth) | |
1057 (let ((tem (logand op 7))) | |
1058 (setq op (logand op 248)) | |
1059 (cond ((eq tem 6) | |
1060 (setq ptr (1+ ptr)) ;offset in next byte | |
1061 (aref bytes ptr)) | |
1062 ((eq tem 7) | |
1063 (setq ptr (1+ ptr)) ;offset in next 2 bytes | |
1064 (+ (aref bytes ptr) | |
1065 (progn (setq ptr (1+ ptr)) | |
1066 (lsh (aref bytes ptr) 8)))) | |
1067 (t tem)))) ;offset was in opcode | |
1068 ((>= op byte-constant) | |
1069 (prog1 (- op byte-constant) ;offset in opcode | |
1070 (setq op byte-constant))) | |
1071 ((and (>= op byte-constant2) | |
1072 (<= op byte-goto-if-not-nil-else-pop)) | |
1073 (setq ptr (1+ ptr)) ;offset in next 2 bytes | |
1074 (+ (aref bytes ptr) | |
1075 (progn (setq ptr (1+ ptr)) | |
1076 (lsh (aref bytes ptr) 8)))) | |
848 | 1077 ((and (>= op byte-listN) |
757 | 1078 (<= op byte-insertN)) |
1079 (setq ptr (1+ ptr)) ;offset in next byte | |
1080 (aref bytes ptr)))) | |
1081 | |
1082 | |
1083 ;;; This de-compiler is used for inline expansion of compiled functions, | |
1084 ;;; and by the disassembler. | |
1085 ;;; | |
8292
6857db0f3c82
(byte-decompile-bytecode-1):
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
1086 ;;; This list contains numbers, which are pc values, |
6857db0f3c82
(byte-decompile-bytecode-1):
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
1087 ;;; before each instruction. |
757 | 1088 (defun byte-decompile-bytecode (bytes constvec) |
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3138
diff
changeset
|
1089 "Turns BYTECODE into lapcode, referring to CONSTVEC." |
757 | 1090 (let ((byte-compile-constants nil) |
1091 (byte-compile-variables nil) | |
1092 (byte-compile-tag-number 0)) | |
1093 (byte-decompile-bytecode-1 bytes constvec))) | |
1094 | |
767
02bfc9709961
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1095 ;; As byte-decompile-bytecode, but updates |
02bfc9709961
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1096 ;; byte-compile-{constants, variables, tag-number}. |
8294
cd3d2474ea10
(byte-decompile-bytecode-1): Don't add pc values
Richard M. Stallman <rms@gnu.org>
parents:
8292
diff
changeset
|
1097 ;; If MAKE-SPLICEABLE is true, then `return' opcodes are replaced |
767
02bfc9709961
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1098 ;; with `goto's destined for the end of the code. |
8294
cd3d2474ea10
(byte-decompile-bytecode-1): Don't add pc values
Richard M. Stallman <rms@gnu.org>
parents:
8292
diff
changeset
|
1099 ;; That is for use by the compiler. |
cd3d2474ea10
(byte-decompile-bytecode-1): Don't add pc values
Richard M. Stallman <rms@gnu.org>
parents:
8292
diff
changeset
|
1100 ;; If MAKE-SPLICEABLE is nil, we are being called for the disassembler. |
cd3d2474ea10
(byte-decompile-bytecode-1): Don't add pc values
Richard M. Stallman <rms@gnu.org>
parents:
8292
diff
changeset
|
1101 ;; In that case, we put a pc value into the list |
cd3d2474ea10
(byte-decompile-bytecode-1): Don't add pc values
Richard M. Stallman <rms@gnu.org>
parents:
8292
diff
changeset
|
1102 ;; before each insn (or its label). |
cd3d2474ea10
(byte-decompile-bytecode-1): Don't add pc values
Richard M. Stallman <rms@gnu.org>
parents:
8292
diff
changeset
|
1103 (defun byte-decompile-bytecode-1 (bytes constvec &optional make-spliceable) |
757 | 1104 (let ((length (length bytes)) |
1105 (ptr 0) optr tag tags op offset | |
1106 lap tmp | |
1107 endtag | |
1108 (retcount 0)) | |
1109 (while (not (= ptr length)) | |
8294
cd3d2474ea10
(byte-decompile-bytecode-1): Don't add pc values
Richard M. Stallman <rms@gnu.org>
parents:
8292
diff
changeset
|
1110 (or make-spliceable |
cd3d2474ea10
(byte-decompile-bytecode-1): Don't add pc values
Richard M. Stallman <rms@gnu.org>
parents:
8292
diff
changeset
|
1111 (setq lap (cons ptr lap))) |
757 | 1112 (setq op (aref bytes ptr) |
1113 optr ptr | |
1114 offset (disassemble-offset)) ; this does dynamic-scope magic | |
1115 (setq op (aref byte-code-vector op)) | |
848 | 1116 (cond ((memq op byte-goto-ops) |
757 | 1117 ;; it's a pc |
1118 (setq offset | |
1119 (cdr (or (assq offset tags) | |
1120 (car (setq tags | |
1121 (cons (cons offset | |
1122 (byte-compile-make-tag)) | |
1123 tags))))))) | |
1124 ((cond ((eq op 'byte-constant2) (setq op 'byte-constant) t) | |
1125 ((memq op byte-constref-ops))) | |
1126 (setq tmp (aref constvec offset) | |
1127 offset (if (eq op 'byte-constant) | |
1128 (byte-compile-get-constant tmp) | |
1129 (or (assq tmp byte-compile-variables) | |
1130 (car (setq byte-compile-variables | |
1131 (cons (list tmp) | |
1132 byte-compile-variables))))))) | |
8294
cd3d2474ea10
(byte-decompile-bytecode-1): Don't add pc values
Richard M. Stallman <rms@gnu.org>
parents:
8292
diff
changeset
|
1133 ((and make-spliceable |
757 | 1134 (eq op 'byte-return)) |
1135 (if (= ptr (1- length)) | |
1136 (setq op nil) | |
1137 (setq offset (or endtag (setq endtag (byte-compile-make-tag))) | |
1138 op 'byte-goto)))) | |
1139 ;; lap = ( [ (pc . (op . arg)) ]* ) | |
1140 (setq lap (cons (cons optr (cons op (or offset 0))) | |
1141 lap)) | |
1142 (setq ptr (1+ ptr))) | |
1143 ;; take off the dummy nil op that we replaced a trailing "return" with. | |
1144 (let ((rest lap)) | |
1145 (while rest | |
8292
6857db0f3c82
(byte-decompile-bytecode-1):
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
1146 (cond ((numberp (car rest))) |
6857db0f3c82
(byte-decompile-bytecode-1):
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
1147 ((setq tmp (assq (car (car rest)) tags)) |
757 | 1148 ;; this addr is jumped to |
1149 (setcdr rest (cons (cons nil (cdr tmp)) | |
1150 (cdr rest))) | |
1151 (setq tags (delq tmp tags)) | |
1152 (setq rest (cdr rest)))) | |
1153 (setq rest (cdr rest)))) | |
1154 (if tags (error "optimizer error: missed tags %s" tags)) | |
1155 (if (null (car (cdr (car lap)))) | |
1156 (setq lap (cdr lap))) | |
1157 (if endtag | |
1158 (setq lap (cons (cons nil endtag) lap))) | |
1159 ;; remove addrs, lap = ( [ (op . arg) | (TAG tagno) ]* ) | |
8292
6857db0f3c82
(byte-decompile-bytecode-1):
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
1160 (mapcar (function (lambda (elt) |
6857db0f3c82
(byte-decompile-bytecode-1):
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
1161 (if (numberp elt) |
6857db0f3c82
(byte-decompile-bytecode-1):
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
1162 elt |
6857db0f3c82
(byte-decompile-bytecode-1):
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
1163 (cdr elt)))) |
6857db0f3c82
(byte-decompile-bytecode-1):
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
1164 (nreverse lap)))) |
757 | 1165 |
1166 | |
1167 ;;; peephole optimizer | |
1168 | |
1169 (defconst byte-tagref-ops (cons 'TAG byte-goto-ops)) | |
1170 | |
1171 (defconst byte-conditional-ops | |
1172 '(byte-goto-if-nil byte-goto-if-not-nil byte-goto-if-nil-else-pop | |
1173 byte-goto-if-not-nil-else-pop)) | |
1174 | |
1175 (defconst byte-after-unbind-ops | |
1176 '(byte-constant byte-dup | |
1177 byte-symbolp byte-consp byte-stringp byte-listp byte-numberp byte-integerp | |
1178 byte-eq byte-equal byte-not | |
1179 byte-cons byte-list1 byte-list2 ; byte-list3 byte-list4 | |
8466
3cca823100db
(byte-after-unbind-ops): Fix paren error wrt doc string.
Richard M. Stallman <rms@gnu.org>
parents:
8294
diff
changeset
|
1180 byte-interactive-p) |
3cca823100db
(byte-after-unbind-ops): Fix paren error wrt doc string.
Richard M. Stallman <rms@gnu.org>
parents:
8294
diff
changeset
|
1181 ;; How about other side-effect-free-ops? Is it safe to move an |
3cca823100db
(byte-after-unbind-ops): Fix paren error wrt doc string.
Richard M. Stallman <rms@gnu.org>
parents:
8294
diff
changeset
|
1182 ;; error invocation (such as from nth) out of an unwind-protect? |
3cca823100db
(byte-after-unbind-ops): Fix paren error wrt doc string.
Richard M. Stallman <rms@gnu.org>
parents:
8294
diff
changeset
|
1183 "Byte-codes that can be moved past an unbind.") |
757 | 1184 |
1185 (defconst byte-compile-side-effect-and-error-free-ops | |
1186 '(byte-constant byte-dup byte-symbolp byte-consp byte-stringp byte-listp | |
1187 byte-integerp byte-numberp byte-eq byte-equal byte-not byte-car-safe | |
1188 byte-cdr-safe byte-cons byte-list1 byte-list2 byte-point byte-point-max | |
1189 byte-point-min byte-following-char byte-preceding-char | |
1190 byte-current-column byte-eolp byte-eobp byte-bolp byte-bobp | |
1191 byte-current-buffer byte-interactive-p)) | |
1192 | |
1193 (defconst byte-compile-side-effect-free-ops | |
1194 (nconc | |
1195 '(byte-varref byte-nth byte-memq byte-car byte-cdr byte-length byte-aref | |
1196 byte-symbol-value byte-get byte-concat2 byte-concat3 byte-sub1 byte-add1 | |
1197 byte-eqlsign byte-gtr byte-lss byte-leq byte-geq byte-diff byte-negate | |
1198 byte-plus byte-max byte-min byte-mult byte-char-after byte-char-syntax | |
1199 byte-buffer-substring byte-string= byte-string< byte-nthcdr byte-elt | |
1200 byte-member byte-assq byte-quo byte-rem) | |
1201 byte-compile-side-effect-and-error-free-ops)) | |
1202 | |
1203 ;;; This piece of shit is because of the way DEFVAR_BOOL() variables work. | |
1204 ;;; Consider the code | |
1205 ;;; | |
1206 ;;; (defun foo (flag) | |
1207 ;;; (let ((old-pop-ups pop-up-windows) | |
1208 ;;; (pop-up-windows flag)) | |
1209 ;;; (cond ((not (eq pop-up-windows old-pop-ups)) | |
1210 ;;; (setq old-pop-ups pop-up-windows) | |
1211 ;;; ...)))) | |
1212 ;;; | |
1213 ;;; Uncompiled, old-pop-ups will always be set to nil or t, even if FLAG is | |
1214 ;;; something else. But if we optimize | |
1215 ;;; | |
1216 ;;; varref flag | |
1217 ;;; varbind pop-up-windows | |
1218 ;;; varref pop-up-windows | |
1219 ;;; not | |
1220 ;;; to | |
1221 ;;; varref flag | |
1222 ;;; dup | |
1223 ;;; varbind pop-up-windows | |
1224 ;;; not | |
1225 ;;; | |
1226 ;;; we break the program, because it will appear that pop-up-windows and | |
1227 ;;; old-pop-ups are not EQ when really they are. So we have to know what | |
1228 ;;; the BOOL variables are, and not perform this optimization on them. | |
1229 ;;; | |
1230 (defconst byte-boolean-vars | |
848 | 1231 '(abbrev-all-caps abbrevs-changed byte-metering-on |
1232 check-protected-fields completion-auto-help completion-ignore-case | |
1233 cursor-in-echo-area debug-on-next-call debug-on-quit | |
1234 defining-kbd-macro delete-exited-processes | |
5315
55a8d59088c1
Add side-effect-free props for many functions.
Richard M. Stallman <rms@gnu.org>
parents:
4755
diff
changeset
|
1235 enable-recursive-minibuffers |
55a8d59088c1
Add side-effect-free props for many functions.
Richard M. Stallman <rms@gnu.org>
parents:
4755
diff
changeset
|
1236 highlight-nonselected-windows indent-tabs-mode |
848 | 1237 insert-default-directory inverse-video load-in-progress |
1238 menu-prompting mode-line-inverse-video no-redraw-on-reenter | |
1239 noninteractive parse-sexp-ignore-comments pop-up-frames | |
1240 pop-up-windows print-escape-newlines print-escape-newlines | |
1241 truncate-partial-width-windows visible-bell vms-stmlf-recfm | |
1242 words-include-escapes x-save-under) | |
757 | 1243 "DEFVAR_BOOL variables. Giving these any non-nil value sets them to t. |
1244 If this does not enumerate all DEFVAR_BOOL variables, the byte-optimizer | |
1245 may generate incorrect code.") | |
1246 | |
1247 (defun byte-optimize-lapcode (lap &optional for-effect) | |
1248 "Simple peephole optimizer. LAP is both modified and returned." | |
1249 (let (lap0 off0 | |
1250 lap1 off1 | |
1251 lap2 off2 | |
1252 (keep-going 'first-time) | |
1253 (add-depth 0) | |
1254 rest tmp tmp2 tmp3 | |
1255 (side-effect-free (if byte-compile-delete-errors | |
1256 byte-compile-side-effect-free-ops | |
1257 byte-compile-side-effect-and-error-free-ops))) | |
1258 (while keep-going | |
1259 (or (eq keep-going 'first-time) | |
1260 (byte-compile-log-lap " ---- next pass")) | |
1261 (setq rest lap | |
1262 keep-going nil) | |
1263 (while rest | |
1264 (setq lap0 (car rest) | |
1265 lap1 (nth 1 rest) | |
1266 lap2 (nth 2 rest)) | |
1267 | |
1268 ;; You may notice that sequences like "dup varset discard" are | |
1269 ;; optimized but sequences like "dup varset TAG1: discard" are not. | |
1270 ;; You may be tempted to change this; resist that temptation. | |
1271 (cond ;; | |
1272 ;; <side-effect-free> pop --> <deleted> | |
1273 ;; ...including: | |
1274 ;; const-X pop --> <deleted> | |
1275 ;; varref-X pop --> <deleted> | |
1276 ;; dup pop --> <deleted> | |
1277 ;; | |
1278 ((and (eq 'byte-discard (car lap1)) | |
1279 (memq (car lap0) side-effect-free)) | |
1280 (setq keep-going t) | |
1281 (setq tmp (aref byte-stack+-info (symbol-value (car lap0)))) | |
1282 (setq rest (cdr rest)) | |
1283 (cond ((= tmp 1) | |
1284 (byte-compile-log-lap | |
1285 " %s discard\t-->\t<deleted>" lap0) | |
1286 (setq lap (delq lap0 (delq lap1 lap)))) | |
1287 ((= tmp 0) | |
1288 (byte-compile-log-lap | |
1289 " %s discard\t-->\t<deleted> discard" lap0) | |
1290 (setq lap (delq lap0 lap))) | |
1291 ((= tmp -1) | |
1292 (byte-compile-log-lap | |
1293 " %s discard\t-->\tdiscard discard" lap0) | |
1294 (setcar lap0 'byte-discard) | |
1295 (setcdr lap0 0)) | |
1296 ((error "Optimizer error: too much on the stack")))) | |
1297 ;; | |
1298 ;; goto*-X X: --> X: | |
1299 ;; | |
1300 ((and (memq (car lap0) byte-goto-ops) | |
1301 (eq (cdr lap0) lap1)) | |
1302 (cond ((eq (car lap0) 'byte-goto) | |
1303 (setq lap (delq lap0 lap)) | |
1304 (setq tmp "<deleted>")) | |
1305 ((memq (car lap0) byte-goto-always-pop-ops) | |
1306 (setcar lap0 (setq tmp 'byte-discard)) | |
1307 (setcdr lap0 0)) | |
1308 ((error "Depth conflict at tag %d" (nth 2 lap0)))) | |
1309 (and (memq byte-optimize-log '(t byte)) | |
1310 (byte-compile-log " (goto %s) %s:\t-->\t%s %s:" | |
1311 (nth 1 lap1) (nth 1 lap1) | |
1312 tmp (nth 1 lap1))) | |
1313 (setq keep-going t)) | |
1314 ;; | |
1315 ;; varset-X varref-X --> dup varset-X | |
1316 ;; varbind-X varref-X --> dup varbind-X | |
1317 ;; const/dup varset-X varref-X --> const/dup varset-X const/dup | |
1318 ;; const/dup varbind-X varref-X --> const/dup varbind-X const/dup | |
1319 ;; The latter two can enable other optimizations. | |
1320 ;; | |
1321 ((and (eq 'byte-varref (car lap2)) | |
1322 (eq (cdr lap1) (cdr lap2)) | |
1323 (memq (car lap1) '(byte-varset byte-varbind))) | |
1324 (if (and (setq tmp (memq (car (cdr lap2)) byte-boolean-vars)) | |
1325 (not (eq (car lap0) 'byte-constant))) | |
1326 nil | |
1327 (setq keep-going t) | |
1328 (if (memq (car lap0) '(byte-constant byte-dup)) | |
1329 (progn | |
1330 (setq tmp (if (or (not tmp) | |
1331 (memq (car (cdr lap0)) '(nil t))) | |
1332 (cdr lap0) | |
1333 (byte-compile-get-constant t))) | |
1334 (byte-compile-log-lap " %s %s %s\t-->\t%s %s %s" | |
1335 lap0 lap1 lap2 lap0 lap1 | |
1336 (cons (car lap0) tmp)) | |
1337 (setcar lap2 (car lap0)) | |
1338 (setcdr lap2 tmp)) | |
1339 (byte-compile-log-lap " %s %s\t-->\tdup %s" lap1 lap2 lap1) | |
1340 (setcar lap2 (car lap1)) | |
1341 (setcar lap1 'byte-dup) | |
1342 (setcdr lap1 0) | |
1343 ;; The stack depth gets locally increased, so we will | |
1344 ;; increase maxdepth in case depth = maxdepth here. | |
1345 ;; This can cause the third argument to byte-code to | |
1346 ;; be larger than necessary. | |
1347 (setq add-depth 1)))) | |
1348 ;; | |
1349 ;; dup varset-X discard --> varset-X | |
1350 ;; dup varbind-X discard --> varbind-X | |
1351 ;; (the varbind variant can emerge from other optimizations) | |
1352 ;; | |
1353 ((and (eq 'byte-dup (car lap0)) | |
1354 (eq 'byte-discard (car lap2)) | |
1355 (memq (car lap1) '(byte-varset byte-varbind))) | |
1356 (byte-compile-log-lap " dup %s discard\t-->\t%s" lap1 lap1) | |
1357 (setq keep-going t | |
1358 rest (cdr rest)) | |
1359 (setq lap (delq lap0 (delq lap2 lap)))) | |
1360 ;; | |
1361 ;; not goto-X-if-nil --> goto-X-if-non-nil | |
1362 ;; not goto-X-if-non-nil --> goto-X-if-nil | |
1363 ;; | |
1364 ;; it is wrong to do the same thing for the -else-pop variants. | |
1365 ;; | |
1366 ((and (eq 'byte-not (car lap0)) | |
1367 (or (eq 'byte-goto-if-nil (car lap1)) | |
1368 (eq 'byte-goto-if-not-nil (car lap1)))) | |
1369 (byte-compile-log-lap " not %s\t-->\t%s" | |
1370 lap1 | |
1371 (cons | |
1372 (if (eq (car lap1) 'byte-goto-if-nil) | |
1373 'byte-goto-if-not-nil | |
1374 'byte-goto-if-nil) | |
1375 (cdr lap1))) | |
1376 (setcar lap1 (if (eq (car lap1) 'byte-goto-if-nil) | |
1377 'byte-goto-if-not-nil | |
1378 'byte-goto-if-nil)) | |
1379 (setq lap (delq lap0 lap)) | |
1380 (setq keep-going t)) | |
1381 ;; | |
1382 ;; goto-X-if-nil goto-Y X: --> goto-Y-if-non-nil X: | |
1383 ;; goto-X-if-non-nil goto-Y X: --> goto-Y-if-nil X: | |
1384 ;; | |
1385 ;; it is wrong to do the same thing for the -else-pop variants. | |
1386 ;; | |
1387 ((and (or (eq 'byte-goto-if-nil (car lap0)) | |
1388 (eq 'byte-goto-if-not-nil (car lap0))) ; gotoX | |
1389 (eq 'byte-goto (car lap1)) ; gotoY | |
1390 (eq (cdr lap0) lap2)) ; TAG X | |
1391 (let ((inverse (if (eq 'byte-goto-if-nil (car lap0)) | |
1392 'byte-goto-if-not-nil 'byte-goto-if-nil))) | |
1393 (byte-compile-log-lap " %s %s %s:\t-->\t%s %s:" | |
1394 lap0 lap1 lap2 | |
1395 (cons inverse (cdr lap1)) lap2) | |
1396 (setq lap (delq lap0 lap)) | |
1397 (setcar lap1 inverse) | |
1398 (setq keep-going t))) | |
1399 ;; | |
1400 ;; const goto-if-* --> whatever | |
1401 ;; | |
1402 ((and (eq 'byte-constant (car lap0)) | |
1403 (memq (car lap1) byte-conditional-ops)) | |
1404 (cond ((if (or (eq (car lap1) 'byte-goto-if-nil) | |
1405 (eq (car lap1) 'byte-goto-if-nil-else-pop)) | |
1406 (car (cdr lap0)) | |
1407 (not (car (cdr lap0)))) | |
1408 (byte-compile-log-lap " %s %s\t-->\t<deleted>" | |
1409 lap0 lap1) | |
1410 (setq rest (cdr rest) | |
1411 lap (delq lap0 (delq lap1 lap)))) | |
1412 (t | |
1413 (if (memq (car lap1) byte-goto-always-pop-ops) | |
1414 (progn | |
1415 (byte-compile-log-lap " %s %s\t-->\t%s" | |
1416 lap0 lap1 (cons 'byte-goto (cdr lap1))) | |
1417 (setq lap (delq lap0 lap))) | |
1418 (byte-compile-log-lap " %s %s\t-->\t%s" lap0 lap1 | |
1419 (cons 'byte-goto (cdr lap1)))) | |
1420 (setcar lap1 'byte-goto))) | |
1421 (setq keep-going t)) | |
1422 ;; | |
1423 ;; varref-X varref-X --> varref-X dup | |
1424 ;; varref-X [dup ...] varref-X --> varref-X [dup ...] dup | |
1425 ;; We don't optimize the const-X variations on this here, | |
1426 ;; because that would inhibit some goto optimizations; we | |
1427 ;; optimize the const-X case after all other optimizations. | |
1428 ;; | |
1429 ((and (eq 'byte-varref (car lap0)) | |
1430 (progn | |
1431 (setq tmp (cdr rest)) | |
1432 (while (eq (car (car tmp)) 'byte-dup) | |
1433 (setq tmp (cdr tmp))) | |
1434 t) | |
1435 (eq (cdr lap0) (cdr (car tmp))) | |
1436 (eq 'byte-varref (car (car tmp)))) | |
1437 (if (memq byte-optimize-log '(t byte)) | |
1438 (let ((str "")) | |
1439 (setq tmp2 (cdr rest)) | |
1440 (while (not (eq tmp tmp2)) | |
1441 (setq tmp2 (cdr tmp2) | |
1442 str (concat str " dup"))) | |
1443 (byte-compile-log-lap " %s%s %s\t-->\t%s%s dup" | |
1444 lap0 str lap0 lap0 str))) | |
1445 (setq keep-going t) | |
1446 (setcar (car tmp) 'byte-dup) | |
1447 (setcdr (car tmp) 0) | |
1448 (setq rest tmp)) | |
1449 ;; | |
1450 ;; TAG1: TAG2: --> TAG1: <deleted> | |
1451 ;; (and other references to TAG2 are replaced with TAG1) | |
1452 ;; | |
1453 ((and (eq (car lap0) 'TAG) | |
1454 (eq (car lap1) 'TAG)) | |
1455 (and (memq byte-optimize-log '(t byte)) | |
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3138
diff
changeset
|
1456 (byte-compile-log " adjacent tags %d and %d merged" |
757 | 1457 (nth 1 lap1) (nth 1 lap0))) |
1458 (setq tmp3 lap) | |
1459 (while (setq tmp2 (rassq lap0 tmp3)) | |
1460 (setcdr tmp2 lap1) | |
1461 (setq tmp3 (cdr (memq tmp2 tmp3)))) | |
1462 (setq lap (delq lap0 lap) | |
1463 keep-going t)) | |
1464 ;; | |
1465 ;; unused-TAG: --> <deleted> | |
1466 ;; | |
1467 ((and (eq 'TAG (car lap0)) | |
1468 (not (rassq lap0 lap))) | |
1469 (and (memq byte-optimize-log '(t byte)) | |
1470 (byte-compile-log " unused tag %d removed" (nth 1 lap0))) | |
1471 (setq lap (delq lap0 lap) | |
1472 keep-going t)) | |
1473 ;; | |
1474 ;; goto ... --> goto <delete until TAG or end> | |
1475 ;; return ... --> return <delete until TAG or end> | |
1476 ;; | |
1477 ((and (memq (car lap0) '(byte-goto byte-return)) | |
1478 (not (memq (car lap1) '(TAG nil)))) | |
1479 (setq tmp rest) | |
1480 (let ((i 0) | |
1481 (opt-p (memq byte-optimize-log '(t lap))) | |
1482 str deleted) | |
1483 (while (and (setq tmp (cdr tmp)) | |
1484 (not (eq 'TAG (car (car tmp))))) | |
1485 (if opt-p (setq deleted (cons (car tmp) deleted) | |
1486 str (concat str " %s") | |
1487 i (1+ i)))) | |
1488 (if opt-p | |
1489 (let ((tagstr | |
1490 (if (eq 'TAG (car (car tmp))) | |
1491 (format "%d:" (cdr (car tmp))) | |
1492 (or (car tmp) "")))) | |
1493 (if (< i 6) | |
1494 (apply 'byte-compile-log-lap-1 | |
1495 (concat " %s" str | |
1496 " %s\t-->\t%s <deleted> %s") | |
1497 lap0 | |
1498 (nconc (nreverse deleted) | |
1499 (list tagstr lap0 tagstr))) | |
1500 (byte-compile-log-lap | |
1501 " %s <%d unreachable op%s> %s\t-->\t%s <deleted> %s" | |
1502 lap0 i (if (= i 1) "" "s") | |
1503 tagstr lap0 tagstr)))) | |
1504 (rplacd rest tmp)) | |
1505 (setq keep-going t)) | |
1506 ;; | |
1507 ;; <safe-op> unbind --> unbind <safe-op> | |
1508 ;; (this may enable other optimizations.) | |
1509 ;; | |
1510 ((and (eq 'byte-unbind (car lap1)) | |
1511 (memq (car lap0) byte-after-unbind-ops)) | |
1512 (byte-compile-log-lap " %s %s\t-->\t%s %s" lap0 lap1 lap1 lap0) | |
1513 (setcar rest lap1) | |
1514 (setcar (cdr rest) lap0) | |
1515 (setq keep-going t)) | |
1516 ;; | |
1517 ;; varbind-X unbind-N --> discard unbind-(N-1) | |
1518 ;; save-excursion unbind-N --> unbind-(N-1) | |
1519 ;; save-restriction unbind-N --> unbind-(N-1) | |
1520 ;; | |
1521 ((and (eq 'byte-unbind (car lap1)) | |
1522 (memq (car lap0) '(byte-varbind byte-save-excursion | |
1523 byte-save-restriction)) | |
1524 (< 0 (cdr lap1))) | |
1525 (if (zerop (setcdr lap1 (1- (cdr lap1)))) | |
1526 (delq lap1 rest)) | |
1527 (if (eq (car lap0) 'byte-varbind) | |
1528 (setcar rest (cons 'byte-discard 0)) | |
1529 (setq lap (delq lap0 lap))) | |
1530 (byte-compile-log-lap " %s %s\t-->\t%s %s" | |
1531 lap0 (cons (car lap1) (1+ (cdr lap1))) | |
1532 (if (eq (car lap0) 'byte-varbind) | |
1533 (car rest) | |
1534 (car (cdr rest))) | |
1535 (if (and (/= 0 (cdr lap1)) | |
1536 (eq (car lap0) 'byte-varbind)) | |
1537 (car (cdr rest)) | |
1538 "")) | |
1539 (setq keep-going t)) | |
1540 ;; | |
1541 ;; goto*-X ... X: goto-Y --> goto*-Y | |
1542 ;; goto-X ... X: return --> return | |
1543 ;; | |
1544 ((and (memq (car lap0) byte-goto-ops) | |
1545 (memq (car (setq tmp (nth 1 (memq (cdr lap0) lap)))) | |
1546 '(byte-goto byte-return))) | |
1547 (cond ((and (not (eq tmp lap0)) | |
1548 (or (eq (car lap0) 'byte-goto) | |
1549 (eq (car tmp) 'byte-goto))) | |
1550 (byte-compile-log-lap " %s [%s]\t-->\t%s" | |
1551 (car lap0) tmp tmp) | |
1552 (if (eq (car tmp) 'byte-return) | |
1553 (setcar lap0 'byte-return)) | |
1554 (setcdr lap0 (cdr tmp)) | |
1555 (setq keep-going t)))) | |
1556 ;; | |
1557 ;; goto-*-else-pop X ... X: goto-if-* --> whatever | |
1558 ;; goto-*-else-pop X ... X: discard --> whatever | |
1559 ;; | |
1560 ((and (memq (car lap0) '(byte-goto-if-nil-else-pop | |
1561 byte-goto-if-not-nil-else-pop)) | |
1562 (memq (car (car (setq tmp (cdr (memq (cdr lap0) lap))))) | |
1563 (eval-when-compile | |
1564 (cons 'byte-discard byte-conditional-ops))) | |
1565 (not (eq lap0 (car tmp)))) | |
1566 (setq tmp2 (car tmp)) | |
1567 (setq tmp3 (assq (car lap0) '((byte-goto-if-nil-else-pop | |
1568 byte-goto-if-nil) | |
1569 (byte-goto-if-not-nil-else-pop | |
1570 byte-goto-if-not-nil)))) | |
1571 (if (memq (car tmp2) tmp3) | |
1572 (progn (setcar lap0 (car tmp2)) | |
1573 (setcdr lap0 (cdr tmp2)) | |
1574 (byte-compile-log-lap " %s-else-pop [%s]\t-->\t%s" | |
1575 (car lap0) tmp2 lap0)) | |
1576 ;; Get rid of the -else-pop's and jump one step further. | |
1577 (or (eq 'TAG (car (nth 1 tmp))) | |
1578 (setcdr tmp (cons (byte-compile-make-tag) | |
1579 (cdr tmp)))) | |
1580 (byte-compile-log-lap " %s [%s]\t-->\t%s <skip>" | |
1581 (car lap0) tmp2 (nth 1 tmp3)) | |
1582 (setcar lap0 (nth 1 tmp3)) | |
1583 (setcdr lap0 (nth 1 tmp))) | |
1584 (setq keep-going t)) | |
1585 ;; | |
1586 ;; const goto-X ... X: goto-if-* --> whatever | |
1587 ;; const goto-X ... X: discard --> whatever | |
1588 ;; | |
1589 ((and (eq (car lap0) 'byte-constant) | |
1590 (eq (car lap1) 'byte-goto) | |
1591 (memq (car (car (setq tmp (cdr (memq (cdr lap1) lap))))) | |
1592 (eval-when-compile | |
1593 (cons 'byte-discard byte-conditional-ops))) | |
1594 (not (eq lap1 (car tmp)))) | |
1595 (setq tmp2 (car tmp)) | |
1596 (cond ((memq (car tmp2) | |
1597 (if (null (car (cdr lap0))) | |
1598 '(byte-goto-if-nil byte-goto-if-nil-else-pop) | |
1599 '(byte-goto-if-not-nil | |
1600 byte-goto-if-not-nil-else-pop))) | |
1601 (byte-compile-log-lap " %s goto [%s]\t-->\t%s %s" | |
1602 lap0 tmp2 lap0 tmp2) | |
1603 (setcar lap1 (car tmp2)) | |
1604 (setcdr lap1 (cdr tmp2)) | |
1605 ;; Let next step fix the (const,goto-if*) sequence. | |
1606 (setq rest (cons nil rest))) | |
1607 (t | |
1608 ;; Jump one step further | |
1609 (byte-compile-log-lap | |
1610 " %s goto [%s]\t-->\t<deleted> goto <skip>" | |
1611 lap0 tmp2) | |
1612 (or (eq 'TAG (car (nth 1 tmp))) | |
1613 (setcdr tmp (cons (byte-compile-make-tag) | |
1614 (cdr tmp)))) | |
1615 (setcdr lap1 (car (cdr tmp))) | |
1616 (setq lap (delq lap0 lap)))) | |
1617 (setq keep-going t)) | |
1618 ;; | |
1619 ;; X: varref-Y ... varset-Y goto-X --> | |
1620 ;; X: varref-Y Z: ... dup varset-Y goto-Z | |
1621 ;; (varset-X goto-BACK, BACK: varref-X --> copy the varref down.) | |
1622 ;; (This is so usual for while loops that it is worth handling). | |
1623 ;; | |
1624 ((and (eq (car lap1) 'byte-varset) | |
1625 (eq (car lap2) 'byte-goto) | |
1626 (not (memq (cdr lap2) rest)) ;Backwards jump | |
1627 (eq (car (car (setq tmp (cdr (memq (cdr lap2) lap))))) | |
1628 'byte-varref) | |
1629 (eq (cdr (car tmp)) (cdr lap1)) | |
1630 (not (memq (car (cdr lap1)) byte-boolean-vars))) | |
1631 ;;(byte-compile-log-lap " Pulled %s to end of loop" (car tmp)) | |
1632 (let ((newtag (byte-compile-make-tag))) | |
1633 (byte-compile-log-lap | |
1634 " %s: %s ... %s %s\t-->\t%s: %s %s: ... %s %s %s" | |
1635 (nth 1 (cdr lap2)) (car tmp) | |
1636 lap1 lap2 | |
1637 (nth 1 (cdr lap2)) (car tmp) | |
1638 (nth 1 newtag) 'byte-dup lap1 | |
1639 (cons 'byte-goto newtag) | |
1640 ) | |
1641 (setcdr rest (cons (cons 'byte-dup 0) (cdr rest))) | |
1642 (setcdr tmp (cons (setcdr lap2 newtag) (cdr tmp)))) | |
1643 (setq add-depth 1) | |
1644 (setq keep-going t)) | |
1645 ;; | |
1646 ;; goto-X Y: ... X: goto-if*-Y --> goto-if-not-*-X+1 Y: | |
1647 ;; (This can pull the loop test to the end of the loop) | |
1648 ;; | |
1649 ((and (eq (car lap0) 'byte-goto) | |
1650 (eq (car lap1) 'TAG) | |
1651 (eq lap1 | |
1652 (cdr (car (setq tmp (cdr (memq (cdr lap0) lap)))))) | |
1653 (memq (car (car tmp)) | |
1654 '(byte-goto byte-goto-if-nil byte-goto-if-not-nil | |
1655 byte-goto-if-nil-else-pop))) | |
1656 ;; (byte-compile-log-lap " %s %s, %s %s --> moved conditional" | |
1657 ;; lap0 lap1 (cdr lap0) (car tmp)) | |
1658 (let ((newtag (byte-compile-make-tag))) | |
1659 (byte-compile-log-lap | |
1660 "%s %s: ... %s: %s\t-->\t%s ... %s:" | |
1661 lap0 (nth 1 lap1) (nth 1 (cdr lap0)) (car tmp) | |
1662 (cons (cdr (assq (car (car tmp)) | |
1663 '((byte-goto-if-nil . byte-goto-if-not-nil) | |
1664 (byte-goto-if-not-nil . byte-goto-if-nil) | |
1665 (byte-goto-if-nil-else-pop . | |
1666 byte-goto-if-not-nil-else-pop) | |
1667 (byte-goto-if-not-nil-else-pop . | |
1668 byte-goto-if-nil-else-pop)))) | |
1669 newtag) | |
1670 | |
1671 (nth 1 newtag) | |
1672 ) | |
1673 (setcdr tmp (cons (setcdr lap0 newtag) (cdr tmp))) | |
1674 (if (eq (car (car tmp)) 'byte-goto-if-nil-else-pop) | |
1675 ;; We can handle this case but not the -if-not-nil case, | |
1676 ;; because we won't know which non-nil constant to push. | |
1677 (setcdr rest (cons (cons 'byte-constant | |
1678 (byte-compile-get-constant nil)) | |
1679 (cdr rest)))) | |
1680 (setcar lap0 (nth 1 (memq (car (car tmp)) | |
1681 '(byte-goto-if-nil-else-pop | |
1682 byte-goto-if-not-nil | |
1683 byte-goto-if-nil | |
1684 byte-goto-if-not-nil | |
1685 byte-goto byte-goto)))) | |
1686 ) | |
1687 (setq keep-going t)) | |
1688 ) | |
1689 (setq rest (cdr rest))) | |
1690 ) | |
1691 ;; Cleanup stage: | |
1692 ;; Rebuild byte-compile-constants / byte-compile-variables. | |
1693 ;; Simple optimizations that would inhibit other optimizations if they | |
1694 ;; were done in the optimizing loop, and optimizations which there is no | |
1695 ;; need to do more than once. | |
1696 (setq byte-compile-constants nil | |
1697 byte-compile-variables nil) | |
1698 (setq rest lap) | |
1699 (while rest | |
1700 (setq lap0 (car rest) | |
1701 lap1 (nth 1 rest)) | |
1702 (if (memq (car lap0) byte-constref-ops) | |
1703 (if (eq (cdr lap0) 'byte-constant) | |
1704 (or (memq (cdr lap0) byte-compile-variables) | |
1705 (setq byte-compile-variables (cons (cdr lap0) | |
1706 byte-compile-variables))) | |
1707 (or (memq (cdr lap0) byte-compile-constants) | |
1708 (setq byte-compile-constants (cons (cdr lap0) | |
1709 byte-compile-constants))))) | |
1710 (cond (;; | |
1711 ;; const-C varset-X const-C --> const-C dup varset-X | |
1712 ;; const-C varbind-X const-C --> const-C dup varbind-X | |
1713 ;; | |
1714 (and (eq (car lap0) 'byte-constant) | |
1715 (eq (car (nth 2 rest)) 'byte-constant) | |
1716 (eq (cdr lap0) (car (nth 2 rest))) | |
1717 (memq (car lap1) '(byte-varbind byte-varset))) | |
1718 (byte-compile-log-lap " %s %s %s\t-->\t%s dup %s" | |
1719 lap0 lap1 lap0 lap0 lap1) | |
1720 (setcar (cdr (cdr rest)) (cons (car lap1) (cdr lap1))) | |
1721 (setcar (cdr rest) (cons 'byte-dup 0)) | |
1722 (setq add-depth 1)) | |
1723 ;; | |
1724 ;; const-X [dup/const-X ...] --> const-X [dup ...] dup | |
1725 ;; varref-X [dup/varref-X ...] --> varref-X [dup ...] dup | |
1726 ;; | |
1727 ((memq (car lap0) '(byte-constant byte-varref)) | |
1728 (setq tmp rest | |
1729 tmp2 nil) | |
1730 (while (progn | |
1731 (while (eq 'byte-dup (car (car (setq tmp (cdr tmp)))))) | |
1732 (and (eq (cdr lap0) (cdr (car tmp))) | |
1733 (eq (car lap0) (car (car tmp))))) | |
1734 (setcar tmp (cons 'byte-dup 0)) | |
1735 (setq tmp2 t)) | |
1736 (if tmp2 | |
1737 (byte-compile-log-lap | |
1738 " %s [dup/%s]... %s\t-->\t%s dup..." lap0 lap0 lap0))) | |
1739 ;; | |
1740 ;; unbind-N unbind-M --> unbind-(N+M) | |
1741 ;; | |
1742 ((and (eq 'byte-unbind (car lap0)) | |
1743 (eq 'byte-unbind (car lap1))) | |
1744 (byte-compile-log-lap " %s %s\t-->\t%s" lap0 lap1 | |
1745 (cons 'byte-unbind | |
1746 (+ (cdr lap0) (cdr lap1)))) | |
1747 (setq keep-going t) | |
1748 (setq lap (delq lap0 lap)) | |
1749 (setcdr lap1 (+ (cdr lap1) (cdr lap0)))) | |
1750 ) | |
1751 (setq rest (cdr rest))) | |
1752 (setq byte-compile-maxdepth (+ byte-compile-maxdepth add-depth))) | |
1753 lap) | |
1754 | |
1755 (provide 'byte-optimize) | |
1756 | |
1757 | |
1758 ;; To avoid "lisp nesting exceeds max-lisp-eval-depth" when this file compiles | |
1759 ;; itself, compile some of its most used recursive functions (at load time). | |
1760 ;; | |
1761 (eval-when-compile | |
1818
7e3322619e46
compiled-function-p has been renamed to byte-code-function-p.
Jim Blandy <jimb@redhat.com>
parents:
957
diff
changeset
|
1762 (or (byte-code-function-p (symbol-function 'byte-optimize-form)) |
757 | 1763 (assq 'byte-code (symbol-function 'byte-optimize-form)) |
1764 (let ((byte-optimize nil) | |
1765 (byte-compile-warnings nil)) | |
1766 (mapcar '(lambda (x) | |
1767 (or noninteractive (message "compiling %s..." x)) | |
1768 (byte-compile x) | |
1769 (or noninteractive (message "compiling %s...done" x))) | |
1770 '(byte-optimize-form | |
1771 byte-optimize-body | |
1772 byte-optimize-predicate | |
1773 byte-optimize-binary-predicate | |
1774 ;; Inserted some more than necessary, to speed it up. | |
1775 byte-optimize-form-code-walker | |
1776 byte-optimize-lapcode)))) | |
1777 nil) | |
848 | 1778 |
1779 ;;; byte-opt.el ends here |