comparison src/bytecode.c @ 16784:79ea730b7e20

(Fbyte_code): Add error check for jumping out of range.

16783:b87f9489bcd3

#define MAYBE_GC()				\
  if (consing_since_gc > gc_cons_threshold)	\
    Fgarbage_collect ();

DEFUN ("byte-code", Fbyte_code, Sbyte_code, 3, 3, 0,
  "Function used internally in byte-compiled code.\n\
The first argument, BYTESTR, is a string of byte code;\n\
the second, VECTOR, a vector of constants;\n\
the third, MAXDEPTH, the maximum stack depth used in this function.\n\

  /* Copy of BYTESTR, saved so we can tell if BYTESTR was relocated.  */
  Lisp_Object string_saved;
  /* Cached address of beginning of string,
     valid if BYTESTR equals STRING_SAVED.  */
  register unsigned char *strbeg;

  CHECK_STRING (bytestr, 0);
  if (!VECTORP (vector))
    vector = wrong_type_argument (Qvectorp, vector);
  CHECK_NUMBER (maxdepth, 2);

	case Bgoto:
	  MAYBE_GC ();
	  QUIT;
	  op = FETCH2;    /* pc = FETCH2 loses since FETCH2 contains pc++ */
	  pc = XSTRING (string_saved)->data + op;
	  break;

	case Bgotoifnil:
	  MAYBE_GC ();
	  op = FETCH2;
	  if (NILP (POP))
	    {
	      QUIT;
	      pc = XSTRING (string_saved)->data + op;
	    }
	  break;

	case Bgotoifnonnil:
	  MAYBE_GC ();
	  op = FETCH2;
	  if (!NILP (POP))
	    {
	      QUIT;
	      pc = XSTRING (string_saved)->data + op;
	    }
	  break;

	case Bgotoifnilelsepop:
	  MAYBE_GC ();
	  op = FETCH2;
	  if (NILP (TOP))
	    {
	      QUIT;
	      pc = XSTRING (string_saved)->data + op;
	    }
	  else DISCARD (1);
	  break;

	  MAYBE_GC ();
	  op = FETCH2;
	  if (!NILP (TOP))
	    {
	      QUIT;
	      pc = XSTRING (string_saved)->data + op;
	    }
	  else DISCARD (1);
	  break;

16784:79ea730b7e20

#define MAYBE_GC()				\
  if (consing_since_gc > gc_cons_threshold)	\
    Fgarbage_collect ();

/* 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\
The first argument, BYTESTR, is a string of byte code;\n\
the second, VECTOR, a vector of constants;\n\
the third, MAXDEPTH, the maximum stack depth used in this function.\n\

  /* Copy of BYTESTR, saved so we can tell if BYTESTR was relocated.  */
  Lisp_Object string_saved;
  /* Cached address of beginning of string,
     valid if BYTESTR equals STRING_SAVED.  */
  register unsigned char *strbeg;
  int bytestr_length = XSTRING (bytestr)->size;

  CHECK_STRING (bytestr, 0);
  if (!VECTORP (vector))
    vector = wrong_type_argument (Qvectorp, vector);
  CHECK_NUMBER (maxdepth, 2);

	case Bgoto:
	  MAYBE_GC ();
	  QUIT;
	  op = FETCH2;    /* pc = FETCH2 loses since FETCH2 contains pc++ */
	  CHECK_RANGE (op);
	  pc = XSTRING (string_saved)->data + op;
	  break;

	case Bgotoifnil:
	  MAYBE_GC ();
	  op = FETCH2;
	  if (NILP (POP))
	    {
	      QUIT;
	      CHECK_RANGE (op);
	      pc = XSTRING (string_saved)->data + op;
	    }
	  break;

	case Bgotoifnonnil:
	  MAYBE_GC ();
	  op = FETCH2;
	  if (!NILP (POP))
	    {
	      QUIT;
	      CHECK_RANGE (op);
	      pc = XSTRING (string_saved)->data + op;
	    }
	  break;

	case Bgotoifnilelsepop:
	  MAYBE_GC ();
	  op = FETCH2;
	  if (NILP (TOP))
	    {
	      QUIT;
	      CHECK_RANGE (op);
	      pc = XSTRING (string_saved)->data + op;
	    }
	  else DISCARD (1);
	  break;

	  MAYBE_GC ();
	  op = FETCH2;
	  if (!NILP (TOP))
	    {
	      QUIT;
	      CHECK_RANGE (op);
	      pc = XSTRING (string_saved)->data + op;
	    }
	  else DISCARD (1);
	  break;