aboutsummaryrefslogtreecommitdiffstats
path: root/src/bytecode.c
diff options
context:
space:
mode:
authorKenichi Handa2012-07-17 07:25:00 +0900
committerKenichi Handa2012-07-17 07:25:00 +0900
commit69c41c4070c86baac11a627e9c3d366420aeb7cc (patch)
treee07fda92570b5e4f264c9a7869b57960940008f0 /src/bytecode.c
parent8c536f15bf95916d56bb50495d22b7da7e09fff9 (diff)
parent758e556a7ab8f61c007e34310ba399a9aaf15362 (diff)
downloademacs-69c41c4070c86baac11a627e9c3d366420aeb7cc.tar.gz
emacs-69c41c4070c86baac11a627e9c3d366420aeb7cc.zip
merge trunk
Diffstat (limited to 'src/bytecode.c')
-rw-r--r--src/bytecode.c1053
1 files changed, 588 insertions, 465 deletions
diff --git a/src/bytecode.c b/src/bytecode.c
index e2370254f36..acdf809971f 100644
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -35,8 +35,8 @@ by Hallvard:
35#include <config.h> 35#include <config.h>
36#include <setjmp.h> 36#include <setjmp.h>
37#include "lisp.h" 37#include "lisp.h"
38#include "buffer.h"
39#include "character.h" 38#include "character.h"
39#include "buffer.h"
40#include "syntax.h" 40#include "syntax.h"
41#include "window.h" 41#include "window.h"
42 42
@@ -54,25 +54,33 @@ by Hallvard:
54/* #define BYTE_CODE_SAFE */ 54/* #define BYTE_CODE_SAFE */
55/* #define BYTE_CODE_METER */ 55/* #define BYTE_CODE_METER */
56 56
57/* If BYTE_CODE_THREADED is defined, then the interpreter will be
58 indirect threaded, using GCC's computed goto extension. This code,
59 as currently implemented, is incompatible with BYTE_CODE_SAFE and
60 BYTE_CODE_METER. */
61#if defined (__GNUC__) && !defined (BYTE_CODE_SAFE) && !defined (BYTE_CODE_METER)
62#define BYTE_CODE_THREADED
63#endif
64
57 65
58#ifdef BYTE_CODE_METER 66#ifdef BYTE_CODE_METER
59 67
60Lisp_Object Qbyte_code_meter; 68Lisp_Object Qbyte_code_meter;
61#define METER_2(code1, code2) \ 69#define METER_2(code1, code2) AREF (AREF (Vbyte_code_meter, code1), code2)
62 XFASTINT (XVECTOR (XVECTOR (Vbyte_code_meter)->contents[(code1)]) \ 70#define METER_1(code) METER_2 (0, code)
63 ->contents[(code2)])
64
65#define METER_1(code) METER_2 (0, (code))
66 71
67#define METER_CODE(last_code, this_code) \ 72#define METER_CODE(last_code, this_code) \
68{ \ 73{ \
69 if (byte_metering_on) \ 74 if (byte_metering_on) \
70 { \ 75 { \
71 if (METER_1 (this_code) < MOST_POSITIVE_FIXNUM) \ 76 if (XFASTINT (METER_1 (this_code)) < MOST_POSITIVE_FIXNUM) \
72 METER_1 (this_code)++; \ 77 XSETFASTINT (METER_1 (this_code), \
78 XFASTINT (METER_1 (this_code)) + 1); \
73 if (last_code \ 79 if (last_code \
74 && METER_2 (last_code, this_code) < MOST_POSITIVE_FIXNUM) \ 80 && (XFASTINT (METER_2 (last_code, this_code)) \
75 METER_2 (last_code, this_code)++; \ 81 < MOST_POSITIVE_FIXNUM)) \
82 XSETFASTINT (METER_2 (last_code, this_code), \
83 XFASTINT (METER_2 (last_code, this_code)) + 1); \
76 } \ 84 } \
77} 85}
78 86
@@ -83,158 +91,204 @@ Lisp_Object Qbytecode;
83 91
84/* Byte codes: */ 92/* Byte codes: */
85 93
86#define Bstack_ref 0 /* Actually, Bstack_ref+0 is not implemented: use dup. */ 94#define BYTE_CODES \
87#define Bvarref 010 95DEFINE (Bstack_ref, 0) /* Actually, Bstack_ref+0 is not implemented: use dup. */ \
88#define Bvarset 020 96DEFINE (Bstack_ref1, 1) \
89#define Bvarbind 030 97DEFINE (Bstack_ref2, 2) \
90#define Bcall 040 98DEFINE (Bstack_ref3, 3) \
91#define Bunbind 050 99DEFINE (Bstack_ref4, 4) \
92 100DEFINE (Bstack_ref5, 5) \
93#define Bnth 070 101DEFINE (Bstack_ref6, 6) \
94#define Bsymbolp 071 102DEFINE (Bstack_ref7, 7) \
95#define Bconsp 072 103DEFINE (Bvarref, 010) \
96#define Bstringp 073 104DEFINE (Bvarref1, 011) \
97#define Blistp 074 105DEFINE (Bvarref2, 012) \
98#define Beq 075 106DEFINE (Bvarref3, 013) \
99#define Bmemq 076 107DEFINE (Bvarref4, 014) \
100#define Bnot 077 108DEFINE (Bvarref5, 015) \
101#define Bcar 0100 109DEFINE (Bvarref6, 016) \
102#define Bcdr 0101 110DEFINE (Bvarref7, 017) \
103#define Bcons 0102 111DEFINE (Bvarset, 020) \
104#define Blist1 0103 112DEFINE (Bvarset1, 021) \
105#define Blist2 0104 113DEFINE (Bvarset2, 022) \
106#define Blist3 0105 114DEFINE (Bvarset3, 023) \
107#define Blist4 0106 115DEFINE (Bvarset4, 024) \
108#define Blength 0107 116DEFINE (Bvarset5, 025) \
109#define Baref 0110 117DEFINE (Bvarset6, 026) \
110#define Baset 0111 118DEFINE (Bvarset7, 027) \
111#define Bsymbol_value 0112 119DEFINE (Bvarbind, 030) \
112#define Bsymbol_function 0113 120DEFINE (Bvarbind1, 031) \
113#define Bset 0114 121DEFINE (Bvarbind2, 032) \
114#define Bfset 0115 122DEFINE (Bvarbind3, 033) \
115#define Bget 0116 123DEFINE (Bvarbind4, 034) \
116#define Bsubstring 0117 124DEFINE (Bvarbind5, 035) \
117#define Bconcat2 0120 125DEFINE (Bvarbind6, 036) \
118#define Bconcat3 0121 126DEFINE (Bvarbind7, 037) \
119#define Bconcat4 0122 127DEFINE (Bcall, 040) \
120#define Bsub1 0123 128DEFINE (Bcall1, 041) \
121#define Badd1 0124 129DEFINE (Bcall2, 042) \
122#define Beqlsign 0125 130DEFINE (Bcall3, 043) \
123#define Bgtr 0126 131DEFINE (Bcall4, 044) \
124#define Blss 0127 132DEFINE (Bcall5, 045) \
125#define Bleq 0130 133DEFINE (Bcall6, 046) \
126#define Bgeq 0131 134DEFINE (Bcall7, 047) \
127#define Bdiff 0132 135DEFINE (Bunbind, 050) \
128#define Bnegate 0133 136DEFINE (Bunbind1, 051) \
129#define Bplus 0134 137DEFINE (Bunbind2, 052) \
130#define Bmax 0135 138DEFINE (Bunbind3, 053) \
131#define Bmin 0136 139DEFINE (Bunbind4, 054) \
132#define Bmult 0137 140DEFINE (Bunbind5, 055) \
133 141DEFINE (Bunbind6, 056) \
134#define Bpoint 0140 142DEFINE (Bunbind7, 057) \
135/* Was Bmark in v17. */ 143 \
136#define Bsave_current_buffer 0141 /* Obsolete. */ 144DEFINE (Bnth, 070) \
137#define Bgoto_char 0142 145DEFINE (Bsymbolp, 071) \
138#define Binsert 0143 146DEFINE (Bconsp, 072) \
139#define Bpoint_max 0144 147DEFINE (Bstringp, 073) \
140#define Bpoint_min 0145 148DEFINE (Blistp, 074) \
141#define Bchar_after 0146 149DEFINE (Beq, 075) \
142#define Bfollowing_char 0147 150DEFINE (Bmemq, 076) \
143#define Bpreceding_char 0150 151DEFINE (Bnot, 077) \
144#define Bcurrent_column 0151 152DEFINE (Bcar, 0100) \
145#define Bindent_to 0152 153DEFINE (Bcdr, 0101) \
146#ifdef BYTE_CODE_SAFE 154DEFINE (Bcons, 0102) \
147#define Bscan_buffer 0153 /* No longer generated as of v18. */ 155DEFINE (Blist1, 0103) \
148#endif 156DEFINE (Blist2, 0104) \
149#define Beolp 0154 157DEFINE (Blist3, 0105) \
150#define Beobp 0155 158DEFINE (Blist4, 0106) \
151#define Bbolp 0156 159DEFINE (Blength, 0107) \
152#define Bbobp 0157 160DEFINE (Baref, 0110) \
153#define Bcurrent_buffer 0160 161DEFINE (Baset, 0111) \
154#define Bset_buffer 0161 162DEFINE (Bsymbol_value, 0112) \
155#define Bsave_current_buffer_1 0162 /* Replacing Bsave_current_buffer. */ 163DEFINE (Bsymbol_function, 0113) \
156#if 0 164DEFINE (Bset, 0114) \
157#define Bread_char 0162 /* No longer generated as of v19 */ 165DEFINE (Bfset, 0115) \
158#endif 166DEFINE (Bget, 0116) \
167DEFINE (Bsubstring, 0117) \
168DEFINE (Bconcat2, 0120) \
169DEFINE (Bconcat3, 0121) \
170DEFINE (Bconcat4, 0122) \
171DEFINE (Bsub1, 0123) \
172DEFINE (Badd1, 0124) \
173DEFINE (Beqlsign, 0125) \
174DEFINE (Bgtr, 0126) \
175DEFINE (Blss, 0127) \
176DEFINE (Bleq, 0130) \
177DEFINE (Bgeq, 0131) \
178DEFINE (Bdiff, 0132) \
179DEFINE (Bnegate, 0133) \
180DEFINE (Bplus, 0134) \
181DEFINE (Bmax, 0135) \
182DEFINE (Bmin, 0136) \
183DEFINE (Bmult, 0137) \
184 \
185DEFINE (Bpoint, 0140) \
186/* Was Bmark in v17. */ \
187DEFINE (Bsave_current_buffer, 0141) /* Obsolete. */ \
188DEFINE (Bgoto_char, 0142) \
189DEFINE (Binsert, 0143) \
190DEFINE (Bpoint_max, 0144) \
191DEFINE (Bpoint_min, 0145) \
192DEFINE (Bchar_after, 0146) \
193DEFINE (Bfollowing_char, 0147) \
194DEFINE (Bpreceding_char, 0150) \
195DEFINE (Bcurrent_column, 0151) \
196DEFINE (Bindent_to, 0152) \
197DEFINE (Beolp, 0154) \
198DEFINE (Beobp, 0155) \
199DEFINE (Bbolp, 0156) \
200DEFINE (Bbobp, 0157) \
201DEFINE (Bcurrent_buffer, 0160) \
202DEFINE (Bset_buffer, 0161) \
203DEFINE (Bsave_current_buffer_1, 0162) /* Replacing Bsave_current_buffer. */ \
204DEFINE (Binteractive_p, 0164) /* Obsolete since Emacs-24.1. */ \
205 \
206DEFINE (Bforward_char, 0165) \
207DEFINE (Bforward_word, 0166) \
208DEFINE (Bskip_chars_forward, 0167) \
209DEFINE (Bskip_chars_backward, 0170) \
210DEFINE (Bforward_line, 0171) \
211DEFINE (Bchar_syntax, 0172) \
212DEFINE (Bbuffer_substring, 0173) \
213DEFINE (Bdelete_region, 0174) \
214DEFINE (Bnarrow_to_region, 0175) \
215DEFINE (Bwiden, 0176) \
216DEFINE (Bend_of_line, 0177) \
217 \
218DEFINE (Bconstant2, 0201) \
219DEFINE (Bgoto, 0202) \
220DEFINE (Bgotoifnil, 0203) \
221DEFINE (Bgotoifnonnil, 0204) \
222DEFINE (Bgotoifnilelsepop, 0205) \
223DEFINE (Bgotoifnonnilelsepop, 0206) \
224DEFINE (Breturn, 0207) \
225DEFINE (Bdiscard, 0210) \
226DEFINE (Bdup, 0211) \
227 \
228DEFINE (Bsave_excursion, 0212) \
229DEFINE (Bsave_window_excursion, 0213) /* Obsolete since Emacs-24.1. */ \
230DEFINE (Bsave_restriction, 0214) \
231DEFINE (Bcatch, 0215) \
232 \
233DEFINE (Bunwind_protect, 0216) \
234DEFINE (Bcondition_case, 0217) \
235DEFINE (Btemp_output_buffer_setup, 0220) /* Obsolete since Emacs-24.1. */ \
236DEFINE (Btemp_output_buffer_show, 0221) /* Obsolete since Emacs-24.1. */ \
237 \
238DEFINE (Bunbind_all, 0222) /* Obsolete. Never used. */ \
239 \
240DEFINE (Bset_marker, 0223) \
241DEFINE (Bmatch_beginning, 0224) \
242DEFINE (Bmatch_end, 0225) \
243DEFINE (Bupcase, 0226) \
244DEFINE (Bdowncase, 0227) \
245 \
246DEFINE (Bstringeqlsign, 0230) \
247DEFINE (Bstringlss, 0231) \
248DEFINE (Bequal, 0232) \
249DEFINE (Bnthcdr, 0233) \
250DEFINE (Belt, 0234) \
251DEFINE (Bmember, 0235) \
252DEFINE (Bassq, 0236) \
253DEFINE (Bnreverse, 0237) \
254DEFINE (Bsetcar, 0240) \
255DEFINE (Bsetcdr, 0241) \
256DEFINE (Bcar_safe, 0242) \
257DEFINE (Bcdr_safe, 0243) \
258DEFINE (Bnconc, 0244) \
259DEFINE (Bquo, 0245) \
260DEFINE (Brem, 0246) \
261DEFINE (Bnumberp, 0247) \
262DEFINE (Bintegerp, 0250) \
263 \
264DEFINE (BRgoto, 0252) \
265DEFINE (BRgotoifnil, 0253) \
266DEFINE (BRgotoifnonnil, 0254) \
267DEFINE (BRgotoifnilelsepop, 0255) \
268DEFINE (BRgotoifnonnilelsepop, 0256) \
269 \
270DEFINE (BlistN, 0257) \
271DEFINE (BconcatN, 0260) \
272DEFINE (BinsertN, 0261) \
273 \
274/* Bstack_ref is code 0. */ \
275DEFINE (Bstack_set, 0262) \
276DEFINE (Bstack_set2, 0263) \
277DEFINE (BdiscardN, 0266) \
278 \
279DEFINE (Bconstant, 0300)
280
281enum byte_code_op
282{
283#define DEFINE(name, value) name = value,
284 BYTE_CODES
285#undef DEFINE
286
159#ifdef BYTE_CODE_SAFE 287#ifdef BYTE_CODE_SAFE
160#define Bset_mark 0163 /* this loser is no longer generated as of v18 */ 288 Bscan_buffer = 0153, /* No longer generated as of v18. */
289 Bset_mark = 0163 /* this loser is no longer generated as of v18 */
161#endif 290#endif
162#define Binteractive_p 0164 /* Obsolete since Emacs-24.1. */ 291};
163
164#define Bforward_char 0165
165#define Bforward_word 0166
166#define Bskip_chars_forward 0167
167#define Bskip_chars_backward 0170
168#define Bforward_line 0171
169#define Bchar_syntax 0172
170#define Bbuffer_substring 0173
171#define Bdelete_region 0174
172#define Bnarrow_to_region 0175
173#define Bwiden 0176
174#define Bend_of_line 0177
175
176#define Bconstant2 0201
177#define Bgoto 0202
178#define Bgotoifnil 0203
179#define Bgotoifnonnil 0204
180#define Bgotoifnilelsepop 0205
181#define Bgotoifnonnilelsepop 0206
182#define Breturn 0207
183#define Bdiscard 0210
184#define Bdup 0211
185
186#define Bsave_excursion 0212
187#define Bsave_window_excursion 0213 /* Obsolete since Emacs-24.1. */
188#define Bsave_restriction 0214
189#define Bcatch 0215
190
191#define Bunwind_protect 0216
192#define Bcondition_case 0217
193#define Btemp_output_buffer_setup 0220 /* Obsolete since Emacs-24.1. */
194#define Btemp_output_buffer_show 0221 /* Obsolete since Emacs-24.1. */
195
196#define Bunbind_all 0222 /* Obsolete. Never used. */
197
198#define Bset_marker 0223
199#define Bmatch_beginning 0224
200#define Bmatch_end 0225
201#define Bupcase 0226
202#define Bdowncase 0227
203
204#define Bstringeqlsign 0230
205#define Bstringlss 0231
206#define Bequal 0232
207#define Bnthcdr 0233
208#define Belt 0234
209#define Bmember 0235
210#define Bassq 0236
211#define Bnreverse 0237
212#define Bsetcar 0240
213#define Bsetcdr 0241
214#define Bcar_safe 0242
215#define Bcdr_safe 0243
216#define Bnconc 0244
217#define Bquo 0245
218#define Brem 0246
219#define Bnumberp 0247
220#define Bintegerp 0250
221
222#define BRgoto 0252
223#define BRgotoifnil 0253
224#define BRgotoifnonnil 0254
225#define BRgotoifnilelsepop 0255
226#define BRgotoifnonnilelsepop 0256
227
228#define BlistN 0257
229#define BconcatN 0260
230#define BinsertN 0261
231
232/* Bstack_ref is code 0. */
233#define Bstack_set 0262
234#define Bstack_set2 0263
235#define BdiscardN 0266
236
237#define Bconstant 0300
238 292
239/* Whether to maintain a `top' and `bottom' field in the stack frame. */ 293/* Whether to maintain a `top' and `bottom' field in the stack frame. */
240#define BYTE_MAINTAIN_TOP (BYTE_CODE_SAFE || BYTE_MARK_STACK) 294#define BYTE_MAINTAIN_TOP (BYTE_CODE_SAFE || BYTE_MARK_STACK)
@@ -488,8 +542,7 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
488 stack.constants = vector; 542 stack.constants = vector;
489 if (MAX_ALLOCA / sizeof (Lisp_Object) <= XFASTINT (maxdepth)) 543 if (MAX_ALLOCA / sizeof (Lisp_Object) <= XFASTINT (maxdepth))
490 memory_full (SIZE_MAX); 544 memory_full (SIZE_MAX);
491 top = (Lisp_Object *) alloca ((XFASTINT (maxdepth) + 1) 545 top = alloca ((XFASTINT (maxdepth) + 1) * sizeof *top);
492 * sizeof (Lisp_Object));
493#if BYTE_MAINTAIN_TOP 546#if BYTE_MAINTAIN_TOP
494 stack.bottom = top + 1; 547 stack.bottom = top + 1;
495 stack.top = NULL; 548 stack.top = NULL;
@@ -561,27 +614,93 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
561 this_op = op = FETCH; 614 this_op = op = FETCH;
562 METER_CODE (prev_op, op); 615 METER_CODE (prev_op, op);
563#else 616#else
617#ifndef BYTE_CODE_THREADED
564 op = FETCH; 618 op = FETCH;
565#endif 619#endif
620#endif
566 621
567 switch (op) 622 /* The interpreter can be compiled one of two ways: as an
623 ordinary switch-based interpreter, or as a threaded
624 interpreter. The threaded interpreter relies on GCC's
625 computed goto extension, so it is not available everywhere.
626 Threading provides a performance boost. These macros are how
627 we allow the code to be compiled both ways. */
628#ifdef BYTE_CODE_THREADED
629 /* The CASE macro introduces an instruction's body. It is
630 either a label or a case label. */
631#define CASE(OP) insn_ ## OP
632 /* NEXT is invoked at the end of an instruction to go to the
633 next instruction. It is either a computed goto, or a
634 plain break. */
635#define NEXT goto *(targets[op = FETCH])
636 /* FIRST is like NEXT, but is only used at the start of the
637 interpreter body. In the switch-based interpreter it is the
638 switch, so the threaded definition must include a semicolon. */
639#define FIRST NEXT;
640 /* Most cases are labeled with the CASE macro, above.
641 CASE_DEFAULT is one exception; it is used if the interpreter
642 being built requires a default case. The threaded
643 interpreter does not, because the dispatch table is
644 completely filled. */
645#define CASE_DEFAULT
646 /* This introduces an instruction that is known to call abort. */
647#define CASE_ABORT CASE (Bstack_ref): CASE (default)
648#else
649 /* See above for the meaning of the various defines. */
650#define CASE(OP) case OP
651#define NEXT break
652#define FIRST switch (op)
653#define CASE_DEFAULT case 255: default:
654#define CASE_ABORT case 0
655#endif
656
657#ifdef BYTE_CODE_THREADED
658
659 /* A convenience define that saves us a lot of typing and makes
660 the table clearer. */
661#define LABEL(OP) [OP] = &&insn_ ## OP
662
663#if (__GNUC__ == 4 && 6 <= __GNUC_MINOR__) || 4 < __GNUC__
664# pragma GCC diagnostic push
665# pragma GCC diagnostic ignored "-Woverride-init"
666#endif
667
668 /* This is the dispatch table for the threaded interpreter. */
669 static const void *const targets[256] =
568 { 670 {
569 case Bvarref + 7: 671 [0 ... (Bconstant - 1)] = &&insn_default,
672 [Bconstant ... 255] = &&insn_Bconstant,
673
674#define DEFINE(name, value) LABEL (name) ,
675 BYTE_CODES
676#undef DEFINE
677 };
678
679#if (__GNUC__ == 4 && 6 <= __GNUC_MINOR__) || 4 < __GNUC__
680# pragma GCC diagnostic pop
681#endif
682
683#endif
684
685
686 FIRST
687 {
688 CASE (Bvarref7):
570 op = FETCH2; 689 op = FETCH2;
571 goto varref; 690 goto varref;
572 691
573 case Bvarref: 692 CASE (Bvarref):
574 case Bvarref + 1: 693 CASE (Bvarref1):
575 case Bvarref + 2: 694 CASE (Bvarref2):
576 case Bvarref + 3: 695 CASE (Bvarref3):
577 case Bvarref + 4: 696 CASE (Bvarref4):
578 case Bvarref + 5: 697 CASE (Bvarref5):
579 op = op - Bvarref; 698 op = op - Bvarref;
580 goto varref; 699 goto varref;
581 700
582 /* This seems to be the most frequently executed byte-code 701 /* This seems to be the most frequently executed byte-code
583 among the Bvarref's, so avoid a goto here. */ 702 among the Bvarref's, so avoid a goto here. */
584 case Bvarref+6: 703 CASE (Bvarref6):
585 op = FETCH; 704 op = FETCH;
586 varref: 705 varref:
587 { 706 {
@@ -606,10 +725,10 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
606 AFTER_POTENTIAL_GC (); 725 AFTER_POTENTIAL_GC ();
607 } 726 }
608 PUSH (v2); 727 PUSH (v2);
609 break; 728 NEXT;
610 } 729 }
611 730
612 case Bgotoifnil: 731 CASE (Bgotoifnil):
613 { 732 {
614 Lisp_Object v1; 733 Lisp_Object v1;
615 MAYBE_GC (); 734 MAYBE_GC ();
@@ -621,10 +740,10 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
621 CHECK_RANGE (op); 740 CHECK_RANGE (op);
622 stack.pc = stack.byte_string_start + op; 741 stack.pc = stack.byte_string_start + op;
623 } 742 }
624 break; 743 NEXT;
625 } 744 }
626 745
627 case Bcar: 746 CASE (Bcar):
628 { 747 {
629 Lisp_Object v1; 748 Lisp_Object v1;
630 v1 = TOP; 749 v1 = TOP;
@@ -638,28 +757,28 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
638 wrong_type_argument (Qlistp, v1); 757 wrong_type_argument (Qlistp, v1);
639 AFTER_POTENTIAL_GC (); 758 AFTER_POTENTIAL_GC ();
640 } 759 }
641 break; 760 NEXT;
642 } 761 }
643 762
644 case Beq: 763 CASE (Beq):
645 { 764 {
646 Lisp_Object v1; 765 Lisp_Object v1;
647 v1 = POP; 766 v1 = POP;
648 TOP = EQ (v1, TOP) ? Qt : Qnil; 767 TOP = EQ (v1, TOP) ? Qt : Qnil;
649 break; 768 NEXT;
650 } 769 }
651 770
652 case Bmemq: 771 CASE (Bmemq):
653 { 772 {
654 Lisp_Object v1; 773 Lisp_Object v1;
655 BEFORE_POTENTIAL_GC (); 774 BEFORE_POTENTIAL_GC ();
656 v1 = POP; 775 v1 = POP;
657 TOP = Fmemq (TOP, v1); 776 TOP = Fmemq (TOP, v1);
658 AFTER_POTENTIAL_GC (); 777 AFTER_POTENTIAL_GC ();
659 break; 778 NEXT;
660 } 779 }
661 780
662 case Bcdr: 781 CASE (Bcdr):
663 { 782 {
664 Lisp_Object v1; 783 Lisp_Object v1;
665 v1 = TOP; 784 v1 = TOP;
@@ -673,24 +792,23 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
673 wrong_type_argument (Qlistp, v1); 792 wrong_type_argument (Qlistp, v1);
674 AFTER_POTENTIAL_GC (); 793 AFTER_POTENTIAL_GC ();
675 } 794 }
676 break; 795 NEXT;
677 break;
678 } 796 }
679 797
680 case Bvarset: 798 CASE (Bvarset):
681 case Bvarset+1: 799 CASE (Bvarset1):
682 case Bvarset+2: 800 CASE (Bvarset2):
683 case Bvarset+3: 801 CASE (Bvarset3):
684 case Bvarset+4: 802 CASE (Bvarset4):
685 case Bvarset+5: 803 CASE (Bvarset5):
686 op -= Bvarset; 804 op -= Bvarset;
687 goto varset; 805 goto varset;
688 806
689 case Bvarset+7: 807 CASE (Bvarset7):
690 op = FETCH2; 808 op = FETCH2;
691 goto varset; 809 goto varset;
692 810
693 case Bvarset+6: 811 CASE (Bvarset6):
694 op = FETCH; 812 op = FETCH;
695 varset: 813 varset:
696 { 814 {
@@ -713,54 +831,54 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
713 } 831 }
714 } 832 }
715 (void) POP; 833 (void) POP;
716 break; 834 NEXT;
717 835
718 case Bdup: 836 CASE (Bdup):
719 { 837 {
720 Lisp_Object v1; 838 Lisp_Object v1;
721 v1 = TOP; 839 v1 = TOP;
722 PUSH (v1); 840 PUSH (v1);
723 break; 841 NEXT;
724 } 842 }
725 843
726 /* ------------------ */ 844 /* ------------------ */
727 845
728 case Bvarbind+6: 846 CASE (Bvarbind6):
729 op = FETCH; 847 op = FETCH;
730 goto varbind; 848 goto varbind;
731 849
732 case Bvarbind+7: 850 CASE (Bvarbind7):
733 op = FETCH2; 851 op = FETCH2;
734 goto varbind; 852 goto varbind;
735 853
736 case Bvarbind: 854 CASE (Bvarbind):
737 case Bvarbind+1: 855 CASE (Bvarbind1):
738 case Bvarbind+2: 856 CASE (Bvarbind2):
739 case Bvarbind+3: 857 CASE (Bvarbind3):
740 case Bvarbind+4: 858 CASE (Bvarbind4):
741 case Bvarbind+5: 859 CASE (Bvarbind5):
742 op -= Bvarbind; 860 op -= Bvarbind;
743 varbind: 861 varbind:
744 /* Specbind can signal and thus GC. */ 862 /* Specbind can signal and thus GC. */
745 BEFORE_POTENTIAL_GC (); 863 BEFORE_POTENTIAL_GC ();
746 specbind (vectorp[op], POP); 864 specbind (vectorp[op], POP);
747 AFTER_POTENTIAL_GC (); 865 AFTER_POTENTIAL_GC ();
748 break; 866 NEXT;
749 867
750 case Bcall+6: 868 CASE (Bcall6):
751 op = FETCH; 869 op = FETCH;
752 goto docall; 870 goto docall;
753 871
754 case Bcall+7: 872 CASE (Bcall7):
755 op = FETCH2; 873 op = FETCH2;
756 goto docall; 874 goto docall;
757 875
758 case Bcall: 876 CASE (Bcall):
759 case Bcall+1: 877 CASE (Bcall1):
760 case Bcall+2: 878 CASE (Bcall2):
761 case Bcall+3: 879 CASE (Bcall3):
762 case Bcall+4: 880 CASE (Bcall4):
763 case Bcall+5: 881 CASE (Bcall5):
764 op -= Bcall; 882 op -= Bcall;
765 docall: 883 docall:
766 { 884 {
@@ -783,47 +901,47 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
783#endif 901#endif
784 TOP = Ffuncall (op + 1, &TOP); 902 TOP = Ffuncall (op + 1, &TOP);
785 AFTER_POTENTIAL_GC (); 903 AFTER_POTENTIAL_GC ();
786 break; 904 NEXT;
787 } 905 }
788 906
789 case Bunbind+6: 907 CASE (Bunbind6):
790 op = FETCH; 908 op = FETCH;
791 goto dounbind; 909 goto dounbind;
792 910
793 case Bunbind+7: 911 CASE (Bunbind7):
794 op = FETCH2; 912 op = FETCH2;
795 goto dounbind; 913 goto dounbind;
796 914
797 case Bunbind: 915 CASE (Bunbind):
798 case Bunbind+1: 916 CASE (Bunbind1):
799 case Bunbind+2: 917 CASE (Bunbind2):
800 case Bunbind+3: 918 CASE (Bunbind3):
801 case Bunbind+4: 919 CASE (Bunbind4):
802 case Bunbind+5: 920 CASE (Bunbind5):
803 op -= Bunbind; 921 op -= Bunbind;
804 dounbind: 922 dounbind:
805 BEFORE_POTENTIAL_GC (); 923 BEFORE_POTENTIAL_GC ();
806 unbind_to (SPECPDL_INDEX () - op, Qnil); 924 unbind_to (SPECPDL_INDEX () - op, Qnil);
807 AFTER_POTENTIAL_GC (); 925 AFTER_POTENTIAL_GC ();
808 break; 926 NEXT;
809 927
810 case Bunbind_all: /* Obsolete. Never used. */ 928 CASE (Bunbind_all): /* Obsolete. Never used. */
811 /* To unbind back to the beginning of this frame. Not used yet, 929 /* To unbind back to the beginning of this frame. Not used yet,
812 but will be needed for tail-recursion elimination. */ 930 but will be needed for tail-recursion elimination. */
813 BEFORE_POTENTIAL_GC (); 931 BEFORE_POTENTIAL_GC ();
814 unbind_to (count, Qnil); 932 unbind_to (count, Qnil);
815 AFTER_POTENTIAL_GC (); 933 AFTER_POTENTIAL_GC ();
816 break; 934 NEXT;
817 935
818 case Bgoto: 936 CASE (Bgoto):
819 MAYBE_GC (); 937 MAYBE_GC ();
820 BYTE_CODE_QUIT; 938 BYTE_CODE_QUIT;
821 op = FETCH2; /* pc = FETCH2 loses since FETCH2 contains pc++ */ 939 op = FETCH2; /* pc = FETCH2 loses since FETCH2 contains pc++ */
822 CHECK_RANGE (op); 940 CHECK_RANGE (op);
823 stack.pc = stack.byte_string_start + op; 941 stack.pc = stack.byte_string_start + op;
824 break; 942 NEXT;
825 943
826 case Bgotoifnonnil: 944 CASE (Bgotoifnonnil):
827 { 945 {
828 Lisp_Object v1; 946 Lisp_Object v1;
829 MAYBE_GC (); 947 MAYBE_GC ();
@@ -835,10 +953,10 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
835 CHECK_RANGE (op); 953 CHECK_RANGE (op);
836 stack.pc = stack.byte_string_start + op; 954 stack.pc = stack.byte_string_start + op;
837 } 955 }
838 break; 956 NEXT;
839 } 957 }
840 958
841 case Bgotoifnilelsepop: 959 CASE (Bgotoifnilelsepop):
842 MAYBE_GC (); 960 MAYBE_GC ();
843 op = FETCH2; 961 op = FETCH2;
844 if (NILP (TOP)) 962 if (NILP (TOP))
@@ -848,9 +966,9 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
848 stack.pc = stack.byte_string_start + op; 966 stack.pc = stack.byte_string_start + op;
849 } 967 }
850 else DISCARD (1); 968 else DISCARD (1);
851 break; 969 NEXT;
852 970
853 case Bgotoifnonnilelsepop: 971 CASE (Bgotoifnonnilelsepop):
854 MAYBE_GC (); 972 MAYBE_GC ();
855 op = FETCH2; 973 op = FETCH2;
856 if (!NILP (TOP)) 974 if (!NILP (TOP))
@@ -860,15 +978,15 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
860 stack.pc = stack.byte_string_start + op; 978 stack.pc = stack.byte_string_start + op;
861 } 979 }
862 else DISCARD (1); 980 else DISCARD (1);
863 break; 981 NEXT;
864 982
865 case BRgoto: 983 CASE (BRgoto):
866 MAYBE_GC (); 984 MAYBE_GC ();
867 BYTE_CODE_QUIT; 985 BYTE_CODE_QUIT;
868 stack.pc += (int) *stack.pc - 127; 986 stack.pc += (int) *stack.pc - 127;
869 break; 987 NEXT;
870 988
871 case BRgotoifnil: 989 CASE (BRgotoifnil):
872 { 990 {
873 Lisp_Object v1; 991 Lisp_Object v1;
874 MAYBE_GC (); 992 MAYBE_GC ();
@@ -879,10 +997,10 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
879 stack.pc += (int) *stack.pc - 128; 997 stack.pc += (int) *stack.pc - 128;
880 } 998 }
881 stack.pc++; 999 stack.pc++;
882 break; 1000 NEXT;
883 } 1001 }
884 1002
885 case BRgotoifnonnil: 1003 CASE (BRgotoifnonnil):
886 { 1004 {
887 Lisp_Object v1; 1005 Lisp_Object v1;
888 MAYBE_GC (); 1006 MAYBE_GC ();
@@ -893,10 +1011,10 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
893 stack.pc += (int) *stack.pc - 128; 1011 stack.pc += (int) *stack.pc - 128;
894 } 1012 }
895 stack.pc++; 1013 stack.pc++;
896 break; 1014 NEXT;
897 } 1015 }
898 1016
899 case BRgotoifnilelsepop: 1017 CASE (BRgotoifnilelsepop):
900 MAYBE_GC (); 1018 MAYBE_GC ();
901 op = *stack.pc++; 1019 op = *stack.pc++;
902 if (NILP (TOP)) 1020 if (NILP (TOP))
@@ -905,9 +1023,9 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
905 stack.pc += op - 128; 1023 stack.pc += op - 128;
906 } 1024 }
907 else DISCARD (1); 1025 else DISCARD (1);
908 break; 1026 NEXT;
909 1027
910 case BRgotoifnonnilelsepop: 1028 CASE (BRgotoifnonnilelsepop):
911 MAYBE_GC (); 1029 MAYBE_GC ();
912 op = *stack.pc++; 1030 op = *stack.pc++;
913 if (!NILP (TOP)) 1031 if (!NILP (TOP))
@@ -916,31 +1034,31 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
916 stack.pc += op - 128; 1034 stack.pc += op - 128;
917 } 1035 }
918 else DISCARD (1); 1036 else DISCARD (1);
919 break; 1037 NEXT;
920 1038
921 case Breturn: 1039 CASE (Breturn):
922 result = POP; 1040 result = POP;
923 goto exit; 1041 goto exit;
924 1042
925 case Bdiscard: 1043 CASE (Bdiscard):
926 DISCARD (1); 1044 DISCARD (1);
927 break; 1045 NEXT;
928 1046
929 case Bconstant2: 1047 CASE (Bconstant2):
930 PUSH (vectorp[FETCH2]); 1048 PUSH (vectorp[FETCH2]);
931 break; 1049 NEXT;
932 1050
933 case Bsave_excursion: 1051 CASE (Bsave_excursion):
934 record_unwind_protect (save_excursion_restore, 1052 record_unwind_protect (save_excursion_restore,
935 save_excursion_save ()); 1053 save_excursion_save ());
936 break; 1054 NEXT;
937 1055
938 case Bsave_current_buffer: /* Obsolete since ??. */ 1056 CASE (Bsave_current_buffer): /* Obsolete since ??. */
939 case Bsave_current_buffer_1: 1057 CASE (Bsave_current_buffer_1):
940 record_unwind_protect (set_buffer_if_live, Fcurrent_buffer ()); 1058 record_unwind_protect (set_buffer_if_live, Fcurrent_buffer ());
941 break; 1059 NEXT;
942 1060
943 case Bsave_window_excursion: /* Obsolete since 24.1. */ 1061 CASE (Bsave_window_excursion): /* Obsolete since 24.1. */
944 { 1062 {
945 register ptrdiff_t count1 = SPECPDL_INDEX (); 1063 register ptrdiff_t count1 = SPECPDL_INDEX ();
946 record_unwind_protect (Fset_window_configuration, 1064 record_unwind_protect (Fset_window_configuration,
@@ -949,29 +1067,29 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
949 TOP = Fprogn (TOP); 1067 TOP = Fprogn (TOP);
950 unbind_to (count1, TOP); 1068 unbind_to (count1, TOP);
951 AFTER_POTENTIAL_GC (); 1069 AFTER_POTENTIAL_GC ();
952 break; 1070 NEXT;
953 } 1071 }
954 1072
955 case Bsave_restriction: 1073 CASE (Bsave_restriction):
956 record_unwind_protect (save_restriction_restore, 1074 record_unwind_protect (save_restriction_restore,
957 save_restriction_save ()); 1075 save_restriction_save ());
958 break; 1076 NEXT;
959 1077
960 case Bcatch: /* FIXME: ill-suited for lexbind. */ 1078 CASE (Bcatch): /* FIXME: ill-suited for lexbind. */
961 { 1079 {
962 Lisp_Object v1; 1080 Lisp_Object v1;
963 BEFORE_POTENTIAL_GC (); 1081 BEFORE_POTENTIAL_GC ();
964 v1 = POP; 1082 v1 = POP;
965 TOP = internal_catch (TOP, eval_sub, v1); 1083 TOP = internal_catch (TOP, eval_sub, v1);
966 AFTER_POTENTIAL_GC (); 1084 AFTER_POTENTIAL_GC ();
967 break; 1085 NEXT;
968 } 1086 }
969 1087
970 case Bunwind_protect: /* FIXME: avoid closure for lexbind. */ 1088 CASE (Bunwind_protect): /* FIXME: avoid closure for lexbind. */
971 record_unwind_protect (Fprogn, POP); 1089 record_unwind_protect (Fprogn, POP);
972 break; 1090 NEXT;
973 1091
974 case Bcondition_case: /* FIXME: ill-suited for lexbind. */ 1092 CASE (Bcondition_case): /* FIXME: ill-suited for lexbind. */
975 { 1093 {
976 Lisp_Object handlers, body; 1094 Lisp_Object handlers, body;
977 handlers = POP; 1095 handlers = POP;
@@ -979,18 +1097,18 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
979 BEFORE_POTENTIAL_GC (); 1097 BEFORE_POTENTIAL_GC ();
980 TOP = internal_lisp_condition_case (TOP, body, handlers); 1098 TOP = internal_lisp_condition_case (TOP, body, handlers);
981 AFTER_POTENTIAL_GC (); 1099 AFTER_POTENTIAL_GC ();
982 break; 1100 NEXT;
983 } 1101 }
984 1102
985 case Btemp_output_buffer_setup: /* Obsolete since 24.1. */ 1103 CASE (Btemp_output_buffer_setup): /* Obsolete since 24.1. */
986 BEFORE_POTENTIAL_GC (); 1104 BEFORE_POTENTIAL_GC ();
987 CHECK_STRING (TOP); 1105 CHECK_STRING (TOP);
988 temp_output_buffer_setup (SSDATA (TOP)); 1106 temp_output_buffer_setup (SSDATA (TOP));
989 AFTER_POTENTIAL_GC (); 1107 AFTER_POTENTIAL_GC ();
990 TOP = Vstandard_output; 1108 TOP = Vstandard_output;
991 break; 1109 NEXT;
992 1110
993 case Btemp_output_buffer_show: /* Obsolete since 24.1. */ 1111 CASE (Btemp_output_buffer_show): /* Obsolete since 24.1. */
994 { 1112 {
995 Lisp_Object v1; 1113 Lisp_Object v1;
996 BEFORE_POTENTIAL_GC (); 1114 BEFORE_POTENTIAL_GC ();
@@ -1000,10 +1118,10 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
1000 /* pop binding of standard-output */ 1118 /* pop binding of standard-output */
1001 unbind_to (SPECPDL_INDEX () - 1, Qnil); 1119 unbind_to (SPECPDL_INDEX () - 1, Qnil);
1002 AFTER_POTENTIAL_GC (); 1120 AFTER_POTENTIAL_GC ();
1003 break; 1121 NEXT;
1004 } 1122 }
1005 1123
1006 case Bnth: 1124 CASE (Bnth):
1007 { 1125 {
1008 Lisp_Object v1, v2; 1126 Lisp_Object v1, v2;
1009 EMACS_INT n; 1127 EMACS_INT n;
@@ -1018,173 +1136,173 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
1018 immediate_quit = 0; 1136 immediate_quit = 0;
1019 TOP = CAR (v1); 1137 TOP = CAR (v1);
1020 AFTER_POTENTIAL_GC (); 1138 AFTER_POTENTIAL_GC ();
1021 break; 1139 NEXT;
1022 } 1140 }
1023 1141
1024 case Bsymbolp: 1142 CASE (Bsymbolp):
1025 TOP = SYMBOLP (TOP) ? Qt : Qnil; 1143 TOP = SYMBOLP (TOP) ? Qt : Qnil;
1026 break; 1144 NEXT;
1027 1145
1028 case Bconsp: 1146 CASE (Bconsp):
1029 TOP = CONSP (TOP) ? Qt : Qnil; 1147 TOP = CONSP (TOP) ? Qt : Qnil;
1030 break; 1148 NEXT;
1031 1149
1032 case Bstringp: 1150 CASE (Bstringp):
1033 TOP = STRINGP (TOP) ? Qt : Qnil; 1151 TOP = STRINGP (TOP) ? Qt : Qnil;
1034 break; 1152 NEXT;
1035 1153
1036 case Blistp: 1154 CASE (Blistp):
1037 TOP = CONSP (TOP) || NILP (TOP) ? Qt : Qnil; 1155 TOP = CONSP (TOP) || NILP (TOP) ? Qt : Qnil;
1038 break; 1156 NEXT;
1039 1157
1040 case Bnot: 1158 CASE (Bnot):
1041 TOP = NILP (TOP) ? Qt : Qnil; 1159 TOP = NILP (TOP) ? Qt : Qnil;
1042 break; 1160 NEXT;
1043 1161
1044 case Bcons: 1162 CASE (Bcons):
1045 { 1163 {
1046 Lisp_Object v1; 1164 Lisp_Object v1;
1047 v1 = POP; 1165 v1 = POP;
1048 TOP = Fcons (TOP, v1); 1166 TOP = Fcons (TOP, v1);
1049 break; 1167 NEXT;
1050 } 1168 }
1051 1169
1052 case Blist1: 1170 CASE (Blist1):
1053 TOP = Fcons (TOP, Qnil); 1171 TOP = Fcons (TOP, Qnil);
1054 break; 1172 NEXT;
1055 1173
1056 case Blist2: 1174 CASE (Blist2):
1057 { 1175 {
1058 Lisp_Object v1; 1176 Lisp_Object v1;
1059 v1 = POP; 1177 v1 = POP;
1060 TOP = Fcons (TOP, Fcons (v1, Qnil)); 1178 TOP = Fcons (TOP, Fcons (v1, Qnil));
1061 break; 1179 NEXT;
1062 } 1180 }
1063 1181
1064 case Blist3: 1182 CASE (Blist3):
1065 DISCARD (2); 1183 DISCARD (2);
1066 TOP = Flist (3, &TOP); 1184 TOP = Flist (3, &TOP);
1067 break; 1185 NEXT;
1068 1186
1069 case Blist4: 1187 CASE (Blist4):
1070 DISCARD (3); 1188 DISCARD (3);
1071 TOP = Flist (4, &TOP); 1189 TOP = Flist (4, &TOP);
1072 break; 1190 NEXT;
1073 1191
1074 case BlistN: 1192 CASE (BlistN):
1075 op = FETCH; 1193 op = FETCH;
1076 DISCARD (op - 1); 1194 DISCARD (op - 1);
1077 TOP = Flist (op, &TOP); 1195 TOP = Flist (op, &TOP);
1078 break; 1196 NEXT;
1079 1197
1080 case Blength: 1198 CASE (Blength):
1081 BEFORE_POTENTIAL_GC (); 1199 BEFORE_POTENTIAL_GC ();
1082 TOP = Flength (TOP); 1200 TOP = Flength (TOP);
1083 AFTER_POTENTIAL_GC (); 1201 AFTER_POTENTIAL_GC ();
1084 break; 1202 NEXT;
1085 1203
1086 case Baref: 1204 CASE (Baref):
1087 { 1205 {
1088 Lisp_Object v1; 1206 Lisp_Object v1;
1089 BEFORE_POTENTIAL_GC (); 1207 BEFORE_POTENTIAL_GC ();
1090 v1 = POP; 1208 v1 = POP;
1091 TOP = Faref (TOP, v1); 1209 TOP = Faref (TOP, v1);
1092 AFTER_POTENTIAL_GC (); 1210 AFTER_POTENTIAL_GC ();
1093 break; 1211 NEXT;
1094 } 1212 }
1095 1213
1096 case Baset: 1214 CASE (Baset):
1097 { 1215 {
1098 Lisp_Object v1, v2; 1216 Lisp_Object v1, v2;
1099 BEFORE_POTENTIAL_GC (); 1217 BEFORE_POTENTIAL_GC ();
1100 v2 = POP; v1 = POP; 1218 v2 = POP; v1 = POP;
1101 TOP = Faset (TOP, v1, v2); 1219 TOP = Faset (TOP, v1, v2);
1102 AFTER_POTENTIAL_GC (); 1220 AFTER_POTENTIAL_GC ();
1103 break; 1221 NEXT;
1104 } 1222 }
1105 1223
1106 case Bsymbol_value: 1224 CASE (Bsymbol_value):
1107 BEFORE_POTENTIAL_GC (); 1225 BEFORE_POTENTIAL_GC ();
1108 TOP = Fsymbol_value (TOP); 1226 TOP = Fsymbol_value (TOP);
1109 AFTER_POTENTIAL_GC (); 1227 AFTER_POTENTIAL_GC ();
1110 break; 1228 NEXT;
1111 1229
1112 case Bsymbol_function: 1230 CASE (Bsymbol_function):
1113 BEFORE_POTENTIAL_GC (); 1231 BEFORE_POTENTIAL_GC ();
1114 TOP = Fsymbol_function (TOP); 1232 TOP = Fsymbol_function (TOP);
1115 AFTER_POTENTIAL_GC (); 1233 AFTER_POTENTIAL_GC ();
1116 break; 1234 NEXT;
1117 1235
1118 case Bset: 1236 CASE (Bset):
1119 { 1237 {
1120 Lisp_Object v1; 1238 Lisp_Object v1;
1121 BEFORE_POTENTIAL_GC (); 1239 BEFORE_POTENTIAL_GC ();
1122 v1 = POP; 1240 v1 = POP;
1123 TOP = Fset (TOP, v1); 1241 TOP = Fset (TOP, v1);
1124 AFTER_POTENTIAL_GC (); 1242 AFTER_POTENTIAL_GC ();
1125 break; 1243 NEXT;
1126 } 1244 }
1127 1245
1128 case Bfset: 1246 CASE (Bfset):
1129 { 1247 {
1130 Lisp_Object v1; 1248 Lisp_Object v1;
1131 BEFORE_POTENTIAL_GC (); 1249 BEFORE_POTENTIAL_GC ();
1132 v1 = POP; 1250 v1 = POP;
1133 TOP = Ffset (TOP, v1); 1251 TOP = Ffset (TOP, v1);
1134 AFTER_POTENTIAL_GC (); 1252 AFTER_POTENTIAL_GC ();
1135 break; 1253 NEXT;
1136 } 1254 }
1137 1255
1138 case Bget: 1256 CASE (Bget):
1139 { 1257 {
1140 Lisp_Object v1; 1258 Lisp_Object v1;
1141 BEFORE_POTENTIAL_GC (); 1259 BEFORE_POTENTIAL_GC ();
1142 v1 = POP; 1260 v1 = POP;
1143 TOP = Fget (TOP, v1); 1261 TOP = Fget (TOP, v1);
1144 AFTER_POTENTIAL_GC (); 1262 AFTER_POTENTIAL_GC ();
1145 break; 1263 NEXT;
1146 } 1264 }
1147 1265
1148 case Bsubstring: 1266 CASE (Bsubstring):
1149 { 1267 {
1150 Lisp_Object v1, v2; 1268 Lisp_Object v1, v2;
1151 BEFORE_POTENTIAL_GC (); 1269 BEFORE_POTENTIAL_GC ();
1152 v2 = POP; v1 = POP; 1270 v2 = POP; v1 = POP;
1153 TOP = Fsubstring (TOP, v1, v2); 1271 TOP = Fsubstring (TOP, v1, v2);
1154 AFTER_POTENTIAL_GC (); 1272 AFTER_POTENTIAL_GC ();
1155 break; 1273 NEXT;
1156 } 1274 }
1157 1275
1158 case Bconcat2: 1276 CASE (Bconcat2):
1159 BEFORE_POTENTIAL_GC (); 1277 BEFORE_POTENTIAL_GC ();
1160 DISCARD (1); 1278 DISCARD (1);
1161 TOP = Fconcat (2, &TOP); 1279 TOP = Fconcat (2, &TOP);
1162 AFTER_POTENTIAL_GC (); 1280 AFTER_POTENTIAL_GC ();
1163 break; 1281 NEXT;
1164 1282
1165 case Bconcat3: 1283 CASE (Bconcat3):
1166 BEFORE_POTENTIAL_GC (); 1284 BEFORE_POTENTIAL_GC ();
1167 DISCARD (2); 1285 DISCARD (2);
1168 TOP = Fconcat (3, &TOP); 1286 TOP = Fconcat (3, &TOP);
1169 AFTER_POTENTIAL_GC (); 1287 AFTER_POTENTIAL_GC ();
1170 break; 1288 NEXT;
1171 1289
1172 case Bconcat4: 1290 CASE (Bconcat4):
1173 BEFORE_POTENTIAL_GC (); 1291 BEFORE_POTENTIAL_GC ();
1174 DISCARD (3); 1292 DISCARD (3);
1175 TOP = Fconcat (4, &TOP); 1293 TOP = Fconcat (4, &TOP);
1176 AFTER_POTENTIAL_GC (); 1294 AFTER_POTENTIAL_GC ();
1177 break; 1295 NEXT;
1178 1296
1179 case BconcatN: 1297 CASE (BconcatN):
1180 op = FETCH; 1298 op = FETCH;
1181 BEFORE_POTENTIAL_GC (); 1299 BEFORE_POTENTIAL_GC ();
1182 DISCARD (op - 1); 1300 DISCARD (op - 1);
1183 TOP = Fconcat (op, &TOP); 1301 TOP = Fconcat (op, &TOP);
1184 AFTER_POTENTIAL_GC (); 1302 AFTER_POTENTIAL_GC ();
1185 break; 1303 NEXT;
1186 1304
1187 case Bsub1: 1305 CASE (Bsub1):
1188 { 1306 {
1189 Lisp_Object v1; 1307 Lisp_Object v1;
1190 v1 = TOP; 1308 v1 = TOP;
@@ -1199,10 +1317,10 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
1199 TOP = Fsub1 (v1); 1317 TOP = Fsub1 (v1);
1200 AFTER_POTENTIAL_GC (); 1318 AFTER_POTENTIAL_GC ();
1201 } 1319 }
1202 break; 1320 NEXT;
1203 } 1321 }
1204 1322
1205 case Badd1: 1323 CASE (Badd1):
1206 { 1324 {
1207 Lisp_Object v1; 1325 Lisp_Object v1;
1208 v1 = TOP; 1326 v1 = TOP;
@@ -1217,10 +1335,10 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
1217 TOP = Fadd1 (v1); 1335 TOP = Fadd1 (v1);
1218 AFTER_POTENTIAL_GC (); 1336 AFTER_POTENTIAL_GC ();
1219 } 1337 }
1220 break; 1338 NEXT;
1221 } 1339 }
1222 1340
1223 case Beqlsign: 1341 CASE (Beqlsign):
1224 { 1342 {
1225 Lisp_Object v1, v2; 1343 Lisp_Object v1, v2;
1226 BEFORE_POTENTIAL_GC (); 1344 BEFORE_POTENTIAL_GC ();
@@ -1238,57 +1356,57 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
1238 } 1356 }
1239 else 1357 else
1240 TOP = (XINT (v1) == XINT (v2) ? Qt : Qnil); 1358 TOP = (XINT (v1) == XINT (v2) ? Qt : Qnil);
1241 break; 1359 NEXT;
1242 } 1360 }
1243 1361
1244 case Bgtr: 1362 CASE (Bgtr):
1245 { 1363 {
1246 Lisp_Object v1; 1364 Lisp_Object v1;
1247 BEFORE_POTENTIAL_GC (); 1365 BEFORE_POTENTIAL_GC ();
1248 v1 = POP; 1366 v1 = POP;
1249 TOP = Fgtr (TOP, v1); 1367 TOP = Fgtr (TOP, v1);
1250 AFTER_POTENTIAL_GC (); 1368 AFTER_POTENTIAL_GC ();
1251 break; 1369 NEXT;
1252 } 1370 }
1253 1371
1254 case Blss: 1372 CASE (Blss):
1255 { 1373 {
1256 Lisp_Object v1; 1374 Lisp_Object v1;
1257 BEFORE_POTENTIAL_GC (); 1375 BEFORE_POTENTIAL_GC ();
1258 v1 = POP; 1376 v1 = POP;
1259 TOP = Flss (TOP, v1); 1377 TOP = Flss (TOP, v1);
1260 AFTER_POTENTIAL_GC (); 1378 AFTER_POTENTIAL_GC ();
1261 break; 1379 NEXT;
1262 } 1380 }
1263 1381
1264 case Bleq: 1382 CASE (Bleq):
1265 { 1383 {
1266 Lisp_Object v1; 1384 Lisp_Object v1;
1267 BEFORE_POTENTIAL_GC (); 1385 BEFORE_POTENTIAL_GC ();
1268 v1 = POP; 1386 v1 = POP;
1269 TOP = Fleq (TOP, v1); 1387 TOP = Fleq (TOP, v1);
1270 AFTER_POTENTIAL_GC (); 1388 AFTER_POTENTIAL_GC ();
1271 break; 1389 NEXT;
1272 } 1390 }
1273 1391
1274 case Bgeq: 1392 CASE (Bgeq):
1275 { 1393 {
1276 Lisp_Object v1; 1394 Lisp_Object v1;
1277 BEFORE_POTENTIAL_GC (); 1395 BEFORE_POTENTIAL_GC ();
1278 v1 = POP; 1396 v1 = POP;
1279 TOP = Fgeq (TOP, v1); 1397 TOP = Fgeq (TOP, v1);
1280 AFTER_POTENTIAL_GC (); 1398 AFTER_POTENTIAL_GC ();
1281 break; 1399 NEXT;
1282 } 1400 }
1283 1401
1284 case Bdiff: 1402 CASE (Bdiff):
1285 BEFORE_POTENTIAL_GC (); 1403 BEFORE_POTENTIAL_GC ();
1286 DISCARD (1); 1404 DISCARD (1);
1287 TOP = Fminus (2, &TOP); 1405 TOP = Fminus (2, &TOP);
1288 AFTER_POTENTIAL_GC (); 1406 AFTER_POTENTIAL_GC ();
1289 break; 1407 NEXT;
1290 1408
1291 case Bnegate: 1409 CASE (Bnegate):
1292 { 1410 {
1293 Lisp_Object v1; 1411 Lisp_Object v1;
1294 v1 = TOP; 1412 v1 = TOP;
@@ -1303,209 +1421,209 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
1303 TOP = Fminus (1, &TOP); 1421 TOP = Fminus (1, &TOP);
1304 AFTER_POTENTIAL_GC (); 1422 AFTER_POTENTIAL_GC ();
1305 } 1423 }
1306 break; 1424 NEXT;
1307 } 1425 }
1308 1426
1309 case Bplus: 1427 CASE (Bplus):
1310 BEFORE_POTENTIAL_GC (); 1428 BEFORE_POTENTIAL_GC ();
1311 DISCARD (1); 1429 DISCARD (1);
1312 TOP = Fplus (2, &TOP); 1430 TOP = Fplus (2, &TOP);
1313 AFTER_POTENTIAL_GC (); 1431 AFTER_POTENTIAL_GC ();
1314 break; 1432 NEXT;
1315 1433
1316 case Bmax: 1434 CASE (Bmax):
1317 BEFORE_POTENTIAL_GC (); 1435 BEFORE_POTENTIAL_GC ();
1318 DISCARD (1); 1436 DISCARD (1);
1319 TOP = Fmax (2, &TOP); 1437 TOP = Fmax (2, &TOP);
1320 AFTER_POTENTIAL_GC (); 1438 AFTER_POTENTIAL_GC ();
1321 break; 1439 NEXT;
1322 1440
1323 case Bmin: 1441 CASE (Bmin):
1324 BEFORE_POTENTIAL_GC (); 1442 BEFORE_POTENTIAL_GC ();
1325 DISCARD (1); 1443 DISCARD (1);
1326 TOP = Fmin (2, &TOP); 1444 TOP = Fmin (2, &TOP);
1327 AFTER_POTENTIAL_GC (); 1445 AFTER_POTENTIAL_GC ();
1328 break; 1446 NEXT;
1329 1447
1330 case Bmult: 1448 CASE (Bmult):
1331 BEFORE_POTENTIAL_GC (); 1449 BEFORE_POTENTIAL_GC ();
1332 DISCARD (1); 1450 DISCARD (1);
1333 TOP = Ftimes (2, &TOP); 1451 TOP = Ftimes (2, &TOP);
1334 AFTER_POTENTIAL_GC (); 1452 AFTER_POTENTIAL_GC ();
1335 break; 1453 NEXT;
1336 1454
1337 case Bquo: 1455 CASE (Bquo):
1338 BEFORE_POTENTIAL_GC (); 1456 BEFORE_POTENTIAL_GC ();
1339 DISCARD (1); 1457 DISCARD (1);
1340 TOP = Fquo (2, &TOP); 1458 TOP = Fquo (2, &TOP);
1341 AFTER_POTENTIAL_GC (); 1459 AFTER_POTENTIAL_GC ();
1342 break; 1460 NEXT;
1343 1461
1344 case Brem: 1462 CASE (Brem):
1345 { 1463 {
1346 Lisp_Object v1; 1464 Lisp_Object v1;
1347 BEFORE_POTENTIAL_GC (); 1465 BEFORE_POTENTIAL_GC ();
1348 v1 = POP; 1466 v1 = POP;
1349 TOP = Frem (TOP, v1); 1467 TOP = Frem (TOP, v1);
1350 AFTER_POTENTIAL_GC (); 1468 AFTER_POTENTIAL_GC ();
1351 break; 1469 NEXT;
1352 } 1470 }
1353 1471
1354 case Bpoint: 1472 CASE (Bpoint):
1355 { 1473 {
1356 Lisp_Object v1; 1474 Lisp_Object v1;
1357 XSETFASTINT (v1, PT); 1475 XSETFASTINT (v1, PT);
1358 PUSH (v1); 1476 PUSH (v1);
1359 break; 1477 NEXT;
1360 } 1478 }
1361 1479
1362 case Bgoto_char: 1480 CASE (Bgoto_char):
1363 BEFORE_POTENTIAL_GC (); 1481 BEFORE_POTENTIAL_GC ();
1364 TOP = Fgoto_char (TOP); 1482 TOP = Fgoto_char (TOP);
1365 AFTER_POTENTIAL_GC (); 1483 AFTER_POTENTIAL_GC ();
1366 break; 1484 NEXT;
1367 1485
1368 case Binsert: 1486 CASE (Binsert):
1369 BEFORE_POTENTIAL_GC (); 1487 BEFORE_POTENTIAL_GC ();
1370 TOP = Finsert (1, &TOP); 1488 TOP = Finsert (1, &TOP);
1371 AFTER_POTENTIAL_GC (); 1489 AFTER_POTENTIAL_GC ();
1372 break; 1490 NEXT;
1373 1491
1374 case BinsertN: 1492 CASE (BinsertN):
1375 op = FETCH; 1493 op = FETCH;
1376 BEFORE_POTENTIAL_GC (); 1494 BEFORE_POTENTIAL_GC ();
1377 DISCARD (op - 1); 1495 DISCARD (op - 1);
1378 TOP = Finsert (op, &TOP); 1496 TOP = Finsert (op, &TOP);
1379 AFTER_POTENTIAL_GC (); 1497 AFTER_POTENTIAL_GC ();
1380 break; 1498 NEXT;
1381 1499
1382 case Bpoint_max: 1500 CASE (Bpoint_max):
1383 { 1501 {
1384 Lisp_Object v1; 1502 Lisp_Object v1;
1385 XSETFASTINT (v1, ZV); 1503 XSETFASTINT (v1, ZV);
1386 PUSH (v1); 1504 PUSH (v1);
1387 break; 1505 NEXT;
1388 } 1506 }
1389 1507
1390 case Bpoint_min: 1508 CASE (Bpoint_min):
1391 { 1509 {
1392 Lisp_Object v1; 1510 Lisp_Object v1;
1393 XSETFASTINT (v1, BEGV); 1511 XSETFASTINT (v1, BEGV);
1394 PUSH (v1); 1512 PUSH (v1);
1395 break; 1513 NEXT;
1396 } 1514 }
1397 1515
1398 case Bchar_after: 1516 CASE (Bchar_after):
1399 BEFORE_POTENTIAL_GC (); 1517 BEFORE_POTENTIAL_GC ();
1400 TOP = Fchar_after (TOP); 1518 TOP = Fchar_after (TOP);
1401 AFTER_POTENTIAL_GC (); 1519 AFTER_POTENTIAL_GC ();
1402 break; 1520 NEXT;
1403 1521
1404 case Bfollowing_char: 1522 CASE (Bfollowing_char):
1405 { 1523 {
1406 Lisp_Object v1; 1524 Lisp_Object v1;
1407 BEFORE_POTENTIAL_GC (); 1525 BEFORE_POTENTIAL_GC ();
1408 v1 = Ffollowing_char (); 1526 v1 = Ffollowing_char ();
1409 AFTER_POTENTIAL_GC (); 1527 AFTER_POTENTIAL_GC ();
1410 PUSH (v1); 1528 PUSH (v1);
1411 break; 1529 NEXT;
1412 } 1530 }
1413 1531
1414 case Bpreceding_char: 1532 CASE (Bpreceding_char):
1415 { 1533 {
1416 Lisp_Object v1; 1534 Lisp_Object v1;
1417 BEFORE_POTENTIAL_GC (); 1535 BEFORE_POTENTIAL_GC ();
1418 v1 = Fprevious_char (); 1536 v1 = Fprevious_char ();
1419 AFTER_POTENTIAL_GC (); 1537 AFTER_POTENTIAL_GC ();
1420 PUSH (v1); 1538 PUSH (v1);
1421 break; 1539 NEXT;
1422 } 1540 }
1423 1541
1424 case Bcurrent_column: 1542 CASE (Bcurrent_column):
1425 { 1543 {
1426 Lisp_Object v1; 1544 Lisp_Object v1;
1427 BEFORE_POTENTIAL_GC (); 1545 BEFORE_POTENTIAL_GC ();
1428 XSETFASTINT (v1, current_column ()); 1546 XSETFASTINT (v1, current_column ());
1429 AFTER_POTENTIAL_GC (); 1547 AFTER_POTENTIAL_GC ();
1430 PUSH (v1); 1548 PUSH (v1);
1431 break; 1549 NEXT;
1432 } 1550 }
1433 1551
1434 case Bindent_to: 1552 CASE (Bindent_to):
1435 BEFORE_POTENTIAL_GC (); 1553 BEFORE_POTENTIAL_GC ();
1436 TOP = Findent_to (TOP, Qnil); 1554 TOP = Findent_to (TOP, Qnil);
1437 AFTER_POTENTIAL_GC (); 1555 AFTER_POTENTIAL_GC ();
1438 break; 1556 NEXT;
1439 1557
1440 case Beolp: 1558 CASE (Beolp):
1441 PUSH (Feolp ()); 1559 PUSH (Feolp ());
1442 break; 1560 NEXT;
1443 1561
1444 case Beobp: 1562 CASE (Beobp):
1445 PUSH (Feobp ()); 1563 PUSH (Feobp ());
1446 break; 1564 NEXT;
1447 1565
1448 case Bbolp: 1566 CASE (Bbolp):
1449 PUSH (Fbolp ()); 1567 PUSH (Fbolp ());
1450 break; 1568 NEXT;
1451 1569
1452 case Bbobp: 1570 CASE (Bbobp):
1453 PUSH (Fbobp ()); 1571 PUSH (Fbobp ());
1454 break; 1572 NEXT;
1455 1573
1456 case Bcurrent_buffer: 1574 CASE (Bcurrent_buffer):
1457 PUSH (Fcurrent_buffer ()); 1575 PUSH (Fcurrent_buffer ());
1458 break; 1576 NEXT;
1459 1577
1460 case Bset_buffer: 1578 CASE (Bset_buffer):
1461 BEFORE_POTENTIAL_GC (); 1579 BEFORE_POTENTIAL_GC ();
1462 TOP = Fset_buffer (TOP); 1580 TOP = Fset_buffer (TOP);
1463 AFTER_POTENTIAL_GC (); 1581 AFTER_POTENTIAL_GC ();
1464 break; 1582 NEXT;
1465 1583
1466 case Binteractive_p: /* Obsolete since 24.1. */ 1584 CASE (Binteractive_p): /* Obsolete since 24.1. */
1467 PUSH (Finteractive_p ()); 1585 PUSH (Finteractive_p ());
1468 break; 1586 NEXT;
1469 1587
1470 case Bforward_char: 1588 CASE (Bforward_char):
1471 BEFORE_POTENTIAL_GC (); 1589 BEFORE_POTENTIAL_GC ();
1472 TOP = Fforward_char (TOP); 1590 TOP = Fforward_char (TOP);
1473 AFTER_POTENTIAL_GC (); 1591 AFTER_POTENTIAL_GC ();
1474 break; 1592 NEXT;
1475 1593
1476 case Bforward_word: 1594 CASE (Bforward_word):
1477 BEFORE_POTENTIAL_GC (); 1595 BEFORE_POTENTIAL_GC ();
1478 TOP = Fforward_word (TOP); 1596 TOP = Fforward_word (TOP);
1479 AFTER_POTENTIAL_GC (); 1597 AFTER_POTENTIAL_GC ();
1480 break; 1598 NEXT;
1481 1599
1482 case Bskip_chars_forward: 1600 CASE (Bskip_chars_forward):
1483 { 1601 {
1484 Lisp_Object v1; 1602 Lisp_Object v1;
1485 BEFORE_POTENTIAL_GC (); 1603 BEFORE_POTENTIAL_GC ();
1486 v1 = POP; 1604 v1 = POP;
1487 TOP = Fskip_chars_forward (TOP, v1); 1605 TOP = Fskip_chars_forward (TOP, v1);
1488 AFTER_POTENTIAL_GC (); 1606 AFTER_POTENTIAL_GC ();
1489 break; 1607 NEXT;
1490 } 1608 }
1491 1609
1492 case Bskip_chars_backward: 1610 CASE (Bskip_chars_backward):
1493 { 1611 {
1494 Lisp_Object v1; 1612 Lisp_Object v1;
1495 BEFORE_POTENTIAL_GC (); 1613 BEFORE_POTENTIAL_GC ();
1496 v1 = POP; 1614 v1 = POP;
1497 TOP = Fskip_chars_backward (TOP, v1); 1615 TOP = Fskip_chars_backward (TOP, v1);
1498 AFTER_POTENTIAL_GC (); 1616 AFTER_POTENTIAL_GC ();
1499 break; 1617 NEXT;
1500 } 1618 }
1501 1619
1502 case Bforward_line: 1620 CASE (Bforward_line):
1503 BEFORE_POTENTIAL_GC (); 1621 BEFORE_POTENTIAL_GC ();
1504 TOP = Fforward_line (TOP); 1622 TOP = Fforward_line (TOP);
1505 AFTER_POTENTIAL_GC (); 1623 AFTER_POTENTIAL_GC ();
1506 break; 1624 NEXT;
1507 1625
1508 case Bchar_syntax: 1626 CASE (Bchar_syntax):
1509 { 1627 {
1510 int c; 1628 int c;
1511 1629
@@ -1517,51 +1635,51 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
1517 MAKE_CHAR_MULTIBYTE (c); 1635 MAKE_CHAR_MULTIBYTE (c);
1518 XSETFASTINT (TOP, syntax_code_spec[(int) SYNTAX (c)]); 1636 XSETFASTINT (TOP, syntax_code_spec[(int) SYNTAX (c)]);
1519 } 1637 }
1520 break; 1638 NEXT;
1521 1639
1522 case Bbuffer_substring: 1640 CASE (Bbuffer_substring):
1523 { 1641 {
1524 Lisp_Object v1; 1642 Lisp_Object v1;
1525 BEFORE_POTENTIAL_GC (); 1643 BEFORE_POTENTIAL_GC ();
1526 v1 = POP; 1644 v1 = POP;
1527 TOP = Fbuffer_substring (TOP, v1); 1645 TOP = Fbuffer_substring (TOP, v1);
1528 AFTER_POTENTIAL_GC (); 1646 AFTER_POTENTIAL_GC ();
1529 break; 1647 NEXT;
1530 } 1648 }
1531 1649
1532 case Bdelete_region: 1650 CASE (Bdelete_region):
1533 { 1651 {
1534 Lisp_Object v1; 1652 Lisp_Object v1;
1535 BEFORE_POTENTIAL_GC (); 1653 BEFORE_POTENTIAL_GC ();
1536 v1 = POP; 1654 v1 = POP;
1537 TOP = Fdelete_region (TOP, v1); 1655 TOP = Fdelete_region (TOP, v1);
1538 AFTER_POTENTIAL_GC (); 1656 AFTER_POTENTIAL_GC ();
1539 break; 1657 NEXT;
1540 } 1658 }
1541 1659
1542 case Bnarrow_to_region: 1660 CASE (Bnarrow_to_region):
1543 { 1661 {
1544 Lisp_Object v1; 1662 Lisp_Object v1;
1545 BEFORE_POTENTIAL_GC (); 1663 BEFORE_POTENTIAL_GC ();
1546 v1 = POP; 1664 v1 = POP;
1547 TOP = Fnarrow_to_region (TOP, v1); 1665 TOP = Fnarrow_to_region (TOP, v1);
1548 AFTER_POTENTIAL_GC (); 1666 AFTER_POTENTIAL_GC ();
1549 break; 1667 NEXT;
1550 } 1668 }
1551 1669
1552 case Bwiden: 1670 CASE (Bwiden):
1553 BEFORE_POTENTIAL_GC (); 1671 BEFORE_POTENTIAL_GC ();
1554 PUSH (Fwiden ()); 1672 PUSH (Fwiden ());
1555 AFTER_POTENTIAL_GC (); 1673 AFTER_POTENTIAL_GC ();
1556 break; 1674 NEXT;
1557 1675
1558 case Bend_of_line: 1676 CASE (Bend_of_line):
1559 BEFORE_POTENTIAL_GC (); 1677 BEFORE_POTENTIAL_GC ();
1560 TOP = Fend_of_line (TOP); 1678 TOP = Fend_of_line (TOP);
1561 AFTER_POTENTIAL_GC (); 1679 AFTER_POTENTIAL_GC ();
1562 break; 1680 NEXT;
1563 1681
1564 case Bset_marker: 1682 CASE (Bset_marker):
1565 { 1683 {
1566 Lisp_Object v1, v2; 1684 Lisp_Object v1, v2;
1567 BEFORE_POTENTIAL_GC (); 1685 BEFORE_POTENTIAL_GC ();
@@ -1569,72 +1687,72 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
1569 v2 = POP; 1687 v2 = POP;
1570 TOP = Fset_marker (TOP, v2, v1); 1688 TOP = Fset_marker (TOP, v2, v1);
1571 AFTER_POTENTIAL_GC (); 1689 AFTER_POTENTIAL_GC ();
1572 break; 1690 NEXT;
1573 } 1691 }
1574 1692
1575 case Bmatch_beginning: 1693 CASE (Bmatch_beginning):
1576 BEFORE_POTENTIAL_GC (); 1694 BEFORE_POTENTIAL_GC ();
1577 TOP = Fmatch_beginning (TOP); 1695 TOP = Fmatch_beginning (TOP);
1578 AFTER_POTENTIAL_GC (); 1696 AFTER_POTENTIAL_GC ();
1579 break; 1697 NEXT;
1580 1698
1581 case Bmatch_end: 1699 CASE (Bmatch_end):
1582 BEFORE_POTENTIAL_GC (); 1700 BEFORE_POTENTIAL_GC ();
1583 TOP = Fmatch_end (TOP); 1701 TOP = Fmatch_end (TOP);
1584 AFTER_POTENTIAL_GC (); 1702 AFTER_POTENTIAL_GC ();
1585 break; 1703 NEXT;
1586 1704
1587 case Bupcase: 1705 CASE (Bupcase):
1588 BEFORE_POTENTIAL_GC (); 1706 BEFORE_POTENTIAL_GC ();
1589 TOP = Fupcase (TOP); 1707 TOP = Fupcase (TOP);
1590 AFTER_POTENTIAL_GC (); 1708 AFTER_POTENTIAL_GC ();
1591 break; 1709 NEXT;
1592 1710
1593 case Bdowncase: 1711 CASE (Bdowncase):
1594 BEFORE_POTENTIAL_GC (); 1712 BEFORE_POTENTIAL_GC ();
1595 TOP = Fdowncase (TOP); 1713 TOP = Fdowncase (TOP);
1596 AFTER_POTENTIAL_GC (); 1714 AFTER_POTENTIAL_GC ();
1597 break; 1715 NEXT;
1598 1716
1599 case Bstringeqlsign: 1717 CASE (Bstringeqlsign):
1600 { 1718 {
1601 Lisp_Object v1; 1719 Lisp_Object v1;
1602 BEFORE_POTENTIAL_GC (); 1720 BEFORE_POTENTIAL_GC ();
1603 v1 = POP; 1721 v1 = POP;
1604 TOP = Fstring_equal (TOP, v1); 1722 TOP = Fstring_equal (TOP, v1);
1605 AFTER_POTENTIAL_GC (); 1723 AFTER_POTENTIAL_GC ();
1606 break; 1724 NEXT;
1607 } 1725 }
1608 1726
1609 case Bstringlss: 1727 CASE (Bstringlss):
1610 { 1728 {
1611 Lisp_Object v1; 1729 Lisp_Object v1;
1612 BEFORE_POTENTIAL_GC (); 1730 BEFORE_POTENTIAL_GC ();
1613 v1 = POP; 1731 v1 = POP;
1614 TOP = Fstring_lessp (TOP, v1); 1732 TOP = Fstring_lessp (TOP, v1);
1615 AFTER_POTENTIAL_GC (); 1733 AFTER_POTENTIAL_GC ();
1616 break; 1734 NEXT;
1617 } 1735 }
1618 1736
1619 case Bequal: 1737 CASE (Bequal):
1620 { 1738 {
1621 Lisp_Object v1; 1739 Lisp_Object v1;
1622 v1 = POP; 1740 v1 = POP;
1623 TOP = Fequal (TOP, v1); 1741 TOP = Fequal (TOP, v1);
1624 break; 1742 NEXT;
1625 } 1743 }
1626 1744
1627 case Bnthcdr: 1745 CASE (Bnthcdr):
1628 { 1746 {
1629 Lisp_Object v1; 1747 Lisp_Object v1;
1630 BEFORE_POTENTIAL_GC (); 1748 BEFORE_POTENTIAL_GC ();
1631 v1 = POP; 1749 v1 = POP;
1632 TOP = Fnthcdr (TOP, v1); 1750 TOP = Fnthcdr (TOP, v1);
1633 AFTER_POTENTIAL_GC (); 1751 AFTER_POTENTIAL_GC ();
1634 break; 1752 NEXT;
1635 } 1753 }
1636 1754
1637 case Belt: 1755 CASE (Belt):
1638 { 1756 {
1639 Lisp_Object v1, v2; 1757 Lisp_Object v1, v2;
1640 if (CONSP (TOP)) 1758 if (CONSP (TOP))
@@ -1660,87 +1778,91 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
1660 TOP = Felt (TOP, v1); 1778 TOP = Felt (TOP, v1);
1661 AFTER_POTENTIAL_GC (); 1779 AFTER_POTENTIAL_GC ();
1662 } 1780 }
1663 break; 1781 NEXT;
1664 } 1782 }
1665 1783
1666 case Bmember: 1784 CASE (Bmember):
1667 { 1785 {
1668 Lisp_Object v1; 1786 Lisp_Object v1;
1669 BEFORE_POTENTIAL_GC (); 1787 BEFORE_POTENTIAL_GC ();
1670 v1 = POP; 1788 v1 = POP;
1671 TOP = Fmember (TOP, v1); 1789 TOP = Fmember (TOP, v1);
1672 AFTER_POTENTIAL_GC (); 1790 AFTER_POTENTIAL_GC ();
1673 break; 1791 NEXT;
1674 } 1792 }
1675 1793
1676 case Bassq: 1794 CASE (Bassq):
1677 { 1795 {
1678 Lisp_Object v1; 1796 Lisp_Object v1;
1679 BEFORE_POTENTIAL_GC (); 1797 BEFORE_POTENTIAL_GC ();
1680 v1 = POP; 1798 v1 = POP;
1681 TOP = Fassq (TOP, v1); 1799 TOP = Fassq (TOP, v1);
1682 AFTER_POTENTIAL_GC (); 1800 AFTER_POTENTIAL_GC ();
1683 break; 1801 NEXT;
1684 } 1802 }
1685 1803
1686 case Bnreverse: 1804 CASE (Bnreverse):
1687 BEFORE_POTENTIAL_GC (); 1805 BEFORE_POTENTIAL_GC ();
1688 TOP = Fnreverse (TOP); 1806 TOP = Fnreverse (TOP);
1689 AFTER_POTENTIAL_GC (); 1807 AFTER_POTENTIAL_GC ();
1690 break; 1808 NEXT;
1691 1809
1692 case Bsetcar: 1810 CASE (Bsetcar):
1693 { 1811 {
1694 Lisp_Object v1; 1812 Lisp_Object v1;
1695 BEFORE_POTENTIAL_GC (); 1813 BEFORE_POTENTIAL_GC ();
1696 v1 = POP; 1814 v1 = POP;
1697 TOP = Fsetcar (TOP, v1); 1815 TOP = Fsetcar (TOP, v1);
1698 AFTER_POTENTIAL_GC (); 1816 AFTER_POTENTIAL_GC ();
1699 break; 1817 NEXT;
1700 } 1818 }
1701 1819
1702 case Bsetcdr: 1820 CASE (Bsetcdr):
1703 { 1821 {
1704 Lisp_Object v1; 1822 Lisp_Object v1;
1705 BEFORE_POTENTIAL_GC (); 1823 BEFORE_POTENTIAL_GC ();
1706 v1 = POP; 1824 v1 = POP;
1707 TOP = Fsetcdr (TOP, v1); 1825 TOP = Fsetcdr (TOP, v1);
1708 AFTER_POTENTIAL_GC (); 1826 AFTER_POTENTIAL_GC ();
1709 break; 1827 NEXT;
1710 } 1828 }
1711 1829
1712 case Bcar_safe: 1830 CASE (Bcar_safe):
1713 { 1831 {
1714 Lisp_Object v1; 1832 Lisp_Object v1;
1715 v1 = TOP; 1833 v1 = TOP;
1716 TOP = CAR_SAFE (v1); 1834 TOP = CAR_SAFE (v1);
1717 break; 1835 NEXT;
1718 } 1836 }
1719 1837
1720 case Bcdr_safe: 1838 CASE (Bcdr_safe):
1721 { 1839 {
1722 Lisp_Object v1; 1840 Lisp_Object v1;
1723 v1 = TOP; 1841 v1 = TOP;
1724 TOP = CDR_SAFE (v1); 1842 TOP = CDR_SAFE (v1);
1725 break; 1843 NEXT;
1726 } 1844 }
1727 1845
1728 case Bnconc: 1846 CASE (Bnconc):
1729 BEFORE_POTENTIAL_GC (); 1847 BEFORE_POTENTIAL_GC ();
1730 DISCARD (1); 1848 DISCARD (1);
1731 TOP = Fnconc (2, &TOP); 1849 TOP = Fnconc (2, &TOP);
1732 AFTER_POTENTIAL_GC (); 1850 AFTER_POTENTIAL_GC ();
1733 break; 1851 NEXT;
1734 1852
1735 case Bnumberp: 1853 CASE (Bnumberp):
1736 TOP = (NUMBERP (TOP) ? Qt : Qnil); 1854 TOP = (NUMBERP (TOP) ? Qt : Qnil);
1737 break; 1855 NEXT;
1738 1856
1739 case Bintegerp: 1857 CASE (Bintegerp):
1740 TOP = INTEGERP (TOP) ? Qt : Qnil; 1858 TOP = INTEGERP (TOP) ? Qt : Qnil;
1741 break; 1859 NEXT;
1742 1860
1743#ifdef BYTE_CODE_SAFE 1861#ifdef BYTE_CODE_SAFE
1862 /* These are intentionally written using 'case' syntax,
1863 because they are incompatible with the threaded
1864 interpreter. */
1865
1744 case Bset_mark: 1866 case Bset_mark:
1745 BEFORE_POTENTIAL_GC (); 1867 BEFORE_POTENTIAL_GC ();
1746 error ("set-mark is an obsolete bytecode"); 1868 error ("set-mark is an obsolete bytecode");
@@ -1753,49 +1875,49 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
1753 break; 1875 break;
1754#endif 1876#endif
1755 1877
1756 case 0: 1878 CASE_ABORT:
1757 /* Actually this is Bstack_ref with offset 0, but we use Bdup 1879 /* Actually this is Bstack_ref with offset 0, but we use Bdup
1758 for that instead. */ 1880 for that instead. */
1759 /* case Bstack_ref: */ 1881 /* CASE (Bstack_ref): */
1760 abort (); 1882 abort ();
1761 1883
1762 /* Handy byte-codes for lexical binding. */ 1884 /* Handy byte-codes for lexical binding. */
1763 case Bstack_ref+1: 1885 CASE (Bstack_ref1):
1764 case Bstack_ref+2: 1886 CASE (Bstack_ref2):
1765 case Bstack_ref+3: 1887 CASE (Bstack_ref3):
1766 case Bstack_ref+4: 1888 CASE (Bstack_ref4):
1767 case Bstack_ref+5: 1889 CASE (Bstack_ref5):
1768 { 1890 {
1769 Lisp_Object *ptr = top - (op - Bstack_ref); 1891 Lisp_Object *ptr = top - (op - Bstack_ref);
1770 PUSH (*ptr); 1892 PUSH (*ptr);
1771 break; 1893 NEXT;
1772 } 1894 }
1773 case Bstack_ref+6: 1895 CASE (Bstack_ref6):
1774 { 1896 {
1775 Lisp_Object *ptr = top - (FETCH); 1897 Lisp_Object *ptr = top - (FETCH);
1776 PUSH (*ptr); 1898 PUSH (*ptr);
1777 break; 1899 NEXT;
1778 } 1900 }
1779 case Bstack_ref+7: 1901 CASE (Bstack_ref7):
1780 { 1902 {
1781 Lisp_Object *ptr = top - (FETCH2); 1903 Lisp_Object *ptr = top - (FETCH2);
1782 PUSH (*ptr); 1904 PUSH (*ptr);
1783 break; 1905 NEXT;
1784 } 1906 }
1785 case Bstack_set: 1907 CASE (Bstack_set):
1786 /* stack-set-0 = discard; stack-set-1 = discard-1-preserve-tos. */ 1908 /* stack-set-0 = discard; stack-set-1 = discard-1-preserve-tos. */
1787 { 1909 {
1788 Lisp_Object *ptr = top - (FETCH); 1910 Lisp_Object *ptr = top - (FETCH);
1789 *ptr = POP; 1911 *ptr = POP;
1790 break; 1912 NEXT;
1791 } 1913 }
1792 case Bstack_set2: 1914 CASE (Bstack_set2):
1793 { 1915 {
1794 Lisp_Object *ptr = top - (FETCH2); 1916 Lisp_Object *ptr = top - (FETCH2);
1795 *ptr = POP; 1917 *ptr = POP;
1796 break; 1918 NEXT;
1797 } 1919 }
1798 case BdiscardN: 1920 CASE (BdiscardN):
1799 op = FETCH; 1921 op = FETCH;
1800 if (op & 0x80) 1922 if (op & 0x80)
1801 { 1923 {
@@ -1803,10 +1925,10 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
1803 top[-op] = TOP; 1925 top[-op] = TOP;
1804 } 1926 }
1805 DISCARD (op); 1927 DISCARD (op);
1806 break; 1928 NEXT;
1807 1929
1808 case 255: 1930 CASE_DEFAULT
1809 default: 1931 CASE (Bconstant):
1810#ifdef BYTE_CODE_SAFE 1932#ifdef BYTE_CODE_SAFE
1811 if (op < Bconstant) 1933 if (op < Bconstant)
1812 { 1934 {
@@ -1820,6 +1942,7 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
1820#else 1942#else
1821 PUSH (vectorp[op - Bconstant]); 1943 PUSH (vectorp[op - Bconstant]);
1822#endif 1944#endif
1945 NEXT;
1823 } 1946 }
1824 } 1947 }
1825 1948
@@ -1867,8 +1990,8 @@ integer, it is incremented each time that symbol's function is called. */);
1867 { 1990 {
1868 int i = 256; 1991 int i = 256;
1869 while (i--) 1992 while (i--)
1870 XVECTOR (Vbyte_code_meter)->contents[i] = 1993 ASET (Vbyte_code_meter, i,
1871 Fmake_vector (make_number (256), make_number (0)); 1994 Fmake_vector (make_number (256), make_number (0)));
1872 } 1995 }
1873#endif 1996#endif
1874} 1997}
generated by cgit v1.2.1 (git 2.18.0) at 2026-01-24 21:57:09 +0000