aboutsummaryrefslogtreecommitdiffstats
path: root/src/bytecode.c
diff options
context:
space:
mode:
authorJoakim Verona2012-07-27 02:22:03 +0200
committerJoakim Verona2012-07-27 02:22:03 +0200
commit5fb63197843dcae66f2fe0ddd6f4a9d560e9db2f (patch)
tree5c55f1096a656a9759f0b53a0b5d1a2289bd366f /src/bytecode.c
parent0c5c85cf2b350c965bb1ffa5b2d77c2adebc406b (diff)
parent562157c814037dcba58a20cd6908a95992c22283 (diff)
downloademacs-5fb63197843dcae66f2fe0ddd6f4a9d560e9db2f.tar.gz
emacs-5fb63197843dcae66f2fe0ddd6f4a9d560e9db2f.zip
upstream
Diffstat (limited to 'src/bytecode.c')
-rw-r--r--src/bytecode.c1047
1 files changed, 583 insertions, 464 deletions
diff --git a/src/bytecode.c b/src/bytecode.c
index 9c7a3fa30cf..dca1e552dd0 100644
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -54,6 +54,14 @@ 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
@@ -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)
@@ -369,15 +423,11 @@ unmark_byte_stack (void)
369/* Garbage collect if we have consed enough since the last time. 423/* Garbage collect if we have consed enough since the last time.
370 We do this at every branch, to avoid loops that never GC. */ 424 We do this at every branch, to avoid loops that never GC. */
371 425
372#define MAYBE_GC() \ 426#define MAYBE_GC() \
373 do { \ 427 do { \
374 if (consing_since_gc > gc_cons_threshold \ 428 BEFORE_POTENTIAL_GC (); \
375 && consing_since_gc > gc_relative_threshold) \ 429 maybe_gc (); \
376 { \ 430 AFTER_POTENTIAL_GC (); \
377 BEFORE_POTENTIAL_GC (); \
378 Fgarbage_collect (); \
379 AFTER_POTENTIAL_GC (); \
380 } \
381 } while (0) 431 } while (0)
382 432
383/* Check for jumping out of range. */ 433/* Check for jumping out of range. */
@@ -488,8 +538,7 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
488 stack.constants = vector; 538 stack.constants = vector;
489 if (MAX_ALLOCA / sizeof (Lisp_Object) <= XFASTINT (maxdepth)) 539 if (MAX_ALLOCA / sizeof (Lisp_Object) <= XFASTINT (maxdepth))
490 memory_full (SIZE_MAX); 540 memory_full (SIZE_MAX);
491 top = (Lisp_Object *) alloca ((XFASTINT (maxdepth) + 1) 541 top = alloca ((XFASTINT (maxdepth) + 1) * sizeof *top);
492 * sizeof (Lisp_Object));
493#if BYTE_MAINTAIN_TOP 542#if BYTE_MAINTAIN_TOP
494 stack.bottom = top + 1; 543 stack.bottom = top + 1;
495 stack.top = NULL; 544 stack.top = NULL;
@@ -561,27 +610,93 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
561 this_op = op = FETCH; 610 this_op = op = FETCH;
562 METER_CODE (prev_op, op); 611 METER_CODE (prev_op, op);
563#else 612#else
613#ifndef BYTE_CODE_THREADED
564 op = FETCH; 614 op = FETCH;
565#endif 615#endif
616#endif
617
618 /* The interpreter can be compiled one of two ways: as an
619 ordinary switch-based interpreter, or as a threaded
620 interpreter. The threaded interpreter relies on GCC's
621 computed goto extension, so it is not available everywhere.
622 Threading provides a performance boost. These macros are how
623 we allow the code to be compiled both ways. */
624#ifdef BYTE_CODE_THREADED
625 /* The CASE macro introduces an instruction's body. It is
626 either a label or a case label. */
627#define CASE(OP) insn_ ## OP
628 /* NEXT is invoked at the end of an instruction to go to the
629 next instruction. It is either a computed goto, or a
630 plain break. */
631#define NEXT goto *(targets[op = FETCH])
632 /* FIRST is like NEXT, but is only used at the start of the
633 interpreter body. In the switch-based interpreter it is the
634 switch, so the threaded definition must include a semicolon. */
635#define FIRST NEXT;
636 /* Most cases are labeled with the CASE macro, above.
637 CASE_DEFAULT is one exception; it is used if the interpreter
638 being built requires a default case. The threaded
639 interpreter does not, because the dispatch table is
640 completely filled. */
641#define CASE_DEFAULT
642 /* This introduces an instruction that is known to call abort. */
643#define CASE_ABORT CASE (Bstack_ref): CASE (default)
644#else
645 /* See above for the meaning of the various defines. */
646#define CASE(OP) case OP
647#define NEXT break
648#define FIRST switch (op)
649#define CASE_DEFAULT case 255: default:
650#define CASE_ABORT case 0
651#endif
566 652
567 switch (op) 653#ifdef BYTE_CODE_THREADED
654
655 /* A convenience define that saves us a lot of typing and makes
656 the table clearer. */
657#define LABEL(OP) [OP] = &&insn_ ## OP
658
659#if (__GNUC__ == 4 && 6 <= __GNUC_MINOR__) || 4 < __GNUC__
660# pragma GCC diagnostic push
661# pragma GCC diagnostic ignored "-Woverride-init"
662#endif
663
664 /* This is the dispatch table for the threaded interpreter. */
665 static const void *const targets[256] =
568 { 666 {
569 case Bvarref + 7: 667 [0 ... (Bconstant - 1)] = &&insn_default,
668 [Bconstant ... 255] = &&insn_Bconstant,
669
670#define DEFINE(name, value) LABEL (name) ,
671 BYTE_CODES
672#undef DEFINE
673 };
674
675#if (__GNUC__ == 4 && 6 <= __GNUC_MINOR__) || 4 < __GNUC__
676# pragma GCC diagnostic pop
677#endif
678
679#endif
680
681
682 FIRST
683 {
684 CASE (Bvarref7):
570 op = FETCH2; 685 op = FETCH2;
571 goto varref; 686 goto varref;
572 687
573 case Bvarref: 688 CASE (Bvarref):
574 case Bvarref + 1: 689 CASE (Bvarref1):
575 case Bvarref + 2: 690 CASE (Bvarref2):
576 case Bvarref + 3: 691 CASE (Bvarref3):
577 case Bvarref + 4: 692 CASE (Bvarref4):
578 case Bvarref + 5: 693 CASE (Bvarref5):
579 op = op - Bvarref; 694 op = op - Bvarref;
580 goto varref; 695 goto varref;
581 696
582 /* This seems to be the most frequently executed byte-code 697 /* This seems to be the most frequently executed byte-code
583 among the Bvarref's, so avoid a goto here. */ 698 among the Bvarref's, so avoid a goto here. */
584 case Bvarref+6: 699 CASE (Bvarref6):
585 op = FETCH; 700 op = FETCH;
586 varref: 701 varref:
587 { 702 {
@@ -606,10 +721,10 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
606 AFTER_POTENTIAL_GC (); 721 AFTER_POTENTIAL_GC ();
607 } 722 }
608 PUSH (v2); 723 PUSH (v2);
609 break; 724 NEXT;
610 } 725 }
611 726
612 case Bgotoifnil: 727 CASE (Bgotoifnil):
613 { 728 {
614 Lisp_Object v1; 729 Lisp_Object v1;
615 MAYBE_GC (); 730 MAYBE_GC ();
@@ -621,10 +736,10 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
621 CHECK_RANGE (op); 736 CHECK_RANGE (op);
622 stack.pc = stack.byte_string_start + op; 737 stack.pc = stack.byte_string_start + op;
623 } 738 }
624 break; 739 NEXT;
625 } 740 }
626 741
627 case Bcar: 742 CASE (Bcar):
628 { 743 {
629 Lisp_Object v1; 744 Lisp_Object v1;
630 v1 = TOP; 745 v1 = TOP;
@@ -638,28 +753,28 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
638 wrong_type_argument (Qlistp, v1); 753 wrong_type_argument (Qlistp, v1);
639 AFTER_POTENTIAL_GC (); 754 AFTER_POTENTIAL_GC ();
640 } 755 }
641 break; 756 NEXT;
642 } 757 }
643 758
644 case Beq: 759 CASE (Beq):
645 { 760 {
646 Lisp_Object v1; 761 Lisp_Object v1;
647 v1 = POP; 762 v1 = POP;
648 TOP = EQ (v1, TOP) ? Qt : Qnil; 763 TOP = EQ (v1, TOP) ? Qt : Qnil;
649 break; 764 NEXT;
650 } 765 }
651 766
652 case Bmemq: 767 CASE (Bmemq):
653 { 768 {
654 Lisp_Object v1; 769 Lisp_Object v1;
655 BEFORE_POTENTIAL_GC (); 770 BEFORE_POTENTIAL_GC ();
656 v1 = POP; 771 v1 = POP;
657 TOP = Fmemq (TOP, v1); 772 TOP = Fmemq (TOP, v1);
658 AFTER_POTENTIAL_GC (); 773 AFTER_POTENTIAL_GC ();
659 break; 774 NEXT;
660 } 775 }
661 776
662 case Bcdr: 777 CASE (Bcdr):
663 { 778 {
664 Lisp_Object v1; 779 Lisp_Object v1;
665 v1 = TOP; 780 v1 = TOP;
@@ -673,24 +788,23 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
673 wrong_type_argument (Qlistp, v1); 788 wrong_type_argument (Qlistp, v1);
674 AFTER_POTENTIAL_GC (); 789 AFTER_POTENTIAL_GC ();
675 } 790 }
676 break; 791 NEXT;
677 break;
678 } 792 }
679 793
680 case Bvarset: 794 CASE (Bvarset):
681 case Bvarset+1: 795 CASE (Bvarset1):
682 case Bvarset+2: 796 CASE (Bvarset2):
683 case Bvarset+3: 797 CASE (Bvarset3):
684 case Bvarset+4: 798 CASE (Bvarset4):
685 case Bvarset+5: 799 CASE (Bvarset5):
686 op -= Bvarset; 800 op -= Bvarset;
687 goto varset; 801 goto varset;
688 802
689 case Bvarset+7: 803 CASE (Bvarset7):
690 op = FETCH2; 804 op = FETCH2;
691 goto varset; 805 goto varset;
692 806
693 case Bvarset+6: 807 CASE (Bvarset6):
694 op = FETCH; 808 op = FETCH;
695 varset: 809 varset:
696 { 810 {
@@ -713,54 +827,54 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
713 } 827 }
714 } 828 }
715 (void) POP; 829 (void) POP;
716 break; 830 NEXT;
717 831
718 case Bdup: 832 CASE (Bdup):
719 { 833 {
720 Lisp_Object v1; 834 Lisp_Object v1;
721 v1 = TOP; 835 v1 = TOP;
722 PUSH (v1); 836 PUSH (v1);
723 break; 837 NEXT;
724 } 838 }
725 839
726 /* ------------------ */ 840 /* ------------------ */
727 841
728 case Bvarbind+6: 842 CASE (Bvarbind6):
729 op = FETCH; 843 op = FETCH;
730 goto varbind; 844 goto varbind;
731 845
732 case Bvarbind+7: 846 CASE (Bvarbind7):
733 op = FETCH2; 847 op = FETCH2;
734 goto varbind; 848 goto varbind;
735 849
736 case Bvarbind: 850 CASE (Bvarbind):
737 case Bvarbind+1: 851 CASE (Bvarbind1):
738 case Bvarbind+2: 852 CASE (Bvarbind2):
739 case Bvarbind+3: 853 CASE (Bvarbind3):
740 case Bvarbind+4: 854 CASE (Bvarbind4):
741 case Bvarbind+5: 855 CASE (Bvarbind5):
742 op -= Bvarbind; 856 op -= Bvarbind;
743 varbind: 857 varbind:
744 /* Specbind can signal and thus GC. */ 858 /* Specbind can signal and thus GC. */
745 BEFORE_POTENTIAL_GC (); 859 BEFORE_POTENTIAL_GC ();
746 specbind (vectorp[op], POP); 860 specbind (vectorp[op], POP);
747 AFTER_POTENTIAL_GC (); 861 AFTER_POTENTIAL_GC ();
748 break; 862 NEXT;
749 863
750 case Bcall+6: 864 CASE (Bcall6):
751 op = FETCH; 865 op = FETCH;
752 goto docall; 866 goto docall;
753 867
754 case Bcall+7: 868 CASE (Bcall7):
755 op = FETCH2; 869 op = FETCH2;
756 goto docall; 870 goto docall;
757 871
758 case Bcall: 872 CASE (Bcall):
759 case Bcall+1: 873 CASE (Bcall1):
760 case Bcall+2: 874 CASE (Bcall2):
761 case Bcall+3: 875 CASE (Bcall3):
762 case Bcall+4: 876 CASE (Bcall4):
763 case Bcall+5: 877 CASE (Bcall5):
764 op -= Bcall; 878 op -= Bcall;
765 docall: 879 docall:
766 { 880 {
@@ -783,47 +897,47 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
783#endif 897#endif
784 TOP = Ffuncall (op + 1, &TOP); 898 TOP = Ffuncall (op + 1, &TOP);
785 AFTER_POTENTIAL_GC (); 899 AFTER_POTENTIAL_GC ();
786 break; 900 NEXT;
787 } 901 }
788 902
789 case Bunbind+6: 903 CASE (Bunbind6):
790 op = FETCH; 904 op = FETCH;
791 goto dounbind; 905 goto dounbind;
792 906
793 case Bunbind+7: 907 CASE (Bunbind7):
794 op = FETCH2; 908 op = FETCH2;
795 goto dounbind; 909 goto dounbind;
796 910
797 case Bunbind: 911 CASE (Bunbind):
798 case Bunbind+1: 912 CASE (Bunbind1):
799 case Bunbind+2: 913 CASE (Bunbind2):
800 case Bunbind+3: 914 CASE (Bunbind3):
801 case Bunbind+4: 915 CASE (Bunbind4):
802 case Bunbind+5: 916 CASE (Bunbind5):
803 op -= Bunbind; 917 op -= Bunbind;
804 dounbind: 918 dounbind:
805 BEFORE_POTENTIAL_GC (); 919 BEFORE_POTENTIAL_GC ();
806 unbind_to (SPECPDL_INDEX () - op, Qnil); 920 unbind_to (SPECPDL_INDEX () - op, Qnil);
807 AFTER_POTENTIAL_GC (); 921 AFTER_POTENTIAL_GC ();
808 break; 922 NEXT;
809 923
810 case Bunbind_all: /* Obsolete. Never used. */ 924 CASE (Bunbind_all): /* Obsolete. Never used. */
811 /* To unbind back to the beginning of this frame. Not used yet, 925 /* To unbind back to the beginning of this frame. Not used yet,
812 but will be needed for tail-recursion elimination. */ 926 but will be needed for tail-recursion elimination. */
813 BEFORE_POTENTIAL_GC (); 927 BEFORE_POTENTIAL_GC ();
814 unbind_to (count, Qnil); 928 unbind_to (count, Qnil);
815 AFTER_POTENTIAL_GC (); 929 AFTER_POTENTIAL_GC ();
816 break; 930 NEXT;
817 931
818 case Bgoto: 932 CASE (Bgoto):
819 MAYBE_GC (); 933 MAYBE_GC ();
820 BYTE_CODE_QUIT; 934 BYTE_CODE_QUIT;
821 op = FETCH2; /* pc = FETCH2 loses since FETCH2 contains pc++ */ 935 op = FETCH2; /* pc = FETCH2 loses since FETCH2 contains pc++ */
822 CHECK_RANGE (op); 936 CHECK_RANGE (op);
823 stack.pc = stack.byte_string_start + op; 937 stack.pc = stack.byte_string_start + op;
824 break; 938 NEXT;
825 939
826 case Bgotoifnonnil: 940 CASE (Bgotoifnonnil):
827 { 941 {
828 Lisp_Object v1; 942 Lisp_Object v1;
829 MAYBE_GC (); 943 MAYBE_GC ();
@@ -835,10 +949,10 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
835 CHECK_RANGE (op); 949 CHECK_RANGE (op);
836 stack.pc = stack.byte_string_start + op; 950 stack.pc = stack.byte_string_start + op;
837 } 951 }
838 break; 952 NEXT;
839 } 953 }
840 954
841 case Bgotoifnilelsepop: 955 CASE (Bgotoifnilelsepop):
842 MAYBE_GC (); 956 MAYBE_GC ();
843 op = FETCH2; 957 op = FETCH2;
844 if (NILP (TOP)) 958 if (NILP (TOP))
@@ -848,9 +962,9 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
848 stack.pc = stack.byte_string_start + op; 962 stack.pc = stack.byte_string_start + op;
849 } 963 }
850 else DISCARD (1); 964 else DISCARD (1);
851 break; 965 NEXT;
852 966
853 case Bgotoifnonnilelsepop: 967 CASE (Bgotoifnonnilelsepop):
854 MAYBE_GC (); 968 MAYBE_GC ();
855 op = FETCH2; 969 op = FETCH2;
856 if (!NILP (TOP)) 970 if (!NILP (TOP))
@@ -860,15 +974,15 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
860 stack.pc = stack.byte_string_start + op; 974 stack.pc = stack.byte_string_start + op;
861 } 975 }
862 else DISCARD (1); 976 else DISCARD (1);
863 break; 977 NEXT;
864 978
865 case BRgoto: 979 CASE (BRgoto):
866 MAYBE_GC (); 980 MAYBE_GC ();
867 BYTE_CODE_QUIT; 981 BYTE_CODE_QUIT;
868 stack.pc += (int) *stack.pc - 127; 982 stack.pc += (int) *stack.pc - 127;
869 break; 983 NEXT;
870 984
871 case BRgotoifnil: 985 CASE (BRgotoifnil):
872 { 986 {
873 Lisp_Object v1; 987 Lisp_Object v1;
874 MAYBE_GC (); 988 MAYBE_GC ();
@@ -879,10 +993,10 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
879 stack.pc += (int) *stack.pc - 128; 993 stack.pc += (int) *stack.pc - 128;
880 } 994 }
881 stack.pc++; 995 stack.pc++;
882 break; 996 NEXT;
883 } 997 }
884 998
885 case BRgotoifnonnil: 999 CASE (BRgotoifnonnil):
886 { 1000 {
887 Lisp_Object v1; 1001 Lisp_Object v1;
888 MAYBE_GC (); 1002 MAYBE_GC ();
@@ -893,10 +1007,10 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
893 stack.pc += (int) *stack.pc - 128; 1007 stack.pc += (int) *stack.pc - 128;
894 } 1008 }
895 stack.pc++; 1009 stack.pc++;
896 break; 1010 NEXT;
897 } 1011 }
898 1012
899 case BRgotoifnilelsepop: 1013 CASE (BRgotoifnilelsepop):
900 MAYBE_GC (); 1014 MAYBE_GC ();
901 op = *stack.pc++; 1015 op = *stack.pc++;
902 if (NILP (TOP)) 1016 if (NILP (TOP))
@@ -905,9 +1019,9 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
905 stack.pc += op - 128; 1019 stack.pc += op - 128;
906 } 1020 }
907 else DISCARD (1); 1021 else DISCARD (1);
908 break; 1022 NEXT;
909 1023
910 case BRgotoifnonnilelsepop: 1024 CASE (BRgotoifnonnilelsepop):
911 MAYBE_GC (); 1025 MAYBE_GC ();
912 op = *stack.pc++; 1026 op = *stack.pc++;
913 if (!NILP (TOP)) 1027 if (!NILP (TOP))
@@ -916,31 +1030,31 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
916 stack.pc += op - 128; 1030 stack.pc += op - 128;
917 } 1031 }
918 else DISCARD (1); 1032 else DISCARD (1);
919 break; 1033 NEXT;
920 1034
921 case Breturn: 1035 CASE (Breturn):
922 result = POP; 1036 result = POP;
923 goto exit; 1037 goto exit;
924 1038
925 case Bdiscard: 1039 CASE (Bdiscard):
926 DISCARD (1); 1040 DISCARD (1);
927 break; 1041 NEXT;
928 1042
929 case Bconstant2: 1043 CASE (Bconstant2):
930 PUSH (vectorp[FETCH2]); 1044 PUSH (vectorp[FETCH2]);
931 break; 1045 NEXT;
932 1046
933 case Bsave_excursion: 1047 CASE (Bsave_excursion):
934 record_unwind_protect (save_excursion_restore, 1048 record_unwind_protect (save_excursion_restore,
935 save_excursion_save ()); 1049 save_excursion_save ());
936 break; 1050 NEXT;
937 1051
938 case Bsave_current_buffer: /* Obsolete since ??. */ 1052 CASE (Bsave_current_buffer): /* Obsolete since ??. */
939 case Bsave_current_buffer_1: 1053 CASE (Bsave_current_buffer_1):
940 record_unwind_protect (set_buffer_if_live, Fcurrent_buffer ()); 1054 record_unwind_protect (set_buffer_if_live, Fcurrent_buffer ());
941 break; 1055 NEXT;
942 1056
943 case Bsave_window_excursion: /* Obsolete since 24.1. */ 1057 CASE (Bsave_window_excursion): /* Obsolete since 24.1. */
944 { 1058 {
945 register ptrdiff_t count1 = SPECPDL_INDEX (); 1059 register ptrdiff_t count1 = SPECPDL_INDEX ();
946 record_unwind_protect (Fset_window_configuration, 1060 record_unwind_protect (Fset_window_configuration,
@@ -949,29 +1063,29 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
949 TOP = Fprogn (TOP); 1063 TOP = Fprogn (TOP);
950 unbind_to (count1, TOP); 1064 unbind_to (count1, TOP);
951 AFTER_POTENTIAL_GC (); 1065 AFTER_POTENTIAL_GC ();
952 break; 1066 NEXT;
953 } 1067 }
954 1068
955 case Bsave_restriction: 1069 CASE (Bsave_restriction):
956 record_unwind_protect (save_restriction_restore, 1070 record_unwind_protect (save_restriction_restore,
957 save_restriction_save ()); 1071 save_restriction_save ());
958 break; 1072 NEXT;
959 1073
960 case Bcatch: /* FIXME: ill-suited for lexbind. */ 1074 CASE (Bcatch): /* FIXME: ill-suited for lexbind. */
961 { 1075 {
962 Lisp_Object v1; 1076 Lisp_Object v1;
963 BEFORE_POTENTIAL_GC (); 1077 BEFORE_POTENTIAL_GC ();
964 v1 = POP; 1078 v1 = POP;
965 TOP = internal_catch (TOP, eval_sub, v1); 1079 TOP = internal_catch (TOP, eval_sub, v1);
966 AFTER_POTENTIAL_GC (); 1080 AFTER_POTENTIAL_GC ();
967 break; 1081 NEXT;
968 } 1082 }
969 1083
970 case Bunwind_protect: /* FIXME: avoid closure for lexbind. */ 1084 CASE (Bunwind_protect): /* FIXME: avoid closure for lexbind. */
971 record_unwind_protect (Fprogn, POP); 1085 record_unwind_protect (Fprogn, POP);
972 break; 1086 NEXT;
973 1087
974 case Bcondition_case: /* FIXME: ill-suited for lexbind. */ 1088 CASE (Bcondition_case): /* FIXME: ill-suited for lexbind. */
975 { 1089 {
976 Lisp_Object handlers, body; 1090 Lisp_Object handlers, body;
977 handlers = POP; 1091 handlers = POP;
@@ -979,18 +1093,18 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
979 BEFORE_POTENTIAL_GC (); 1093 BEFORE_POTENTIAL_GC ();
980 TOP = internal_lisp_condition_case (TOP, body, handlers); 1094 TOP = internal_lisp_condition_case (TOP, body, handlers);
981 AFTER_POTENTIAL_GC (); 1095 AFTER_POTENTIAL_GC ();
982 break; 1096 NEXT;
983 } 1097 }
984 1098
985 case Btemp_output_buffer_setup: /* Obsolete since 24.1. */ 1099 CASE (Btemp_output_buffer_setup): /* Obsolete since 24.1. */
986 BEFORE_POTENTIAL_GC (); 1100 BEFORE_POTENTIAL_GC ();
987 CHECK_STRING (TOP); 1101 CHECK_STRING (TOP);
988 temp_output_buffer_setup (SSDATA (TOP)); 1102 temp_output_buffer_setup (SSDATA (TOP));
989 AFTER_POTENTIAL_GC (); 1103 AFTER_POTENTIAL_GC ();
990 TOP = Vstandard_output; 1104 TOP = Vstandard_output;
991 break; 1105 NEXT;
992 1106
993 case Btemp_output_buffer_show: /* Obsolete since 24.1. */ 1107 CASE (Btemp_output_buffer_show): /* Obsolete since 24.1. */
994 { 1108 {
995 Lisp_Object v1; 1109 Lisp_Object v1;
996 BEFORE_POTENTIAL_GC (); 1110 BEFORE_POTENTIAL_GC ();
@@ -1000,10 +1114,10 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
1000 /* pop binding of standard-output */ 1114 /* pop binding of standard-output */
1001 unbind_to (SPECPDL_INDEX () - 1, Qnil); 1115 unbind_to (SPECPDL_INDEX () - 1, Qnil);
1002 AFTER_POTENTIAL_GC (); 1116 AFTER_POTENTIAL_GC ();
1003 break; 1117 NEXT;
1004 } 1118 }
1005 1119
1006 case Bnth: 1120 CASE (Bnth):
1007 { 1121 {
1008 Lisp_Object v1, v2; 1122 Lisp_Object v1, v2;
1009 EMACS_INT n; 1123 EMACS_INT n;
@@ -1018,173 +1132,173 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
1018 immediate_quit = 0; 1132 immediate_quit = 0;
1019 TOP = CAR (v1); 1133 TOP = CAR (v1);
1020 AFTER_POTENTIAL_GC (); 1134 AFTER_POTENTIAL_GC ();
1021 break; 1135 NEXT;
1022 } 1136 }
1023 1137
1024 case Bsymbolp: 1138 CASE (Bsymbolp):
1025 TOP = SYMBOLP (TOP) ? Qt : Qnil; 1139 TOP = SYMBOLP (TOP) ? Qt : Qnil;
1026 break; 1140 NEXT;
1027 1141
1028 case Bconsp: 1142 CASE (Bconsp):
1029 TOP = CONSP (TOP) ? Qt : Qnil; 1143 TOP = CONSP (TOP) ? Qt : Qnil;
1030 break; 1144 NEXT;
1031 1145
1032 case Bstringp: 1146 CASE (Bstringp):
1033 TOP = STRINGP (TOP) ? Qt : Qnil; 1147 TOP = STRINGP (TOP) ? Qt : Qnil;
1034 break; 1148 NEXT;
1035 1149
1036 case Blistp: 1150 CASE (Blistp):
1037 TOP = CONSP (TOP) || NILP (TOP) ? Qt : Qnil; 1151 TOP = CONSP (TOP) || NILP (TOP) ? Qt : Qnil;
1038 break; 1152 NEXT;
1039 1153
1040 case Bnot: 1154 CASE (Bnot):
1041 TOP = NILP (TOP) ? Qt : Qnil; 1155 TOP = NILP (TOP) ? Qt : Qnil;
1042 break; 1156 NEXT;
1043 1157
1044 case Bcons: 1158 CASE (Bcons):
1045 { 1159 {
1046 Lisp_Object v1; 1160 Lisp_Object v1;
1047 v1 = POP; 1161 v1 = POP;
1048 TOP = Fcons (TOP, v1); 1162 TOP = Fcons (TOP, v1);
1049 break; 1163 NEXT;
1050 } 1164 }
1051 1165
1052 case Blist1: 1166 CASE (Blist1):
1053 TOP = Fcons (TOP, Qnil); 1167 TOP = Fcons (TOP, Qnil);
1054 break; 1168 NEXT;
1055 1169
1056 case Blist2: 1170 CASE (Blist2):
1057 { 1171 {
1058 Lisp_Object v1; 1172 Lisp_Object v1;
1059 v1 = POP; 1173 v1 = POP;
1060 TOP = Fcons (TOP, Fcons (v1, Qnil)); 1174 TOP = Fcons (TOP, Fcons (v1, Qnil));
1061 break; 1175 NEXT;
1062 } 1176 }
1063 1177
1064 case Blist3: 1178 CASE (Blist3):
1065 DISCARD (2); 1179 DISCARD (2);
1066 TOP = Flist (3, &TOP); 1180 TOP = Flist (3, &TOP);
1067 break; 1181 NEXT;
1068 1182
1069 case Blist4: 1183 CASE (Blist4):
1070 DISCARD (3); 1184 DISCARD (3);
1071 TOP = Flist (4, &TOP); 1185 TOP = Flist (4, &TOP);
1072 break; 1186 NEXT;
1073 1187
1074 case BlistN: 1188 CASE (BlistN):
1075 op = FETCH; 1189 op = FETCH;
1076 DISCARD (op - 1); 1190 DISCARD (op - 1);
1077 TOP = Flist (op, &TOP); 1191 TOP = Flist (op, &TOP);
1078 break; 1192 NEXT;
1079 1193
1080 case Blength: 1194 CASE (Blength):
1081 BEFORE_POTENTIAL_GC (); 1195 BEFORE_POTENTIAL_GC ();
1082 TOP = Flength (TOP); 1196 TOP = Flength (TOP);
1083 AFTER_POTENTIAL_GC (); 1197 AFTER_POTENTIAL_GC ();
1084 break; 1198 NEXT;
1085 1199
1086 case Baref: 1200 CASE (Baref):
1087 { 1201 {
1088 Lisp_Object v1; 1202 Lisp_Object v1;
1089 BEFORE_POTENTIAL_GC (); 1203 BEFORE_POTENTIAL_GC ();
1090 v1 = POP; 1204 v1 = POP;
1091 TOP = Faref (TOP, v1); 1205 TOP = Faref (TOP, v1);
1092 AFTER_POTENTIAL_GC (); 1206 AFTER_POTENTIAL_GC ();
1093 break; 1207 NEXT;
1094 } 1208 }
1095 1209
1096 case Baset: 1210 CASE (Baset):
1097 { 1211 {
1098 Lisp_Object v1, v2; 1212 Lisp_Object v1, v2;
1099 BEFORE_POTENTIAL_GC (); 1213 BEFORE_POTENTIAL_GC ();
1100 v2 = POP; v1 = POP; 1214 v2 = POP; v1 = POP;
1101 TOP = Faset (TOP, v1, v2); 1215 TOP = Faset (TOP, v1, v2);
1102 AFTER_POTENTIAL_GC (); 1216 AFTER_POTENTIAL_GC ();
1103 break; 1217 NEXT;
1104 } 1218 }
1105 1219
1106 case Bsymbol_value: 1220 CASE (Bsymbol_value):
1107 BEFORE_POTENTIAL_GC (); 1221 BEFORE_POTENTIAL_GC ();
1108 TOP = Fsymbol_value (TOP); 1222 TOP = Fsymbol_value (TOP);
1109 AFTER_POTENTIAL_GC (); 1223 AFTER_POTENTIAL_GC ();
1110 break; 1224 NEXT;
1111 1225
1112 case Bsymbol_function: 1226 CASE (Bsymbol_function):
1113 BEFORE_POTENTIAL_GC (); 1227 BEFORE_POTENTIAL_GC ();
1114 TOP = Fsymbol_function (TOP); 1228 TOP = Fsymbol_function (TOP);
1115 AFTER_POTENTIAL_GC (); 1229 AFTER_POTENTIAL_GC ();
1116 break; 1230 NEXT;
1117 1231
1118 case Bset: 1232 CASE (Bset):
1119 { 1233 {
1120 Lisp_Object v1; 1234 Lisp_Object v1;
1121 BEFORE_POTENTIAL_GC (); 1235 BEFORE_POTENTIAL_GC ();
1122 v1 = POP; 1236 v1 = POP;
1123 TOP = Fset (TOP, v1); 1237 TOP = Fset (TOP, v1);
1124 AFTER_POTENTIAL_GC (); 1238 AFTER_POTENTIAL_GC ();
1125 break; 1239 NEXT;
1126 } 1240 }
1127 1241
1128 case Bfset: 1242 CASE (Bfset):
1129 { 1243 {
1130 Lisp_Object v1; 1244 Lisp_Object v1;
1131 BEFORE_POTENTIAL_GC (); 1245 BEFORE_POTENTIAL_GC ();
1132 v1 = POP; 1246 v1 = POP;
1133 TOP = Ffset (TOP, v1); 1247 TOP = Ffset (TOP, v1);
1134 AFTER_POTENTIAL_GC (); 1248 AFTER_POTENTIAL_GC ();
1135 break; 1249 NEXT;
1136 } 1250 }
1137 1251
1138 case Bget: 1252 CASE (Bget):
1139 { 1253 {
1140 Lisp_Object v1; 1254 Lisp_Object v1;
1141 BEFORE_POTENTIAL_GC (); 1255 BEFORE_POTENTIAL_GC ();
1142 v1 = POP; 1256 v1 = POP;
1143 TOP = Fget (TOP, v1); 1257 TOP = Fget (TOP, v1);
1144 AFTER_POTENTIAL_GC (); 1258 AFTER_POTENTIAL_GC ();
1145 break; 1259 NEXT;
1146 } 1260 }
1147 1261
1148 case Bsubstring: 1262 CASE (Bsubstring):
1149 { 1263 {
1150 Lisp_Object v1, v2; 1264 Lisp_Object v1, v2;
1151 BEFORE_POTENTIAL_GC (); 1265 BEFORE_POTENTIAL_GC ();
1152 v2 = POP; v1 = POP; 1266 v2 = POP; v1 = POP;
1153 TOP = Fsubstring (TOP, v1, v2); 1267 TOP = Fsubstring (TOP, v1, v2);
1154 AFTER_POTENTIAL_GC (); 1268 AFTER_POTENTIAL_GC ();
1155 break; 1269 NEXT;
1156 } 1270 }
1157 1271
1158 case Bconcat2: 1272 CASE (Bconcat2):
1159 BEFORE_POTENTIAL_GC (); 1273 BEFORE_POTENTIAL_GC ();
1160 DISCARD (1); 1274 DISCARD (1);
1161 TOP = Fconcat (2, &TOP); 1275 TOP = Fconcat (2, &TOP);
1162 AFTER_POTENTIAL_GC (); 1276 AFTER_POTENTIAL_GC ();
1163 break; 1277 NEXT;
1164 1278
1165 case Bconcat3: 1279 CASE (Bconcat3):
1166 BEFORE_POTENTIAL_GC (); 1280 BEFORE_POTENTIAL_GC ();
1167 DISCARD (2); 1281 DISCARD (2);
1168 TOP = Fconcat (3, &TOP); 1282 TOP = Fconcat (3, &TOP);
1169 AFTER_POTENTIAL_GC (); 1283 AFTER_POTENTIAL_GC ();
1170 break; 1284 NEXT;
1171 1285
1172 case Bconcat4: 1286 CASE (Bconcat4):
1173 BEFORE_POTENTIAL_GC (); 1287 BEFORE_POTENTIAL_GC ();
1174 DISCARD (3); 1288 DISCARD (3);
1175 TOP = Fconcat (4, &TOP); 1289 TOP = Fconcat (4, &TOP);
1176 AFTER_POTENTIAL_GC (); 1290 AFTER_POTENTIAL_GC ();
1177 break; 1291 NEXT;
1178 1292
1179 case BconcatN: 1293 CASE (BconcatN):
1180 op = FETCH; 1294 op = FETCH;
1181 BEFORE_POTENTIAL_GC (); 1295 BEFORE_POTENTIAL_GC ();
1182 DISCARD (op - 1); 1296 DISCARD (op - 1);
1183 TOP = Fconcat (op, &TOP); 1297 TOP = Fconcat (op, &TOP);
1184 AFTER_POTENTIAL_GC (); 1298 AFTER_POTENTIAL_GC ();
1185 break; 1299 NEXT;
1186 1300
1187 case Bsub1: 1301 CASE (Bsub1):
1188 { 1302 {
1189 Lisp_Object v1; 1303 Lisp_Object v1;
1190 v1 = TOP; 1304 v1 = TOP;
@@ -1199,10 +1313,10 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
1199 TOP = Fsub1 (v1); 1313 TOP = Fsub1 (v1);
1200 AFTER_POTENTIAL_GC (); 1314 AFTER_POTENTIAL_GC ();
1201 } 1315 }
1202 break; 1316 NEXT;
1203 } 1317 }
1204 1318
1205 case Badd1: 1319 CASE (Badd1):
1206 { 1320 {
1207 Lisp_Object v1; 1321 Lisp_Object v1;
1208 v1 = TOP; 1322 v1 = TOP;
@@ -1217,10 +1331,10 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
1217 TOP = Fadd1 (v1); 1331 TOP = Fadd1 (v1);
1218 AFTER_POTENTIAL_GC (); 1332 AFTER_POTENTIAL_GC ();
1219 } 1333 }
1220 break; 1334 NEXT;
1221 } 1335 }
1222 1336
1223 case Beqlsign: 1337 CASE (Beqlsign):
1224 { 1338 {
1225 Lisp_Object v1, v2; 1339 Lisp_Object v1, v2;
1226 BEFORE_POTENTIAL_GC (); 1340 BEFORE_POTENTIAL_GC ();
@@ -1238,57 +1352,57 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
1238 } 1352 }
1239 else 1353 else
1240 TOP = (XINT (v1) == XINT (v2) ? Qt : Qnil); 1354 TOP = (XINT (v1) == XINT (v2) ? Qt : Qnil);
1241 break; 1355 NEXT;
1242 } 1356 }
1243 1357
1244 case Bgtr: 1358 CASE (Bgtr):
1245 { 1359 {
1246 Lisp_Object v1; 1360 Lisp_Object v1;
1247 BEFORE_POTENTIAL_GC (); 1361 BEFORE_POTENTIAL_GC ();
1248 v1 = POP; 1362 v1 = POP;
1249 TOP = Fgtr (TOP, v1); 1363 TOP = Fgtr (TOP, v1);
1250 AFTER_POTENTIAL_GC (); 1364 AFTER_POTENTIAL_GC ();
1251 break; 1365 NEXT;
1252 } 1366 }
1253 1367
1254 case Blss: 1368 CASE (Blss):
1255 { 1369 {
1256 Lisp_Object v1; 1370 Lisp_Object v1;
1257 BEFORE_POTENTIAL_GC (); 1371 BEFORE_POTENTIAL_GC ();
1258 v1 = POP; 1372 v1 = POP;
1259 TOP = Flss (TOP, v1); 1373 TOP = Flss (TOP, v1);
1260 AFTER_POTENTIAL_GC (); 1374 AFTER_POTENTIAL_GC ();
1261 break; 1375 NEXT;
1262 } 1376 }
1263 1377
1264 case Bleq: 1378 CASE (Bleq):
1265 { 1379 {
1266 Lisp_Object v1; 1380 Lisp_Object v1;
1267 BEFORE_POTENTIAL_GC (); 1381 BEFORE_POTENTIAL_GC ();
1268 v1 = POP; 1382 v1 = POP;
1269 TOP = Fleq (TOP, v1); 1383 TOP = Fleq (TOP, v1);
1270 AFTER_POTENTIAL_GC (); 1384 AFTER_POTENTIAL_GC ();
1271 break; 1385 NEXT;
1272 } 1386 }
1273 1387
1274 case Bgeq: 1388 CASE (Bgeq):
1275 { 1389 {
1276 Lisp_Object v1; 1390 Lisp_Object v1;
1277 BEFORE_POTENTIAL_GC (); 1391 BEFORE_POTENTIAL_GC ();
1278 v1 = POP; 1392 v1 = POP;
1279 TOP = Fgeq (TOP, v1); 1393 TOP = Fgeq (TOP, v1);
1280 AFTER_POTENTIAL_GC (); 1394 AFTER_POTENTIAL_GC ();
1281 break; 1395 NEXT;
1282 } 1396 }
1283 1397
1284 case Bdiff: 1398 CASE (Bdiff):
1285 BEFORE_POTENTIAL_GC (); 1399 BEFORE_POTENTIAL_GC ();
1286 DISCARD (1); 1400 DISCARD (1);
1287 TOP = Fminus (2, &TOP); 1401 TOP = Fminus (2, &TOP);
1288 AFTER_POTENTIAL_GC (); 1402 AFTER_POTENTIAL_GC ();
1289 break; 1403 NEXT;
1290 1404
1291 case Bnegate: 1405 CASE (Bnegate):
1292 { 1406 {
1293 Lisp_Object v1; 1407 Lisp_Object v1;
1294 v1 = TOP; 1408 v1 = TOP;
@@ -1303,209 +1417,209 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
1303 TOP = Fminus (1, &TOP); 1417 TOP = Fminus (1, &TOP);
1304 AFTER_POTENTIAL_GC (); 1418 AFTER_POTENTIAL_GC ();
1305 } 1419 }
1306 break; 1420 NEXT;
1307 } 1421 }
1308 1422
1309 case Bplus: 1423 CASE (Bplus):
1310 BEFORE_POTENTIAL_GC (); 1424 BEFORE_POTENTIAL_GC ();
1311 DISCARD (1); 1425 DISCARD (1);
1312 TOP = Fplus (2, &TOP); 1426 TOP = Fplus (2, &TOP);
1313 AFTER_POTENTIAL_GC (); 1427 AFTER_POTENTIAL_GC ();
1314 break; 1428 NEXT;
1315 1429
1316 case Bmax: 1430 CASE (Bmax):
1317 BEFORE_POTENTIAL_GC (); 1431 BEFORE_POTENTIAL_GC ();
1318 DISCARD (1); 1432 DISCARD (1);
1319 TOP = Fmax (2, &TOP); 1433 TOP = Fmax (2, &TOP);
1320 AFTER_POTENTIAL_GC (); 1434 AFTER_POTENTIAL_GC ();
1321 break; 1435 NEXT;
1322 1436
1323 case Bmin: 1437 CASE (Bmin):
1324 BEFORE_POTENTIAL_GC (); 1438 BEFORE_POTENTIAL_GC ();
1325 DISCARD (1); 1439 DISCARD (1);
1326 TOP = Fmin (2, &TOP); 1440 TOP = Fmin (2, &TOP);
1327 AFTER_POTENTIAL_GC (); 1441 AFTER_POTENTIAL_GC ();
1328 break; 1442 NEXT;
1329 1443
1330 case Bmult: 1444 CASE (Bmult):
1331 BEFORE_POTENTIAL_GC (); 1445 BEFORE_POTENTIAL_GC ();
1332 DISCARD (1); 1446 DISCARD (1);
1333 TOP = Ftimes (2, &TOP); 1447 TOP = Ftimes (2, &TOP);
1334 AFTER_POTENTIAL_GC (); 1448 AFTER_POTENTIAL_GC ();
1335 break; 1449 NEXT;
1336 1450
1337 case Bquo: 1451 CASE (Bquo):
1338 BEFORE_POTENTIAL_GC (); 1452 BEFORE_POTENTIAL_GC ();
1339 DISCARD (1); 1453 DISCARD (1);
1340 TOP = Fquo (2, &TOP); 1454 TOP = Fquo (2, &TOP);
1341 AFTER_POTENTIAL_GC (); 1455 AFTER_POTENTIAL_GC ();
1342 break; 1456 NEXT;
1343 1457
1344 case Brem: 1458 CASE (Brem):
1345 { 1459 {
1346 Lisp_Object v1; 1460 Lisp_Object v1;
1347 BEFORE_POTENTIAL_GC (); 1461 BEFORE_POTENTIAL_GC ();
1348 v1 = POP; 1462 v1 = POP;
1349 TOP = Frem (TOP, v1); 1463 TOP = Frem (TOP, v1);
1350 AFTER_POTENTIAL_GC (); 1464 AFTER_POTENTIAL_GC ();
1351 break; 1465 NEXT;
1352 } 1466 }
1353 1467
1354 case Bpoint: 1468 CASE (Bpoint):
1355 { 1469 {
1356 Lisp_Object v1; 1470 Lisp_Object v1;
1357 XSETFASTINT (v1, PT); 1471 XSETFASTINT (v1, PT);
1358 PUSH (v1); 1472 PUSH (v1);
1359 break; 1473 NEXT;
1360 } 1474 }
1361 1475
1362 case Bgoto_char: 1476 CASE (Bgoto_char):
1363 BEFORE_POTENTIAL_GC (); 1477 BEFORE_POTENTIAL_GC ();
1364 TOP = Fgoto_char (TOP); 1478 TOP = Fgoto_char (TOP);
1365 AFTER_POTENTIAL_GC (); 1479 AFTER_POTENTIAL_GC ();
1366 break; 1480 NEXT;
1367 1481
1368 case Binsert: 1482 CASE (Binsert):
1369 BEFORE_POTENTIAL_GC (); 1483 BEFORE_POTENTIAL_GC ();
1370 TOP = Finsert (1, &TOP); 1484 TOP = Finsert (1, &TOP);
1371 AFTER_POTENTIAL_GC (); 1485 AFTER_POTENTIAL_GC ();
1372 break; 1486 NEXT;
1373 1487
1374 case BinsertN: 1488 CASE (BinsertN):
1375 op = FETCH; 1489 op = FETCH;
1376 BEFORE_POTENTIAL_GC (); 1490 BEFORE_POTENTIAL_GC ();
1377 DISCARD (op - 1); 1491 DISCARD (op - 1);
1378 TOP = Finsert (op, &TOP); 1492 TOP = Finsert (op, &TOP);
1379 AFTER_POTENTIAL_GC (); 1493 AFTER_POTENTIAL_GC ();
1380 break; 1494 NEXT;
1381 1495
1382 case Bpoint_max: 1496 CASE (Bpoint_max):
1383 { 1497 {
1384 Lisp_Object v1; 1498 Lisp_Object v1;
1385 XSETFASTINT (v1, ZV); 1499 XSETFASTINT (v1, ZV);
1386 PUSH (v1); 1500 PUSH (v1);
1387 break; 1501 NEXT;
1388 } 1502 }
1389 1503
1390 case Bpoint_min: 1504 CASE (Bpoint_min):
1391 { 1505 {
1392 Lisp_Object v1; 1506 Lisp_Object v1;
1393 XSETFASTINT (v1, BEGV); 1507 XSETFASTINT (v1, BEGV);
1394 PUSH (v1); 1508 PUSH (v1);
1395 break; 1509 NEXT;
1396 } 1510 }
1397 1511
1398 case Bchar_after: 1512 CASE (Bchar_after):
1399 BEFORE_POTENTIAL_GC (); 1513 BEFORE_POTENTIAL_GC ();
1400 TOP = Fchar_after (TOP); 1514 TOP = Fchar_after (TOP);
1401 AFTER_POTENTIAL_GC (); 1515 AFTER_POTENTIAL_GC ();
1402 break; 1516 NEXT;
1403 1517
1404 case Bfollowing_char: 1518 CASE (Bfollowing_char):
1405 { 1519 {
1406 Lisp_Object v1; 1520 Lisp_Object v1;
1407 BEFORE_POTENTIAL_GC (); 1521 BEFORE_POTENTIAL_GC ();
1408 v1 = Ffollowing_char (); 1522 v1 = Ffollowing_char ();
1409 AFTER_POTENTIAL_GC (); 1523 AFTER_POTENTIAL_GC ();
1410 PUSH (v1); 1524 PUSH (v1);
1411 break; 1525 NEXT;
1412 } 1526 }
1413 1527
1414 case Bpreceding_char: 1528 CASE (Bpreceding_char):
1415 { 1529 {
1416 Lisp_Object v1; 1530 Lisp_Object v1;
1417 BEFORE_POTENTIAL_GC (); 1531 BEFORE_POTENTIAL_GC ();
1418 v1 = Fprevious_char (); 1532 v1 = Fprevious_char ();
1419 AFTER_POTENTIAL_GC (); 1533 AFTER_POTENTIAL_GC ();
1420 PUSH (v1); 1534 PUSH (v1);
1421 break; 1535 NEXT;
1422 } 1536 }
1423 1537
1424 case Bcurrent_column: 1538 CASE (Bcurrent_column):
1425 { 1539 {
1426 Lisp_Object v1; 1540 Lisp_Object v1;
1427 BEFORE_POTENTIAL_GC (); 1541 BEFORE_POTENTIAL_GC ();
1428 XSETFASTINT (v1, current_column ()); 1542 XSETFASTINT (v1, current_column ());
1429 AFTER_POTENTIAL_GC (); 1543 AFTER_POTENTIAL_GC ();
1430 PUSH (v1); 1544 PUSH (v1);
1431 break; 1545 NEXT;
1432 } 1546 }
1433 1547
1434 case Bindent_to: 1548 CASE (Bindent_to):
1435 BEFORE_POTENTIAL_GC (); 1549 BEFORE_POTENTIAL_GC ();
1436 TOP = Findent_to (TOP, Qnil); 1550 TOP = Findent_to (TOP, Qnil);
1437 AFTER_POTENTIAL_GC (); 1551 AFTER_POTENTIAL_GC ();
1438 break; 1552 NEXT;
1439 1553
1440 case Beolp: 1554 CASE (Beolp):
1441 PUSH (Feolp ()); 1555 PUSH (Feolp ());
1442 break; 1556 NEXT;
1443 1557
1444 case Beobp: 1558 CASE (Beobp):
1445 PUSH (Feobp ()); 1559 PUSH (Feobp ());
1446 break; 1560 NEXT;
1447 1561
1448 case Bbolp: 1562 CASE (Bbolp):
1449 PUSH (Fbolp ()); 1563 PUSH (Fbolp ());
1450 break; 1564 NEXT;
1451 1565
1452 case Bbobp: 1566 CASE (Bbobp):
1453 PUSH (Fbobp ()); 1567 PUSH (Fbobp ());
1454 break; 1568 NEXT;
1455 1569
1456 case Bcurrent_buffer: 1570 CASE (Bcurrent_buffer):
1457 PUSH (Fcurrent_buffer ()); 1571 PUSH (Fcurrent_buffer ());
1458 break; 1572 NEXT;
1459 1573
1460 case Bset_buffer: 1574 CASE (Bset_buffer):
1461 BEFORE_POTENTIAL_GC (); 1575 BEFORE_POTENTIAL_GC ();
1462 TOP = Fset_buffer (TOP); 1576 TOP = Fset_buffer (TOP);
1463 AFTER_POTENTIAL_GC (); 1577 AFTER_POTENTIAL_GC ();
1464 break; 1578 NEXT;
1465 1579
1466 case Binteractive_p: /* Obsolete since 24.1. */ 1580 CASE (Binteractive_p): /* Obsolete since 24.1. */
1467 PUSH (Finteractive_p ()); 1581 PUSH (Finteractive_p ());
1468 break; 1582 NEXT;
1469 1583
1470 case Bforward_char: 1584 CASE (Bforward_char):
1471 BEFORE_POTENTIAL_GC (); 1585 BEFORE_POTENTIAL_GC ();
1472 TOP = Fforward_char (TOP); 1586 TOP = Fforward_char (TOP);
1473 AFTER_POTENTIAL_GC (); 1587 AFTER_POTENTIAL_GC ();
1474 break; 1588 NEXT;
1475 1589
1476 case Bforward_word: 1590 CASE (Bforward_word):
1477 BEFORE_POTENTIAL_GC (); 1591 BEFORE_POTENTIAL_GC ();
1478 TOP = Fforward_word (TOP); 1592 TOP = Fforward_word (TOP);
1479 AFTER_POTENTIAL_GC (); 1593 AFTER_POTENTIAL_GC ();
1480 break; 1594 NEXT;
1481 1595
1482 case Bskip_chars_forward: 1596 CASE (Bskip_chars_forward):
1483 { 1597 {
1484 Lisp_Object v1; 1598 Lisp_Object v1;
1485 BEFORE_POTENTIAL_GC (); 1599 BEFORE_POTENTIAL_GC ();
1486 v1 = POP; 1600 v1 = POP;
1487 TOP = Fskip_chars_forward (TOP, v1); 1601 TOP = Fskip_chars_forward (TOP, v1);
1488 AFTER_POTENTIAL_GC (); 1602 AFTER_POTENTIAL_GC ();
1489 break; 1603 NEXT;
1490 } 1604 }
1491 1605
1492 case Bskip_chars_backward: 1606 CASE (Bskip_chars_backward):
1493 { 1607 {
1494 Lisp_Object v1; 1608 Lisp_Object v1;
1495 BEFORE_POTENTIAL_GC (); 1609 BEFORE_POTENTIAL_GC ();
1496 v1 = POP; 1610 v1 = POP;
1497 TOP = Fskip_chars_backward (TOP, v1); 1611 TOP = Fskip_chars_backward (TOP, v1);
1498 AFTER_POTENTIAL_GC (); 1612 AFTER_POTENTIAL_GC ();
1499 break; 1613 NEXT;
1500 } 1614 }
1501 1615
1502 case Bforward_line: 1616 CASE (Bforward_line):
1503 BEFORE_POTENTIAL_GC (); 1617 BEFORE_POTENTIAL_GC ();
1504 TOP = Fforward_line (TOP); 1618 TOP = Fforward_line (TOP);
1505 AFTER_POTENTIAL_GC (); 1619 AFTER_POTENTIAL_GC ();
1506 break; 1620 NEXT;
1507 1621
1508 case Bchar_syntax: 1622 CASE (Bchar_syntax):
1509 { 1623 {
1510 int c; 1624 int c;
1511 1625
@@ -1517,51 +1631,51 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
1517 MAKE_CHAR_MULTIBYTE (c); 1631 MAKE_CHAR_MULTIBYTE (c);
1518 XSETFASTINT (TOP, syntax_code_spec[(int) SYNTAX (c)]); 1632 XSETFASTINT (TOP, syntax_code_spec[(int) SYNTAX (c)]);
1519 } 1633 }
1520 break; 1634 NEXT;
1521 1635
1522 case Bbuffer_substring: 1636 CASE (Bbuffer_substring):
1523 { 1637 {
1524 Lisp_Object v1; 1638 Lisp_Object v1;
1525 BEFORE_POTENTIAL_GC (); 1639 BEFORE_POTENTIAL_GC ();
1526 v1 = POP; 1640 v1 = POP;
1527 TOP = Fbuffer_substring (TOP, v1); 1641 TOP = Fbuffer_substring (TOP, v1);
1528 AFTER_POTENTIAL_GC (); 1642 AFTER_POTENTIAL_GC ();
1529 break; 1643 NEXT;
1530 } 1644 }
1531 1645
1532 case Bdelete_region: 1646 CASE (Bdelete_region):
1533 { 1647 {
1534 Lisp_Object v1; 1648 Lisp_Object v1;
1535 BEFORE_POTENTIAL_GC (); 1649 BEFORE_POTENTIAL_GC ();
1536 v1 = POP; 1650 v1 = POP;
1537 TOP = Fdelete_region (TOP, v1); 1651 TOP = Fdelete_region (TOP, v1);
1538 AFTER_POTENTIAL_GC (); 1652 AFTER_POTENTIAL_GC ();
1539 break; 1653 NEXT;
1540 } 1654 }
1541 1655
1542 case Bnarrow_to_region: 1656 CASE (Bnarrow_to_region):
1543 { 1657 {
1544 Lisp_Object v1; 1658 Lisp_Object v1;
1545 BEFORE_POTENTIAL_GC (); 1659 BEFORE_POTENTIAL_GC ();
1546 v1 = POP; 1660 v1 = POP;
1547 TOP = Fnarrow_to_region (TOP, v1); 1661 TOP = Fnarrow_to_region (TOP, v1);
1548 AFTER_POTENTIAL_GC (); 1662 AFTER_POTENTIAL_GC ();
1549 break; 1663 NEXT;
1550 } 1664 }
1551 1665
1552 case Bwiden: 1666 CASE (Bwiden):
1553 BEFORE_POTENTIAL_GC (); 1667 BEFORE_POTENTIAL_GC ();
1554 PUSH (Fwiden ()); 1668 PUSH (Fwiden ());
1555 AFTER_POTENTIAL_GC (); 1669 AFTER_POTENTIAL_GC ();
1556 break; 1670 NEXT;
1557 1671
1558 case Bend_of_line: 1672 CASE (Bend_of_line):
1559 BEFORE_POTENTIAL_GC (); 1673 BEFORE_POTENTIAL_GC ();
1560 TOP = Fend_of_line (TOP); 1674 TOP = Fend_of_line (TOP);
1561 AFTER_POTENTIAL_GC (); 1675 AFTER_POTENTIAL_GC ();
1562 break; 1676 NEXT;
1563 1677
1564 case Bset_marker: 1678 CASE (Bset_marker):
1565 { 1679 {
1566 Lisp_Object v1, v2; 1680 Lisp_Object v1, v2;
1567 BEFORE_POTENTIAL_GC (); 1681 BEFORE_POTENTIAL_GC ();
@@ -1569,72 +1683,72 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
1569 v2 = POP; 1683 v2 = POP;
1570 TOP = Fset_marker (TOP, v2, v1); 1684 TOP = Fset_marker (TOP, v2, v1);
1571 AFTER_POTENTIAL_GC (); 1685 AFTER_POTENTIAL_GC ();
1572 break; 1686 NEXT;
1573 } 1687 }
1574 1688
1575 case Bmatch_beginning: 1689 CASE (Bmatch_beginning):
1576 BEFORE_POTENTIAL_GC (); 1690 BEFORE_POTENTIAL_GC ();
1577 TOP = Fmatch_beginning (TOP); 1691 TOP = Fmatch_beginning (TOP);
1578 AFTER_POTENTIAL_GC (); 1692 AFTER_POTENTIAL_GC ();
1579 break; 1693 NEXT;
1580 1694
1581 case Bmatch_end: 1695 CASE (Bmatch_end):
1582 BEFORE_POTENTIAL_GC (); 1696 BEFORE_POTENTIAL_GC ();
1583 TOP = Fmatch_end (TOP); 1697 TOP = Fmatch_end (TOP);
1584 AFTER_POTENTIAL_GC (); 1698 AFTER_POTENTIAL_GC ();
1585 break; 1699 NEXT;
1586 1700
1587 case Bupcase: 1701 CASE (Bupcase):
1588 BEFORE_POTENTIAL_GC (); 1702 BEFORE_POTENTIAL_GC ();
1589 TOP = Fupcase (TOP); 1703 TOP = Fupcase (TOP);
1590 AFTER_POTENTIAL_GC (); 1704 AFTER_POTENTIAL_GC ();
1591 break; 1705 NEXT;
1592 1706
1593 case Bdowncase: 1707 CASE (Bdowncase):
1594 BEFORE_POTENTIAL_GC (); 1708 BEFORE_POTENTIAL_GC ();
1595 TOP = Fdowncase (TOP); 1709 TOP = Fdowncase (TOP);
1596 AFTER_POTENTIAL_GC (); 1710 AFTER_POTENTIAL_GC ();
1597 break; 1711 NEXT;
1598 1712
1599 case Bstringeqlsign: 1713 CASE (Bstringeqlsign):
1600 { 1714 {
1601 Lisp_Object v1; 1715 Lisp_Object v1;
1602 BEFORE_POTENTIAL_GC (); 1716 BEFORE_POTENTIAL_GC ();
1603 v1 = POP; 1717 v1 = POP;
1604 TOP = Fstring_equal (TOP, v1); 1718 TOP = Fstring_equal (TOP, v1);
1605 AFTER_POTENTIAL_GC (); 1719 AFTER_POTENTIAL_GC ();
1606 break; 1720 NEXT;
1607 } 1721 }
1608 1722
1609 case Bstringlss: 1723 CASE (Bstringlss):
1610 { 1724 {
1611 Lisp_Object v1; 1725 Lisp_Object v1;
1612 BEFORE_POTENTIAL_GC (); 1726 BEFORE_POTENTIAL_GC ();
1613 v1 = POP; 1727 v1 = POP;
1614 TOP = Fstring_lessp (TOP, v1); 1728 TOP = Fstring_lessp (TOP, v1);
1615 AFTER_POTENTIAL_GC (); 1729 AFTER_POTENTIAL_GC ();
1616 break; 1730 NEXT;
1617 } 1731 }
1618 1732
1619 case Bequal: 1733 CASE (Bequal):
1620 { 1734 {
1621 Lisp_Object v1; 1735 Lisp_Object v1;
1622 v1 = POP; 1736 v1 = POP;
1623 TOP = Fequal (TOP, v1); 1737 TOP = Fequal (TOP, v1);
1624 break; 1738 NEXT;
1625 } 1739 }
1626 1740
1627 case Bnthcdr: 1741 CASE (Bnthcdr):
1628 { 1742 {
1629 Lisp_Object v1; 1743 Lisp_Object v1;
1630 BEFORE_POTENTIAL_GC (); 1744 BEFORE_POTENTIAL_GC ();
1631 v1 = POP; 1745 v1 = POP;
1632 TOP = Fnthcdr (TOP, v1); 1746 TOP = Fnthcdr (TOP, v1);
1633 AFTER_POTENTIAL_GC (); 1747 AFTER_POTENTIAL_GC ();
1634 break; 1748 NEXT;
1635 } 1749 }
1636 1750
1637 case Belt: 1751 CASE (Belt):
1638 { 1752 {
1639 Lisp_Object v1, v2; 1753 Lisp_Object v1, v2;
1640 if (CONSP (TOP)) 1754 if (CONSP (TOP))
@@ -1660,87 +1774,91 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
1660 TOP = Felt (TOP, v1); 1774 TOP = Felt (TOP, v1);
1661 AFTER_POTENTIAL_GC (); 1775 AFTER_POTENTIAL_GC ();
1662 } 1776 }
1663 break; 1777 NEXT;
1664 } 1778 }
1665 1779
1666 case Bmember: 1780 CASE (Bmember):
1667 { 1781 {
1668 Lisp_Object v1; 1782 Lisp_Object v1;
1669 BEFORE_POTENTIAL_GC (); 1783 BEFORE_POTENTIAL_GC ();
1670 v1 = POP; 1784 v1 = POP;
1671 TOP = Fmember (TOP, v1); 1785 TOP = Fmember (TOP, v1);
1672 AFTER_POTENTIAL_GC (); 1786 AFTER_POTENTIAL_GC ();
1673 break; 1787 NEXT;
1674 } 1788 }
1675 1789
1676 case Bassq: 1790 CASE (Bassq):
1677 { 1791 {
1678 Lisp_Object v1; 1792 Lisp_Object v1;
1679 BEFORE_POTENTIAL_GC (); 1793 BEFORE_POTENTIAL_GC ();
1680 v1 = POP; 1794 v1 = POP;
1681 TOP = Fassq (TOP, v1); 1795 TOP = Fassq (TOP, v1);
1682 AFTER_POTENTIAL_GC (); 1796 AFTER_POTENTIAL_GC ();
1683 break; 1797 NEXT;
1684 } 1798 }
1685 1799
1686 case Bnreverse: 1800 CASE (Bnreverse):
1687 BEFORE_POTENTIAL_GC (); 1801 BEFORE_POTENTIAL_GC ();
1688 TOP = Fnreverse (TOP); 1802 TOP = Fnreverse (TOP);
1689 AFTER_POTENTIAL_GC (); 1803 AFTER_POTENTIAL_GC ();
1690 break; 1804 NEXT;
1691 1805
1692 case Bsetcar: 1806 CASE (Bsetcar):
1693 { 1807 {
1694 Lisp_Object v1; 1808 Lisp_Object v1;
1695 BEFORE_POTENTIAL_GC (); 1809 BEFORE_POTENTIAL_GC ();
1696 v1 = POP; 1810 v1 = POP;
1697 TOP = Fsetcar (TOP, v1); 1811 TOP = Fsetcar (TOP, v1);
1698 AFTER_POTENTIAL_GC (); 1812 AFTER_POTENTIAL_GC ();
1699 break; 1813 NEXT;
1700 } 1814 }
1701 1815
1702 case Bsetcdr: 1816 CASE (Bsetcdr):
1703 { 1817 {
1704 Lisp_Object v1; 1818 Lisp_Object v1;
1705 BEFORE_POTENTIAL_GC (); 1819 BEFORE_POTENTIAL_GC ();
1706 v1 = POP; 1820 v1 = POP;
1707 TOP = Fsetcdr (TOP, v1); 1821 TOP = Fsetcdr (TOP, v1);
1708 AFTER_POTENTIAL_GC (); 1822 AFTER_POTENTIAL_GC ();
1709 break; 1823 NEXT;
1710 } 1824 }
1711 1825
1712 case Bcar_safe: 1826 CASE (Bcar_safe):
1713 { 1827 {
1714 Lisp_Object v1; 1828 Lisp_Object v1;
1715 v1 = TOP; 1829 v1 = TOP;
1716 TOP = CAR_SAFE (v1); 1830 TOP = CAR_SAFE (v1);
1717 break; 1831 NEXT;
1718 } 1832 }
1719 1833
1720 case Bcdr_safe: 1834 CASE (Bcdr_safe):
1721 { 1835 {
1722 Lisp_Object v1; 1836 Lisp_Object v1;
1723 v1 = TOP; 1837 v1 = TOP;
1724 TOP = CDR_SAFE (v1); 1838 TOP = CDR_SAFE (v1);
1725 break; 1839 NEXT;
1726 } 1840 }
1727 1841
1728 case Bnconc: 1842 CASE (Bnconc):
1729 BEFORE_POTENTIAL_GC (); 1843 BEFORE_POTENTIAL_GC ();
1730 DISCARD (1); 1844 DISCARD (1);
1731 TOP = Fnconc (2, &TOP); 1845 TOP = Fnconc (2, &TOP);
1732 AFTER_POTENTIAL_GC (); 1846 AFTER_POTENTIAL_GC ();
1733 break; 1847 NEXT;
1734 1848
1735 case Bnumberp: 1849 CASE (Bnumberp):
1736 TOP = (NUMBERP (TOP) ? Qt : Qnil); 1850 TOP = (NUMBERP (TOP) ? Qt : Qnil);
1737 break; 1851 NEXT;
1738 1852
1739 case Bintegerp: 1853 CASE (Bintegerp):
1740 TOP = INTEGERP (TOP) ? Qt : Qnil; 1854 TOP = INTEGERP (TOP) ? Qt : Qnil;
1741 break; 1855 NEXT;
1742 1856
1743#ifdef BYTE_CODE_SAFE 1857#ifdef BYTE_CODE_SAFE
1858 /* These are intentionally written using 'case' syntax,
1859 because they are incompatible with the threaded
1860 interpreter. */
1861
1744 case Bset_mark: 1862 case Bset_mark:
1745 BEFORE_POTENTIAL_GC (); 1863 BEFORE_POTENTIAL_GC ();
1746 error ("set-mark is an obsolete bytecode"); 1864 error ("set-mark is an obsolete bytecode");
@@ -1753,49 +1871,49 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
1753 break; 1871 break;
1754#endif 1872#endif
1755 1873
1756 case 0: 1874 CASE_ABORT:
1757 /* Actually this is Bstack_ref with offset 0, but we use Bdup 1875 /* Actually this is Bstack_ref with offset 0, but we use Bdup
1758 for that instead. */ 1876 for that instead. */
1759 /* case Bstack_ref: */ 1877 /* CASE (Bstack_ref): */
1760 abort (); 1878 abort ();
1761 1879
1762 /* Handy byte-codes for lexical binding. */ 1880 /* Handy byte-codes for lexical binding. */
1763 case Bstack_ref+1: 1881 CASE (Bstack_ref1):
1764 case Bstack_ref+2: 1882 CASE (Bstack_ref2):
1765 case Bstack_ref+3: 1883 CASE (Bstack_ref3):
1766 case Bstack_ref+4: 1884 CASE (Bstack_ref4):
1767 case Bstack_ref+5: 1885 CASE (Bstack_ref5):
1768 { 1886 {
1769 Lisp_Object *ptr = top - (op - Bstack_ref); 1887 Lisp_Object *ptr = top - (op - Bstack_ref);
1770 PUSH (*ptr); 1888 PUSH (*ptr);
1771 break; 1889 NEXT;
1772 } 1890 }
1773 case Bstack_ref+6: 1891 CASE (Bstack_ref6):
1774 { 1892 {
1775 Lisp_Object *ptr = top - (FETCH); 1893 Lisp_Object *ptr = top - (FETCH);
1776 PUSH (*ptr); 1894 PUSH (*ptr);
1777 break; 1895 NEXT;
1778 } 1896 }
1779 case Bstack_ref+7: 1897 CASE (Bstack_ref7):
1780 { 1898 {
1781 Lisp_Object *ptr = top - (FETCH2); 1899 Lisp_Object *ptr = top - (FETCH2);
1782 PUSH (*ptr); 1900 PUSH (*ptr);
1783 break; 1901 NEXT;
1784 } 1902 }
1785 case Bstack_set: 1903 CASE (Bstack_set):
1786 /* stack-set-0 = discard; stack-set-1 = discard-1-preserve-tos. */ 1904 /* stack-set-0 = discard; stack-set-1 = discard-1-preserve-tos. */
1787 { 1905 {
1788 Lisp_Object *ptr = top - (FETCH); 1906 Lisp_Object *ptr = top - (FETCH);
1789 *ptr = POP; 1907 *ptr = POP;
1790 break; 1908 NEXT;
1791 } 1909 }
1792 case Bstack_set2: 1910 CASE (Bstack_set2):
1793 { 1911 {
1794 Lisp_Object *ptr = top - (FETCH2); 1912 Lisp_Object *ptr = top - (FETCH2);
1795 *ptr = POP; 1913 *ptr = POP;
1796 break; 1914 NEXT;
1797 } 1915 }
1798 case BdiscardN: 1916 CASE (BdiscardN):
1799 op = FETCH; 1917 op = FETCH;
1800 if (op & 0x80) 1918 if (op & 0x80)
1801 { 1919 {
@@ -1803,10 +1921,10 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
1803 top[-op] = TOP; 1921 top[-op] = TOP;
1804 } 1922 }
1805 DISCARD (op); 1923 DISCARD (op);
1806 break; 1924 NEXT;
1807 1925
1808 case 255: 1926 CASE_DEFAULT
1809 default: 1927 CASE (Bconstant):
1810#ifdef BYTE_CODE_SAFE 1928#ifdef BYTE_CODE_SAFE
1811 if (op < Bconstant) 1929 if (op < Bconstant)
1812 { 1930 {
@@ -1820,6 +1938,7 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
1820#else 1938#else
1821 PUSH (vectorp[op - Bconstant]); 1939 PUSH (vectorp[op - Bconstant]);
1822#endif 1940#endif
1941 NEXT;
1823 } 1942 }
1824 } 1943 }
1825 1944
@@ -1867,8 +1986,8 @@ integer, it is incremented each time that symbol's function is called. */);
1867 { 1986 {
1868 int i = 256; 1987 int i = 256;
1869 while (i--) 1988 while (i--)
1870 XVECTOR (Vbyte_code_meter)->contents[i] = 1989 ASET (Vbyte_code_meter, i,
1871 Fmake_vector (make_number (256), make_number (0)); 1990 Fmake_vector (make_number (256), make_number (0)));
1872 } 1991 }
1873#endif 1992#endif
1874} 1993}
generated by cgit v1.2.1 (git 2.18.0) at 2026-02-13 12:17:21 +0000