comparison src/bytecode.c @ 814:a634e3b7acc8

[xemacs-hg @ 2002-04-14 12:41:59 by ben] latest changes TODO.ben-mule-21-5: Update. make-docfile.c: Add basic support for handling ISO 2022 doc strings -- we parse the basic charset designation sequences so we know whether we're in ASCII and have to pay attention to end quotes and such. Reformat code according to coding standards. abbrev.el: Add `global-abbrev-mode', which turns on or off abbrev-mode in all buffers. Added `defining-abbrev-turns-on-abbrev-mode' -- if non-nil, defining an abbrev through an interactive function will automatically turn on abbrev-mode, either globally or locally depending on the command. This is the "what you'd expect" behavior. indent.el: general function for indenting a balanced expression in a mode-correct way. Works similar to indent-region in that a mode can specify a specific command to do the whole operation; if not, figure out the region using forward-sexp and indent each line using indent-according-to-mode. keydefs.el: Removed. Modify M-C-backslash to do indent-region-or-balanced-expression. Make S-Tab just insert a TAB char, like it's meant to do. make-docfile.el: Now that we're using the call-process-in-lisp, we need to load an extra file win32-native.el because we're running a bare temacs. menubar-items.el: Totally redo the Cmds menu so that most used commands appear directly on the menu and less used commands appear in submenus. The old way may have been very pretty, but rather impractical. process.el: Under Windows, don't ever use old-call-process-internal, even in batch mode. We can do processes in batch mode. subr.el: Someone recoded truncate-string-to-width, saying "the FSF version is too complicated and does lots of hard-to-understand stuff" but the resulting recoded version was *totally* wrong! it misunderstood the basic point of this function, which is work in *columns* not chars. i dumped ours and copied the version from FSF 21.1. Also added truncate-string-with-continuation-dots, since this idiom is used often. config.inc.samp, xemacs.mak: Separate out debug and optimize flags. Remove all vestiges of USE_MINIMAL_TAGBITS, USE_INDEXED_LRECORD_IMPLEMENTATION, and GUNG_HO, since those ifdefs have long been removed. Make error-checking support actually work. Some rearrangement of config.inc.samp to make it more logical. Remove callproc.c and ntproc.c from xemacs.mak, no longer used. Make pdump the default. lisp.h: Add support for strong type-checking of Bytecount, Bytebpos, Charcount, Charbpos, and others, by making them classes, overloading the operators to provide integer-like operation and carefully controlling what operations are allowed. Not currently enabled in C++ builds because there are still a number of compile errors, and it won't really work till we merge in my "8-bit-Mule" workspace, in which I make use of the new types Charxpos, Bytexpos, Memxpos, representing a "position" either in a buffer or a string. (This is especially important in the extent code.) abbrev.c, alloc.c, eval.c, buffer.c, buffer.h, editfns.c, fns.c, text.h: Warning fixes, some of them related to new C++ strict type checking of Bytecount, Charbpos, etc. dired.c: Caught an actual error due to strong type checking -- char len being passed when should be byte len. alloc.c, backtrace.h, bytecode.c, bytecode.h, eval.c, sysdep.c: Further optimize Ffuncall: -- process arg list at compiled-function creation time, converting into an array for extra-quick access at funcall time. -- rewrite funcall_compiled_function to use it, and inline this function. -- change the order of check for magic stuff in SPECBIND_FAST_UNSAFE to be faster. -- move the check for need to garbage collect into the allocation code, so only a single flag needs to be checked in funcall. buffer.c, symbols.c: add debug funs to check on mule optimization info in buffers and strings. eval.c, emacs.c, text.c, regex.c, scrollbar-msw.c, search.c: Fix evil crashes due to eistrings not properly reinitialized under pdump. Redo a bit some of the init routines; convert some complex_vars_of() into simple vars_of(), because they didn't need complex processing. callproc.c, emacs.c, event-stream.c, nt.c, process.c, process.h, sysdep.c, sysdep.h, syssignal.h, syswindows.h, ntproc.c: Delete. Hallelujah, praise the Lord, there is no god but Allah!!! fix so that processes can be invoked in bare temacs -- thereby eliminating any need for callproc.c. (currently only eliminated under NT.) remove all crufty and unnecessary old process code in ntproc.c and elsewhere. move non-callproc-specific stuff (mostly environment) into process.c, so callproc.c can be left out under NT. console-tty.c, doc.c, file-coding.c, file-coding.h, lstream.c, lstream.h: fix doc string handling so it works with Japanese, etc docs. change handling of "character mode" so callers don't have to manually set it (quite error-prone). event-msw.c: spacing fixes. lread.c: eliminate unused crufty vintage-19 "FSF defun hack" code. lrecord.h: improve pdump description docs. buffer.c, ntheap.c, unexnt.c, win32.c, emacs.c: Mule-ize some unexec and startup code. It was pseudo-Mule-ized before by simply always calling the ...A versions of functions, but that won't cut it -- eventually we want to be able to run properly even if XEmacs has been installed in a Japanese directory. (The current problem is the timing of the loading of the Unicode tables; this will eventually be fixed.) Go through and fix various other places where the code was not Mule-clean. Provide a function mswindows_get_module_file_name() to get our own name without resort to PATH_MAX and such. Add a big comment in main() about the problem with Unicode table load timing that I just alluded to. emacs.c: When error-checking is enabled (interpreted as "user is developing XEmacs"), don't ask user to "pause to read messages" when a fatal error has occurred, because it will wedge if we are in an inner modal loop (typically when a menu is popped up) and make us unable to get a useful stack trace in the debugger. text.c: Correct update_entirely_ascii_p_flag to actually work. lisp.h, symsinit.h: declarations for above changes.
author ben
date Sun, 14 Apr 2002 12:43:31 +0000
parents 2b676dc88c66
children 6728e641994e
comparison
equal deleted inserted replaced
813:9541922fb765 814:a634e3b7acc8
1 /* Execution of byte code produced by bytecomp.el. 1 /* Execution of byte code produced by bytecomp.el.
2 Implementation of compiled-function objects. 2 Implementation of compiled-function objects.
3 Copyright (C) 1992, 1993 Free Software Foundation, Inc. 3 Copyright (C) 1992, 1993 Free Software Foundation, Inc.
4 Copyright (C) 1995 Ben Wing. 4 Copyright (C) 1995, 2002 Ben Wing.
5 5
6 This file is part of XEmacs. 6 This file is part of XEmacs.
7 7
8 XEmacs is free software; you can redistribute it and/or modify it 8 XEmacs is free software; you can redistribute it and/or modify it
9 under the terms of the GNU General Public License as published by the 9 under the terms of the GNU General Public License as published by the
207 Bassq = 0267, /* new in v20 */ 207 Bassq = 0267, /* new in v20 */
208 208
209 Bconstant = 0300 209 Bconstant = 0300
210 }; 210 };
211 typedef enum Opcode Opcode; 211 typedef enum Opcode Opcode;
212 typedef unsigned char Opbyte;
213 212
214 213
215 Lisp_Object * execute_rare_opcode (Lisp_Object *stack_ptr, 214 Lisp_Object * execute_rare_opcode (Lisp_Object *stack_ptr,
216 const Opbyte *program_ptr, 215 const Opbyte *program_ptr,
217 Opcode opcode); 216 Opcode opcode);
218
219 static Lisp_Object execute_optimized_program (const Opbyte *program,
220 int stack_depth,
221 Lisp_Object *constants_data);
222
223 extern Lisp_Object Qand_rest, Qand_optional;
224 217
225 /* Define BYTE_CODE_METER to enable generation of a byte-op usage histogram. 218 /* Define BYTE_CODE_METER to enable generation of a byte-op usage histogram.
226 This isn't defined in FSF Emacs and isn't defined in XEmacs v19. */ 219 This isn't defined in FSF Emacs and isn't defined in XEmacs v19. */
227 /* #define BYTE_CODE_METER */ 220 /* #define BYTE_CODE_METER */
228 221
462 } 455 }
463 return make_int (ival1); 456 return make_int (ival1);
464 #endif /* !LISP_FLOAT_TYPE */ 457 #endif /* !LISP_FLOAT_TYPE */
465 } 458 }
466 459
467 /* Apply compiled-function object FUN to the NARGS evaluated arguments
468 in ARGS, and return the result of evaluation. */
469 Lisp_Object
470 funcall_compiled_function (Lisp_Object fun, int nargs, Lisp_Object args[])
471 {
472 /* This function can GC */
473 int speccount = specpdl_depth();
474 REGISTER int i = 0;
475 Lisp_Compiled_Function *f = XCOMPILED_FUNCTION (fun);
476 int optional = 0;
477
478 if (!OPAQUEP (f->instructions))
479 /* Lazily munge the instructions into a more efficient form */
480 optimize_compiled_function (fun);
481
482 /* optimize_compiled_function() guaranteed that f->specpdl_depth is
483 the required space on the specbinding stack for binding the args
484 and local variables of fun. So just reserve it once. */
485 SPECPDL_RESERVE (f->specpdl_depth);
486
487 {
488 /* Fmake_byte_code() guaranteed that f->arglist is a valid list
489 containing only non-constant symbols. */
490 LIST_LOOP_3 (symbol, f->arglist, tail)
491 {
492 if (EQ (symbol, Qand_rest))
493 {
494 tail = XCDR (tail);
495 symbol = XCAR (tail);
496 SPECBIND_FAST_UNSAFE (symbol, Flist (nargs - i, &args[i]));
497 goto run_code;
498 }
499 else if (EQ (symbol, Qand_optional))
500 optional = 1;
501 else if (i == nargs && !optional)
502 goto wrong_number_of_arguments;
503 else
504 SPECBIND_FAST_UNSAFE (symbol, i < nargs ? args[i++] : Qnil);
505 }
506 }
507
508 if (i < nargs)
509 goto wrong_number_of_arguments;
510
511 run_code:
512
513 {
514 Lisp_Object value =
515 execute_optimized_program ((Opbyte *) XOPAQUE_DATA (f->instructions),
516 f->stack_depth,
517 XVECTOR_DATA (f->constants));
518
519 /* The attempt to optimize this by only unbinding variables failed
520 because using buffer-local variables as function parameters
521 leads to specpdl_ptr->func != 0 */
522 /* UNBIND_TO_GCPRO_VARIABLES_ONLY (speccount, value); */
523 UNBIND_TO_GCPRO (speccount, value);
524 return value;
525 }
526
527 wrong_number_of_arguments:
528 /* The actual printed compiled_function object is incomprehensible.
529 Check the backtrace to see if we can get a more meaningful symbol. */
530 if (EQ (fun, indirect_function (*backtrace_list->function, 0)))
531 fun = *backtrace_list->function;
532 return Fsignal (Qwrong_number_of_arguments, list2 (fun, make_int (nargs)));
533 }
534
535 460
536 /* Read next uint8 from the instruction stream. */ 461 /* Read next uint8 from the instruction stream. */
537 #define READ_UINT_1 ((unsigned int) (unsigned char) *program_ptr++) 462 #define READ_UINT_1 ((unsigned int) (unsigned char) *program_ptr++)
538 463
539 /* Read next uint16 from the instruction stream. */ 464 /* Read next uint16 from the instruction stream. */
591 This function has been seriously optimized for performance. 516 This function has been seriously optimized for performance.
592 Don't change the constructs unless you are willing to do 517 Don't change the constructs unless you are willing to do
593 real benchmarking and profiling work -- martin */ 518 real benchmarking and profiling work -- martin */
594 519
595 520
596 static Lisp_Object 521 Lisp_Object
597 execute_optimized_program (const Opbyte *program, 522 execute_optimized_program (const Opbyte *program,
598 int stack_depth, 523 int stack_depth,
599 Lisp_Object *constants_data) 524 Lisp_Object *constants_data)
600 { 525 {
601 /* This function can GC */ 526 /* This function can GC */
1960 1885
1961 static Lisp_Object 1886 static Lisp_Object
1962 mark_compiled_function (Lisp_Object obj) 1887 mark_compiled_function (Lisp_Object obj)
1963 { 1888 {
1964 Lisp_Compiled_Function *f = XCOMPILED_FUNCTION (obj); 1889 Lisp_Compiled_Function *f = XCOMPILED_FUNCTION (obj);
1890 int i;
1965 1891
1966 mark_object (f->instructions); 1892 mark_object (f->instructions);
1967 mark_object (f->arglist); 1893 mark_object (f->arglist);
1968 mark_object (f->doc_and_interactive); 1894 mark_object (f->doc_and_interactive);
1969 #ifdef COMPILED_FUNCTION_ANNOTATION_HACK 1895 #ifdef COMPILED_FUNCTION_ANNOTATION_HACK
1970 mark_object (f->annotated); 1896 mark_object (f->annotated);
1971 #endif 1897 #endif
1898 for (i = 0; i < f->args_in_array; i++)
1899 mark_object (f->args[i]);
1900
1972 /* tail-recurse on constants */ 1901 /* tail-recurse on constants */
1973 return f->constants; 1902 return f->constants;
1974 } 1903 }
1975 1904
1976 static int 1905 static int
1999 f->flags.domainp, 1928 f->flags.domainp,
2000 internal_hash (f->instructions, depth + 1), 1929 internal_hash (f->instructions, depth + 1),
2001 internal_hash (f->constants, depth + 1)); 1930 internal_hash (f->constants, depth + 1));
2002 } 1931 }
2003 1932
1933 static const struct lrecord_description lo_description_1[] = {
1934 { XD_LISP_OBJECT, 0 },
1935 { XD_END }
1936 };
1937
1938 static const struct struct_description lo_description = {
1939 sizeof (Lisp_Object),
1940 lo_description_1
1941 };
1942
2004 static const struct lrecord_description compiled_function_description[] = { 1943 static const struct lrecord_description compiled_function_description[] = {
1944 { XD_INT, offsetof (Lisp_Compiled_Function, args_in_array) },
1945 { XD_STRUCT_PTR, offsetof (Lisp_Compiled_Function, args),
1946 XD_INDIRECT (0, 0), &lo_description },
2005 { XD_LISP_OBJECT, offsetof (Lisp_Compiled_Function, instructions) }, 1947 { XD_LISP_OBJECT, offsetof (Lisp_Compiled_Function, instructions) },
2006 { XD_LISP_OBJECT, offsetof (Lisp_Compiled_Function, constants) }, 1948 { XD_LISP_OBJECT, offsetof (Lisp_Compiled_Function, constants) },
2007 { XD_LISP_OBJECT, offsetof (Lisp_Compiled_Function, arglist) }, 1949 { XD_LISP_OBJECT, offsetof (Lisp_Compiled_Function, arglist) },
2008 { XD_LISP_OBJECT, offsetof (Lisp_Compiled_Function, doc_and_interactive) }, 1950 { XD_LISP_OBJECT, offsetof (Lisp_Compiled_Function, doc_and_interactive) },
2009 #ifdef COMPILED_FUNCTION_ANNOTATION_HACK 1951 #ifdef COMPILED_FUNCTION_ANNOTATION_HACK