hacked on by jwz@lucid.com 17-jun-91
o added a compile-time switch to turn on simple sanity checking;
o put back the obsolete byte-codes for error-detection;
- o put back fset, symbol-function, and read-char because I don't
- see any reason for them to have been removed;
o added a new instruction, unbind_all, which I will use for
tail-recursion elimination;
- o made temp_output_buffer_show() be called with the right number
+ o made temp_output_buffer_show be called with the right number
of args;
o made the new bytecodes be called with args in the right order;
o added metering support.
by Hallvard:
- o added relative jump instructions.
+ o added relative jump instructions;
o all conditionals now only do QUIT if they jump.
*/
-
#include "config.h"
#include "lisp.h"
#include "buffer.h"
*
* define BYTE_CODE_METER to enable generation of a byte-op usage histogram.
*/
-#define BYTE_CODE_SAFE
-#define BYTE_CODE_METER
+/* #define BYTE_CODE_SAFE */
+/* #define BYTE_CODE_METER */
\f
#ifdef BYTE_CODE_METER
Lisp_Object Vbyte_code_meter, Qbyte_code_meter;
int byte_metering_on;
-# define METER_2(code1,code2) \
+#define METER_2(code1, code2) \
XFASTINT (XVECTOR (XVECTOR (Vbyte_code_meter)->contents[(code1)]) \
->contents[(code2)])
-# define METER_1(code) METER_2 (0,(code))
-
-# define METER_CODE(last_code, this_code) { \
- if (byte_metering_on) { \
- if (METER_1 (this_code) != ((1<<VALBITS)-1)) \
- METER_1 (this_code) ++; \
- if (last_code && \
- METER_2 (last_code,this_code) != ((1<<VALBITS)-1)) \
- METER_2 (last_code,this_code) ++; \
- } \
- }
+#define METER_1(code) METER_2 (0, (code))
+
+#define METER_CODE(last_code, this_code) \
+{ \
+ if (byte_metering_on) \
+ { \
+ if (METER_1 (this_code) != ((1<<VALBITS)-1)) \
+ METER_1 (this_code)++; \
+ if (last_code \
+ && METER_2 (last_code, this_code) != ((1<<VALBITS)-1)) \
+ METER_2 (last_code, this_code)++; \
+ } \
+}
-#else /* ! BYTE_CODE_METER */
+#else /* no BYTE_CODE_METER */
-# define meter_code(last_code, this_code)
+#define METER_CODE(last_code, this_code)
-#endif
+#endif /* no BYTE_CODE_METER */
\f
Lisp_Object Qbytecode;
#define Baref 0110
#define Baset 0111
#define Bsymbol_value 0112
-#define Bsymbol_function 0113
+#define Bsymbol_function 0113 /* no longer generated as of v19 */
#define Bset 0114
-#define Bfset 0115
+#define Bfset 0115 /* no longer generated as of v19 */
#define Bget 0116
#define Bsubstring 0117
#define Bconcat2 0120
#define BlistN 0257
#define BconcatN 0260
+#define BinsertN 0261
#define Bconstant 0300
#define CONSTANTLIM 0100
{
#ifdef BYTE_CODE_SAFE
if (stackp > stacke)
- error (
- "Stack overflow in byte code (byte compiler bug), pc = %d, depth = %d",
+ error ("Byte code stack overflow (byte compiler bug), pc %d, depth %d",
pc - XSTRING (string_saved)->data, stacke - stackp);
if (stackp < stack)
- error ("Stack underflow in byte code (byte compiler bug), pc = %d",
+ error ("Byte code stack underflow (byte compiler bug), pc %d",
pc - XSTRING (string_saved)->data);
#endif
case Bcall+4: case Bcall+5:
op -= Bcall;
docall:
- DISCARD(op);
+ DISCARD (op);
#ifdef BYTE_CODE_METER
if (byte_metering_on && XTYPE (TOP) == Lisp_Symbol)
{
}
}
#endif
+ /* The frobbing of gcpro3 was lost by jwz's changes in June 91
+ and then reinserted by jwz in Nov 91. */
+ /* Remove protection from the args we are giving to Ffuncall.
+ FFuncall will protect them, and double protection would
+ cause disasters. */
+ gcpro3.nvars = &TOP - stack - 1;
TOP = Ffuncall (op + 1, &TOP);
+ gcpro3.nvars = XFASTINT (maxdepth);
break;
case Bunbind+6:
case Bunbind_all:
/* To unbind back to the beginning of this frame. Not used yet,
- but wil be needed for tail-recursion elimination.
- */
+ but will be needed for tail-recursion elimination. */
unbind_to (count, Qnil);
break;
QUIT;
pc = XSTRING (string_saved)->data + op;
}
- else DISCARD(1);
+ else DISCARD (1);
break;
case Bgotoifnonnilelsepop:
QUIT;
pc = XSTRING (string_saved)->data + op;
}
- else DISCARD(1);
+ else DISCARD (1);
break;
case BRgoto:
QUIT;
pc += op - 128;
}
- else DISCARD(1);
+ else DISCARD (1);
break;
case BRgotoifnonnilelsepop:
QUIT;
pc += op - 128;
}
- else DISCARD(1);
+ else DISCARD (1);
break;
case Breturn:
goto exit;
case Bdiscard:
- DISCARD(1);
+ DISCARD (1);
break;
case Bdup:
break;
case Blist3:
- DISCARD(2);
+ DISCARD (2);
TOP = Flist (3, &TOP);
break;
case Blist4:
- DISCARD(3);
+ DISCARD (3);
TOP = Flist (4, &TOP);
break;
break;
case Bconcat2:
- DISCARD(1);
+ DISCARD (1);
TOP = Fconcat (2, &TOP);
break;
case Bconcat3:
- DISCARD(2);
+ DISCARD (2);
TOP = Fconcat (3, &TOP);
break;
case Bconcat4:
- DISCARD(3);
+ DISCARD (3);
TOP = Fconcat (4, &TOP);
break;
break;
case Bdiff:
- DISCARD(1);
+ DISCARD (1);
TOP = Fminus (2, &TOP);
break;
break;
case Bplus:
- DISCARD(1);
+ DISCARD (1);
TOP = Fplus (2, &TOP);
break;
case Bmax:
- DISCARD(1);
+ DISCARD (1);
TOP = Fmax (2, &TOP);
break;
case Bmin:
- DISCARD(1);
+ DISCARD (1);
TOP = Fmin (2, &TOP);
break;
case Bmult:
- DISCARD(1);
+ DISCARD (1);
TOP = Ftimes (2, &TOP);
break;
case Bquo:
- DISCARD(1);
+ DISCARD (1);
TOP = Fquo (2, &TOP);
break;
TOP = Finsert (1, &TOP);
break;
+ case BinsertN:
+ op = FETCH;
+ DISCARD (op - 1);
+ TOP = Finsert (op, &TOP);
+ break;
+
case Bpoint_max:
XFASTINT (v1) = ZV;
PUSH (v1);
break;
case Bnconc:
- DISCARD(1);
+ DISCARD (1);
TOP = Fnconc (2, &TOP);
break;
error ("scan-buffer is an obsolete bytecode");
break;
case Bmark:
- error("mark is an obsolete bytecode");
+ error ("mark is an obsolete bytecode");
break;
#endif
#ifdef BYTE_CODE_METER
DEFVAR_LISP ("byte-code-meter", &Vbyte_code_meter,
- "a vector of vectors which holds a histogram of byte-code usage.");
+ "A vector of vectors which holds a histogram of byte-code usage.");
DEFVAR_BOOL ("byte-metering-on", &byte_metering_on, "");
byte_metering_on = 0;
- Vbyte_code_meter = Fmake_vector(make_number(256), make_number(0));
+ Vbyte_code_meter = Fmake_vector (make_number (256), make_number (0));
+ Qbyte_code_meter = intern ("byte-code-meter");
staticpro (&Qbyte_code_meter);
{
int i = 256;
while (i--)
- XVECTOR(Vbyte_code_meter)->contents[i] =
- Fmake_vector(make_number(256), make_number(0));
+ XVECTOR (Vbyte_code_meter)->contents[i] =
+ Fmake_vector (make_number (256), make_number (0));
}
#endif
}
HCoop / bpt / emacs.git / blobdiff