#define Bbobp 0157
#define Bcurrent_buffer 0160
#define Bset_buffer 0161
+#define Bsave_current_buffer_1 0162 /* Replacing Bsave_current_buffer. */
#define Bread_char 0162 /* No longer generated as of v19 */
#define Bset_mark 0163 /* this loser is no longer generated as of v18 */
#define Binteractive_p 0164 /* Needed since interactive-p takes unevalled args */
#define MAYBE_GC() \
if (consing_since_gc > gc_cons_threshold) \
- Fgarbage_collect ();
+ { \
+ Fgarbage_collect (); \
+ HANDLE_RELOCATION (); \
+ } \
+ else
+
+/* Relocate BYTESTR if there has been a GC recently. */
+#define HANDLE_RELOCATION() \
+ if (! EQ (string_saved, bytestr)) \
+ { \
+ pc = pc - XSTRING (string_saved)->data + XSTRING (bytestr)->data; \
+ string_saved = bytestr; \
+ } \
+ else
/* Check for jumping out of range. */
#define CHECK_RANGE(ARG) \
pc - XSTRING (string_saved)->data);
#endif
- if (! EQ (string_saved, bytestr))
- {
- pc = pc - XSTRING (string_saved)->data + XSTRING (bytestr)->data;
- string_saved = bytestr;
- }
+ /* Update BYTESTR if we had a garbage collection. */
+ HANDLE_RELOCATION ();
#ifdef BYTE_CODE_METER
prev_op = this_op;
break;
case Bsave_current_buffer:
+ case Bsave_current_buffer_1:
record_unwind_protect (Fset_buffer, Fcurrent_buffer ());
break;
TOP = Fset_buffer (TOP);
break;
- case Bread_char:
- PUSH (Fread_char ());
- QUIT;
- break;
-
case Binteractive_p:
PUSH (Finteractive_p ());
break;