Mercurial > hg > xemacs-beta
annotate src/bytecode.c @ 5464:e79916901603 r21-5-30
XEmacs 21.5.30 "garlic" is released.
| author | Stephen J. Turnbull <stephen@xemacs.org> |
|---|---|
| date | Wed, 27 Apr 2011 01:24:28 +0900 |
| parents | d967d96ca043 |
| children | ac37a5f7e5be |
| rev | line source |
|---|---|
| 428 | 1 /* Execution of byte code produced by bytecomp.el. |
| 2 Implementation of compiled-function objects. | |
| 3 Copyright (C) 1992, 1993 Free Software Foundation, Inc. | |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5125
diff
changeset
|
4 Copyright (C) 1995, 2002, 2010 Ben Wing. |
| 428 | 5 |
| 6 This file is part of XEmacs. | |
| 7 | |
| 8 XEmacs is free software; you can redistribute it and/or modify it | |
| 9 under the terms of the GNU General Public License as published by the | |
| 10 Free Software Foundation; either version 2, or (at your option) any | |
| 11 later version. | |
| 12 | |
| 13 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 16 for more details. | |
| 17 | |
| 18 You should have received a copy of the GNU General Public License | |
| 19 along with XEmacs; see the file COPYING. If not, write to | |
| 20 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 21 Boston, MA 02111-1307, USA. */ | |
| 22 | |
| 23 /* Synched up with: Mule 2.0, FSF 19.30. */ | |
| 24 | |
| 25 /* This file has been Mule-ized. */ | |
| 26 | |
| 27 | |
| 28 /* Authorship: | |
| 29 | |
| 30 FSF: long ago. | |
| 31 | |
| 32 hacked on by jwz@jwz.org 1991-06 | |
| 33 o added a compile-time switch to turn on simple sanity checking; | |
| 34 o put back the obsolete byte-codes for error-detection; | |
| 35 o added a new instruction, unbind_all, which I will use for | |
| 36 tail-recursion elimination; | |
| 37 o made temp_output_buffer_show be called with the right number | |
| 38 of args; | |
| 39 o made the new bytecodes be called with args in the right order; | |
| 40 o added metering support. | |
| 41 | |
| 42 by Hallvard: | |
| 43 o added relative jump instructions; | |
| 44 o all conditionals now only do QUIT if they jump. | |
| 45 | |
| 46 Ben Wing: some changes for Mule, 1995-06. | |
| 47 | |
| 48 Martin Buchholz: performance hacking, 1998-09. | |
| 49 See Internals Manual, Evaluation. | |
| 50 */ | |
| 51 | |
| 52 #include <config.h> | |
| 53 #include "lisp.h" | |
| 54 #include "backtrace.h" | |
| 55 #include "buffer.h" | |
| 56 #include "bytecode.h" | |
| 57 #include "opaque.h" | |
| 58 #include "syntax.h" | |
| 872 | 59 #include "window.h" |
| 428 | 60 |
|
4921
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
61 #define NUM_REMEMBERED_BYTE_OPS 100 |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
62 |
| 3092 | 63 #ifdef NEW_GC |
| 64 static Lisp_Object | |
| 65 make_compiled_function_args (int totalargs) | |
| 66 { | |
| 67 Lisp_Compiled_Function_Args *args; | |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
68 args = XCOMPILED_FUNCTION_ARGS |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5125
diff
changeset
|
69 (ALLOC_SIZED_LISP_OBJECT |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
70 (FLEXIBLE_ARRAY_STRUCT_SIZEOF (Lisp_Compiled_Function_Args, |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
71 Lisp_Object, args, totalargs), |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5125
diff
changeset
|
72 compiled_function_args)); |
| 3092 | 73 args->size = totalargs; |
| 74 return wrap_compiled_function_args (args); | |
| 75 } | |
| 76 | |
| 77 static Bytecount | |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5125
diff
changeset
|
78 size_compiled_function_args (Lisp_Object obj) |
| 3092 | 79 { |
| 80 return FLEXIBLE_ARRAY_STRUCT_SIZEOF (Lisp_Compiled_Function_Args, | |
| 81 Lisp_Object, args, | |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5125
diff
changeset
|
82 XCOMPILED_FUNCTION_ARGS (obj)->size); |
| 3092 | 83 } |
| 84 | |
| 85 static const struct memory_description compiled_function_args_description[] = { | |
| 86 { XD_LONG, offsetof (Lisp_Compiled_Function_Args, size) }, | |
| 87 { XD_LISP_OBJECT_ARRAY, offsetof (Lisp_Compiled_Function_Args, args), | |
| 88 XD_INDIRECT(0, 0) }, | |
| 89 { XD_END } | |
| 90 }; | |
| 91 | |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
92 DEFINE_DUMPABLE_SIZABLE_INTERNAL_LISP_OBJECT ("compiled-function-args", |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
93 compiled_function_args, |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
94 0, |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
95 compiled_function_args_description, |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
96 size_compiled_function_args, |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
97 Lisp_Compiled_Function_Args); |
| 3092 | 98 #endif /* NEW_GC */ |
| 99 | |
| 428 | 100 EXFUN (Ffetch_bytecode, 1); |
| 101 | |
| 102 Lisp_Object Qbyte_code, Qcompiled_functionp, Qinvalid_byte_code; | |
| 103 | |
|
4921
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
104 |
| 428 | 105 enum Opcode /* Byte codes */ |
| 106 { | |
|
4921
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
107 #define OPCODE(sym, val) B##sym = val, |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
108 #include "bytecode-ops.h" |
| 428 | 109 }; |
| 110 typedef enum Opcode Opcode; | |
| 111 | |
| 112 Lisp_Object * execute_rare_opcode (Lisp_Object *stack_ptr, | |
|
4921
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
113 #ifdef ERROR_CHECK_BYTE_CODE |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
114 Lisp_Object *stack_beg, |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
115 Lisp_Object *stack_end, |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
116 #endif /* ERROR_CHECK_BYTE_CODE */ |
| 442 | 117 const Opbyte *program_ptr, |
| 428 | 118 Opcode opcode); |
| 119 | |
|
4921
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
120 #ifndef ERROR_CHECK_BYTE_CODE |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
121 |
|
4974
fe0d3106cc36
fix compile problems in bytecode.c when no error-check-byte-code (issue 666)
Ben Wing <ben@xemacs.org>
parents:
4970
diff
changeset
|
122 /* Normally we would use `x' instead of `0' in the argument list, to avoid |
|
fe0d3106cc36
fix compile problems in bytecode.c when no error-check-byte-code (issue 666)
Ben Wing <ben@xemacs.org>
parents:
4970
diff
changeset
|
123 problems if `x' (an expression) has side effects, and warnings if `x' |
|
fe0d3106cc36
fix compile problems in bytecode.c when no error-check-byte-code (issue 666)
Ben Wing <ben@xemacs.org>
parents:
4970
diff
changeset
|
124 contains variables or parameters that are otherwise unused. But in |
|
fe0d3106cc36
fix compile problems in bytecode.c when no error-check-byte-code (issue 666)
Ben Wing <ben@xemacs.org>
parents:
4970
diff
changeset
|
125 this case `x' contains references to vars and params that exist only |
|
fe0d3106cc36
fix compile problems in bytecode.c when no error-check-byte-code (issue 666)
Ben Wing <ben@xemacs.org>
parents:
4970
diff
changeset
|
126 when ERROR_CHECK_BYTE_CODE, and leaving in `x' would result in compile |
|
fe0d3106cc36
fix compile problems in bytecode.c when no error-check-byte-code (issue 666)
Ben Wing <ben@xemacs.org>
parents:
4970
diff
changeset
|
127 errors. */ |
|
fe0d3106cc36
fix compile problems in bytecode.c when no error-check-byte-code (issue 666)
Ben Wing <ben@xemacs.org>
parents:
4970
diff
changeset
|
128 # define bytecode_assert(x) disabled_assert (0) |
|
fe0d3106cc36
fix compile problems in bytecode.c when no error-check-byte-code (issue 666)
Ben Wing <ben@xemacs.org>
parents:
4970
diff
changeset
|
129 # define bytecode_assert_with_message(x, msg) disabled_assert(0) |
|
4921
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
130 # define bytecode_abort_with_message(msg) abort_with_message (msg) |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
131 |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
132 #else /* ERROR_CHECK_BYTE_CODE */ |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
133 |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
134 # define bytecode_assert(x) \ |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
135 ((x) ? (void) 0 : assert_failed_with_remembered_ops (__FILE__, __LINE__, #x)) |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
136 # define bytecode_assert_with_message(x, msg) \ |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
137 ((x) ? (void) 0 : assert_failed_with_remembered_ops (__FILE__, __LINE__, msg)) |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
138 # define bytecode_abort_with_message(msg) \ |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
139 assert_failed_with_remembered_ops (__FILE__, __LINE__, msg) |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
140 |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
141 /* Table mapping opcodes to their names. This handles opcodes like |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
142 Bvarref+7, but it doesn't list any of the Bconstant+N opcodes; those |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
143 are handled specially. */ |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
144 Ascbyte *opcode_name_table[256]; |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
145 |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
146 /* Circular queue remembering the most recent operations. */ |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
147 Opcode remembered_ops[NUM_REMEMBERED_BYTE_OPS]; |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
148 int remembered_op_next_pos, num_remembered; |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
149 |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
150 static void |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
151 remember_operation (Opcode op) |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
152 { |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
153 remembered_ops[remembered_op_next_pos] = op; |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
154 remembered_op_next_pos = |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
155 (remembered_op_next_pos + 1) % NUM_REMEMBERED_BYTE_OPS; |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
156 if (num_remembered < NUM_REMEMBERED_BYTE_OPS) |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
157 num_remembered++; |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
158 } |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
159 |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
160 static void |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
161 assert_failed_with_remembered_ops (const Ascbyte *file, int line, |
| 4970 | 162 const Ascbyte *msg_to_abort_with) |
|
4921
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
163 { |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
164 Ascbyte *msg = |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
165 alloca_array (Ascbyte, |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
166 NUM_REMEMBERED_BYTE_OPS*50 + strlen (msg_to_abort_with)); |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
167 int i; |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
168 |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
169 if (msg_to_abort_with) |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
170 strcpy (msg, msg_to_abort_with); |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
171 strcat (msg, "\n\nRecent bytecodes, oldest first:\n\n"); |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
172 |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
173 for (i = 0; i < num_remembered; i++) |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
174 { |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
175 Ascbyte msg2[50]; |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
176 int pos; |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
177 Opcode op; |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
178 |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
179 sprintf (msg2, "%5d: ", i - num_remembered + 1); |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
180 strcat (msg, msg2); |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
181 pos = (remembered_op_next_pos + NUM_REMEMBERED_BYTE_OPS + |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
182 i - num_remembered) % NUM_REMEMBERED_BYTE_OPS; |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
183 op = remembered_ops[pos]; |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
184 if (op >= Bconstant) |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
185 { |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
186 sprintf (msg2, "constant+%d", op - Bconstant); |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
187 strcat (msg, msg2); |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
188 } |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
189 else |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
190 { |
| 4970 | 191 const Ascbyte *opname = opcode_name_table[op]; |
|
4921
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
192 if (!opname) |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
193 { |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
194 stderr_out ("Internal error! NULL pointer in opcode_name_table, opcode %d\n", op); |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
195 strcat (msg, "NULL"); |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
196 } |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
197 else |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
198 strcat (msg, opname); |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
199 } |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
200 sprintf (msg2, " (%d)\n", op); |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
201 strcat (msg, msg2); |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
202 } |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
203 |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
204 assert_failed (file, line, msg); |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
205 } |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
206 |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
207 #endif /* ERROR_CHECK_BYTE_CODE */ |
| 428 | 208 |
| 209 | |
| 210 #ifdef BYTE_CODE_METER | |
| 211 | |
| 212 Lisp_Object Vbyte_code_meter, Qbyte_code_meter; | |
| 213 int byte_metering_on; | |
| 214 | |
| 215 static void | |
| 216 meter_code (Opcode prev_opcode, Opcode this_opcode) | |
| 217 { | |
| 218 if (byte_metering_on) | |
| 219 { | |
| 220 Lisp_Object *p = XVECTOR_DATA (XVECTOR_DATA (Vbyte_code_meter)[this_opcode]); | |
| 221 p[0] = INT_PLUS1 (p[0]); | |
| 222 if (prev_opcode) | |
| 223 p[prev_opcode] = INT_PLUS1 (p[prev_opcode]); | |
| 224 } | |
| 225 } | |
| 226 | |
| 227 #endif /* BYTE_CODE_METER */ | |
| 228 | |
| 229 | |
| 230 static Lisp_Object | |
| 231 bytecode_negate (Lisp_Object obj) | |
| 232 { | |
| 233 retry: | |
| 234 | |
| 1983 | 235 if (INTP (obj)) return make_integer (- XINT (obj)); |
| 428 | 236 if (FLOATP (obj)) return make_float (- XFLOAT_DATA (obj)); |
| 1983 | 237 if (CHARP (obj)) return make_integer (- ((int) XCHAR (obj))); |
| 238 if (MARKERP (obj)) return make_integer (- ((int) marker_position (obj))); | |
| 239 #ifdef HAVE_BIGNUM | |
| 240 if (BIGNUMP (obj)) BIGNUM_ARITH_RETURN (obj, neg); | |
| 241 #endif | |
| 242 #ifdef HAVE_RATIO | |
| 243 if (RATIOP (obj)) RATIO_ARITH_RETURN (obj, neg); | |
| 244 #endif | |
|
4678
b5e1d4f6b66f
Make #'floor, #'ceiling, #'round, #'truncate conform to Common Lisp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4677
diff
changeset
|
245 #ifdef HAVE_BIGFLOAT |
|
b5e1d4f6b66f
Make #'floor, #'ceiling, #'round, #'truncate conform to Common Lisp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4677
diff
changeset
|
246 if (BIGFLOATP (obj)) BIGFLOAT_ARITH_RETURN (obj, neg); |
| 1983 | 247 #endif |
| 428 | 248 |
| 249 obj = wrong_type_argument (Qnumber_char_or_marker_p, obj); | |
| 250 goto retry; | |
| 251 } | |
| 252 | |
| 253 static Lisp_Object | |
|
5300
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5206
diff
changeset
|
254 bytecode_nreverse (Lisp_Object sequence) |
| 428 | 255 { |
|
5300
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5206
diff
changeset
|
256 if (LISTP (sequence)) |
| 428 | 257 { |
|
5300
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5206
diff
changeset
|
258 REGISTER Lisp_Object prev = Qnil; |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5206
diff
changeset
|
259 REGISTER Lisp_Object tail = sequence; |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5206
diff
changeset
|
260 |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5206
diff
changeset
|
261 while (!NILP (tail)) |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5206
diff
changeset
|
262 { |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5206
diff
changeset
|
263 REGISTER Lisp_Object next; |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5206
diff
changeset
|
264 CHECK_CONS (tail); |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5206
diff
changeset
|
265 next = XCDR (tail); |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5206
diff
changeset
|
266 XCDR (tail) = prev; |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5206
diff
changeset
|
267 prev = tail; |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5206
diff
changeset
|
268 tail = next; |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5206
diff
changeset
|
269 } |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5206
diff
changeset
|
270 return prev; |
| 428 | 271 } |
|
5300
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5206
diff
changeset
|
272 else |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5206
diff
changeset
|
273 { |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5206
diff
changeset
|
274 return Fnreverse (sequence); |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5206
diff
changeset
|
275 } |
| 428 | 276 } |
| 277 | |
| 278 | |
| 279 /* We have our own two-argument versions of various arithmetic ops. | |
| 280 Only two-argument arithmetic operations have their own byte codes. */ | |
|
4910
6bc1f3f6cf0d
Make canoncase visible to Lisp; use it with chars in internal_equalp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4906
diff
changeset
|
281 int |
| 428 | 282 bytecode_arithcompare (Lisp_Object obj1, Lisp_Object obj2) |
| 283 { | |
| 1983 | 284 #ifdef WITH_NUMBER_TYPES |
| 285 switch (promote_args (&obj1, &obj2)) | |
| 286 { | |
| 287 case FIXNUM_T: | |
| 288 { | |
| 289 EMACS_INT ival1 = XREALINT (obj1), ival2 = XREALINT (obj2); | |
| 290 return ival1 < ival2 ? -1 : ival1 > ival2 ? 1 : 0; | |
| 291 } | |
| 292 #ifdef HAVE_BIGNUM | |
| 293 case BIGNUM_T: | |
| 294 return bignum_cmp (XBIGNUM_DATA (obj1), XBIGNUM_DATA (obj2)); | |
| 295 #endif | |
| 296 #ifdef HAVE_RATIO | |
| 297 case RATIO_T: | |
| 298 return ratio_cmp (XRATIO_DATA (obj1), XRATIO_DATA (obj2)); | |
| 299 #endif | |
| 1995 | 300 #ifdef HAVE_BIGFLOAT |
| 301 case BIGFLOAT_T: | |
| 302 return bigfloat_cmp (XBIGFLOAT_DATA (obj1), XBIGFLOAT_DATA (obj2)); | |
| 303 #endif | |
| 304 default: /* FLOAT_T */ | |
| 1983 | 305 { |
| 306 double dval1 = XFLOAT_DATA (obj1), dval2 = XFLOAT_DATA (obj2); | |
| 307 return dval1 < dval2 ? -1 : dval1 > dval2 ? 1 : 0; | |
| 308 } | |
| 309 } | |
| 310 #else /* !WITH_NUMBER_TYPES */ | |
| 428 | 311 retry: |
| 312 | |
| 313 { | |
| 314 EMACS_INT ival1, ival2; | |
| 315 | |
| 316 if (INTP (obj1)) ival1 = XINT (obj1); | |
| 317 else if (CHARP (obj1)) ival1 = XCHAR (obj1); | |
| 318 else if (MARKERP (obj1)) ival1 = marker_position (obj1); | |
| 319 else goto arithcompare_float; | |
| 320 | |
| 321 if (INTP (obj2)) ival2 = XINT (obj2); | |
| 322 else if (CHARP (obj2)) ival2 = XCHAR (obj2); | |
| 323 else if (MARKERP (obj2)) ival2 = marker_position (obj2); | |
| 324 else goto arithcompare_float; | |
| 325 | |
| 326 return ival1 < ival2 ? -1 : ival1 > ival2 ? 1 : 0; | |
| 327 } | |
| 328 | |
| 329 arithcompare_float: | |
| 330 | |
| 331 { | |
| 332 double dval1, dval2; | |
| 333 | |
| 334 if (FLOATP (obj1)) dval1 = XFLOAT_DATA (obj1); | |
| 335 else if (INTP (obj1)) dval1 = (double) XINT (obj1); | |
| 336 else if (CHARP (obj1)) dval1 = (double) XCHAR (obj1); | |
| 337 else if (MARKERP (obj1)) dval1 = (double) marker_position (obj1); | |
| 338 else | |
| 339 { | |
| 340 obj1 = wrong_type_argument (Qnumber_char_or_marker_p, obj1); | |
| 341 goto retry; | |
| 342 } | |
| 343 | |
| 344 if (FLOATP (obj2)) dval2 = XFLOAT_DATA (obj2); | |
| 345 else if (INTP (obj2)) dval2 = (double) XINT (obj2); | |
| 346 else if (CHARP (obj2)) dval2 = (double) XCHAR (obj2); | |
| 347 else if (MARKERP (obj2)) dval2 = (double) marker_position (obj2); | |
| 348 else | |
| 349 { | |
| 350 obj2 = wrong_type_argument (Qnumber_char_or_marker_p, obj2); | |
| 351 goto retry; | |
| 352 } | |
| 353 | |
| 354 return dval1 < dval2 ? -1 : dval1 > dval2 ? 1 : 0; | |
| 355 } | |
| 1983 | 356 #endif /* WITH_NUMBER_TYPES */ |
| 428 | 357 } |
| 358 | |
| 359 static Lisp_Object | |
| 360 bytecode_arithop (Lisp_Object obj1, Lisp_Object obj2, Opcode opcode) | |
| 361 { | |
| 1983 | 362 #ifdef WITH_NUMBER_TYPES |
| 363 switch (promote_args (&obj1, &obj2)) | |
| 364 { | |
| 365 case FIXNUM_T: | |
| 366 { | |
| 367 EMACS_INT ival1 = XREALINT (obj1), ival2 = XREALINT (obj2); | |
| 368 switch (opcode) | |
| 369 { | |
| 370 case Bplus: ival1 += ival2; break; | |
| 371 case Bdiff: ival1 -= ival2; break; | |
| 372 case Bmult: | |
| 373 #ifdef HAVE_BIGNUM | |
| 374 /* Due to potential overflow, we compute using bignums */ | |
| 375 bignum_set_long (scratch_bignum, ival1); | |
| 376 bignum_set_long (scratch_bignum2, ival2); | |
| 377 bignum_mul (scratch_bignum, scratch_bignum, scratch_bignum2); | |
| 378 return Fcanonicalize_number (make_bignum_bg (scratch_bignum)); | |
| 379 #else | |
| 380 ival1 *= ival2; break; | |
| 381 #endif | |
| 382 case Bquo: | |
|
4717
fcc7e89d5e68
Properly handle continuable divide-by-zero errors. Fix truncation of a
Jerry James <james@xemacs.org>
parents:
4678
diff
changeset
|
383 if (ival2 == 0) |
|
fcc7e89d5e68
Properly handle continuable divide-by-zero errors. Fix truncation of a
Jerry James <james@xemacs.org>
parents:
4678
diff
changeset
|
384 signal_error_2 (Qarith_error, "division by zero", obj1, obj2); |
| 1983 | 385 ival1 /= ival2; |
| 386 break; | |
| 387 case Bmax: if (ival1 < ival2) ival1 = ival2; break; | |
| 388 case Bmin: if (ival1 > ival2) ival1 = ival2; break; | |
| 389 } | |
| 390 return make_integer (ival1); | |
| 391 } | |
| 392 #ifdef HAVE_BIGNUM | |
| 393 case BIGNUM_T: | |
| 394 switch (opcode) | |
| 395 { | |
| 396 case Bplus: | |
| 397 bignum_add (scratch_bignum, XBIGNUM_DATA (obj1), | |
| 398 XBIGNUM_DATA (obj2)); | |
| 399 break; | |
| 400 case Bdiff: | |
| 401 bignum_sub (scratch_bignum, XBIGNUM_DATA (obj1), | |
| 402 XBIGNUM_DATA (obj2)); | |
| 403 break; | |
| 404 case Bmult: | |
| 405 bignum_mul (scratch_bignum, XBIGNUM_DATA (obj1), | |
| 406 XBIGNUM_DATA (obj2)); | |
| 407 break; | |
| 408 case Bquo: | |
| 409 if (bignum_sign (XBIGNUM_DATA (obj2)) == 0) | |
|
4717
fcc7e89d5e68
Properly handle continuable divide-by-zero errors. Fix truncation of a
Jerry James <james@xemacs.org>
parents:
4678
diff
changeset
|
410 signal_error_2 (Qarith_error, "division by zero", obj1, obj2); |
| 1983 | 411 bignum_div (scratch_bignum, XBIGNUM_DATA (obj1), |
| 412 XBIGNUM_DATA (obj2)); | |
| 413 break; | |
| 414 case Bmax: | |
| 415 return bignum_gt (XBIGNUM_DATA (obj1), XBIGNUM_DATA (obj2)) | |
| 416 ? obj1 : obj2; | |
| 417 case Bmin: | |
| 418 return bignum_lt (XBIGNUM_DATA (obj1), XBIGNUM_DATA (obj2)) | |
| 419 ? obj1 : obj2; | |
| 420 } | |
| 421 return Fcanonicalize_number (make_bignum_bg (scratch_bignum)); | |
| 422 #endif | |
| 423 #ifdef HAVE_RATIO | |
| 424 case RATIO_T: | |
| 425 switch (opcode) | |
| 426 { | |
| 427 case Bplus: | |
| 428 ratio_add (scratch_ratio, XRATIO_DATA (obj1), XRATIO_DATA (obj2)); | |
| 429 break; | |
| 430 case Bdiff: | |
| 431 ratio_sub (scratch_ratio, XRATIO_DATA (obj1), XRATIO_DATA (obj2)); | |
| 432 break; | |
| 433 case Bmult: | |
| 434 ratio_mul (scratch_ratio, XRATIO_DATA (obj1), XRATIO_DATA (obj2)); | |
| 435 break; | |
| 436 case Bquo: | |
| 437 if (ratio_sign (XRATIO_DATA (obj2)) == 0) | |
|
4717
fcc7e89d5e68
Properly handle continuable divide-by-zero errors. Fix truncation of a
Jerry James <james@xemacs.org>
parents:
4678
diff
changeset
|
438 signal_error_2 (Qarith_error, "division by zero", obj1, obj2); |
| 1983 | 439 ratio_div (scratch_ratio, XRATIO_DATA (obj1), XRATIO_DATA (obj2)); |
| 440 break; | |
| 441 case Bmax: | |
| 442 return ratio_gt (XRATIO_DATA (obj1), XRATIO_DATA (obj2)) | |
| 443 ? obj1 : obj2; | |
| 444 case Bmin: | |
| 445 return ratio_lt (XRATIO_DATA (obj1), XRATIO_DATA (obj2)) | |
| 446 ? obj1 : obj2; | |
| 447 } | |
| 448 return make_ratio_rt (scratch_ratio); | |
| 449 #endif | |
| 450 #ifdef HAVE_BIGFLOAT | |
| 451 case BIGFLOAT_T: | |
| 452 bigfloat_set_prec (scratch_bigfloat, max (XBIGFLOAT_GET_PREC (obj1), | |
| 453 XBIGFLOAT_GET_PREC (obj2))); | |
| 454 switch (opcode) | |
| 455 { | |
| 456 case Bplus: | |
| 457 bigfloat_add (scratch_bigfloat, XBIGFLOAT_DATA (obj1), | |
| 458 XBIGFLOAT_DATA (obj2)); | |
| 459 break; | |
| 460 case Bdiff: | |
| 461 bigfloat_sub (scratch_bigfloat, XBIGFLOAT_DATA (obj1), | |
| 462 XBIGFLOAT_DATA (obj2)); | |
| 463 break; | |
| 464 case Bmult: | |
| 465 bigfloat_mul (scratch_bigfloat, XBIGFLOAT_DATA (obj1), | |
| 466 XBIGFLOAT_DATA (obj2)); | |
| 467 break; | |
| 468 case Bquo: | |
| 469 if (bigfloat_sign (XBIGFLOAT_DATA (obj2)) == 0) | |
|
4717
fcc7e89d5e68
Properly handle continuable divide-by-zero errors. Fix truncation of a
Jerry James <james@xemacs.org>
parents:
4678
diff
changeset
|
470 signal_error_2 (Qarith_error, "division by zero", obj1, obj2); |
| 1983 | 471 bigfloat_div (scratch_bigfloat, XBIGFLOAT_DATA (obj1), |
| 472 XBIGFLOAT_DATA (obj2)); | |
| 473 break; | |
| 474 case Bmax: | |
| 475 return bigfloat_gt (XBIGFLOAT_DATA (obj1), XBIGFLOAT_DATA (obj2)) | |
| 476 ? obj1 : obj2; | |
| 477 case Bmin: | |
| 478 return bigfloat_lt (XBIGFLOAT_DATA (obj1), XBIGFLOAT_DATA (obj2)) | |
| 479 ? obj1 : obj2; | |
| 480 } | |
| 481 return make_bigfloat_bf (scratch_bigfloat); | |
| 482 #endif | |
| 1995 | 483 default: /* FLOAT_T */ |
| 484 { | |
| 485 double dval1 = XFLOAT_DATA (obj1), dval2 = XFLOAT_DATA (obj2); | |
| 486 switch (opcode) | |
| 487 { | |
| 488 case Bplus: dval1 += dval2; break; | |
| 489 case Bdiff: dval1 -= dval2; break; | |
| 490 case Bmult: dval1 *= dval2; break; | |
| 491 case Bquo: | |
|
4717
fcc7e89d5e68
Properly handle continuable divide-by-zero errors. Fix truncation of a
Jerry James <james@xemacs.org>
parents:
4678
diff
changeset
|
492 if (dval2 == 0.0) |
|
fcc7e89d5e68
Properly handle continuable divide-by-zero errors. Fix truncation of a
Jerry James <james@xemacs.org>
parents:
4678
diff
changeset
|
493 signal_error_2 (Qarith_error, "division by zero", obj1, obj2); |
| 1995 | 494 dval1 /= dval2; |
| 495 break; | |
| 496 case Bmax: if (dval1 < dval2) dval1 = dval2; break; | |
| 497 case Bmin: if (dval1 > dval2) dval1 = dval2; break; | |
| 498 } | |
| 499 return make_float (dval1); | |
| 500 } | |
| 1983 | 501 } |
| 502 #else /* !WITH_NUMBER_TYPES */ | |
| 428 | 503 EMACS_INT ival1, ival2; |
| 504 int float_p; | |
| 505 | |
| 506 retry: | |
| 507 | |
| 508 float_p = 0; | |
| 509 | |
| 510 if (INTP (obj1)) ival1 = XINT (obj1); | |
| 511 else if (CHARP (obj1)) ival1 = XCHAR (obj1); | |
| 512 else if (MARKERP (obj1)) ival1 = marker_position (obj1); | |
| 513 else if (FLOATP (obj1)) ival1 = 0, float_p = 1; | |
| 514 else | |
| 515 { | |
| 516 obj1 = wrong_type_argument (Qnumber_char_or_marker_p, obj1); | |
| 517 goto retry; | |
| 518 } | |
| 519 | |
| 520 if (INTP (obj2)) ival2 = XINT (obj2); | |
| 521 else if (CHARP (obj2)) ival2 = XCHAR (obj2); | |
| 522 else if (MARKERP (obj2)) ival2 = marker_position (obj2); | |
| 523 else if (FLOATP (obj2)) ival2 = 0, float_p = 1; | |
| 524 else | |
| 525 { | |
| 526 obj2 = wrong_type_argument (Qnumber_char_or_marker_p, obj2); | |
| 527 goto retry; | |
| 528 } | |
| 529 | |
| 530 if (!float_p) | |
| 531 { | |
| 532 switch (opcode) | |
| 533 { | |
| 534 case Bplus: ival1 += ival2; break; | |
| 535 case Bdiff: ival1 -= ival2; break; | |
| 536 case Bmult: ival1 *= ival2; break; | |
| 537 case Bquo: | |
|
4717
fcc7e89d5e68
Properly handle continuable divide-by-zero errors. Fix truncation of a
Jerry James <james@xemacs.org>
parents:
4678
diff
changeset
|
538 if (ival2 == 0) |
|
fcc7e89d5e68
Properly handle continuable divide-by-zero errors. Fix truncation of a
Jerry James <james@xemacs.org>
parents:
4678
diff
changeset
|
539 signal_error_2 (Qarith_error, "division by zero", obj1, obj2); |
| 428 | 540 ival1 /= ival2; |
| 541 break; | |
| 542 case Bmax: if (ival1 < ival2) ival1 = ival2; break; | |
| 543 case Bmin: if (ival1 > ival2) ival1 = ival2; break; | |
| 544 } | |
| 545 return make_int (ival1); | |
| 546 } | |
| 547 else | |
| 548 { | |
| 549 double dval1 = FLOATP (obj1) ? XFLOAT_DATA (obj1) : (double) ival1; | |
| 550 double dval2 = FLOATP (obj2) ? XFLOAT_DATA (obj2) : (double) ival2; | |
| 551 switch (opcode) | |
| 552 { | |
| 553 case Bplus: dval1 += dval2; break; | |
| 554 case Bdiff: dval1 -= dval2; break; | |
| 555 case Bmult: dval1 *= dval2; break; | |
| 556 case Bquo: | |
|
4717
fcc7e89d5e68
Properly handle continuable divide-by-zero errors. Fix truncation of a
Jerry James <james@xemacs.org>
parents:
4678
diff
changeset
|
557 if (dval2 == 0) |
|
fcc7e89d5e68
Properly handle continuable divide-by-zero errors. Fix truncation of a
Jerry James <james@xemacs.org>
parents:
4678
diff
changeset
|
558 signal_error_2 (Qarith_error, "division by zero", obj1, obj2); |
| 428 | 559 dval1 /= dval2; |
| 560 break; | |
| 561 case Bmax: if (dval1 < dval2) dval1 = dval2; break; | |
| 562 case Bmin: if (dval1 > dval2) dval1 = dval2; break; | |
| 563 } | |
| 564 return make_float (dval1); | |
| 565 } | |
| 1983 | 566 #endif /* WITH_NUMBER_TYPES */ |
| 428 | 567 } |
| 568 | |
| 569 | |
|
4921
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
570 |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
571 /*********************** The instruction array *********************/ |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
572 |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
573 /* Check that there are at least LEN elements left in the end of the |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
574 instruction array before fetching them. Note that we allow for |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
575 PROGRAM_PTR == PROGRAM_END after the fetch -- that means there are |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
576 no more elements to fetch next time around, but we might exit before |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
577 next time comes. |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
578 |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
579 When checking the destination if jumps, however, we don't allow |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
580 PROGRAM_PTR to equal PROGRAM_END, since we will always be fetching |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
581 another instruction after the jump. */ |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
582 |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
583 #define CHECK_OPCODE_SPACE(len) \ |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
584 bytecode_assert (program_ptr + len <= program_end) |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
585 |
| 428 | 586 /* Read next uint8 from the instruction stream. */ |
|
4921
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
587 #define READ_UINT_1 \ |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
588 (CHECK_OPCODE_SPACE (1), (unsigned int) (unsigned char) *program_ptr++) |
| 428 | 589 |
| 590 /* Read next uint16 from the instruction stream. */ | |
| 591 #define READ_UINT_2 \ | |
|
4921
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
592 (CHECK_OPCODE_SPACE (2), \ |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
593 program_ptr += 2, \ |
| 428 | 594 (((unsigned int) (unsigned char) program_ptr[-1]) * 256 + \ |
| 595 ((unsigned int) (unsigned char) program_ptr[-2]))) | |
| 596 | |
| 597 /* Read next int8 from the instruction stream. */ | |
|
4921
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
598 #define READ_INT_1 \ |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
599 (CHECK_OPCODE_SPACE (1), (int) (signed char) *program_ptr++) |
| 428 | 600 |
| 601 /* Read next int16 from the instruction stream. */ | |
| 602 #define READ_INT_2 \ | |
|
4921
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
603 (CHECK_OPCODE_SPACE (2), \ |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
604 program_ptr += 2, \ |
| 428 | 605 (((int) ( signed char) program_ptr[-1]) * 256 + \ |
| 606 ((int) (unsigned char) program_ptr[-2]))) | |
| 607 | |
| 608 /* Read next int8 from instruction stream; don't advance program_pointer */ | |
|
4921
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
609 #define PEEK_INT_1 \ |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
610 (CHECK_OPCODE_SPACE (1), (int) (signed char) program_ptr[0]) |
| 428 | 611 |
| 612 /* Read next int16 from instruction stream; don't advance program_pointer */ | |
| 613 #define PEEK_INT_2 \ | |
|
4921
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
614 (CHECK_OPCODE_SPACE (2), \ |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
615 (((int) ( signed char) program_ptr[1]) * 256) | \ |
| 428 | 616 ((int) (unsigned char) program_ptr[0])) |
| 617 | |
| 618 /* Do relative jumps from the current location. | |
| 619 We only do a QUIT if we jump backwards, for efficiency. | |
| 620 No infloops without backward jumps! */ | |
|
4921
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
621 #define JUMP_RELATIVE(jump) do { \ |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
622 int _JR_jump = (jump); \ |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
623 if (_JR_jump < 0) QUIT; \ |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
624 /* Check that where we're going to is in range. Note that we don't use \ |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
625 CHECK_OPCODE_SPACE() -- that only checks the end, and it allows \ |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
626 program_ptr == program_end, which we don't allow. */ \ |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
627 bytecode_assert (program_ptr + _JR_jump >= program && \ |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
628 program_ptr + _JR_jump < program_end); \ |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
629 program_ptr += _JR_jump; \ |
| 428 | 630 } while (0) |
| 631 | |
| 632 #define JUMP JUMP_RELATIVE (PEEK_INT_2) | |
| 633 #define JUMPR JUMP_RELATIVE (PEEK_INT_1) | |
| 634 | |
|
4921
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
635 #define JUMP_NEXT (CHECK_OPCODE_SPACE (2), (void) (program_ptr += 2)) |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
636 #define JUMPR_NEXT (CHECK_OPCODE_SPACE (1), (void) (program_ptr += 1)) |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
637 |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
638 /*********************** The stack array *********************/ |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
639 |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
640 /* NOTE: The stack array doesn't work quite like you'd expect. |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
641 |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
642 STACK_PTR points to the value on the top of the stack. Popping a value |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
643 fetches the value from the STACK_PTR and then decrements it. Pushing a |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
644 value first increments it, then writes the new value. STACK_PTR - |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
645 STACK_BEG is the number of elements on the stack. |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
646 |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
647 This means that when STACK_PTR == STACK_BEG, the stack is empty, and |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
648 the space at STACK_BEG is never written to -- the first push will write |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
649 into the space directly after STACK_BEG. This is why the call to |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
650 alloca_array() below has a count of `stack_depth + 1', and why |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
651 we GCPRO1 (stack_ptr[1]) -- the value at stack_ptr[0] is unused and |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
652 uninitialized. |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
653 |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
654 Also, STACK_END actually points to the last usable storage location, |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
655 and does not point past the end, like you'd expect. */ |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
656 |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
657 #define CHECK_STACKPTR_OFFSET(len) \ |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
658 bytecode_assert (stack_ptr + (len) >= stack_beg && \ |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
659 stack_ptr + (len) <= stack_end) |
| 428 | 660 |
| 661 /* Push x onto the execution stack. */ | |
|
4921
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
662 #define PUSH(x) (CHECK_STACKPTR_OFFSET (1), *++stack_ptr = (x)) |
| 428 | 663 |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
664 /* Pop a value, which may be multiple, off the execution stack. */ |
|
4921
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
665 #define POP_WITH_MULTIPLE_VALUES (CHECK_STACKPTR_OFFSET (-1), *stack_ptr--) |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
666 |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
667 /* Pop a value off the execution stack, treating multiple values as single. */ |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
668 #define POP (IGNORE_MULTIPLE_VALUES (POP_WITH_MULTIPLE_VALUES)) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
669 |
|
4921
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
670 /* ..._UNSAFE() means it evaluates its argument more than once. */ |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
671 #define DISCARD_PRESERVING_MULTIPLE_VALUES_UNSAFE(n) \ |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
672 (CHECK_STACKPTR_OFFSET (-(n)), stack_ptr -= (n)) |
| 428 | 673 |
| 674 /* Discard n values from the execution stack. */ | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
675 #define DISCARD(n) do { \ |
|
4921
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
676 int _discard_n = (n); \ |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
677 if (1 != multiple_value_current_limit) \ |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
678 { \ |
|
4921
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
679 int i; \ |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
680 for (i = 0; i < _discard_n; i++) \ |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
681 { \ |
|
4921
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
682 CHECK_STACKPTR_OFFSET (-1); \ |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
683 *stack_ptr = ignore_multiple_values (*stack_ptr); \ |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
684 stack_ptr--; \ |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
685 } \ |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
686 } \ |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
687 else \ |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
688 { \ |
|
4921
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
689 CHECK_STACKPTR_OFFSET (-_discard_n); \ |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
690 stack_ptr -= _discard_n; \ |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
691 } \ |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
692 } while (0) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
693 |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
694 /* Get the value, which may be multiple, at the top of the execution stack; |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
695 and leave it there. */ |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
696 #define TOP_WITH_MULTIPLE_VALUES (*stack_ptr) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
697 |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
698 #define TOP_ADDRESS (stack_ptr) |
| 428 | 699 |
| 700 /* Get the value which is at the top of the execution stack, | |
| 701 but don't pop it. */ | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
702 #define TOP (IGNORE_MULTIPLE_VALUES (TOP_WITH_MULTIPLE_VALUES)) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
703 |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
704 #define TOP_LVALUE (*stack_ptr) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
705 |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
706 |
| 428 | 707 |
| 1920 | 708 /* See comment before the big switch in execute_optimized_program(). */ |
| 1884 | 709 #define GCPRO_STACK (gcpro1.nvars = stack_ptr - stack_beg) |
| 710 | |
|
4921
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
711 |
| 428 | 712 /* The actual interpreter for byte code. |
| 713 This function has been seriously optimized for performance. | |
| 714 Don't change the constructs unless you are willing to do | |
| 715 real benchmarking and profiling work -- martin */ | |
| 716 | |
| 717 | |
| 814 | 718 Lisp_Object |
| 442 | 719 execute_optimized_program (const Opbyte *program, |
|
4921
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
720 #ifdef ERROR_CHECK_BYTE_CODE |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
721 Elemcount program_length, |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
722 #endif |
| 428 | 723 int stack_depth, |
| 724 Lisp_Object *constants_data) | |
| 725 { | |
| 726 /* This function can GC */ | |
| 442 | 727 REGISTER const Opbyte *program_ptr = (Opbyte *) program; |
|
4921
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
728 #ifdef ERROR_CHECK_BYTE_CODE |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
729 const Opbyte *program_end = program_ptr + program_length; |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
730 #endif |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
731 /* See comment above explaining the `+ 1' */ |
| 1884 | 732 Lisp_Object *stack_beg = alloca_array (Lisp_Object, stack_depth + 1); |
| 733 REGISTER Lisp_Object *stack_ptr = stack_beg; | |
| 428 | 734 int speccount = specpdl_depth (); |
| 735 struct gcpro gcpro1; | |
| 736 | |
| 737 #ifdef BYTE_CODE_METER | |
| 4925 | 738 Opcode this_opcode = (Opcode) 0; |
| 428 | 739 Opcode prev_opcode; |
| 740 #endif | |
| 741 | |
| 742 #ifdef ERROR_CHECK_BYTE_CODE | |
| 743 Lisp_Object *stack_end = stack_beg + stack_depth; | |
| 744 #endif | |
| 745 | |
| 1920 | 746 /* We used to GCPRO the whole interpreter stack before entering this while |
| 747 loop (21.5.14 and before), but that interferes with collection of weakly | |
| 748 referenced objects. Although strictly speaking there's no promise that | |
| 749 weak references will disappear by any given point in time, they should | |
| 750 be collected at the first opportunity. Waiting until exit from the | |
| 751 function caused test failures because "stale" objects "above" the top of | |
| 752 the stack were still GCPROed, and they were not getting collected until | |
| 753 after exit from the (byte-compiled) test! | |
| 754 | |
| 755 Now the idea is to dynamically adjust the array of GCPROed objects to | |
| 756 include only the "active" region of the stack. | |
| 757 | |
| 758 We use the "GCPRO1 the array base and set the nvars member" method. It | |
| 759 would be slightly inefficient but correct to use GCPRO1_ARRAY here. It | |
| 760 would just redundantly set nvars. | |
| 761 #### Maybe it would be clearer to use GCPRO1_ARRAY and do GCPRO_STACK | |
| 762 after the switch? | |
| 763 | |
| 764 GCPRO_STACK is something of a misnomer, because it suggests that a | |
| 765 struct gcpro is initialized each time. This is false; only the nvars | |
| 766 member of a single struct gcpro is being adjusted. This works because | |
| 767 each time a new object is assigned to a stack location, the old object | |
| 768 loses its reference and is effectively UNGCPROed, and the new object is | |
| 769 automatically GCPROed as long as nvars is correct. Only when we | |
| 770 return from the interpreter do we need to finalize the struct gcpro | |
| 771 itself, and that's done at case Breturn. | |
| 772 */ | |
|
4921
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
773 |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
774 /* See comment above explaining the `[1]' */ |
| 428 | 775 GCPRO1 (stack_ptr[1]); |
| 1758 | 776 |
| 428 | 777 while (1) |
| 778 { | |
| 779 REGISTER Opcode opcode = (Opcode) READ_UINT_1; | |
| 1920 | 780 |
|
4921
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
781 #ifdef ERROR_CHECK_BYTE_CODE |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
782 remember_operation (opcode); |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
783 #endif |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
784 |
| 1920 | 785 GCPRO_STACK; /* Get nvars right before maybe signaling. */ |
|
4921
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
786 /* #### NOTE: This code should probably never get triggered, since we |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
787 now catch the problems earlier, farther down, before we ever set |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
788 a bad value for STACK_PTR. */ |
| 428 | 789 #ifdef ERROR_CHECK_BYTE_CODE |
| 790 if (stack_ptr > stack_end) | |
| 563 | 791 stack_overflow ("byte code stack overflow", Qunbound); |
| 428 | 792 if (stack_ptr < stack_beg) |
| 563 | 793 stack_overflow ("byte code stack underflow", Qunbound); |
| 428 | 794 #endif |
| 795 | |
| 796 #ifdef BYTE_CODE_METER | |
| 797 prev_opcode = this_opcode; | |
| 798 this_opcode = opcode; | |
| 799 meter_code (prev_opcode, this_opcode); | |
| 800 #endif | |
| 801 | |
| 802 switch (opcode) | |
| 803 { | |
| 804 REGISTER int n; | |
| 805 | |
| 806 default: | |
| 807 if (opcode >= Bconstant) | |
| 808 PUSH (constants_data[opcode - Bconstant]); | |
| 809 else | |
| 1884 | 810 { |
| 811 /* We're not sure what these do, so better safe than sorry. */ | |
| 812 /* GCPRO_STACK; */ | |
|
4921
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
813 stack_ptr = execute_rare_opcode (stack_ptr, |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
814 #ifdef ERROR_CHECK_BYTE_CODE |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
815 stack_beg, |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
816 stack_end, |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
817 #endif /* ERROR_CHECK_BYTE_CODE */ |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
818 program_ptr, opcode); |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
819 CHECK_STACKPTR_OFFSET (0); |
| 1884 | 820 } |
| 428 | 821 break; |
| 822 | |
| 823 case Bvarref: | |
| 824 case Bvarref+1: | |
| 825 case Bvarref+2: | |
| 826 case Bvarref+3: | |
| 827 case Bvarref+4: | |
| 828 case Bvarref+5: n = opcode - Bvarref; goto do_varref; | |
| 829 case Bvarref+7: n = READ_UINT_2; goto do_varref; | |
| 830 case Bvarref+6: n = READ_UINT_1; /* most common */ | |
| 831 do_varref: | |
| 832 { | |
| 833 Lisp_Object symbol = constants_data[n]; | |
| 834 Lisp_Object value = XSYMBOL (symbol)->value; | |
| 835 if (SYMBOL_VALUE_MAGIC_P (value)) | |
| 1920 | 836 /* I GCPRO_STACKed Fsymbol_value elsewhere, but I dunno why. */ |
| 837 /* GCPRO_STACK; */ | |
| 428 | 838 value = Fsymbol_value (symbol); |
| 839 PUSH (value); | |
| 840 break; | |
| 841 } | |
| 842 | |
| 843 case Bvarset: | |
| 844 case Bvarset+1: | |
| 845 case Bvarset+2: | |
| 846 case Bvarset+3: | |
| 847 case Bvarset+4: | |
| 848 case Bvarset+5: n = opcode - Bvarset; goto do_varset; | |
| 849 case Bvarset+7: n = READ_UINT_2; goto do_varset; | |
| 850 case Bvarset+6: n = READ_UINT_1; /* most common */ | |
| 851 do_varset: | |
| 852 { | |
| 853 Lisp_Object symbol = constants_data[n]; | |
| 440 | 854 Lisp_Symbol *symbol_ptr = XSYMBOL (symbol); |
| 428 | 855 Lisp_Object old_value = symbol_ptr->value; |
| 856 Lisp_Object new_value = POP; | |
| 1661 | 857 if (!SYMBOL_VALUE_MAGIC_P (old_value) || UNBOUNDP (old_value)) |
| 428 | 858 symbol_ptr->value = new_value; |
| 1884 | 859 else { |
| 860 /* Fset may call magic handlers */ | |
| 861 /* GCPRO_STACK; */ | |
| 428 | 862 Fset (symbol, new_value); |
| 1884 | 863 } |
| 864 | |
| 428 | 865 break; |
| 866 } | |
| 867 | |
| 868 case Bvarbind: | |
| 869 case Bvarbind+1: | |
| 870 case Bvarbind+2: | |
| 871 case Bvarbind+3: | |
| 872 case Bvarbind+4: | |
| 873 case Bvarbind+5: n = opcode - Bvarbind; goto do_varbind; | |
| 874 case Bvarbind+7: n = READ_UINT_2; goto do_varbind; | |
| 875 case Bvarbind+6: n = READ_UINT_1; /* most common */ | |
| 876 do_varbind: | |
| 877 { | |
| 878 Lisp_Object symbol = constants_data[n]; | |
| 440 | 879 Lisp_Symbol *symbol_ptr = XSYMBOL (symbol); |
| 428 | 880 Lisp_Object old_value = symbol_ptr->value; |
| 881 Lisp_Object new_value = POP; | |
| 882 if (!SYMBOL_VALUE_MAGIC_P (old_value) || UNBOUNDP (old_value)) | |
| 883 { | |
| 884 specpdl_ptr->symbol = symbol; | |
| 885 specpdl_ptr->old_value = old_value; | |
| 886 specpdl_ptr->func = 0; | |
| 887 specpdl_ptr++; | |
| 888 specpdl_depth_counter++; | |
| 889 | |
| 890 symbol_ptr->value = new_value; | |
| 853 | 891 |
| 892 #ifdef ERROR_CHECK_CATCH | |
| 893 check_specbind_stack_sanity (); | |
| 894 #endif | |
| 428 | 895 } |
| 896 else | |
| 1884 | 897 { |
| 898 /* does an Fset, may call magic handlers */ | |
| 899 /* GCPRO_STACK; */ | |
| 900 specbind_magic (symbol, new_value); | |
| 901 } | |
| 428 | 902 break; |
| 903 } | |
| 904 | |
| 905 case Bcall: | |
| 906 case Bcall+1: | |
| 907 case Bcall+2: | |
| 908 case Bcall+3: | |
| 909 case Bcall+4: | |
| 910 case Bcall+5: | |
| 911 case Bcall+6: | |
| 912 case Bcall+7: | |
| 913 n = (opcode < Bcall+6 ? opcode - Bcall : | |
| 914 opcode == Bcall+6 ? READ_UINT_1 : READ_UINT_2); | |
| 1920 | 915 /* #### Shouldn't this be just before the Ffuncall? |
| 916 Neither Fget nor Fput can GC. */ | |
| 1884 | 917 /* GCPRO_STACK; */ |
| 428 | 918 DISCARD (n); |
| 919 #ifdef BYTE_CODE_METER | |
| 920 if (byte_metering_on && SYMBOLP (TOP)) | |
| 921 { | |
| 922 Lisp_Object val = Fget (TOP, Qbyte_code_meter, Qnil); | |
| 923 if (INTP (val)) | |
| 924 Fput (TOP, Qbyte_code_meter, make_int (XINT (val) + 1)); | |
| 925 } | |
| 926 #endif | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
927 TOP_LVALUE = TOP; /* Ignore multiple values. */ |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
928 TOP_LVALUE = Ffuncall (n + 1, TOP_ADDRESS); |
| 428 | 929 break; |
| 930 | |
| 931 case Bunbind: | |
| 932 case Bunbind+1: | |
| 933 case Bunbind+2: | |
| 934 case Bunbind+3: | |
| 935 case Bunbind+4: | |
| 936 case Bunbind+5: | |
| 937 case Bunbind+6: | |
| 938 case Bunbind+7: | |
| 939 UNBIND_TO (specpdl_depth() - | |
| 940 (opcode < Bunbind+6 ? opcode-Bunbind : | |
| 941 opcode == Bunbind+6 ? READ_UINT_1 : READ_UINT_2)); | |
| 942 break; | |
| 943 | |
| 944 | |
| 945 case Bgoto: | |
| 946 JUMP; | |
| 947 break; | |
| 948 | |
| 949 case Bgotoifnil: | |
| 950 if (NILP (POP)) | |
| 951 JUMP; | |
| 952 else | |
| 953 JUMP_NEXT; | |
| 954 break; | |
| 955 | |
| 956 case Bgotoifnonnil: | |
| 957 if (!NILP (POP)) | |
| 958 JUMP; | |
| 959 else | |
| 960 JUMP_NEXT; | |
| 961 break; | |
| 962 | |
| 963 case Bgotoifnilelsepop: | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
964 /* Discard any multiple value: */ |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
965 if (NILP (TOP_LVALUE = TOP)) |
| 428 | 966 JUMP; |
| 967 else | |
| 968 { | |
| 969 DISCARD (1); | |
| 970 JUMP_NEXT; | |
| 971 } | |
| 972 break; | |
| 973 | |
| 974 case Bgotoifnonnilelsepop: | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
975 /* Discard any multiple value: */ |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
976 if (!NILP (TOP_LVALUE = TOP)) |
| 428 | 977 JUMP; |
| 978 else | |
| 979 { | |
| 980 DISCARD (1); | |
| 981 JUMP_NEXT; | |
| 982 } | |
| 983 break; | |
| 984 | |
| 985 | |
| 986 case BRgoto: | |
| 987 JUMPR; | |
| 988 break; | |
| 989 | |
| 990 case BRgotoifnil: | |
| 991 if (NILP (POP)) | |
| 992 JUMPR; | |
| 993 else | |
| 994 JUMPR_NEXT; | |
| 995 break; | |
| 996 | |
| 997 case BRgotoifnonnil: | |
| 998 if (!NILP (POP)) | |
| 999 JUMPR; | |
| 1000 else | |
| 1001 JUMPR_NEXT; | |
| 1002 break; | |
| 1003 | |
| 1004 case BRgotoifnilelsepop: | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1005 if (NILP (TOP_LVALUE = TOP)) |
| 428 | 1006 JUMPR; |
| 1007 else | |
| 1008 { | |
| 1009 DISCARD (1); | |
| 1010 JUMPR_NEXT; | |
| 1011 } | |
| 1012 break; | |
| 1013 | |
| 1014 case BRgotoifnonnilelsepop: | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1015 if (!NILP (TOP_LVALUE = TOP)) |
| 428 | 1016 JUMPR; |
| 1017 else | |
| 1018 { | |
| 1019 DISCARD (1); | |
| 1020 JUMPR_NEXT; | |
| 1021 } | |
| 1022 break; | |
| 1023 | |
| 1024 case Breturn: | |
| 1025 UNGCPRO; | |
| 1026 #ifdef ERROR_CHECK_BYTE_CODE | |
| 1027 /* Binds and unbinds are supposed to be compiled balanced. */ | |
| 1028 if (specpdl_depth() != speccount) | |
| 563 | 1029 invalid_byte_code ("unbalanced specbinding stack", Qunbound); |
| 428 | 1030 #endif |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1031 return TOP_WITH_MULTIPLE_VALUES; |
| 428 | 1032 |
| 1033 case Bdiscard: | |
| 1034 DISCARD (1); | |
| 1035 break; | |
| 1036 | |
| 1037 case Bdup: | |
| 1038 { | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1039 Lisp_Object arg = TOP_WITH_MULTIPLE_VALUES; |
| 428 | 1040 PUSH (arg); |
| 1041 break; | |
| 1042 } | |
| 1043 | |
| 1044 case Bconstant2: | |
| 1045 PUSH (constants_data[READ_UINT_2]); | |
| 1046 break; | |
| 1047 | |
| 1048 case Bcar: | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1049 { |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1050 /* Fcar can GC via wrong_type_argument. */ |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1051 /* GCPRO_STACK; */ |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1052 Lisp_Object arg = TOP; |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1053 TOP_LVALUE = CONSP (arg) ? XCAR (arg) : Fcar (arg); |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1054 break; |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1055 } |
| 428 | 1056 |
| 1057 case Bcdr: | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1058 { |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1059 /* Fcdr can GC via wrong_type_argument. */ |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1060 /* GCPRO_STACK; */ |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1061 Lisp_Object arg = TOP; |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1062 TOP_LVALUE = CONSP (arg) ? XCDR (arg) : Fcdr (arg); |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1063 break; |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1064 } |
| 428 | 1065 |
| 1066 case Bunbind_all: | |
| 1067 /* To unbind back to the beginning of this frame. Not used yet, | |
| 1068 but will be needed for tail-recursion elimination. */ | |
| 771 | 1069 unbind_to (speccount); |
| 428 | 1070 break; |
| 1071 | |
| 1072 case Bnth: | |
| 1073 { | |
| 1074 Lisp_Object arg = POP; | |
| 1920 | 1075 /* Fcar and Fnthcdr can GC via wrong_type_argument. */ |
| 1076 /* GCPRO_STACK; */ | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1077 TOP_LVALUE = Fcar (Fnthcdr (TOP, arg)); |
| 428 | 1078 break; |
| 1079 } | |
| 1080 | |
| 1081 case Bsymbolp: | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1082 TOP_LVALUE = SYMBOLP (TOP) ? Qt : Qnil; |
| 428 | 1083 break; |
| 1084 | |
| 1085 case Bconsp: | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1086 TOP_LVALUE = CONSP (TOP) ? Qt : Qnil; |
| 428 | 1087 break; |
| 1088 | |
| 1089 case Bstringp: | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1090 TOP_LVALUE = STRINGP (TOP) ? Qt : Qnil; |
| 428 | 1091 break; |
| 1092 | |
| 1093 case Blistp: | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1094 TOP_LVALUE = LISTP (TOP) ? Qt : Qnil; |
| 428 | 1095 break; |
| 1096 | |
| 1097 case Bnumberp: | |
| 1983 | 1098 #ifdef WITH_NUMBER_TYPES |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1099 TOP_LVALUE = NUMBERP (TOP) ? Qt : Qnil; |
| 1983 | 1100 #else |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1101 TOP_LVALUE = INT_OR_FLOATP (TOP) ? Qt : Qnil; |
| 1983 | 1102 #endif |
| 428 | 1103 break; |
| 1104 | |
|
4885
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4775
diff
changeset
|
1105 case Bfixnump: |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1106 TOP_LVALUE = INTP (TOP) ? Qt : Qnil; |
| 428 | 1107 break; |
| 1108 | |
| 1109 case Beq: | |
| 1110 { | |
| 1111 Lisp_Object arg = POP; | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1112 TOP_LVALUE = EQ_WITH_EBOLA_NOTICE (TOP, arg) ? Qt : Qnil; |
| 428 | 1113 break; |
| 1114 } | |
| 1115 | |
| 1116 case Bnot: | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1117 TOP_LVALUE = NILP (TOP) ? Qt : Qnil; |
| 428 | 1118 break; |
| 1119 | |
| 1120 case Bcons: | |
| 1121 { | |
| 1122 Lisp_Object arg = POP; | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1123 TOP_LVALUE = Fcons (TOP, arg); |
| 428 | 1124 break; |
| 1125 } | |
| 1126 | |
| 1127 case Blist1: | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1128 TOP_LVALUE = Fcons (TOP, Qnil); |
| 428 | 1129 break; |
| 1130 | |
| 1131 | |
| 1132 case BlistN: | |
| 1133 n = READ_UINT_1; | |
| 1134 goto do_list; | |
| 1135 | |
| 1136 case Blist2: | |
| 1137 case Blist3: | |
| 1138 case Blist4: | |
| 1139 /* common case */ | |
| 1140 n = opcode - (Blist1 - 1); | |
| 1141 do_list: | |
| 1142 { | |
| 1143 Lisp_Object list = Qnil; | |
| 1144 list_loop: | |
| 1145 list = Fcons (TOP, list); | |
| 1146 if (--n) | |
| 1147 { | |
| 1148 DISCARD (1); | |
| 1149 goto list_loop; | |
| 1150 } | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1151 TOP_LVALUE = list; |
| 428 | 1152 break; |
| 1153 } | |
| 1154 | |
| 1155 | |
| 1156 case Bconcat2: | |
| 1157 case Bconcat3: | |
| 1158 case Bconcat4: | |
| 1159 n = opcode - (Bconcat2 - 2); | |
| 1160 goto do_concat; | |
| 1161 | |
| 1162 case BconcatN: | |
| 1163 /* common case */ | |
| 1164 n = READ_UINT_1; | |
| 1165 do_concat: | |
| 1166 DISCARD (n - 1); | |
| 1920 | 1167 /* Apparently `concat' can GC; Fconcat GCPROs its arguments. */ |
| 1168 /* GCPRO_STACK; */ | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1169 TOP_LVALUE = TOP; /* Ignore multiple values. */ |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1170 TOP_LVALUE = Fconcat (n, TOP_ADDRESS); |
| 428 | 1171 break; |
| 1172 | |
| 1173 | |
| 1174 case Blength: | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1175 TOP_LVALUE = Flength (TOP); |
| 428 | 1176 break; |
| 1177 | |
| 1178 case Baset: | |
| 1179 { | |
| 1180 Lisp_Object arg2 = POP; | |
| 1181 Lisp_Object arg1 = POP; | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1182 TOP_LVALUE = Faset (TOP, arg1, arg2); |
| 428 | 1183 break; |
| 1184 } | |
| 1185 | |
| 1186 case Bsymbol_value: | |
| 1920 | 1187 /* Why does this need GCPRO_STACK? If not, remove others, too. */ |
| 1884 | 1188 /* GCPRO_STACK; */ |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1189 TOP_LVALUE = Fsymbol_value (TOP); |
| 428 | 1190 break; |
| 1191 | |
| 1192 case Bsymbol_function: | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1193 TOP_LVALUE = Fsymbol_function (TOP); |
| 428 | 1194 break; |
| 1195 | |
| 1196 case Bget: | |
| 1197 { | |
| 1198 Lisp_Object arg = POP; | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1199 TOP_LVALUE = Fget (TOP, arg, Qnil); |
| 428 | 1200 break; |
| 1201 } | |
| 1202 | |
| 1203 case Bsub1: | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1204 { |
| 1983 | 1205 #ifdef HAVE_BIGNUM |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1206 TOP_LVALUE = Fsub1 (TOP); |
| 1983 | 1207 #else |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1208 Lisp_Object arg = TOP; |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1209 TOP_LVALUE = INTP (arg) ? INT_MINUS1 (arg) : Fsub1 (arg); |
| 1983 | 1210 #endif |
| 428 | 1211 break; |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1212 } |
| 428 | 1213 case Badd1: |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1214 { |
| 1983 | 1215 #ifdef HAVE_BIGNUM |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1216 TOP_LVALUE = Fadd1 (TOP); |
| 1983 | 1217 #else |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1218 Lisp_Object arg = TOP; |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1219 TOP_LVALUE = INTP (arg) ? INT_PLUS1 (arg) : Fadd1 (arg); |
| 1983 | 1220 #endif |
| 428 | 1221 break; |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1222 } |
| 428 | 1223 |
| 1224 case Beqlsign: | |
| 1225 { | |
| 1226 Lisp_Object arg = POP; | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1227 TOP_LVALUE = bytecode_arithcompare (TOP, arg) == 0 ? Qt : Qnil; |
| 428 | 1228 break; |
| 1229 } | |
| 1230 | |
| 1231 case Bgtr: | |
| 1232 { | |
| 1233 Lisp_Object arg = POP; | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1234 TOP_LVALUE = bytecode_arithcompare (TOP, arg) > 0 ? Qt : Qnil; |
| 428 | 1235 break; |
| 1236 } | |
| 1237 | |
| 1238 case Blss: | |
| 1239 { | |
| 1240 Lisp_Object arg = POP; | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1241 TOP_LVALUE = bytecode_arithcompare (TOP, arg) < 0 ? Qt : Qnil; |
| 428 | 1242 break; |
| 1243 } | |
| 1244 | |
| 1245 case Bleq: | |
| 1246 { | |
| 1247 Lisp_Object arg = POP; | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1248 TOP_LVALUE = bytecode_arithcompare (TOP, arg) <= 0 ? Qt : Qnil; |
| 428 | 1249 break; |
| 1250 } | |
| 1251 | |
| 1252 case Bgeq: | |
| 1253 { | |
| 1254 Lisp_Object arg = POP; | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1255 TOP_LVALUE = bytecode_arithcompare (TOP, arg) >= 0 ? Qt : Qnil; |
| 428 | 1256 break; |
| 1257 } | |
| 1258 | |
| 1259 | |
| 1260 case Bnegate: | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1261 TOP_LVALUE = bytecode_negate (TOP); |
| 428 | 1262 break; |
| 1263 | |
| 1264 case Bnconc: | |
| 1265 DISCARD (1); | |
| 1920 | 1266 /* nconc2 GCPROs before calling this. */ |
| 1267 /* GCPRO_STACK; */ | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1268 TOP_LVALUE = TOP; /* Ignore multiple values. */ |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1269 TOP_LVALUE = bytecode_nconc2 (TOP_ADDRESS); |
| 428 | 1270 break; |
| 1271 | |
| 1272 case Bplus: | |
| 1273 { | |
| 1274 Lisp_Object arg2 = POP; | |
| 1275 Lisp_Object arg1 = TOP; | |
| 1983 | 1276 #ifdef HAVE_BIGNUM |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1277 TOP_LVALUE = bytecode_arithop (arg1, arg2, opcode); |
| 1983 | 1278 #else |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1279 TOP_LVALUE = INTP (arg1) && INTP (arg2) ? |
| 428 | 1280 INT_PLUS (arg1, arg2) : |
| 1281 bytecode_arithop (arg1, arg2, opcode); | |
| 1983 | 1282 #endif |
| 428 | 1283 break; |
| 1284 } | |
| 1285 | |
| 1286 case Bdiff: | |
| 1287 { | |
| 1288 Lisp_Object arg2 = POP; | |
| 1289 Lisp_Object arg1 = TOP; | |
| 1983 | 1290 #ifdef HAVE_BIGNUM |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1291 TOP_LVALUE = bytecode_arithop (arg1, arg2, opcode); |
| 1983 | 1292 #else |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1293 TOP_LVALUE = INTP (arg1) && INTP (arg2) ? |
| 428 | 1294 INT_MINUS (arg1, arg2) : |
| 1295 bytecode_arithop (arg1, arg2, opcode); | |
| 1983 | 1296 #endif |
| 428 | 1297 break; |
| 1298 } | |
| 1299 | |
| 1300 case Bmult: | |
| 1301 case Bquo: | |
| 1302 case Bmax: | |
| 1303 case Bmin: | |
| 1304 { | |
| 1305 Lisp_Object arg = POP; | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1306 TOP_LVALUE = bytecode_arithop (TOP, arg, opcode); |
| 428 | 1307 break; |
| 1308 } | |
| 1309 | |
| 1310 case Bpoint: | |
| 1311 PUSH (make_int (BUF_PT (current_buffer))); | |
| 1312 break; | |
| 1313 | |
| 1314 case Binsert: | |
| 1920 | 1315 /* Says it can GC. */ |
| 1316 /* GCPRO_STACK; */ | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1317 TOP_LVALUE = TOP; /* Ignore multiple values. */ |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1318 TOP_LVALUE = Finsert (1, TOP_ADDRESS); |
| 428 | 1319 break; |
| 1320 | |
| 1321 case BinsertN: | |
| 1322 n = READ_UINT_1; | |
| 1323 DISCARD (n - 1); | |
| 1920 | 1324 /* See Binsert. */ |
| 1325 /* GCPRO_STACK; */ | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1326 TOP_LVALUE = TOP; /* Ignore multiple values. */ |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1327 TOP_LVALUE = Finsert (n, TOP_ADDRESS); |
| 428 | 1328 break; |
| 1329 | |
| 1330 case Baref: | |
| 1331 { | |
| 1332 Lisp_Object arg = POP; | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1333 TOP_LVALUE = Faref (TOP, arg); |
| 428 | 1334 break; |
| 1335 } | |
| 1336 | |
| 1337 case Bmemq: | |
| 1338 { | |
| 1339 Lisp_Object arg = POP; | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1340 TOP_LVALUE = Fmemq (TOP, arg); |
| 428 | 1341 break; |
| 1342 } | |
| 1343 | |
| 1344 case Bset: | |
| 1345 { | |
| 1346 Lisp_Object arg = POP; | |
| 1884 | 1347 /* Fset may call magic handlers */ |
| 1348 /* GCPRO_STACK; */ | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1349 TOP_LVALUE = Fset (TOP, arg); |
| 428 | 1350 break; |
| 1351 } | |
| 1352 | |
| 1353 case Bequal: | |
| 1354 { | |
| 1355 Lisp_Object arg = POP; | |
| 1920 | 1356 /* Can QUIT, so can GC, right? */ |
| 1357 /* GCPRO_STACK; */ | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1358 TOP_LVALUE = Fequal (TOP, arg); |
| 428 | 1359 break; |
| 1360 } | |
| 1361 | |
| 1362 case Bnthcdr: | |
| 1363 { | |
| 1364 Lisp_Object arg = POP; | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1365 TOP_LVALUE = Fnthcdr (TOP, arg); |
| 428 | 1366 break; |
| 1367 } | |
| 1368 | |
| 1369 case Belt: | |
| 1370 { | |
| 1371 Lisp_Object arg = POP; | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1372 TOP_LVALUE = Felt (TOP, arg); |
| 428 | 1373 break; |
| 1374 } | |
| 1375 | |
| 1376 case Bmember: | |
| 1377 { | |
| 1378 Lisp_Object arg = POP; | |
| 1920 | 1379 /* Can QUIT, so can GC, right? */ |
| 1380 /* GCPRO_STACK; */ | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1381 TOP_LVALUE = Fmember (TOP, arg); |
| 428 | 1382 break; |
| 1383 } | |
| 1384 | |
| 1385 case Bgoto_char: | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1386 TOP_LVALUE = Fgoto_char (TOP, Qnil); |
| 428 | 1387 break; |
| 1388 | |
| 1389 case Bcurrent_buffer: | |
| 1390 { | |
| 793 | 1391 Lisp_Object buffer = wrap_buffer (current_buffer); |
| 1392 | |
| 428 | 1393 PUSH (buffer); |
| 1394 break; | |
| 1395 } | |
| 1396 | |
| 1397 case Bset_buffer: | |
| 1884 | 1398 /* #### WAG: set-buffer may cause Fset's of buffer locals |
| 1399 Didn't prevent crash. :-( */ | |
| 1400 /* GCPRO_STACK; */ | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1401 TOP_LVALUE = Fset_buffer (TOP); |
| 428 | 1402 break; |
| 1403 | |
| 1404 case Bpoint_max: | |
| 1405 PUSH (make_int (BUF_ZV (current_buffer))); | |
| 1406 break; | |
| 1407 | |
| 1408 case Bpoint_min: | |
| 1409 PUSH (make_int (BUF_BEGV (current_buffer))); | |
| 1410 break; | |
| 1411 | |
| 1412 case Bskip_chars_forward: | |
| 1413 { | |
| 1414 Lisp_Object arg = POP; | |
| 1920 | 1415 /* Can QUIT, so can GC, right? */ |
| 1416 /* GCPRO_STACK; */ | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1417 TOP_LVALUE = Fskip_chars_forward (TOP, arg, Qnil); |
| 428 | 1418 break; |
| 1419 } | |
| 1420 | |
| 1421 case Bassq: | |
| 1422 { | |
| 1423 Lisp_Object arg = POP; | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1424 TOP_LVALUE = Fassq (TOP, arg); |
| 428 | 1425 break; |
| 1426 } | |
| 1427 | |
| 1428 case Bsetcar: | |
| 1429 { | |
| 1430 Lisp_Object arg = POP; | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1431 TOP_LVALUE = Fsetcar (TOP, arg); |
| 428 | 1432 break; |
| 1433 } | |
| 1434 | |
| 1435 case Bsetcdr: | |
| 1436 { | |
| 1437 Lisp_Object arg = POP; | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1438 TOP_LVALUE = Fsetcdr (TOP, arg); |
| 428 | 1439 break; |
| 1440 } | |
| 1441 | |
| 1442 case Bnreverse: | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1443 TOP_LVALUE = bytecode_nreverse (TOP); |
| 428 | 1444 break; |
| 1445 | |
| 1446 case Bcar_safe: | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1447 TOP_LVALUE = CONSP (TOP) ? XCAR (TOP) : Qnil; |
| 428 | 1448 break; |
| 1449 | |
| 1450 case Bcdr_safe: | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1451 TOP_LVALUE = CONSP (TOP) ? XCDR (TOP) : Qnil; |
| 428 | 1452 break; |
| 1453 | |
| 1454 } | |
| 1455 } | |
| 1456 } | |
| 1457 | |
| 1458 /* It makes a worthwhile performance difference (5%) to shunt | |
| 1459 lesser-used opcodes off to a subroutine, to keep the switch in | |
| 1460 execute_optimized_program small. If you REALLY care about | |
| 1461 performance, you want to keep your heavily executed code away from | |
| 1462 rarely executed code, to minimize cache misses. | |
| 1463 | |
| 1464 Don't make this function static, since then the compiler might inline it. */ | |
| 1465 Lisp_Object * | |
| 1466 execute_rare_opcode (Lisp_Object *stack_ptr, | |
|
4921
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
1467 #ifdef ERROR_CHECK_BYTE_CODE |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
1468 Lisp_Object *stack_beg, |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
1469 Lisp_Object *stack_end, |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
1470 #endif /* ERROR_CHECK_BYTE_CODE */ |
| 2286 | 1471 const Opbyte *UNUSED (program_ptr), |
| 428 | 1472 Opcode opcode) |
| 1473 { | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1474 REGISTER int n; |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1475 |
| 428 | 1476 switch (opcode) |
| 1477 { | |
|
4921
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
1478 |
| 428 | 1479 case Bsave_excursion: |
| 1480 record_unwind_protect (save_excursion_restore, | |
| 1481 save_excursion_save ()); | |
| 1482 break; | |
| 1483 | |
|
4775
1d61580e0cf7
Remove Fsave_window_excursion from window.c, it's overridden by Lisp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4717
diff
changeset
|
1484 /* This bytecode will eventually go away, once we no longer encounter |
|
1d61580e0cf7
Remove Fsave_window_excursion from window.c, it's overridden by Lisp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4717
diff
changeset
|
1485 byte code from 21.4. In 21.5.10 and newer, save-window-excursion is |
|
1d61580e0cf7
Remove Fsave_window_excursion from window.c, it's overridden by Lisp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4717
diff
changeset
|
1486 a macro. */ |
| 428 | 1487 case Bsave_window_excursion: |
| 1488 { | |
| 1489 int count = specpdl_depth (); | |
|
4775
1d61580e0cf7
Remove Fsave_window_excursion from window.c, it's overridden by Lisp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4717
diff
changeset
|
1490 record_unwind_protect (Feval, |
|
1d61580e0cf7
Remove Fsave_window_excursion from window.c, it's overridden by Lisp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4717
diff
changeset
|
1491 list2 (Qset_window_configuration, |
|
1d61580e0cf7
Remove Fsave_window_excursion from window.c, it's overridden by Lisp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4717
diff
changeset
|
1492 call0 (Qcurrent_window_configuration))); |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1493 TOP_LVALUE = Fprogn (TOP); |
| 771 | 1494 unbind_to (count); |
| 428 | 1495 break; |
| 1496 } | |
| 1497 | |
| 1498 case Bsave_restriction: | |
| 1499 record_unwind_protect (save_restriction_restore, | |
| 844 | 1500 save_restriction_save (current_buffer)); |
| 428 | 1501 break; |
| 1502 | |
| 1503 case Bcatch: | |
| 1504 { | |
| 1505 Lisp_Object arg = POP; | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1506 TOP_LVALUE = internal_catch (TOP, Feval, arg, 0, 0, 0); |
| 428 | 1507 break; |
| 1508 } | |
| 1509 | |
| 1510 case Bskip_chars_backward: | |
| 1511 { | |
| 1512 Lisp_Object arg = POP; | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1513 TOP_LVALUE = Fskip_chars_backward (TOP, arg, Qnil); |
| 428 | 1514 break; |
| 1515 } | |
| 1516 | |
| 1517 case Bunwind_protect: | |
| 1518 record_unwind_protect (Fprogn, POP); | |
| 1519 break; | |
| 1520 | |
| 1521 case Bcondition_case: | |
| 1522 { | |
| 1523 Lisp_Object arg2 = POP; /* handlers */ | |
| 1524 Lisp_Object arg1 = POP; /* bodyform */ | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1525 TOP_LVALUE = condition_case_3 (arg1, TOP, arg2); |
| 428 | 1526 break; |
| 1527 } | |
| 1528 | |
| 1529 case Bset_marker: | |
| 1530 { | |
| 1531 Lisp_Object arg2 = POP; | |
| 1532 Lisp_Object arg1 = POP; | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1533 TOP_LVALUE = Fset_marker (TOP, arg1, arg2); |
| 428 | 1534 break; |
| 1535 } | |
| 1536 | |
| 1537 case Brem: | |
| 1538 { | |
| 1539 Lisp_Object arg = POP; | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1540 TOP_LVALUE = Frem (TOP, arg); |
| 428 | 1541 break; |
| 1542 } | |
| 1543 | |
| 1544 case Bmatch_beginning: | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1545 TOP_LVALUE = Fmatch_beginning (TOP); |
| 428 | 1546 break; |
| 1547 | |
| 1548 case Bmatch_end: | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1549 TOP_LVALUE = Fmatch_end (TOP); |
| 428 | 1550 break; |
| 1551 | |
| 1552 case Bupcase: | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1553 TOP_LVALUE = Fupcase (TOP, Qnil); |
| 428 | 1554 break; |
| 1555 | |
| 1556 case Bdowncase: | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1557 TOP_LVALUE = Fdowncase (TOP, Qnil); |
| 428 | 1558 break; |
| 1559 | |
| 1560 case Bfset: | |
| 1561 { | |
| 1562 Lisp_Object arg = POP; | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1563 TOP_LVALUE = Ffset (TOP, arg); |
| 428 | 1564 break; |
| 1565 } | |
| 1566 | |
| 1567 case Bstring_equal: | |
| 1568 { | |
| 1569 Lisp_Object arg = POP; | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1570 TOP_LVALUE = Fstring_equal (TOP, arg); |
| 428 | 1571 break; |
| 1572 } | |
| 1573 | |
| 1574 case Bstring_lessp: | |
| 1575 { | |
| 1576 Lisp_Object arg = POP; | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1577 TOP_LVALUE = Fstring_lessp (TOP, arg); |
| 428 | 1578 break; |
| 1579 } | |
| 1580 | |
|
5089
99f8ebc082d9
Make #'substring an alias of #'subseq; give the latter the byte code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4974
diff
changeset
|
1581 case Bsubseq: |
| 428 | 1582 { |
| 1583 Lisp_Object arg2 = POP; | |
| 1584 Lisp_Object arg1 = POP; | |
|
5089
99f8ebc082d9
Make #'substring an alias of #'subseq; give the latter the byte code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4974
diff
changeset
|
1585 TOP_LVALUE = Fsubseq (TOP, arg1, arg2); |
| 428 | 1586 break; |
| 1587 } | |
| 1588 | |
| 1589 case Bcurrent_column: | |
| 1590 PUSH (make_int (current_column (current_buffer))); | |
| 1591 break; | |
| 1592 | |
| 1593 case Bchar_after: | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1594 TOP_LVALUE = Fchar_after (TOP, Qnil); |
| 428 | 1595 break; |
| 1596 | |
| 1597 case Bindent_to: | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1598 TOP_LVALUE = Findent_to (TOP, Qnil, Qnil); |
| 428 | 1599 break; |
| 1600 | |
| 1601 case Bwiden: | |
| 1602 PUSH (Fwiden (Qnil)); | |
| 1603 break; | |
| 1604 | |
| 1605 case Bfollowing_char: | |
| 1606 PUSH (Ffollowing_char (Qnil)); | |
| 1607 break; | |
| 1608 | |
| 1609 case Bpreceding_char: | |
| 1610 PUSH (Fpreceding_char (Qnil)); | |
| 1611 break; | |
| 1612 | |
| 1613 case Beolp: | |
| 1614 PUSH (Feolp (Qnil)); | |
| 1615 break; | |
| 1616 | |
| 1617 case Beobp: | |
| 1618 PUSH (Feobp (Qnil)); | |
| 1619 break; | |
| 1620 | |
| 1621 case Bbolp: | |
| 1622 PUSH (Fbolp (Qnil)); | |
| 1623 break; | |
| 1624 | |
| 1625 case Bbobp: | |
| 1626 PUSH (Fbobp (Qnil)); | |
| 1627 break; | |
| 1628 | |
| 1629 case Bsave_current_buffer: | |
| 1630 record_unwind_protect (save_current_buffer_restore, | |
| 1631 Fcurrent_buffer ()); | |
| 1632 break; | |
| 1633 | |
| 1634 case Binteractive_p: | |
| 1635 PUSH (Finteractive_p ()); | |
| 1636 break; | |
| 1637 | |
| 1638 case Bforward_char: | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1639 TOP_LVALUE = Fforward_char (TOP, Qnil); |
| 428 | 1640 break; |
| 1641 | |
| 1642 case Bforward_word: | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1643 TOP_LVALUE = Fforward_word (TOP, Qnil); |
| 428 | 1644 break; |
| 1645 | |
| 1646 case Bforward_line: | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1647 TOP_LVALUE = Fforward_line (TOP, Qnil); |
| 428 | 1648 break; |
| 1649 | |
| 1650 case Bchar_syntax: | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1651 TOP_LVALUE = Fchar_syntax (TOP, Qnil); |
| 428 | 1652 break; |
| 1653 | |
| 1654 case Bbuffer_substring: | |
| 1655 { | |
| 1656 Lisp_Object arg = POP; | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1657 TOP_LVALUE = Fbuffer_substring (TOP, arg, Qnil); |
| 428 | 1658 break; |
| 1659 } | |
| 1660 | |
| 1661 case Bdelete_region: | |
| 1662 { | |
| 1663 Lisp_Object arg = POP; | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1664 TOP_LVALUE = Fdelete_region (TOP, arg, Qnil); |
| 428 | 1665 break; |
| 1666 } | |
| 1667 | |
| 1668 case Bnarrow_to_region: | |
| 1669 { | |
| 1670 Lisp_Object arg = POP; | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1671 TOP_LVALUE = Fnarrow_to_region (TOP, arg, Qnil); |
| 428 | 1672 break; |
| 1673 } | |
| 1674 | |
| 1675 case Bend_of_line: | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1676 TOP_LVALUE = Fend_of_line (TOP, Qnil); |
| 428 | 1677 break; |
| 1678 | |
| 1679 case Btemp_output_buffer_setup: | |
| 1680 temp_output_buffer_setup (TOP); | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1681 TOP_LVALUE = Vstandard_output; |
| 428 | 1682 break; |
| 1683 | |
| 1684 case Btemp_output_buffer_show: | |
| 1685 { | |
| 1686 Lisp_Object arg = POP; | |
| 1687 temp_output_buffer_show (TOP, Qnil); | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1688 TOP_LVALUE = arg; |
| 428 | 1689 /* GAG ME!! */ |
| 1690 /* pop binding of standard-output */ | |
| 771 | 1691 unbind_to (specpdl_depth() - 1); |
| 428 | 1692 break; |
| 1693 } | |
| 1694 | |
|
5374
d967d96ca043
Conditionalise the old-* functions and byte codes at compile time.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5370
diff
changeset
|
1695 #ifdef SUPPORT_CONFOUNDING_FUNCTIONS |
|
d967d96ca043
Conditionalise the old-* functions and byte codes at compile time.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5370
diff
changeset
|
1696 |
| 428 | 1697 case Bold_eq: |
| 1698 { | |
| 1699 Lisp_Object arg = POP; | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1700 TOP_LVALUE = HACKEQ_UNSAFE (TOP, arg) ? Qt : Qnil; |
| 428 | 1701 break; |
| 1702 } | |
| 1703 | |
| 1704 case Bold_memq: | |
| 1705 { | |
| 1706 Lisp_Object arg = POP; | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1707 TOP_LVALUE = Fold_memq (TOP, arg); |
| 428 | 1708 break; |
| 1709 } | |
| 1710 | |
| 1711 case Bold_equal: | |
| 1712 { | |
| 1713 Lisp_Object arg = POP; | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1714 TOP_LVALUE = Fold_equal (TOP, arg); |
| 428 | 1715 break; |
| 1716 } | |
| 1717 | |
| 1718 case Bold_member: | |
| 1719 { | |
| 1720 Lisp_Object arg = POP; | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1721 TOP_LVALUE = Fold_member (TOP, arg); |
| 428 | 1722 break; |
| 1723 } | |
| 1724 | |
| 1725 case Bold_assq: | |
| 1726 { | |
| 1727 Lisp_Object arg = POP; | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1728 TOP_LVALUE = Fold_assq (TOP, arg); |
| 428 | 1729 break; |
| 1730 } | |
| 1731 | |
|
5374
d967d96ca043
Conditionalise the old-* functions and byte codes at compile time.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5370
diff
changeset
|
1732 #endif |
|
d967d96ca043
Conditionalise the old-* functions and byte codes at compile time.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5370
diff
changeset
|
1733 |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1734 case Bbind_multiple_value_limits: |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1735 { |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1736 Lisp_Object upper = POP, first = TOP, speccount; |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1737 |
|
5307
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5300
diff
changeset
|
1738 check_integer_range (upper, Qzero, |
|
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5300
diff
changeset
|
1739 make_integer (Vmultiple_values_limit)); |
|
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5300
diff
changeset
|
1740 check_integer_range (first, Qzero, upper); |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1741 |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1742 speccount = make_int (bind_multiple_value_limits (XINT (first), |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1743 XINT (upper))); |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1744 PUSH (upper); |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1745 PUSH (speccount); |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1746 break; |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1747 } |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1748 |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1749 case Bmultiple_value_call: |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1750 { |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1751 n = XINT (POP); |
|
4921
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
1752 DISCARD_PRESERVING_MULTIPLE_VALUES_UNSAFE (n - 1); |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1753 /* Discard multiple values for the first (function) argument: */ |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1754 TOP_LVALUE = TOP; |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1755 TOP_LVALUE = multiple_value_call (n, TOP_ADDRESS); |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1756 break; |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1757 } |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1758 |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1759 case Bmultiple_value_list_internal: |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1760 { |
|
4921
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
1761 DISCARD_PRESERVING_MULTIPLE_VALUES_UNSAFE (3); |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1762 TOP_LVALUE = multiple_value_list_internal (4, TOP_ADDRESS); |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1763 break; |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1764 } |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1765 |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1766 case Bthrow: |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1767 { |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1768 Lisp_Object arg = POP_WITH_MULTIPLE_VALUES; |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1769 |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1770 /* We never throw to a catch tag that is a multiple value: */ |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1771 throw_or_bomb_out (TOP, arg, 0, Qnil, Qnil); |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1772 break; |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1773 } |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3263
diff
changeset
|
1774 |
| 428 | 1775 default: |
|
4914
1628e3b9601a
When aborting due to unknown opcode, output more descriptive msg
Ben Wing <ben@xemacs.org>
parents:
4910
diff
changeset
|
1776 { |
|
1628e3b9601a
When aborting due to unknown opcode, output more descriptive msg
Ben Wing <ben@xemacs.org>
parents:
4910
diff
changeset
|
1777 Ascbyte msg[100]; |
|
1628e3b9601a
When aborting due to unknown opcode, output more descriptive msg
Ben Wing <ben@xemacs.org>
parents:
4910
diff
changeset
|
1778 sprintf (msg, "Unknown opcode %d", opcode); |
|
4921
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
1779 bytecode_abort_with_message (msg); |
|
4914
1628e3b9601a
When aborting due to unknown opcode, output more descriptive msg
Ben Wing <ben@xemacs.org>
parents:
4910
diff
changeset
|
1780 } |
| 428 | 1781 break; |
| 1782 } | |
| 1783 return stack_ptr; | |
| 1784 } | |
| 1785 | |
| 1786 | |
| 563 | 1787 DOESNT_RETURN |
|
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4775
diff
changeset
|
1788 invalid_byte_code (const Ascbyte *reason, Lisp_Object frob) |
| 428 | 1789 { |
| 563 | 1790 signal_error (Qinvalid_byte_code, reason, frob); |
| 428 | 1791 } |
| 1792 | |
| 1793 /* Check for valid opcodes. Change this when adding new opcodes. */ | |
| 1794 static void | |
| 1795 check_opcode (Opcode opcode) | |
| 1796 { | |
| 1797 if ((opcode < Bvarref) || | |
| 1798 (opcode == 0251) || | |
| 1799 (opcode > Bassq && opcode < Bconstant)) | |
| 563 | 1800 invalid_byte_code ("invalid opcode in instruction stream", |
| 1801 make_int (opcode)); | |
| 428 | 1802 } |
| 1803 | |
| 1804 /* Check that IDX is a valid offset into the `constants' vector */ | |
| 1805 static void | |
| 1806 check_constants_index (int idx, Lisp_Object constants) | |
| 1807 { | |
| 1808 if (idx < 0 || idx >= XVECTOR_LENGTH (constants)) | |
| 563 | 1809 signal_ferror |
| 1810 (Qinvalid_byte_code, | |
| 1811 "reference %d to constants array out of range 0, %ld", | |
| 428 | 1812 idx, XVECTOR_LENGTH (constants) - 1); |
| 1813 } | |
| 1814 | |
| 1815 /* Get next character from Lisp instructions string. */ | |
| 563 | 1816 #define READ_INSTRUCTION_CHAR(lvalue) do { \ |
| 867 | 1817 (lvalue) = itext_ichar (ptr); \ |
| 1818 INC_IBYTEPTR (ptr); \ | |
| 563 | 1819 *icounts_ptr++ = program_ptr - program; \ |
| 1820 if (lvalue > UCHAR_MAX) \ | |
| 1821 invalid_byte_code \ | |
| 1822 ("Invalid character in byte code string", make_char (lvalue)); \ | |
| 428 | 1823 } while (0) |
| 1824 | |
| 1825 /* Get opcode from Lisp instructions string. */ | |
| 1826 #define READ_OPCODE do { \ | |
| 1827 unsigned int c; \ | |
| 1828 READ_INSTRUCTION_CHAR (c); \ | |
| 1829 opcode = (Opcode) c; \ | |
| 1830 } while (0) | |
| 1831 | |
| 1832 /* Get next operand, a uint8, from Lisp instructions string. */ | |
| 1833 #define READ_OPERAND_1 do { \ | |
| 1834 READ_INSTRUCTION_CHAR (arg); \ | |
| 1835 argsize = 1; \ | |
| 1836 } while (0) | |
| 1837 | |
| 1838 /* Get next operand, a uint16, from Lisp instructions string. */ | |
| 1839 #define READ_OPERAND_2 do { \ | |
| 1840 unsigned int arg1, arg2; \ | |
| 1841 READ_INSTRUCTION_CHAR (arg1); \ | |
| 1842 READ_INSTRUCTION_CHAR (arg2); \ | |
| 1843 arg = arg1 + (arg2 << 8); \ | |
| 1844 argsize = 2; \ | |
| 1845 } while (0) | |
| 1846 | |
| 1847 /* Write 1 byte to PTR, incrementing PTR */ | |
| 1848 #define WRITE_INT8(value, ptr) do { \ | |
| 1849 *((ptr)++) = (value); \ | |
| 1850 } while (0) | |
| 1851 | |
| 1852 /* Write 2 bytes to PTR, incrementing PTR */ | |
| 1853 #define WRITE_INT16(value, ptr) do { \ | |
| 1854 WRITE_INT8 (((unsigned) (value)) & 0x00ff, (ptr)); \ | |
| 1855 WRITE_INT8 (((unsigned) (value)) >> 8 , (ptr)); \ | |
| 1856 } while (0) | |
| 1857 | |
| 1858 /* We've changed our minds about the opcode we've already written. */ | |
| 1859 #define REWRITE_OPCODE(new_opcode) ((void) (program_ptr[-1] = new_opcode)) | |
| 1860 | |
| 1861 /* Encode an op arg within the opcode, or as a 1 or 2-byte operand. */ | |
| 1862 #define WRITE_NARGS(base_opcode) do { \ | |
| 1863 if (arg <= 5) \ | |
| 1864 { \ | |
| 1865 REWRITE_OPCODE (base_opcode + arg); \ | |
| 1866 } \ | |
| 1867 else if (arg <= UCHAR_MAX) \ | |
| 1868 { \ | |
| 1869 REWRITE_OPCODE (base_opcode + 6); \ | |
| 1870 WRITE_INT8 (arg, program_ptr); \ | |
| 1871 } \ | |
| 1872 else \ | |
| 1873 { \ | |
| 1874 REWRITE_OPCODE (base_opcode + 7); \ | |
| 1875 WRITE_INT16 (arg, program_ptr); \ | |
| 1876 } \ | |
| 1877 } while (0) | |
| 1878 | |
| 1879 /* Encode a constants reference within the opcode, or as a 2-byte operand. */ | |
| 1880 #define WRITE_CONSTANT do { \ | |
| 1881 check_constants_index(arg, constants); \ | |
| 1882 if (arg <= UCHAR_MAX - Bconstant) \ | |
| 1883 { \ | |
| 1884 REWRITE_OPCODE (Bconstant + arg); \ | |
| 1885 } \ | |
| 1886 else \ | |
| 1887 { \ | |
| 1888 REWRITE_OPCODE (Bconstant2); \ | |
| 1889 WRITE_INT16 (arg, program_ptr); \ | |
| 1890 } \ | |
| 1891 } while (0) | |
| 1892 | |
| 1893 #define WRITE_OPCODE WRITE_INT8 (opcode, program_ptr) | |
| 1894 | |
| 1895 /* Compile byte code instructions into free space provided by caller, with | |
| 1896 size >= (2 * string_char_length (instructions) + 1) * sizeof (Opbyte). | |
| 1897 Returns length of compiled code. */ | |
| 1898 static void | |
| 1899 optimize_byte_code (/* in */ | |
| 1900 Lisp_Object instructions, | |
| 1901 Lisp_Object constants, | |
| 1902 /* out */ | |
| 442 | 1903 Opbyte * const program, |
|
4921
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
1904 Elemcount * const program_length, |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
1905 Elemcount * const varbind_count) |
| 428 | 1906 { |
| 647 | 1907 Bytecount instructions_length = XSTRING_LENGTH (instructions); |
| 665 | 1908 Elemcount comfy_size = (Elemcount) (2 * instructions_length); |
| 428 | 1909 |
| 442 | 1910 int * const icounts = alloca_array (int, comfy_size); |
| 428 | 1911 int * icounts_ptr = icounts; |
| 1912 | |
| 1913 /* We maintain a table of jumps in the source code. */ | |
| 1914 struct jump | |
| 1915 { | |
| 1916 int from; | |
| 1917 int to; | |
| 1918 }; | |
| 442 | 1919 struct jump * const jumps = alloca_array (struct jump, comfy_size); |
| 428 | 1920 struct jump *jumps_ptr = jumps; |
| 1921 | |
| 1922 Opbyte *program_ptr = program; | |
| 1923 | |
| 867 | 1924 const Ibyte *ptr = XSTRING_DATA (instructions); |
| 1925 const Ibyte * const end = ptr + instructions_length; | |
| 428 | 1926 |
| 1927 *varbind_count = 0; | |
| 1928 | |
| 1929 while (ptr < end) | |
| 1930 { | |
| 1931 Opcode opcode; | |
| 1932 int arg; | |
| 1933 int argsize = 0; | |
| 1934 READ_OPCODE; | |
| 1935 WRITE_OPCODE; | |
| 1936 | |
| 1937 switch (opcode) | |
| 1938 { | |
| 1939 Lisp_Object val; | |
| 1940 | |
| 1941 case Bvarref+7: READ_OPERAND_2; goto do_varref; | |
| 1942 case Bvarref+6: READ_OPERAND_1; goto do_varref; | |
| 1943 case Bvarref: case Bvarref+1: case Bvarref+2: | |
| 1944 case Bvarref+3: case Bvarref+4: case Bvarref+5: | |
| 1945 arg = opcode - Bvarref; | |
| 1946 do_varref: | |
| 1947 check_constants_index (arg, constants); | |
| 1948 val = XVECTOR_DATA (constants) [arg]; | |
| 1949 if (!SYMBOLP (val)) | |
| 563 | 1950 invalid_byte_code ("variable reference to non-symbol", val); |
| 428 | 1951 if (EQ (val, Qnil) || EQ (val, Qt) || (SYMBOL_IS_KEYWORD (val))) |
| 563 | 1952 invalid_byte_code ("variable reference to constant symbol", val); |
| 428 | 1953 WRITE_NARGS (Bvarref); |
| 1954 break; | |
| 1955 | |
| 1956 case Bvarset+7: READ_OPERAND_2; goto do_varset; | |
| 1957 case Bvarset+6: READ_OPERAND_1; goto do_varset; | |
| 1958 case Bvarset: case Bvarset+1: case Bvarset+2: | |
| 1959 case Bvarset+3: case Bvarset+4: case Bvarset+5: | |
| 1960 arg = opcode - Bvarset; | |
| 1961 do_varset: | |
| 1962 check_constants_index (arg, constants); | |
| 1963 val = XVECTOR_DATA (constants) [arg]; | |
| 1964 if (!SYMBOLP (val)) | |
| 563 | 1965 wtaerror ("attempt to set non-symbol", val); |
| 428 | 1966 if (EQ (val, Qnil) || EQ (val, Qt)) |
| 563 | 1967 signal_error (Qsetting_constant, 0, val); |
|
5370
4c4b96b13f70
Address the easy test failures in tests/automated.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5307
diff
changeset
|
1968 #ifdef NEED_TO_HANDLE_21_4_CODE |
| 428 | 1969 /* Ignore assignments to keywords by converting to Bdiscard. |
|
5370
4c4b96b13f70
Address the easy test failures in tests/automated.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5307
diff
changeset
|
1970 For backward compatibility only - we'd like to make this an |
|
4c4b96b13f70
Address the easy test failures in tests/automated.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5307
diff
changeset
|
1971 error. */ |
| 428 | 1972 if (SYMBOL_IS_KEYWORD (val)) |
| 1973 REWRITE_OPCODE (Bdiscard); | |
| 1974 else | |
|
5370
4c4b96b13f70
Address the easy test failures in tests/automated.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5307
diff
changeset
|
1975 #endif |
| 428 | 1976 WRITE_NARGS (Bvarset); |
| 1977 break; | |
| 1978 | |
| 1979 case Bvarbind+7: READ_OPERAND_2; goto do_varbind; | |
| 1980 case Bvarbind+6: READ_OPERAND_1; goto do_varbind; | |
| 1981 case Bvarbind: case Bvarbind+1: case Bvarbind+2: | |
| 1982 case Bvarbind+3: case Bvarbind+4: case Bvarbind+5: | |
| 1983 arg = opcode - Bvarbind; | |
| 1984 do_varbind: | |
| 1985 (*varbind_count)++; | |
| 1986 check_constants_index (arg, constants); | |
| 1987 val = XVECTOR_DATA (constants) [arg]; | |
| 1988 if (!SYMBOLP (val)) | |
| 563 | 1989 wtaerror ("attempt to let-bind non-symbol", val); |
| 428 | 1990 if (EQ (val, Qnil) || EQ (val, Qt) || (SYMBOL_IS_KEYWORD (val))) |
| 563 | 1991 signal_error (Qsetting_constant, |
| 1992 "attempt to let-bind constant symbol", val); | |
| 428 | 1993 WRITE_NARGS (Bvarbind); |
| 1994 break; | |
| 1995 | |
| 1996 case Bcall+7: READ_OPERAND_2; goto do_call; | |
| 1997 case Bcall+6: READ_OPERAND_1; goto do_call; | |
| 1998 case Bcall: case Bcall+1: case Bcall+2: | |
| 1999 case Bcall+3: case Bcall+4: case Bcall+5: | |
| 2000 arg = opcode - Bcall; | |
| 2001 do_call: | |
| 2002 WRITE_NARGS (Bcall); | |
| 2003 break; | |
| 2004 | |
| 2005 case Bunbind+7: READ_OPERAND_2; goto do_unbind; | |
| 2006 case Bunbind+6: READ_OPERAND_1; goto do_unbind; | |
| 2007 case Bunbind: case Bunbind+1: case Bunbind+2: | |
| 2008 case Bunbind+3: case Bunbind+4: case Bunbind+5: | |
| 2009 arg = opcode - Bunbind; | |
| 2010 do_unbind: | |
| 2011 WRITE_NARGS (Bunbind); | |
| 2012 break; | |
| 2013 | |
| 2014 case Bgoto: | |
| 2015 case Bgotoifnil: | |
| 2016 case Bgotoifnonnil: | |
| 2017 case Bgotoifnilelsepop: | |
| 2018 case Bgotoifnonnilelsepop: | |
| 2019 READ_OPERAND_2; | |
| 2020 /* Make program_ptr-relative */ | |
| 2021 arg += icounts - (icounts_ptr - argsize); | |
| 2022 goto do_jump; | |
| 2023 | |
| 2024 case BRgoto: | |
| 2025 case BRgotoifnil: | |
| 2026 case BRgotoifnonnil: | |
| 2027 case BRgotoifnilelsepop: | |
| 2028 case BRgotoifnonnilelsepop: | |
| 2029 READ_OPERAND_1; | |
| 2030 /* Make program_ptr-relative */ | |
| 2031 arg -= 127; | |
| 2032 do_jump: | |
| 2033 /* Record program-relative goto addresses in `jumps' table */ | |
| 2034 jumps_ptr->from = icounts_ptr - icounts - argsize; | |
| 2035 jumps_ptr->to = jumps_ptr->from + arg; | |
| 2036 jumps_ptr++; | |
| 2037 if (arg >= -1 && arg <= argsize) | |
| 563 | 2038 invalid_byte_code ("goto instruction is its own target", Qunbound); |
| 428 | 2039 if (arg <= SCHAR_MIN || |
| 2040 arg > SCHAR_MAX) | |
| 2041 { | |
| 2042 if (argsize == 1) | |
| 2043 REWRITE_OPCODE (opcode + Bgoto - BRgoto); | |
| 2044 WRITE_INT16 (arg, program_ptr); | |
| 2045 } | |
| 2046 else | |
| 2047 { | |
| 2048 if (argsize == 2) | |
| 2049 REWRITE_OPCODE (opcode + BRgoto - Bgoto); | |
| 2050 WRITE_INT8 (arg, program_ptr); | |
| 2051 } | |
| 2052 break; | |
| 2053 | |
| 2054 case Bconstant2: | |
| 2055 READ_OPERAND_2; | |
| 2056 WRITE_CONSTANT; | |
| 2057 break; | |
| 2058 | |
| 2059 case BlistN: | |
| 2060 case BconcatN: | |
| 2061 case BinsertN: | |
| 2062 READ_OPERAND_1; | |
| 2063 WRITE_INT8 (arg, program_ptr); | |
| 2064 break; | |
| 2065 | |
| 2066 default: | |
| 2067 if (opcode < Bconstant) | |
| 2068 check_opcode (opcode); | |
| 2069 else | |
| 2070 { | |
| 2071 arg = opcode - Bconstant; | |
| 2072 WRITE_CONSTANT; | |
| 2073 } | |
| 2074 break; | |
| 2075 } | |
| 2076 } | |
| 2077 | |
| 2078 /* Fix up jumps table to refer to NEW offsets. */ | |
| 2079 { | |
| 2080 struct jump *j; | |
| 2081 for (j = jumps; j < jumps_ptr; j++) | |
| 2082 { | |
| 2083 #ifdef ERROR_CHECK_BYTE_CODE | |
| 2084 assert (j->from < icounts_ptr - icounts); | |
| 2085 assert (j->to < icounts_ptr - icounts); | |
| 2086 #endif | |
| 2087 j->from = icounts[j->from]; | |
| 2088 j->to = icounts[j->to]; | |
| 2089 #ifdef ERROR_CHECK_BYTE_CODE | |
| 2090 assert (j->from < program_ptr - program); | |
| 2091 assert (j->to < program_ptr - program); | |
| 2092 check_opcode ((Opcode) (program[j->from-1])); | |
| 2093 #endif | |
| 2094 check_opcode ((Opcode) (program[j->to])); | |
| 2095 } | |
| 2096 } | |
| 2097 | |
| 2098 /* Fixup jumps in byte-code until no more fixups needed */ | |
| 2099 { | |
| 2100 int more_fixups_needed = 1; | |
| 2101 | |
| 2102 while (more_fixups_needed) | |
| 2103 { | |
| 2104 struct jump *j; | |
| 2105 more_fixups_needed = 0; | |
| 2106 for (j = jumps; j < jumps_ptr; j++) | |
| 2107 { | |
| 2108 int from = j->from; | |
| 2109 int to = j->to; | |
| 2110 int jump = to - from; | |
| 2111 Opbyte *p = program + from; | |
| 2112 Opcode opcode = (Opcode) p[-1]; | |
| 2113 if (!more_fixups_needed) | |
| 2114 check_opcode ((Opcode) p[jump]); | |
| 2115 assert (to >= 0 && program + to < program_ptr); | |
| 2116 switch (opcode) | |
| 2117 { | |
| 2118 case Bgoto: | |
| 2119 case Bgotoifnil: | |
| 2120 case Bgotoifnonnil: | |
| 2121 case Bgotoifnilelsepop: | |
| 2122 case Bgotoifnonnilelsepop: | |
| 2123 WRITE_INT16 (jump, p); | |
| 2124 break; | |
| 2125 | |
| 2126 case BRgoto: | |
| 2127 case BRgotoifnil: | |
| 2128 case BRgotoifnonnil: | |
| 2129 case BRgotoifnilelsepop: | |
| 2130 case BRgotoifnonnilelsepop: | |
| 2131 if (jump > SCHAR_MIN && | |
| 2132 jump <= SCHAR_MAX) | |
| 2133 { | |
| 2134 WRITE_INT8 (jump, p); | |
| 2135 } | |
| 2136 else /* barf */ | |
| 2137 { | |
| 2138 struct jump *jj; | |
| 2139 for (jj = jumps; jj < jumps_ptr; jj++) | |
| 2140 { | |
| 2141 assert (jj->from < program_ptr - program); | |
| 2142 assert (jj->to < program_ptr - program); | |
| 2143 if (jj->from > from) jj->from++; | |
| 2144 if (jj->to > from) jj->to++; | |
| 2145 } | |
| 2146 p[-1] += Bgoto - BRgoto; | |
| 2147 more_fixups_needed = 1; | |
| 2148 memmove (p+1, p, program_ptr++ - p); | |
| 2149 WRITE_INT16 (jump, p); | |
| 2150 } | |
| 2151 break; | |
| 2152 | |
| 2153 default: | |
| 2500 | 2154 ABORT(); |
| 428 | 2155 break; |
| 2156 } | |
| 2157 } | |
| 2158 } | |
| 2159 } | |
| 2160 | |
| 2161 /* *program_ptr++ = 0; */ | |
| 2162 *program_length = program_ptr - program; | |
| 2163 } | |
| 2164 | |
| 2165 /* Optimize the byte code and store the optimized program, only | |
| 2166 understood by bytecode.c, in an opaque object in the | |
| 2167 instructions slot of the Compiled_Function object. */ | |
| 2168 void | |
| 2169 optimize_compiled_function (Lisp_Object compiled_function) | |
| 2170 { | |
| 2171 Lisp_Compiled_Function *f = XCOMPILED_FUNCTION (compiled_function); | |
|
4921
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
2172 Elemcount program_length; |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
2173 Elemcount varbind_count; |
| 428 | 2174 Opbyte *program; |
| 2175 | |
| 1737 | 2176 { |
| 2177 int minargs = 0, maxargs = 0, totalargs = 0; | |
| 2178 int optional_p = 0, rest_p = 0, i = 0; | |
| 2179 { | |
| 2180 LIST_LOOP_2 (arg, f->arglist) | |
| 2181 { | |
| 2182 if (EQ (arg, Qand_optional)) | |
| 2183 optional_p = 1; | |
| 2184 else if (EQ (arg, Qand_rest)) | |
| 2185 rest_p = 1; | |
| 2186 else | |
| 2187 { | |
| 2188 if (rest_p) | |
| 2189 { | |
| 2190 maxargs = MANY; | |
| 2191 totalargs++; | |
| 2192 break; | |
| 2193 } | |
| 2194 if (!optional_p) | |
| 2195 minargs++; | |
| 2196 maxargs++; | |
| 2197 totalargs++; | |
| 2198 } | |
| 2199 } | |
| 2200 } | |
| 2201 | |
| 2202 if (totalargs) | |
| 3092 | 2203 #ifdef NEW_GC |
| 2204 f->arguments = make_compiled_function_args (totalargs); | |
| 2205 #else /* not NEW_GC */ | |
| 1737 | 2206 f->args = xnew_array (Lisp_Object, totalargs); |
| 3092 | 2207 #endif /* not NEW_GC */ |
| 1737 | 2208 |
| 2209 { | |
| 2210 LIST_LOOP_2 (arg, f->arglist) | |
| 2211 { | |
| 2212 if (!EQ (arg, Qand_optional) && !EQ (arg, Qand_rest)) | |
| 3092 | 2213 #ifdef NEW_GC |
| 2214 XCOMPILED_FUNCTION_ARGS_DATA (f->arguments)[i++] = arg; | |
| 2215 #else /* not NEW_GC */ | |
| 1737 | 2216 f->args[i++] = arg; |
| 3092 | 2217 #endif /* not NEW_GC */ |
| 1737 | 2218 } |
| 2219 } | |
| 2220 | |
| 2221 f->max_args = maxargs; | |
| 2222 f->min_args = minargs; | |
| 2223 f->args_in_array = totalargs; | |
| 2224 } | |
| 2225 | |
| 428 | 2226 /* If we have not actually read the bytecode string |
| 2227 and constants vector yet, fetch them from the file. */ | |
| 2228 if (CONSP (f->instructions)) | |
| 2229 Ffetch_bytecode (compiled_function); | |
| 2230 | |
| 2231 if (STRINGP (f->instructions)) | |
| 2232 { | |
| 826 | 2233 /* XSTRING_LENGTH() is more efficient than string_char_length(), |
| 428 | 2234 which would be slightly more `proper' */ |
| 2235 program = alloca_array (Opbyte, 1 + 2 * XSTRING_LENGTH (f->instructions)); | |
| 2236 optimize_byte_code (f->instructions, f->constants, | |
| 2237 program, &program_length, &varbind_count); | |
| 2500 | 2238 f->specpdl_depth = (unsigned short) (XINT (Flength (f->arglist)) + |
| 2239 varbind_count); | |
| 428 | 2240 f->instructions = |
| 440 | 2241 make_opaque (program, program_length * sizeof (Opbyte)); |
| 428 | 2242 } |
| 2243 | |
| 2244 assert (OPAQUEP (f->instructions)); | |
| 2245 } | |
| 2246 | |
| 2247 /************************************************************************/ | |
| 2248 /* The compiled-function object type */ | |
| 2249 /************************************************************************/ | |
| 3092 | 2250 |
| 428 | 2251 static void |
| 2252 print_compiled_function (Lisp_Object obj, Lisp_Object printcharfun, | |
| 2253 int escapeflag) | |
| 2254 { | |
| 2255 /* This function can GC */ | |
| 2256 Lisp_Compiled_Function *f = | |
| 2257 XCOMPILED_FUNCTION (obj); /* GC doesn't relocate */ | |
| 2258 int docp = f->flags.documentationp; | |
| 2259 int intp = f->flags.interactivep; | |
| 2260 struct gcpro gcpro1, gcpro2; | |
| 2261 GCPRO2 (obj, printcharfun); | |
| 2262 | |
|
5146
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5128
diff
changeset
|
2263 write_ascstring (printcharfun, print_readably ? "#[" : |
|
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5128
diff
changeset
|
2264 "#<compiled-function "); |
| 428 | 2265 #ifdef COMPILED_FUNCTION_ANNOTATION_HACK |
| 2266 if (!print_readably) | |
| 2267 { | |
| 2268 Lisp_Object ann = compiled_function_annotation (f); | |
| 2269 if (!NILP (ann)) | |
| 800 | 2270 write_fmt_string_lisp (printcharfun, "(from %S) ", 1, ann); |
| 428 | 2271 } |
| 2272 #endif /* COMPILED_FUNCTION_ANNOTATION_HACK */ | |
| 2273 /* COMPILED_ARGLIST = 0 */ | |
| 2274 print_internal (compiled_function_arglist (f), printcharfun, escapeflag); | |
| 2275 | |
| 2276 /* COMPILED_INSTRUCTIONS = 1 */ | |
|
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4775
diff
changeset
|
2277 write_ascstring (printcharfun, " "); |
| 428 | 2278 { |
| 2279 struct gcpro ngcpro1; | |
| 2280 Lisp_Object instructions = compiled_function_instructions (f); | |
| 2281 NGCPRO1 (instructions); | |
| 2282 if (STRINGP (instructions) && !print_readably) | |
| 2283 { | |
| 2284 /* We don't usually want to see that junk in the bytecode. */ | |
| 800 | 2285 write_fmt_string (printcharfun, "\"...(%ld)\"", |
| 826 | 2286 (long) string_char_length (instructions)); |
| 428 | 2287 } |
| 2288 else | |
| 2289 print_internal (instructions, printcharfun, escapeflag); | |
| 2290 NUNGCPRO; | |
| 2291 } | |
| 2292 | |
| 2293 /* COMPILED_CONSTANTS = 2 */ | |
|
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4775
diff
changeset
|
2294 write_ascstring (printcharfun, " "); |
| 428 | 2295 print_internal (compiled_function_constants (f), printcharfun, escapeflag); |
| 2296 | |
| 2297 /* COMPILED_STACK_DEPTH = 3 */ | |
| 800 | 2298 write_fmt_string (printcharfun, " %d", compiled_function_stack_depth (f)); |
| 428 | 2299 |
| 2300 /* COMPILED_DOC_STRING = 4 */ | |
| 2301 if (docp || intp) | |
| 2302 { | |
|
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4775
diff
changeset
|
2303 write_ascstring (printcharfun, " "); |
| 428 | 2304 print_internal (compiled_function_documentation (f), printcharfun, |
| 2305 escapeflag); | |
| 2306 } | |
| 2307 | |
| 2308 /* COMPILED_INTERACTIVE = 5 */ | |
| 2309 if (intp) | |
| 2310 { | |
|
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4775
diff
changeset
|
2311 write_ascstring (printcharfun, " "); |
| 428 | 2312 print_internal (compiled_function_interactive (f), printcharfun, |
| 2313 escapeflag); | |
| 2314 } | |
| 2315 | |
| 2316 UNGCPRO; | |
|
5146
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5128
diff
changeset
|
2317 if (print_readably) |
|
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5128
diff
changeset
|
2318 write_ascstring (printcharfun, "]"); |
|
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5128
diff
changeset
|
2319 else |
|
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5128
diff
changeset
|
2320 write_fmt_string (printcharfun, " 0x%x>", LISP_OBJECT_UID (obj)); |
| 428 | 2321 } |
| 2322 | |
| 2323 | |
| 2324 static Lisp_Object | |
| 2325 mark_compiled_function (Lisp_Object obj) | |
| 2326 { | |
| 2327 Lisp_Compiled_Function *f = XCOMPILED_FUNCTION (obj); | |
| 814 | 2328 int i; |
| 428 | 2329 |
| 2330 mark_object (f->instructions); | |
| 2331 mark_object (f->arglist); | |
| 2332 mark_object (f->doc_and_interactive); | |
| 2333 #ifdef COMPILED_FUNCTION_ANNOTATION_HACK | |
| 2334 mark_object (f->annotated); | |
| 2335 #endif | |
| 814 | 2336 for (i = 0; i < f->args_in_array; i++) |
| 3092 | 2337 #ifdef NEW_GC |
| 2338 mark_object (XCOMPILED_FUNCTION_ARGS_DATA (f->arguments)[i]); | |
| 2339 #else /* not NEW_GC */ | |
| 814 | 2340 mark_object (f->args[i]); |
| 3092 | 2341 #endif /* not NEW_GC */ |
| 814 | 2342 |
| 428 | 2343 /* tail-recurse on constants */ |
| 2344 return f->constants; | |
| 2345 } | |
| 2346 | |
| 2347 static int | |
|
4906
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
2348 compiled_function_equal (Lisp_Object obj1, Lisp_Object obj2, int depth, |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
2349 int UNUSED (foldcase)) |
| 428 | 2350 { |
| 2351 Lisp_Compiled_Function *f1 = XCOMPILED_FUNCTION (obj1); | |
| 2352 Lisp_Compiled_Function *f2 = XCOMPILED_FUNCTION (obj2); | |
| 2353 return | |
| 2354 (f1->flags.documentationp == f2->flags.documentationp && | |
| 2355 f1->flags.interactivep == f2->flags.interactivep && | |
| 2356 f1->flags.domainp == f2->flags.domainp && /* I18N3 */ | |
| 2357 internal_equal (compiled_function_instructions (f1), | |
| 2358 compiled_function_instructions (f2), depth + 1) && | |
| 2359 internal_equal (f1->constants, f2->constants, depth + 1) && | |
| 2360 internal_equal (f1->arglist, f2->arglist, depth + 1) && | |
| 2361 internal_equal (f1->doc_and_interactive, | |
| 2362 f2->doc_and_interactive, depth + 1)); | |
| 2363 } | |
| 2364 | |
| 665 | 2365 static Hashcode |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5146
diff
changeset
|
2366 compiled_function_hash (Lisp_Object obj, int depth, Boolint UNUSED (equalp)) |
| 428 | 2367 { |
| 2368 Lisp_Compiled_Function *f = XCOMPILED_FUNCTION (obj); | |
| 2369 return HASH3 ((f->flags.documentationp << 2) + | |
| 2370 (f->flags.interactivep << 1) + | |
| 2371 f->flags.domainp, | |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5146
diff
changeset
|
2372 internal_hash (f->instructions, depth + 1, 0), |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5146
diff
changeset
|
2373 internal_hash (f->constants, depth + 1, 0)); |
| 428 | 2374 } |
| 2375 | |
| 1204 | 2376 static const struct memory_description compiled_function_description[] = { |
| 814 | 2377 { XD_INT, offsetof (Lisp_Compiled_Function, args_in_array) }, |
| 3092 | 2378 #ifdef NEW_GC |
| 2379 { XD_LISP_OBJECT, offsetof (Lisp_Compiled_Function, arguments) }, | |
| 2380 #else /* not NEW_GC */ | |
| 2381 { XD_BLOCK_PTR, offsetof (Lisp_Compiled_Function, args), | |
| 2551 | 2382 XD_INDIRECT (0, 0), { &lisp_object_description } }, |
| 3092 | 2383 #endif /* not NEW_GC */ |
| 440 | 2384 { XD_LISP_OBJECT, offsetof (Lisp_Compiled_Function, instructions) }, |
| 2385 { XD_LISP_OBJECT, offsetof (Lisp_Compiled_Function, constants) }, | |
| 2386 { XD_LISP_OBJECT, offsetof (Lisp_Compiled_Function, arglist) }, | |
| 2387 { XD_LISP_OBJECT, offsetof (Lisp_Compiled_Function, doc_and_interactive) }, | |
| 428 | 2388 #ifdef COMPILED_FUNCTION_ANNOTATION_HACK |
| 440 | 2389 { XD_LISP_OBJECT, offsetof (Lisp_Compiled_Function, annotated) }, |
| 428 | 2390 #endif |
| 2391 { XD_END } | |
| 2392 }; | |
| 2393 | |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
2394 DEFINE_DUMPABLE_FROB_BLOCK_LISP_OBJECT ("compiled-function", compiled_function, |
|
5124
623d57b7fbe8
separate regular and disksave finalization, print method fixes.
Ben Wing <ben@xemacs.org>
parents:
5118
diff
changeset
|
2395 mark_compiled_function, |
|
623d57b7fbe8
separate regular and disksave finalization, print method fixes.
Ben Wing <ben@xemacs.org>
parents:
5118
diff
changeset
|
2396 print_compiled_function, 0, |
|
623d57b7fbe8
separate regular and disksave finalization, print method fixes.
Ben Wing <ben@xemacs.org>
parents:
5118
diff
changeset
|
2397 compiled_function_equal, |
|
623d57b7fbe8
separate regular and disksave finalization, print method fixes.
Ben Wing <ben@xemacs.org>
parents:
5118
diff
changeset
|
2398 compiled_function_hash, |
|
623d57b7fbe8
separate regular and disksave finalization, print method fixes.
Ben Wing <ben@xemacs.org>
parents:
5118
diff
changeset
|
2399 compiled_function_description, |
|
623d57b7fbe8
separate regular and disksave finalization, print method fixes.
Ben Wing <ben@xemacs.org>
parents:
5118
diff
changeset
|
2400 Lisp_Compiled_Function); |
| 3092 | 2401 |
| 428 | 2402 |
| 2403 DEFUN ("compiled-function-p", Fcompiled_function_p, 1, 1, 0, /* | |
| 2404 Return t if OBJECT is a byte-compiled function object. | |
| 2405 */ | |
| 2406 (object)) | |
| 2407 { | |
| 2408 return COMPILED_FUNCTIONP (object) ? Qt : Qnil; | |
| 2409 } | |
| 2410 | |
| 2411 /************************************************************************/ | |
| 2412 /* compiled-function object accessor functions */ | |
| 2413 /************************************************************************/ | |
| 2414 | |
| 2415 Lisp_Object | |
| 2416 compiled_function_arglist (Lisp_Compiled_Function *f) | |
| 2417 { | |
| 2418 return f->arglist; | |
| 2419 } | |
| 2420 | |
| 2421 Lisp_Object | |
| 2422 compiled_function_instructions (Lisp_Compiled_Function *f) | |
| 2423 { | |
| 2424 if (! OPAQUEP (f->instructions)) | |
| 2425 return f->instructions; | |
| 2426 | |
| 2427 { | |
| 2428 /* Invert action performed by optimize_byte_code() */ | |
| 2429 Lisp_Opaque *opaque = XOPAQUE (f->instructions); | |
| 2430 | |
| 867 | 2431 Ibyte * const buffer = |
| 2367 | 2432 alloca_ibytes (OPAQUE_SIZE (opaque) * MAX_ICHAR_LEN); |
| 867 | 2433 Ibyte *bp = buffer; |
| 428 | 2434 |
| 442 | 2435 const Opbyte * const program = (const Opbyte *) OPAQUE_DATA (opaque); |
| 2436 const Opbyte *program_ptr = program; | |
| 2437 const Opbyte * const program_end = program_ptr + OPAQUE_SIZE (opaque); | |
| 428 | 2438 |
| 2439 while (program_ptr < program_end) | |
| 2440 { | |
| 2441 Opcode opcode = (Opcode) READ_UINT_1; | |
| 867 | 2442 bp += set_itext_ichar (bp, opcode); |
| 428 | 2443 switch (opcode) |
| 2444 { | |
| 2445 case Bvarref+7: | |
| 2446 case Bvarset+7: | |
| 2447 case Bvarbind+7: | |
| 2448 case Bcall+7: | |
| 2449 case Bunbind+7: | |
| 2450 case Bconstant2: | |
| 867 | 2451 bp += set_itext_ichar (bp, READ_UINT_1); |
| 2452 bp += set_itext_ichar (bp, READ_UINT_1); | |
| 428 | 2453 break; |
| 2454 | |
| 2455 case Bvarref+6: | |
| 2456 case Bvarset+6: | |
| 2457 case Bvarbind+6: | |
| 2458 case Bcall+6: | |
| 2459 case Bunbind+6: | |
| 2460 case BlistN: | |
| 2461 case BconcatN: | |
| 2462 case BinsertN: | |
| 867 | 2463 bp += set_itext_ichar (bp, READ_UINT_1); |
| 428 | 2464 break; |
| 2465 | |
| 2466 case Bgoto: | |
| 2467 case Bgotoifnil: | |
| 2468 case Bgotoifnonnil: | |
| 2469 case Bgotoifnilelsepop: | |
| 2470 case Bgotoifnonnilelsepop: | |
| 2471 { | |
| 2472 int jump = READ_INT_2; | |
| 2473 Opbyte buf2[2]; | |
| 2474 Opbyte *buf2p = buf2; | |
| 2475 /* Convert back to program-relative address */ | |
| 2476 WRITE_INT16 (jump + (program_ptr - 2 - program), buf2p); | |
| 867 | 2477 bp += set_itext_ichar (bp, buf2[0]); |
| 2478 bp += set_itext_ichar (bp, buf2[1]); | |
| 428 | 2479 break; |
| 2480 } | |
| 2481 | |
| 2482 case BRgoto: | |
| 2483 case BRgotoifnil: | |
| 2484 case BRgotoifnonnil: | |
| 2485 case BRgotoifnilelsepop: | |
| 2486 case BRgotoifnonnilelsepop: | |
| 867 | 2487 bp += set_itext_ichar (bp, READ_INT_1 + 127); |
| 428 | 2488 break; |
| 2489 | |
| 2490 default: | |
| 2491 break; | |
| 2492 } | |
| 2493 } | |
| 2494 return make_string (buffer, bp - buffer); | |
| 2495 } | |
| 2496 } | |
| 2497 | |
| 2498 Lisp_Object | |
| 2499 compiled_function_constants (Lisp_Compiled_Function *f) | |
| 2500 { | |
| 2501 return f->constants; | |
| 2502 } | |
| 2503 | |
| 2504 int | |
| 2505 compiled_function_stack_depth (Lisp_Compiled_Function *f) | |
| 2506 { | |
| 2507 return f->stack_depth; | |
| 2508 } | |
| 2509 | |
| 2510 /* The compiled_function->doc_and_interactive slot uses the minimal | |
| 2511 number of conses, based on compiled_function->flags; it may take | |
| 2512 any of the following forms: | |
| 2513 | |
| 2514 doc | |
| 2515 interactive | |
| 2516 domain | |
| 2517 (doc . interactive) | |
| 2518 (doc . domain) | |
| 2519 (interactive . domain) | |
| 2520 (doc . (interactive . domain)) | |
| 2521 */ | |
| 2522 | |
| 2523 /* Caller must check flags.interactivep first */ | |
| 2524 Lisp_Object | |
| 2525 compiled_function_interactive (Lisp_Compiled_Function *f) | |
| 2526 { | |
| 2527 assert (f->flags.interactivep); | |
| 2528 if (f->flags.documentationp && f->flags.domainp) | |
| 2529 return XCAR (XCDR (f->doc_and_interactive)); | |
| 2530 else if (f->flags.documentationp) | |
| 2531 return XCDR (f->doc_and_interactive); | |
| 2532 else if (f->flags.domainp) | |
| 2533 return XCAR (f->doc_and_interactive); | |
| 2534 else | |
| 2535 return f->doc_and_interactive; | |
| 2536 } | |
| 2537 | |
| 2538 /* Caller need not check flags.documentationp first */ | |
| 2539 Lisp_Object | |
| 2540 compiled_function_documentation (Lisp_Compiled_Function *f) | |
| 2541 { | |
| 2542 if (! f->flags.documentationp) | |
| 2543 return Qnil; | |
| 2544 else if (f->flags.interactivep && f->flags.domainp) | |
| 2545 return XCAR (f->doc_and_interactive); | |
| 2546 else if (f->flags.interactivep) | |
| 2547 return XCAR (f->doc_and_interactive); | |
| 2548 else if (f->flags.domainp) | |
| 2549 return XCAR (f->doc_and_interactive); | |
| 2550 else | |
| 2551 return f->doc_and_interactive; | |
| 2552 } | |
| 2553 | |
| 2554 /* Caller need not check flags.domainp first */ | |
| 2555 Lisp_Object | |
| 2556 compiled_function_domain (Lisp_Compiled_Function *f) | |
| 2557 { | |
| 2558 if (! f->flags.domainp) | |
| 2559 return Qnil; | |
| 2560 else if (f->flags.documentationp && f->flags.interactivep) | |
| 2561 return XCDR (XCDR (f->doc_and_interactive)); | |
| 2562 else if (f->flags.documentationp) | |
| 2563 return XCDR (f->doc_and_interactive); | |
| 2564 else if (f->flags.interactivep) | |
| 2565 return XCDR (f->doc_and_interactive); | |
| 2566 else | |
| 2567 return f->doc_and_interactive; | |
| 2568 } | |
| 2569 | |
| 2570 #ifdef COMPILED_FUNCTION_ANNOTATION_HACK | |
| 2571 | |
| 2572 Lisp_Object | |
| 2573 compiled_function_annotation (Lisp_Compiled_Function *f) | |
| 2574 { | |
| 2575 return f->annotated; | |
| 2576 } | |
| 2577 | |
| 2578 #endif | |
| 2579 | |
|
5206
39d74978fd32
Keep around file info for dumped functions and variables without docstrings.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5191
diff
changeset
|
2580 /* used only by Snarf-documentation. */ |
| 428 | 2581 void |
| 2582 set_compiled_function_documentation (Lisp_Compiled_Function *f, | |
| 2583 Lisp_Object new_doc) | |
| 2584 { | |
| 2585 assert (INTP (new_doc) || STRINGP (new_doc)); | |
| 2586 | |
|
5206
39d74978fd32
Keep around file info for dumped functions and variables without docstrings.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5191
diff
changeset
|
2587 if (f->flags.documentationp) |
|
39d74978fd32
Keep around file info for dumped functions and variables without docstrings.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5191
diff
changeset
|
2588 { |
|
39d74978fd32
Keep around file info for dumped functions and variables without docstrings.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5191
diff
changeset
|
2589 if (f->flags.interactivep && f->flags.domainp) |
|
39d74978fd32
Keep around file info for dumped functions and variables without docstrings.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5191
diff
changeset
|
2590 XCAR (f->doc_and_interactive) = new_doc; |
|
39d74978fd32
Keep around file info for dumped functions and variables without docstrings.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5191
diff
changeset
|
2591 else if (f->flags.interactivep) |
|
39d74978fd32
Keep around file info for dumped functions and variables without docstrings.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5191
diff
changeset
|
2592 XCAR (f->doc_and_interactive) = new_doc; |
|
39d74978fd32
Keep around file info for dumped functions and variables without docstrings.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5191
diff
changeset
|
2593 else if (f->flags.domainp) |
|
39d74978fd32
Keep around file info for dumped functions and variables without docstrings.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5191
diff
changeset
|
2594 XCAR (f->doc_and_interactive) = new_doc; |
|
39d74978fd32
Keep around file info for dumped functions and variables without docstrings.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5191
diff
changeset
|
2595 else |
|
39d74978fd32
Keep around file info for dumped functions and variables without docstrings.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5191
diff
changeset
|
2596 f->doc_and_interactive = new_doc; |
|
39d74978fd32
Keep around file info for dumped functions and variables without docstrings.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5191
diff
changeset
|
2597 } |
| 428 | 2598 else |
|
5206
39d74978fd32
Keep around file info for dumped functions and variables without docstrings.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5191
diff
changeset
|
2599 { |
|
39d74978fd32
Keep around file info for dumped functions and variables without docstrings.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5191
diff
changeset
|
2600 f->flags.documentationp = 1; |
|
39d74978fd32
Keep around file info for dumped functions and variables without docstrings.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5191
diff
changeset
|
2601 if (f->flags.interactivep || f->flags.domainp) |
|
39d74978fd32
Keep around file info for dumped functions and variables without docstrings.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5191
diff
changeset
|
2602 { |
|
39d74978fd32
Keep around file info for dumped functions and variables without docstrings.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5191
diff
changeset
|
2603 f->doc_and_interactive = Fcons (new_doc, f->doc_and_interactive); |
|
39d74978fd32
Keep around file info for dumped functions and variables without docstrings.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5191
diff
changeset
|
2604 } |
|
39d74978fd32
Keep around file info for dumped functions and variables without docstrings.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5191
diff
changeset
|
2605 else |
|
39d74978fd32
Keep around file info for dumped functions and variables without docstrings.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5191
diff
changeset
|
2606 { |
|
39d74978fd32
Keep around file info for dumped functions and variables without docstrings.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5191
diff
changeset
|
2607 f->doc_and_interactive = new_doc; |
|
39d74978fd32
Keep around file info for dumped functions and variables without docstrings.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5191
diff
changeset
|
2608 } |
|
39d74978fd32
Keep around file info for dumped functions and variables without docstrings.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5191
diff
changeset
|
2609 } |
| 428 | 2610 } |
| 2611 | |
| 2612 | |
| 2613 DEFUN ("compiled-function-arglist", Fcompiled_function_arglist, 1, 1, 0, /* | |
| 2614 Return the argument list of the compiled-function object FUNCTION. | |
| 2615 */ | |
| 2616 (function)) | |
| 2617 { | |
| 2618 CHECK_COMPILED_FUNCTION (function); | |
| 2619 return compiled_function_arglist (XCOMPILED_FUNCTION (function)); | |
| 2620 } | |
| 2621 | |
| 2622 DEFUN ("compiled-function-instructions", Fcompiled_function_instructions, 1, 1, 0, /* | |
| 2623 Return the byte-opcode string of the compiled-function object FUNCTION. | |
| 2624 */ | |
| 2625 (function)) | |
| 2626 { | |
| 2627 CHECK_COMPILED_FUNCTION (function); | |
| 2628 return compiled_function_instructions (XCOMPILED_FUNCTION (function)); | |
| 2629 } | |
| 2630 | |
| 2631 DEFUN ("compiled-function-constants", Fcompiled_function_constants, 1, 1, 0, /* | |
| 2632 Return the constants vector of the compiled-function object FUNCTION. | |
| 2633 */ | |
| 2634 (function)) | |
| 2635 { | |
| 2636 CHECK_COMPILED_FUNCTION (function); | |
| 2637 return compiled_function_constants (XCOMPILED_FUNCTION (function)); | |
| 2638 } | |
| 2639 | |
| 2640 DEFUN ("compiled-function-stack-depth", Fcompiled_function_stack_depth, 1, 1, 0, /* | |
| 444 | 2641 Return the maximum stack depth of the compiled-function object FUNCTION. |
| 428 | 2642 */ |
| 2643 (function)) | |
| 2644 { | |
| 2645 CHECK_COMPILED_FUNCTION (function); | |
| 2646 return make_int (compiled_function_stack_depth (XCOMPILED_FUNCTION (function))); | |
| 2647 } | |
| 2648 | |
| 2649 DEFUN ("compiled-function-doc-string", Fcompiled_function_doc_string, 1, 1, 0, /* | |
| 2650 Return the doc string of the compiled-function object FUNCTION, if available. | |
| 2651 Functions that had their doc strings snarfed into the DOC file will have | |
| 2652 an integer returned instead of a string. | |
| 2653 */ | |
| 2654 (function)) | |
| 2655 { | |
| 2656 CHECK_COMPILED_FUNCTION (function); | |
| 2657 return compiled_function_documentation (XCOMPILED_FUNCTION (function)); | |
| 2658 } | |
| 2659 | |
| 2660 DEFUN ("compiled-function-interactive", Fcompiled_function_interactive, 1, 1, 0, /* | |
| 2661 Return the interactive spec of the compiled-function object FUNCTION, or nil. | |
| 2662 If non-nil, the return value will be a list whose first element is | |
| 2663 `interactive' and whose second element is the interactive spec. | |
| 2664 */ | |
| 2665 (function)) | |
| 2666 { | |
| 2667 CHECK_COMPILED_FUNCTION (function); | |
| 2668 return XCOMPILED_FUNCTION (function)->flags.interactivep | |
| 2669 ? list2 (Qinteractive, | |
| 2670 compiled_function_interactive (XCOMPILED_FUNCTION (function))) | |
| 2671 : Qnil; | |
| 2672 } | |
| 2673 | |
| 2674 #ifdef COMPILED_FUNCTION_ANNOTATION_HACK | |
| 2675 | |
| 826 | 2676 DEFUN ("compiled-function-annotation", Fcompiled_function_annotation, 1, 1, 0, /* |
| 428 | 2677 Return the annotation of the compiled-function object FUNCTION, or nil. |
| 2678 The annotation is a piece of information indicating where this | |
| 2679 compiled-function object came from. Generally this will be | |
| 2680 a symbol naming a function; or a string naming a file, if the | |
| 2681 compiled-function object was not defined in a function; or nil, | |
| 2682 if the compiled-function object was not created as a result of | |
| 2683 a `load'. | |
| 2684 */ | |
| 2685 (function)) | |
| 2686 { | |
| 2687 CHECK_COMPILED_FUNCTION (function); | |
| 2688 return compiled_function_annotation (XCOMPILED_FUNCTION (function)); | |
| 2689 } | |
| 2690 | |
| 2691 #endif /* COMPILED_FUNCTION_ANNOTATION_HACK */ | |
| 2692 | |
| 2693 DEFUN ("compiled-function-domain", Fcompiled_function_domain, 1, 1, 0, /* | |
| 2694 Return the domain of the compiled-function object FUNCTION, or nil. | |
| 2695 This is only meaningful if I18N3 was enabled when emacs was compiled. | |
| 2696 */ | |
| 2697 (function)) | |
| 2698 { | |
| 2699 CHECK_COMPILED_FUNCTION (function); | |
| 2700 return XCOMPILED_FUNCTION (function)->flags.domainp | |
| 2701 ? compiled_function_domain (XCOMPILED_FUNCTION (function)) | |
| 2702 : Qnil; | |
| 2703 } | |
| 2704 | |
| 2705 | |
| 2706 | |
| 2707 DEFUN ("fetch-bytecode", Ffetch_bytecode, 1, 1, 0, /* | |
| 2708 If the byte code for compiled function FUNCTION is lazy-loaded, fetch it now. | |
| 2709 */ | |
| 2710 (function)) | |
| 2711 { | |
| 2712 Lisp_Compiled_Function *f; | |
| 2713 CHECK_COMPILED_FUNCTION (function); | |
| 2714 f = XCOMPILED_FUNCTION (function); | |
| 2715 | |
| 2716 if (OPAQUEP (f->instructions) || STRINGP (f->instructions)) | |
| 2717 return function; | |
| 2718 | |
| 2719 if (CONSP (f->instructions)) | |
| 2720 { | |
| 2721 Lisp_Object tem = read_doc_string (f->instructions); | |
| 2722 if (!CONSP (tem)) | |
| 563 | 2723 signal_error (Qinvalid_byte_code, |
| 2724 "Invalid lazy-loaded byte code", tem); | |
| 428 | 2725 /* v18 or v19 bytecode file. Need to Ebolify. */ |
| 2726 if (f->flags.ebolified && VECTORP (XCDR (tem))) | |
| 2727 ebolify_bytecode_constants (XCDR (tem)); | |
| 2728 f->instructions = XCAR (tem); | |
| 2729 f->constants = XCDR (tem); | |
| 2730 return function; | |
| 2731 } | |
| 2500 | 2732 ABORT (); |
| 801 | 2733 return Qnil; /* not (usually) reached */ |
| 428 | 2734 } |
| 2735 | |
| 2736 DEFUN ("optimize-compiled-function", Foptimize_compiled_function, 1, 1, 0, /* | |
| 2737 Convert compiled function FUNCTION into an optimized internal form. | |
| 2738 */ | |
| 2739 (function)) | |
| 2740 { | |
| 2741 Lisp_Compiled_Function *f; | |
| 2742 CHECK_COMPILED_FUNCTION (function); | |
| 2743 f = XCOMPILED_FUNCTION (function); | |
| 2744 | |
| 2745 if (OPAQUEP (f->instructions)) /* Already optimized? */ | |
| 2746 return Qnil; | |
| 2747 | |
| 2748 optimize_compiled_function (function); | |
| 2749 return Qnil; | |
| 2750 } | |
| 2751 | |
| 2752 DEFUN ("byte-code", Fbyte_code, 3, 3, 0, /* | |
| 2753 Function used internally in byte-compiled code. | |
| 2754 First argument INSTRUCTIONS is a string of byte code. | |
| 2755 Second argument CONSTANTS is a vector of constants. | |
| 2756 Third argument STACK-DEPTH is the maximum stack depth used in this function. | |
| 2757 If STACK-DEPTH is incorrect, Emacs may crash. | |
| 2758 */ | |
| 2759 (instructions, constants, stack_depth)) | |
| 2760 { | |
| 2761 /* This function can GC */ | |
|
4921
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
2762 Elemcount varbind_count; |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
2763 Elemcount program_length; |
| 428 | 2764 Opbyte *program; |
| 2765 | |
| 2766 CHECK_STRING (instructions); | |
| 2767 CHECK_VECTOR (constants); | |
|
5307
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5300
diff
changeset
|
2768 check_integer_range (stack_depth, Qzero, make_int (USHRT_MAX)); |
| 428 | 2769 |
| 2770 /* Optimize the `instructions' string, just like when executing a | |
| 2771 regular compiled function, but don't save it for later since this is | |
| 2772 likely to only be executed once. */ | |
| 2773 program = alloca_array (Opbyte, 1 + 2 * XSTRING_LENGTH (instructions)); | |
| 2774 optimize_byte_code (instructions, constants, program, | |
| 2775 &program_length, &varbind_count); | |
| 2776 SPECPDL_RESERVE (varbind_count); | |
| 2777 return execute_optimized_program (program, | |
|
4921
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
2778 #ifdef ERROR_CHECK_BYTE_CODE |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
2779 program_length, |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
2780 #endif |
| 428 | 2781 XINT (stack_depth), |
| 2782 XVECTOR_DATA (constants)); | |
| 2783 } | |
| 2784 | |
| 2785 | |
| 2786 void | |
| 2787 syms_of_bytecode (void) | |
| 2788 { | |
|
5117
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
2720
diff
changeset
|
2789 INIT_LISP_OBJECT (compiled_function); |
| 3092 | 2790 #ifdef NEW_GC |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
2791 INIT_LISP_OBJECT (compiled_function_args); |
| 3092 | 2792 #endif /* NEW_GC */ |
| 442 | 2793 |
| 2794 DEFERROR_STANDARD (Qinvalid_byte_code, Qinvalid_state); | |
| 563 | 2795 DEFSYMBOL (Qbyte_code); |
| 2796 DEFSYMBOL_MULTIWORD_PREDICATE (Qcompiled_functionp); | |
| 428 | 2797 |
| 2798 DEFSUBR (Fbyte_code); | |
| 2799 DEFSUBR (Ffetch_bytecode); | |
| 2800 DEFSUBR (Foptimize_compiled_function); | |
| 2801 | |
| 2802 DEFSUBR (Fcompiled_function_p); | |
| 2803 DEFSUBR (Fcompiled_function_instructions); | |
| 2804 DEFSUBR (Fcompiled_function_constants); | |
| 2805 DEFSUBR (Fcompiled_function_stack_depth); | |
| 2806 DEFSUBR (Fcompiled_function_arglist); | |
| 2807 DEFSUBR (Fcompiled_function_interactive); | |
| 2808 DEFSUBR (Fcompiled_function_doc_string); | |
| 2809 DEFSUBR (Fcompiled_function_domain); | |
| 2810 #ifdef COMPILED_FUNCTION_ANNOTATION_HACK | |
| 2811 DEFSUBR (Fcompiled_function_annotation); | |
| 2812 #endif | |
| 2813 | |
| 2814 #ifdef BYTE_CODE_METER | |
| 563 | 2815 DEFSYMBOL (Qbyte_code_meter); |
| 428 | 2816 #endif |
| 2817 } | |
| 2818 | |
| 2819 void | |
| 2820 vars_of_bytecode (void) | |
| 2821 { | |
| 2822 #ifdef BYTE_CODE_METER | |
| 2823 DEFVAR_LISP ("byte-code-meter", &Vbyte_code_meter /* | |
| 2824 A vector of vectors which holds a histogram of byte code usage. | |
| 2825 \(aref (aref byte-code-meter 0) CODE) indicates how many times the byte | |
| 2826 opcode CODE has been executed. | |
| 2827 \(aref (aref byte-code-meter CODE1) CODE2), where CODE1 is not 0, | |
| 2828 indicates how many times the byte opcodes CODE1 and CODE2 have been | |
| 2829 executed in succession. | |
| 2830 */ ); | |
| 2831 DEFVAR_BOOL ("byte-metering-on", &byte_metering_on /* | |
| 2832 If non-nil, keep profiling information on byte code usage. | |
| 2833 The variable `byte-code-meter' indicates how often each byte opcode is used. | |
| 2834 If a symbol has a property named `byte-code-meter' whose value is an | |
| 2835 integer, it is incremented each time that symbol's function is called. | |
| 2836 */ ); | |
| 2837 | |
| 2838 byte_metering_on = 0; | |
| 2839 Vbyte_code_meter = make_vector (256, Qzero); | |
| 2840 { | |
| 2841 int i = 256; | |
| 2842 while (i--) | |
| 2843 XVECTOR_DATA (Vbyte_code_meter)[i] = make_vector (256, Qzero); | |
| 2844 } | |
| 2845 #endif /* BYTE_CODE_METER */ | |
| 2846 } | |
|
4921
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
2847 |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
2848 #ifdef ERROR_CHECK_BYTE_CODE |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
2849 |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
2850 /* Initialize the opcodes in the table that correspond to a base opcode |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
2851 plus an offset (except for Bconstant). */ |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
2852 |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
2853 static void |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
2854 init_opcode_table_multi_op (Opcode op) |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
2855 { |
| 5091 | 2856 const Ascbyte *base = opcode_name_table[op]; |
|
4921
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
2857 Ascbyte temp[300]; |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
2858 int i; |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
2859 |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
2860 for (i = 1; i < 7; i++) |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
2861 { |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
2862 assert (!opcode_name_table[op + i]); |
| 5091 | 2863 sprintf (temp, "%s+%d", base, i); |
|
4921
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
2864 opcode_name_table[op + i] = xstrdup (temp); |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
2865 } |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
2866 } |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
2867 |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
2868 #endif /* ERROR_CHECK_BYTE_CODE */ |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
2869 |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
2870 void |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
2871 reinit_vars_of_bytecode (void) |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
2872 { |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
2873 #ifdef ERROR_CHECK_BYTE_CODE |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
2874 int i; |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
2875 |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
2876 #define OPCODE(sym, val) opcode_name_table[val] = xstrdup (#sym); |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
2877 #include "bytecode-ops.h" |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
2878 |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
2879 for (i = 0; i < countof (opcode_name_table); i++) |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
2880 { |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
2881 int j; |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
2882 Ascbyte *name = opcode_name_table[i]; |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
2883 if (name) |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
2884 { |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
2885 Bytecount len = strlen (name); |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
2886 /* Prettify the name by converting underscores to hyphens, similar |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
2887 to what happens with DEFSYMBOL. */ |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
2888 for (j = 0; j < len; j++) |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
2889 if (name[j] == '_') |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
2890 name[j] = '-'; |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
2891 } |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
2892 } |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
2893 |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
2894 init_opcode_table_multi_op (Bvarref); |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
2895 init_opcode_table_multi_op (Bvarset); |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
2896 init_opcode_table_multi_op (Bvarbind); |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
2897 init_opcode_table_multi_op (Bcall); |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
2898 init_opcode_table_multi_op (Bunbind); |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
2899 #endif /* ERROR_CHECK_BYTE_CODE */ |
|
17362f371cc2
add more byte-code assertions and better failure output
Ben Wing <ben@xemacs.org>
parents:
4914
diff
changeset
|
2900 } |