[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.

--- a/src/bytecode.c	Sat Apr 13 20:44:53 2002 +0000
+++ b/src/bytecode.c	Sun Apr 14 12:43:31 2002 +0000
@@ -1,7 +1,7 @@
 /* Execution of byte code produced by bytecomp.el.
    Implementation of compiled-function objects.
    Copyright (C) 1992, 1993 Free Software Foundation, Inc.
-   Copyright (C) 1995 Ben Wing.
+   Copyright (C) 1995, 2002 Ben Wing.
 
 This file is part of XEmacs.
 
@@ -209,19 +209,12 @@
   Bconstant 		= 0300
 };
 typedef enum Opcode Opcode;
-typedef unsigned char Opbyte;
 
 
 Lisp_Object * execute_rare_opcode (Lisp_Object *stack_ptr,
 				   const Opbyte *program_ptr,
 				   Opcode opcode);
 
-static Lisp_Object execute_optimized_program (const Opbyte *program,
-					      int stack_depth,
-					      Lisp_Object *constants_data);
-
-extern Lisp_Object Qand_rest, Qand_optional;
-
 /* Define BYTE_CODE_METER to enable generation of a byte-op usage histogram.
    This isn't defined in FSF Emacs and isn't defined in XEmacs v19. */
 /* #define BYTE_CODE_METER */
@@ -464,74 +457,6 @@
 #endif /* !LISP_FLOAT_TYPE */
 }
 
-/* Apply compiled-function object FUN to the NARGS evaluated arguments
-   in ARGS, and return the result of evaluation. */
-Lisp_Object
-funcall_compiled_function (Lisp_Object fun, int nargs, Lisp_Object args[])
-{
-  /* This function can GC */
-  int speccount = specpdl_depth();
-  REGISTER int i = 0;
-  Lisp_Compiled_Function *f = XCOMPILED_FUNCTION (fun);
-  int optional = 0;
-
-  if (!OPAQUEP (f->instructions))
-    /* Lazily munge the instructions into a more efficient form */
-    optimize_compiled_function (fun);
-
-  /* optimize_compiled_function() guaranteed that f->specpdl_depth is
-     the required space on the specbinding stack for binding the args
-     and local variables of fun.   So just reserve it once. */
-  SPECPDL_RESERVE (f->specpdl_depth);
-
-  {
-    /* Fmake_byte_code() guaranteed that f->arglist is a valid list
-       containing only non-constant symbols. */
-    LIST_LOOP_3 (symbol, f->arglist, tail)
-      {
-	if (EQ (symbol, Qand_rest))
-	  {
-	    tail = XCDR (tail);
-	    symbol  = XCAR (tail);
-	    SPECBIND_FAST_UNSAFE (symbol, Flist (nargs - i, &args[i]));
-	    goto run_code;
-	  }
-	else if (EQ (symbol, Qand_optional))
-	  optional = 1;
-	else if (i == nargs && !optional)
-	  goto wrong_number_of_arguments;
-	else
-	  SPECBIND_FAST_UNSAFE (symbol, i < nargs ? args[i++] : Qnil);
-      }
-  }
-
-  if (i < nargs)
-    goto wrong_number_of_arguments;
-
- run_code:
-
-  {
-    Lisp_Object value =
-      execute_optimized_program ((Opbyte *) XOPAQUE_DATA (f->instructions),
-				 f->stack_depth,
-				 XVECTOR_DATA (f->constants));
-
-    /* The attempt to optimize this by only unbinding variables failed
-       because using buffer-local variables as function parameters
-       leads to specpdl_ptr->func != 0 */
-    /* UNBIND_TO_GCPRO_VARIABLES_ONLY (speccount, value); */
-    UNBIND_TO_GCPRO (speccount, value);
-    return value;
-  }
-
- wrong_number_of_arguments:
-  /* The actual printed compiled_function object is incomprehensible.
-     Check the backtrace to see if we can get a more meaningful symbol. */
-  if (EQ (fun, indirect_function (*backtrace_list->function, 0)))
-    fun = *backtrace_list->function;
-  return Fsignal (Qwrong_number_of_arguments, list2 (fun, make_int (nargs)));
-}
-
 
 /* Read next uint8 from the instruction stream. */
 #define READ_UINT_1 ((unsigned int) (unsigned char) *program_ptr++)
@@ -593,7 +518,7 @@
    real benchmarking and profiling work -- martin */
 
 
-static Lisp_Object
+Lisp_Object
 execute_optimized_program (const Opbyte *program,
 			   int stack_depth,
 			   Lisp_Object *constants_data)
@@ -1962,6 +1887,7 @@
 mark_compiled_function (Lisp_Object obj)
 {
   Lisp_Compiled_Function *f = XCOMPILED_FUNCTION (obj);
+  int i;
 
   mark_object (f->instructions);
   mark_object (f->arglist);
@@ -1969,6 +1895,9 @@
 #ifdef COMPILED_FUNCTION_ANNOTATION_HACK
   mark_object (f->annotated);
 #endif
+  for (i = 0; i < f->args_in_array; i++)
+    mark_object (f->args[i]);
+
   /* tail-recurse on constants */
   return f->constants;
 }
@@ -2001,7 +1930,20 @@
 		internal_hash (f->constants,    depth + 1));
 }
 
+static const struct lrecord_description lo_description_1[] = {
+  { XD_LISP_OBJECT, 0 },
+  { XD_END }
+};
+
+static const struct struct_description lo_description = {
+  sizeof (Lisp_Object),
+  lo_description_1
+};
+
 static const struct lrecord_description compiled_function_description[] = {
+  { XD_INT,         offsetof (Lisp_Compiled_Function, args_in_array) },
+  { XD_STRUCT_PTR,  offsetof (Lisp_Compiled_Function, args),
+      XD_INDIRECT (0, 0), &lo_description },
   { XD_LISP_OBJECT, offsetof (Lisp_Compiled_Function, instructions) },
   { XD_LISP_OBJECT, offsetof (Lisp_Compiled_Function, constants) },
   { XD_LISP_OBJECT, offsetof (Lisp_Compiled_Function, arglist) },