Mercurial > hg > xemacs-beta
annotate src/bytecode.h @ 5652:cc6f0266bc36
Avoid #'delq in core Lisp, for the sake of style, a very slightly smaller binary
lisp/ChangeLog addition:
2012-05-01 Aidan Kehoe <kehoea@parhasard.net>
Avoid #'delq in core code, for the sake of style and a (very
slightly) smaller binary.
* behavior.el (disable-behavior):
* behavior.el (compute-behavior-group-children):
* buff-menu.el (buffers-tab-items):
* byte-optimize.el (byte-optimize-delay-constants-math):
* byte-optimize.el (byte-optimize-logmumble):
* byte-optimize.el (byte-decompile-bytecode-1):
* byte-optimize.el (byte-optimize-lapcode):
* bytecomp.el:
* bytecomp.el (byte-compile-arglist-warn):
* bytecomp.el (byte-compile-warn-about-unresolved-functions):
* bytecomp.el (byte-compile-lambda):
* bytecomp.el (byte-compile-out-toplevel):
* bytecomp.el (byte-compile-insert):
* bytecomp.el (byte-compile-defalias-warn):
* cl-macs.el (cl-upcase-arg):
* cl-macs.el (cl-transform-lambda):
* cl-macs.el (cl-do-proclaim):
* cl-macs.el (defstruct):
* cl-macs.el (cl-make-type-test):
* cl-macs.el (define-compiler-macro):
* cl-macs.el (delete-duplicates):
* cus-edit.el (widget-face-value-delete):
* cus-edit.el (face-history):
* easymenu.el (easy-menu-remove):
* files.el (files-fetch-hook-value):
* files.el (file-expand-wildcards):
* font-lock.el (font-lock-update-removed-keyword-alist):
* font-lock.el (font-lock-remove-keywords):
* frame.el (frame-initialize):
* frame.el (frame-notice-user-settings):
* frame.el (set-frame-font):
* frame.el (delete-other-frames):
* frame.el (get-frame-for-buffer-noselect):
* gnuserv.el (gnuserv-kill-buffer-function):
* gnuserv.el (gnuserv-check-device):
* gnuserv.el (gnuserv-kill-client):
* gnuserv.el (gnuserv-buffer-done-1):
* gtk-font-menu.el (gtk-reset-device-font-menus):
* gutter-items.el (buffers-tab-items):
* gutter.el (set-gutter-element-visible-p):
* info.el (Info-find-file-node):
* info.el (Info-history-add):
* info.el (Info-build-annotation-completions):
* info.el (Info-index):
* info.el (Info-reannotate-node):
* itimer.el (delete-itimer):
* itimer.el (start-itimer):
* lib-complete.el (lib-complete:cache-completions):
* loadhist.el (unload-feature):
* menubar-items.el (build-buffers-menu-internal):
* menubar.el (delete-menu-item):
* menubar.el (relabel-menu-item):
* msw-font-menu.el (mswindows-reset-device-font-menus):
* mule/make-coding-system.el (fixed-width-generate-helper):
* next-error.el (next-error-find-buffer):
* obsolete.el:
* obsolete.el (find-non-ascii-charset-string):
* obsolete.el (find-non-ascii-charset-region):
* occur.el (multi-occur-by-filename-regexp):
* occur.el (occur-1):
* packages.el (packages-package-hierarchy-directory-names):
* packages.el (package-get-key-1):
* process.el (setenv):
* simple.el (undo):
* simple.el (handle-pre-motion-command-current-command-is-motion):
* sound.el (load-sound-file):
* wid-edit.el (widget-field-value-delete):
* wid-edit.el (widget-checklist-match-inline):
* wid-edit.el (widget-checklist-match-find):
* wid-edit.el (widget-editable-list-delete-at):
* wid-edit.el (widget-editable-list-entry-create):
* window.el (quit-window):
* x-font-menu.el (x-reset-device-font-menus-core):
1. Replace (delq nil (mapcar ....)) with analogous (mapcan ...)
forms; this is in non-dumped files, it was done previously in
dumped files.
2. Replace (delq FOO (copy-sequence BAR)) with (remove* FOO BAR),
where #'eq and #'eql are equivalent
3. Replace (delq FOO BAR) with (delete* FOO BAR), where FOO is not
a non-fixnum number. Saves a little space in the dumped file
(since the compiler macro adds :test #'eq to the delete* call if
it's not clear that FOO is not a non-fixnum number).
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Tue, 01 May 2012 16:17:42 +0100 |
| parents | 308d34e9f07d |
| children |
| rev | line source |
|---|---|
| 428 | 1 /* Definitions for bytecode interpretation and compiled-function objects. |
| 2 Copyright (C) 1985, 1986, 1987, 1992, 1993 Free Software Foundation, Inc. | |
| 814 | 3 Copyright (C) 2002 Ben Wing. |
| 428 | 4 |
| 5 This file is part of XEmacs. | |
| 6 | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5127
diff
changeset
|
7 XEmacs is free software: you can redistribute it and/or modify it |
| 428 | 8 under the terms of the GNU General Public License as published by the |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5127
diff
changeset
|
9 Free Software Foundation, either version 3 of the License, or (at your |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5127
diff
changeset
|
10 option) any later version. |
| 428 | 11 |
| 12 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 15 for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5127
diff
changeset
|
18 along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 428 | 19 |
| 20 /* Synched up with: Not in FSF. */ | |
| 21 | |
| 22 /* Authorship: | |
| 23 | |
| 24 FSF: long ago. | |
| 25 Mly: rewrote for 19.8, properly abstracted. | |
| 26 Jon Reid: some changes for I18N3 (domain, etc), for 19.8. | |
| 27 */ | |
| 28 | |
| 440 | 29 #ifndef INCLUDED_bytecode_h_ |
| 30 #define INCLUDED_bytecode_h_ | |
| 428 | 31 |
| 3092 | 32 #ifdef NEW_GC |
| 33 struct compiled_function_args | |
| 34 { | |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5125
diff
changeset
|
35 NORMAL_LISP_OBJECT_HEADER header; |
| 3092 | 36 long size; |
| 37 Lisp_Object args[1]; | |
| 38 }; | |
| 39 | |
| 40 typedef struct compiled_function_args Lisp_Compiled_Function_Args; | |
| 41 | |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
parents:
3263
diff
changeset
|
42 DECLARE_LISP_OBJECT (compiled_function_args, Lisp_Compiled_Function_Args); |
| 3092 | 43 |
| 44 #define XCOMPILED_FUNCTION_ARGS(x) \ | |
| 45 XRECORD (x, compiled_function_args, Lisp_Compiled_Function_Args) | |
| 46 #define wrap_compiled_function_args(p) wrap_record (p, compiled_function_args) | |
| 47 #define COMPILED_FUNCTION_ARGS_P(x) RECORDP (x, compiled_function_args) | |
| 48 #define CHECK_COMPILED_FUNCTION_ARGS(x) \ | |
| 49 CHECK_RECORD (x, compiled_function_args) | |
| 50 #define CONCHECK_COMPILED_FUNCTION_ARGS(x) \ | |
| 51 CONCHECK_RECORD (x, compiled_function_args) | |
| 52 | |
| 53 #define compiled_function_args_data(v) ((v)->args) | |
| 54 #define XCOMPILED_FUNCTION_ARGS_DATA(s) \ | |
| 55 compiled_function_args_data (XCOMPILED_FUNCTION_ARGS (s)) | |
| 3263 | 56 #endif /* NEW_GC */ |
| 3092 | 57 |
| 428 | 58 /* Meanings of slots in a Lisp_Compiled_Function. |
| 59 Don't use these! For backward compatibility only. */ | |
| 60 #define COMPILED_ARGLIST 0 | |
| 61 #define COMPILED_INSTRUCTIONS 1 | |
| 62 #define COMPILED_CONSTANTS 2 | |
| 63 #define COMPILED_STACK_DEPTH 3 | |
| 64 #define COMPILED_DOC_STRING 4 | |
| 65 #define COMPILED_INTERACTIVE 5 | |
| 66 #define COMPILED_DOMAIN 6 | |
| 67 | |
|
4921
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
3263
diff
changeset
|
68 /* Someone claims: [[ It doesn't make sense to have this and also have |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
3263
diff
changeset
|
69 load-history ]] But in fact they are quite different things. Perhaps |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
3263
diff
changeset
|
70 we should turn this on only when DEBUG_XEMACS but there's no speed |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
3263
diff
changeset
|
71 harm at all, so no reason not to do it always. */ |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
3263
diff
changeset
|
72 #define COMPILED_FUNCTION_ANNOTATION_HACK |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
3263
diff
changeset
|
73 |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
3263
diff
changeset
|
74 #ifdef DEBUG_XEMACS |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
3263
diff
changeset
|
75 /* Define BYTE_CODE_METER to enable generation of a byte-op usage |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
3263
diff
changeset
|
76 histogram. This isn't defined in FSF Emacs and isn't defined in XEmacs |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
3263
diff
changeset
|
77 v19. But this is precisely the thing to turn on when DEBUG_XEMACS. It |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
3263
diff
changeset
|
78 may lead to a slight speed penalty but nothing major. */ |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
3263
diff
changeset
|
79 #define BYTE_CODE_METER |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
3263
diff
changeset
|
80 #endif |
| 428 | 81 |
| 82 struct Lisp_Compiled_Function | |
| 83 { | |
|
5120
d1247f3cc363
latest work on lisp-object workspace;
Ben Wing <ben@xemacs.org>
parents:
5118
diff
changeset
|
84 FROB_BLOCK_LISP_OBJECT_HEADER lheader; |
| 428 | 85 unsigned short stack_depth; |
| 86 unsigned short specpdl_depth; | |
| 87 struct | |
| 88 { | |
| 89 unsigned int documentationp: 1; | |
| 90 unsigned int interactivep: 1; | |
| 91 /* Only used if I18N3, but always defined for simplicity. */ | |
| 92 unsigned int domainp: 1; | |
| 93 /* Non-zero if this bytecode came from a v18 or v19 file. | |
| 94 We need to Ebolify the `assoc', `delq', etc. functions. */ | |
| 95 unsigned int ebolified: 1; | |
| 96 } flags; | |
| 97 Lisp_Object instructions; | |
| 98 Lisp_Object constants; | |
| 99 Lisp_Object arglist; | |
| 814 | 100 /* For speed, we unroll arglist into an array of argument symbols, so we |
| 101 don't have to process arglist every time we make a function call. */ | |
| 3092 | 102 #ifdef NEW_GC |
| 103 Lisp_Object arguments; | |
| 104 #else /* not NEW_GC */ | |
| 814 | 105 Lisp_Object *args; |
| 3092 | 106 #endif /* not NEW_GC */ |
| 814 | 107 /* Minimum and maximum number of arguments. If MAX_ARGS == MANY, the |
| 108 function was declared with &rest, and (args_in_array - 1) indicates | |
| 109 how many arguments there are before the &rest argument. (We could | |
| 110 munge the max_non_rest_args into max_args by using a negative number, | |
| 111 but that interferes with pdump marking. We don't want to use a flag | |
| 112 to indicate &rest because that would add an extra check in the | |
| 113 simplest case.) */ | |
| 114 int min_args, max_args; | |
| 115 int args_in_array; | |
| 428 | 116 /* This uses the minimal number of conses; see accessors in data.c. */ |
| 117 Lisp_Object doc_and_interactive; | |
| 118 #ifdef COMPILED_FUNCTION_ANNOTATION_HACK | |
| 119 /* Something indicating where the bytecode came from */ | |
| 120 Lisp_Object annotated; | |
| 121 #endif | |
| 122 }; | |
| 123 typedef struct Lisp_Compiled_Function Lisp_Compiled_Function; | |
| 124 | |
| 125 Lisp_Object run_byte_code (Lisp_Object compiled_function_or_instructions, ...); | |
| 126 | |
| 127 Lisp_Object compiled_function_arglist (Lisp_Compiled_Function *f); | |
| 128 Lisp_Object compiled_function_instructions (Lisp_Compiled_Function *f); | |
| 129 Lisp_Object compiled_function_constants (Lisp_Compiled_Function *f); | |
| 130 int compiled_function_stack_depth (Lisp_Compiled_Function *f); | |
| 131 Lisp_Object compiled_function_documentation (Lisp_Compiled_Function *f); | |
| 132 Lisp_Object compiled_function_annotation (Lisp_Compiled_Function *f); | |
| 133 Lisp_Object compiled_function_domain (Lisp_Compiled_Function *f); | |
| 134 Lisp_Object compiled_function_interactive (Lisp_Compiled_Function *f); | |
| 135 | |
| 136 void set_compiled_function_documentation (Lisp_Compiled_Function *f, | |
| 137 Lisp_Object new_doc); | |
| 138 | |
| 139 void optimize_compiled_function (Lisp_Object compiled_function); | |
| 140 | |
| 814 | 141 typedef unsigned char Opbyte; |
| 142 Lisp_Object execute_optimized_program (const Opbyte *program, | |
|
4921
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
3263
diff
changeset
|
143 #ifdef ERROR_CHECK_BYTE_CODE |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
3263
diff
changeset
|
144 Elemcount program_length, |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
3263
diff
changeset
|
145 #endif |
| 814 | 146 int stack_depth, |
| 147 Lisp_Object *constants_data); | |
| 148 | |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
parents:
3263
diff
changeset
|
149 DECLARE_LISP_OBJECT (compiled_function, Lisp_Compiled_Function); |
| 428 | 150 #define XCOMPILED_FUNCTION(x) XRECORD (x, compiled_function, \ |
| 151 Lisp_Compiled_Function) | |
| 617 | 152 #define wrap_compiled_function(p) wrap_record (p, compiled_function) |
| 428 | 153 #define COMPILED_FUNCTIONP(x) RECORDP (x, compiled_function) |
| 154 #define CHECK_COMPILED_FUNCTION(x) CHECK_RECORD (x, compiled_function) | |
| 155 #define CONCHECK_COMPILED_FUNCTION(x) CONCHECK_RECORD (x, compiled_function) | |
| 156 | |
| 157 extern Lisp_Object Qbyte_code; | |
| 158 | |
| 159 /* total 1765 internal 101 doc-and-int 775 doc-only 389 int-only 42 neither 559 | |
| 160 no doc slot, no int slot | |
| 161 overhead : (* 1765 0) = 0 | |
| 162 doc-and-int (args . (doc . int)): (* 775 4) = 3100 | |
| 163 doc-only (args . doc) : (* 389 2) = 778 | |
| 164 int-only (args . int) : (* 42 2) = 84 | |
| 165 neither args : (* 559 0) = 0 = 3962 | |
| 166 combined | |
| 167 overhead : (* 1765 1) = 1765 | |
| 168 doc-and-int (doc . int) : (* 775 2) = 1550 | |
| 169 doc-only doc : (* 389 0) = 0 | |
| 170 int-only int : (* 42 0) = 0 | |
| 171 neither - : (* 559 0) = 0 = 3315 | |
| 172 both | |
| 173 overhead : (* 1765 2) = 3530 | |
| 174 doc-and-int - : (* 775 0) = 0 | |
| 175 doc-only - : (* 389 0) = 0 | |
| 176 int-only - : (* 42 0) = 0 | |
| 177 neither - : (* 559 0) = 0 = 3530 | |
| 178 */ | |
| 179 | |
| 440 | 180 #endif /* INCLUDED_bytecode_h_ */ |
| 428 | 181 |