(fix_submap_inheritance, get_keyelt, store_in_keymap,

[bpt/emacs.git] / src / bytecode.c

diff --git a/src/bytecode.c b/src/bytecode.c
index 92406a7..193630f 100644 (file)
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -148,6 +148,7 @@ Lisp_Object Qbytecode;
 #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 */
@@ -256,7 +257,24 @@ Lisp_Object Qbytecode;
 
 #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)                       \
+  if (ARG >= bytestr_length) abort ()
 
 DEFUN ("byte-code", Fbyte_code, Sbyte_code, 3, 3, 0,
   "Function used internally in byte-compiled code.\n\
@@ -288,6 +306,7 @@ If the third argument is incorrect, Emacs may crash.")
   /* Cached address of beginning of string,
      valid if BYTESTR equals STRING_SAVED.  */
   register unsigned char *strbeg;
+  int bytestr_length = XSTRING (bytestr)->size_byte;
 
   CHECK_STRING (bytestr, 0);
   if (!VECTORP (vector))
@@ -318,11 +337,8 @@ If the third argument is incorrect, Emacs may crash.")
               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;
@@ -441,6 +457,7 @@ If the third argument is incorrect, Emacs may crash.")
          MAYBE_GC ();
          QUIT;
          op = FETCH2;    /* pc = FETCH2 loses since FETCH2 contains pc++ */
+         CHECK_RANGE (op);
          pc = XSTRING (string_saved)->data + op;
          break;
 
@@ -450,6 +467,7 @@ If the third argument is incorrect, Emacs may crash.")
          if (NILP (POP))
            {
              QUIT;
+             CHECK_RANGE (op);
              pc = XSTRING (string_saved)->data + op;
            }
          break;
@@ -460,6 +478,7 @@ If the third argument is incorrect, Emacs may crash.")
          if (!NILP (POP))
            {
              QUIT;
+             CHECK_RANGE (op);
              pc = XSTRING (string_saved)->data + op;
            }
          break;
@@ -470,6 +489,7 @@ If the third argument is incorrect, Emacs may crash.")
          if (NILP (TOP))
            {
              QUIT;
+             CHECK_RANGE (op);
              pc = XSTRING (string_saved)->data + op;
            }
          else DISCARD (1);
@@ -481,6 +501,7 @@ If the third argument is incorrect, Emacs may crash.")
          if (!NILP (TOP))
            {
              QUIT;
+             CHECK_RANGE (op);
              pc = XSTRING (string_saved)->data + op;
            }
          else DISCARD (1);
@@ -556,7 +577,8 @@ If the third argument is incorrect, Emacs may crash.")
          break;
 
        case Bsave_current_buffer:
-         record_unwind_protect (Fset_buffer, Fcurrent_buffer ());
+       case Bsave_current_buffer_1:
+         record_unwind_protect (set_buffer_if_live, Fcurrent_buffer ());
          break;
 
        case Bsave_window_excursion:
@@ -938,11 +960,6 @@ If the third argument is incorrect, Emacs may crash.")
          TOP = Fset_buffer (TOP);
          break;
 
-       case Bread_char:
-         PUSH (Fread_char ());
-         QUIT;
-         break;
-
        case Binteractive_p:
          PUSH (Finteractive_p ());
          break;