Mercurial > hg > xemacs-beta
view lib-src/ellcc.c @ 853:2b6fa2618f76
[xemacs-hg @ 2002-05-28 08:44:22 by ben]
merge my stderr-proc ws
make-docfile.c: Fix places where we forget to check for EOF.
code-init.el: Don't use CRLF conversion by default on process output. CMD.EXE and
friends work both ways but Cygwin programs don't like the CRs.
code-process.el, multicast.el, process.el: Removed.
Improvements to call-process-internal:
-- allows a buffer to be specified for input and stderr output
-- use it on all systems
-- implement C-g as documented
-- clean up and comment
call-process-region uses new call-process facilities; no temp file.
remove duplicate funs in process.el.
comment exactly how coding systems work and fix various problems.
open-multicast-group now does similar coding-system frobbing to
open-network-stream.
dumped-lisp.el, faces.el, msw-faces.el: Fix some hidden errors due to code not being defined at the right time.
xemacs.mak: Add -DSTRICT.
================================================================
ALLOW SEPARATION OF STDOUT AND STDERR IN PROCESSES
================================================================
Standard output and standard error can be processed separately in
a process. Each can have its own buffer, its own mark in that buffer,
and its filter function. You can specify a separate buffer for stderr
in `start-process' to get things started, or use the new primitives:
set-process-stderr-buffer
process-stderr-buffer
process-stderr-mark
set-process-stderr-filter
process-stderr-filter
Also, process-send-region takes a 4th optional arg, a buffer.
Currently always uses a pipe() under Unix to read the error output.
(#### Would a PTY be better?)
sysdep.h, sysproc.h, unexfreebsd.c, unexsunos4.c, nt.c, emacs.c, callproc.c, symsinit.h, sysdep.c, Makefile.in.in, process-unix.c: Delete callproc.c. Move child_setup() to process-unix.c.
wait_for_termination() now only needed on a few really old systems.
console-msw.h, event-Xt.c, event-msw.c, event-stream.c, event-tty.c, event-unixoid.c, events.h, process-nt.c, process-unix.c, process.c, process.h, procimpl.h: Rewrite the process methods to handle a separate channel for
error input. Create Lstreams for reading in the error channel.
Many process methods need change. In general the changes are
fairly clear as they involve duplicating what's used for reading
the normal stdout and changing for stderr -- although tedious,
as such changes are required throughout the entire process code.
Rewrote the code that reads process output to do two loops, one
for stdout and one for stderr.
gpmevent.c, tooltalk.c: set_process_filter takes an argument for stderr.
================================================================
NEW ERROR-TRAPPING MECHANISM
================================================================
Totally rewrite error trapping code to be unified and support more
features. Basic function is call_trapping_problems(), which lets
you specify, by means of flags, what sorts of problems you want
trapped. these can include
-- quit
-- errors
-- throws past the function
-- creation of "display objects" (e.g. buffers)
-- deletion of already-existing "display objects" (e.g. buffers)
-- modification of already-existing buffers
-- entering the debugger
-- gc
-- errors->warnings (ala suspended errors)
etc. All other error funs rewritten in terms of this one.
Various older mechanisms removed or rewritten.
window.c, insdel.c, console.c, buffer.c, device.c, frame.c: When creating a display object, added call to
note_object_created(), for use with trapping_problems mechanism.
When deleting, call check_allowed_operation() and note_object
deleted().
The trapping-problems code records the objects created since the
call-trapping-problems began. Those objects can be deleted, but
none others (i.e. previously existing ones).
bytecode.c, cmdloop.c: internal_catch takes another arg.
eval.c: Add long comments describing the "five lists" used to maintain
state (backtrace, gcpro, specbind, etc.) in the Lisp engine.
backtrace.h, eval.c: Implement trapping-problems mechanism, eliminate old mechanisms or
redo in terms of new one.
frame.c, gutter.c: Flush out the concept of "critical display section", defined by
the in_display() var. Use an internal_bind() to get it reset,
rather than just doing it at end, because there may be a non-local
exit.
event-msw.c, event-stream.c, console-msw.h, device.c, dialog-msw.c, frame.c, frame.h, intl.c, toolbar.c, menubar-msw.c, redisplay.c, alloc.c, menubar-x.c: Make use of new trapping-errors stuff and rewrite code based on
old mechanisms.
glyphs-widget.c, redisplay.h: Protect calling Lisp in redisplay.
insdel.c: Protect hooks against deleting existing buffers.
frame-msw.c: Use EQ, not EQUAL in hash tables whose keys are just numbers.
Otherwise we run into stickiness in redisplay because
internal_equal() can QUIT.
================================================================
SIGNAL, C-G CHANGES
================================================================
Here we change the way that C-g interacts with event reading. The
idea is that a C-g occurring while we're reading a user event
should be read as C-g, but elsewhere should be a QUIT. The former
code did all sorts of bizarreness -- requiring that no QUIT occurs
anywhere in event-reading code (impossible to enforce given the
stuff called or Lisp code invoked), and having some weird system
involving enqueue/dequeue of a C-g and interaction with Vquit_flag
-- and it didn't work.
Now, we simply enclose all code where we want C-g read as an event
with {begin/end}_dont_check_for_quit(). This completely turns off
the mechanism that checks (and may remove or alter) C-g in the
read-ahead queues, so we just get the C-g normal.
Signal.c documents this very carefully.
cmdloop.c: Correct use of dont_check_for_quit to new scheme, remove old
out-of-date comments.
event-stream.c: Fix C-g handling to actually work.
device-x.c: Disable quit checking when err out.
signal.c: Cleanup. Add large descriptive comment.
process-unix.c, process-nt.c, sysdep.c: Use QUIT instead of REALLY_QUIT.
It's not necessary to use REALLY_QUIT and just confuses the issue.
lisp.h: Comment quit handlers.
================================================================
CONS CHANGES
================================================================
free_cons() now takes a Lisp_Object not the result of XCONS().
car and cdr have been renamed so that they don't get used directly;
go through XCAR(), XCDR() instead.
alloc.c, dired.c, editfns.c, emodules.c, fns.c, glyphs-msw.c, glyphs-x.c, glyphs.c, keymap.c, minibuf.c, search.c, eval.c, lread.c, lisp.h: Correct free_cons calling convention: now takes Lisp_Object,
not Lisp_Cons
chartab.c: Eliminate direct use of ->car, ->cdr, should be black box.
callint.c: Rewrote using EXTERNAL_LIST_LOOP to avoid use of Lisp_Cons.
================================================================
USE INTERNAL-BIND-*
================================================================
eval.c: Cleanups of these funs.
alloc.c, fileio.c, undo.c, specifier.c, text.c, profile.c, lread.c, redisplay.c, menubar-x.c, macros.c: Rewrote to use internal_bind_int() and internal_bind_lisp_object()
in place of whatever varied and cumbersome mechanisms were
formerly there.
================================================================
SPECBIND SANITY
================================================================
backtrace.h: - Improved comments
backtrace.h, bytecode.c, eval.c: Add new mechanism check_specbind_stack_sanity() for sanity
checking code each time the catchlist or specbind stack change.
Removed older prototype of same mechanism.
================================================================
MISC
================================================================
lisp.h, insdel.c, window.c, device.c, console.c, buffer.c: Fleshed out authorship.
device-msw.c: Correct bad Unicode-ization.
print.c: Be more careful when not initialized or in fatal error handling.
search.c: Eliminate running_asynch_code, an FSF holdover.
alloc.c: Added comments about gc-cons-threshold.
dialog-x.c: Use begin_gc_forbidden() around code to build up a widget value
tree, like in menubar-x.c.
gui.c: Use Qunbound not Qnil as the default for
gethash.
lisp-disunion.h, lisp-union.h: Added warnings on use of VOID_TO_LISP().
lisp.h: Use ERROR_CHECK_STRUCTURES to turn on
ERROR_CHECK_TRAPPING_PROBLEMS and ERROR_CHECK_TYPECHECK
lisp.h: Add assert_with_message.
lisp.h: Add macros for gcproing entire arrays. (You could do this before
but it required manual twiddling the gcpro structure.)
lisp.h: Add prototypes for new functions defined elsewhere.
author | ben |
---|---|
date | Tue, 28 May 2002 08:45:36 +0000 |
parents | abe6d1db359e |
children | 25e260cb7994 |
line wrap: on
line source
/* ellcc.c - front-end for compiling Emacs modules Copyright (C) 1998, 1999 J. Kean Johnston. This file is part of XEmacs. XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. Author: J. Kean Johnston (jkj@sco.com). Please mail bugs and suggestions to the XEmacs maintainer. */ /* Here's the scoop. We would really like this to be a shell script, but the various Windows platforms don't have reliable scripting that suits our needs. We don't want to rely on perl or some other such language so we have to roll our own executable to act as a front-end for the compiler. This program is used to invoke the compiler, the linker and to generate the module specific documentation and initialization code. We assume we are in 'compile' mode unless we encounter an argument which tells us that we're not. We take all arguments and pass them on directly to the compiler, except for a few which are specific to this program: --mode=VALUE This sets the program mode. VALUE can be one of compile, link, init or verbose. --mod-name=NAME Sets the module name to the string NAME. --mod-title=TITLE Sets the module title to the string TITLE. --mod-version=VER Sets the module version to the string VER. The idea is that Makefiles will use ellcc as the compiler for making dynamic Emacs modules, and life should be as simple as: make CC=ellcc LD='ellcc --mode=link' The only additional requirement is an entry in the Makefile to produce the module initialization file, which will usually be something along the lines of: modinit.c: $(SRCS) ellcc --mode=init --mod-name=\"$(MODNAME)\" \ --mod-title=\"$(MODTITLE)\" --mod-version=\"$(MODVERSION)\" \ -o $@ $(SRCS) See the samples for more details. */ #include <config.h> #include <stdio.h> #include <stdlib.h> #include <stddef.h> #include <string.h> #include <ctype.h> #include <errno.h> #include <sys/types.h> #ifdef HAVE_UNISTD_H # include <unistd.h> #endif /* HAVE_UNISTD_H */ #define EMODULES_GATHER_VERSION #include <emodules.h> #include <ellcc.h> /* Generated files must be included using <...> */ #define DEBUG #ifndef HAVE_SHLIB int main (int argc, char *argv[]) { fprintf (stderr, "Dynamic modules not supported on this platform\n"); return EXIT_FAILURE; } #else /* * Try to figure out the commands we need to use to create shared objects, * and how to compile for PIC mode. */ /* * xnew, xrnew -- allocate, reallocate storage * * SYNOPSIS: Type *xnew (int n, Type); * Type *xrnew (OldPointer, int n, Type); */ #ifdef chkmalloc # include "chkmalloc.h" # define xnew(n,Type) ((Type *) trace_malloc (__FILE__, __LINE__, \ (n) * sizeof (Type))) # define xrnew(op,n,Type) ((Type *) trace_realloc (__FILE__, __LINE__, \ (op), (n) * sizeof (Type))) #else # define xnew(n,Type) ((Type *) xmalloc ((n) * sizeof (Type))) # define xrnew(op,n,Type) ((Type *) xrealloc ((op), (n) * sizeof (Type))) #endif static void *xmalloc (size_t); static void fatal (char *, char *); static void add_to_argv (const char *); static void do_compile_mode (void); static void do_link_mode (void); static void do_init_mode (void); #define SSTR(S) ((S)?(S):"") #define ELLCC_COMPILE_MODE 0 #define ELLCC_LINK_MODE 1 #define ELLCC_INIT_MODE 2 static int ellcc_mode = ELLCC_COMPILE_MODE; static char *progname; static char *mod_name = NULL; static char *mod_version = NULL; static char *mod_title = NULL; static char *mod_output = NULL; static int verbose = 0; static char **exec_argv; static int exec_argc = 1; static int *exec_args; static int real_argc = 0; static int prog_argc; static char **prog_argv; /* * We allow the user to over-ride things in the environment */ char *ellcc, *ellld, *ellcflags, *ellldflags, *ellpicflags, *elldllflags; #define OVERENV(STR,EVAR,DFLT) \ STR = getenv(EVAR); \ if ((STR) == (char *)0) \ STR = DFLT int main (int argc, char *argv[]) { char *tmp; int i, done_mode = 0; prog_argc = argc; prog_argv = argv; #if defined(WIN32_NATIVE) tmp = strrchr (argv[0], '\\'); if (tmp != (char *)0) tmp++; #elif !defined (VMS) tmp = strrchr (argv[0], '/'); if (tmp != (char *)0) tmp++; #else tmp = argv[0]; #endif if (tmp != (char *)0) progname = tmp; else progname = argv[0]; tmp = &progname[strlen(progname)-2]; if (strcmp (tmp, "cc") == 0) ellcc_mode = ELLCC_COMPILE_MODE; else if (strcmp (tmp, "ld") == 0) ellcc_mode = ELLCC_LINK_MODE; else if (strcmp (tmp, "it") == 0) ellcc_mode = ELLCC_INIT_MODE; exec_argv = xnew(argc + 20, char *); exec_args = xnew(argc, int); for (i = 0; i < argc; i++) exec_args[i] = -1; if (argc < 2) fatal ("too few arguments", (char *)0); exec_args[0] = 0; for (i = 1; i < argc; i++) { if (strncmp (argv[i], "--mode=", 7) == 0) { char *modeopt = argv[i] + 7; if (done_mode && strcmp (modeopt, "verbose")) fatal ("more than one mode specified", (char *) 0); if (strcmp (modeopt, "link") == 0) { done_mode++; ellcc_mode = ELLCC_LINK_MODE; } else if (strcmp (modeopt, "compile") == 0) { done_mode++; ellcc_mode = ELLCC_COMPILE_MODE; } else if (strcmp (modeopt, "init") == 0) { done_mode++; ellcc_mode = ELLCC_INIT_MODE; } else if (strcmp (modeopt, "verbose") == 0) verbose += 1; } else if (strcmp (argv[i], "--mod-location") == 0) { printf ("%s\n", ELLCC_MODDIR); return 0; } else if (strcmp (argv[i], "--mod-site-location") == 0) { printf ("%s\n", ELLCC_SITEMODS); return 0; } else if (strcmp (argv[i], "--mod-archdir") == 0) { printf ("%s\n", ELLCC_ARCHDIR); return 0; } else if (strcmp (argv[i], "--mod-config") == 0) { printf ("%s\n", ELLCC_CONFIG); return 0; } else if (strncmp (argv[i], "--mod-name=", 11) == 0) mod_name = argv[i] + 11; else if (strncmp (argv[i], "--mod-title=", 12) == 0) mod_title = argv[i] + 12; else if (strncmp (argv[i], "--mod-version=", 14) == 0) mod_version = argv[i] + 14; else if (strncmp (argv[i], "--mod-output=", 13) == 0) mod_output = argv[i] + 13; else { exec_args[exec_argc] = i; exec_argc++; } } if (ellcc_mode == ELLCC_LINK_MODE && mod_output == (char *)0) fatal ("must specify --mod-output when linking", (char *)0); if (ellcc_mode == ELLCC_INIT_MODE && mod_output == (char *)0) fatal ("must specify --mod-output when creating init file", (char *)0); if (ellcc_mode == ELLCC_INIT_MODE && mod_name == (char *)0) fatal ("must specify --mod-name when creating init file", (char *)0); /* * We now have the list of arguments to pass to the compiler or * linker (or to process for doc files). We can do the real work * now. */ if (verbose) printf ("ellcc driver version %s for EMODULES version %s (%ld)\n", ELLCC_EMACS_VER, EMODULES_VERSION, EMODULES_REVISION); #ifdef DEBUG if (verbose >= 2) { printf (" mode = %d (%s)\n", ellcc_mode, ellcc_mode == ELLCC_COMPILE_MODE ? "compile" : ellcc_mode == ELLCC_LINK_MODE ? "link" : "init"); printf (" module_name = \"%s\"\n", SSTR(mod_name)); printf (" module_title = \"%s\"\n", SSTR(mod_title)); printf (" module_version = \"%s\"\n", SSTR(mod_version)); printf (" CC = %s\n", ELLCC_CC); printf (" CFLAGS = %s\n", ELLCC_CFLAGS); printf (" CC PIC flags = %s\n", ELLCC_DLL_CFLAGS); printf (" LD = %s\n", ELLCC_DLL_LD); printf (" LDFLAGS = %s\n", ELLCC_DLL_LDFLAGS); printf (" architecture = %s\n", ELLCC_CONFIG); printf (" Include directory = %s/include\n", ELLCC_ARCHDIR); printf ("\n"); } #endif if (exec_argc < 2) fatal ("too few arguments", (char *) 0); /* * Get the over-rides from the environment */ OVERENV(ellcc, "ELLCC", ELLCC_CC); OVERENV(ellld, "ELLLD", ELLCC_DLL_LD); OVERENV(ellcflags, "ELLCFLAGS", ELLCC_CFLAGS); OVERENV(ellldflags, "ELLLDFLAGS", ELLCC_LDFLAGS); OVERENV(elldllflags, "ELLDLLFLAGS", ELLCC_DLL_LDFLAGS); OVERENV(ellpicflags, "ELLPICFLAGS", ELLCC_DLL_CFLAGS); if (ellcc_mode == ELLCC_COMPILE_MODE) do_compile_mode(); else if (ellcc_mode == ELLCC_LINK_MODE) do_link_mode(); else do_init_mode(); /* * The arguments to pass on to the desired program have now been set * up and we can run the program. */ if (verbose) { for (i = 0; i < real_argc; i++) printf ("%s ", exec_argv[i]); printf ("\n"); fflush (stdout); } exec_argv[real_argc] = (char *)0; /* Terminate argument list */ i = execvp (exec_argv[0], exec_argv); if (verbose) printf ("%s exited with status %d\n", exec_argv[0], i); return i; } /* Like malloc but get fatal error if memory is exhausted. */ static void * xmalloc (size_t size) { void *result = malloc (size); if (result == NULL) fatal ("virtual memory exhausted", (char *)0); return result; } /* Print error message and exit. */ static void fatal (char *s1, char *s2) { fprintf (stderr, "%s: ", progname); fprintf (stderr, s1, s2); fprintf (stderr, "\n"); exit (EXIT_FAILURE); } /* * Add a string to the argument vector list that will be passed on down * to the compiler or linker. We need to split individual words into * arguments, taking quoting into account. This can get ugly. */ static void add_to_argv (const char *str) { int sm = 0; const char *s = (const char *)0; if ((str == (const char *)0) || (str[0] == '\0')) return; while (*str) { switch (sm) { case 0: /* Start of case - string leading whitespace */ if (isspace ((unsigned char) *str)) str++; else { sm = 1; /* Change state to non-whitespace */ s = str; /* Mark the start of THIS argument */ } break; case 1: /* Non-whitespace character. Mark the start */ if (isspace ((unsigned char) *str)) { /* Reached the end of the argument. Add it. */ int l = str-s; exec_argv[real_argc] = xnew (l+2, char); strncpy (exec_argv[real_argc], s, l); exec_argv[real_argc][l] = '\0'; real_argc++; sm = 0; /* Back to start state */ s = (const char *)0; break; } else if (*str == '\\') { sm = 2; /* Escaped character */ str++; break; } else if (*str == '\'') { /* Start of quoted string (single quotes) */ sm = 3; } else if (*str == '"') { /* Start of quoted string (double quotes) */ sm = 4; } else { /* This was just a normal character. Advance the pointer. */ str++; } break; case 2: /* Escaped character */ str++; /* Preserve the quoted character */ sm = 1; /* Go back to gathering state */ break; case 3: /* Inside single quoted string */ if (*str == '\'') sm = 1; str++; break; case 4: /* inside double quoted string */ if (*str == '"') sm = 1; str++; break; } } if (s != (const char *)0) { int l = str-s; exec_argv[real_argc] = xnew (l+2, char); strncpy (exec_argv[real_argc], s, l); exec_argv[real_argc][l] = '\0'; real_argc++; s = (const char *)0; } } /* * For compile mode, things are pretty straight forward. All we need to do * is build up the argument vector and exec() it. We must just make sure * that we get all of the required arguments in place. */ static void do_compile_mode (void) { int i; char ts[4096]; /* Plenty big enough */ add_to_argv (ellcc); add_to_argv (ellcflags); add_to_argv (ellpicflags); add_to_argv ("-DPIC"); add_to_argv ("-DEMACS_MODULE"); #ifdef XEMACS add_to_argv ("-DXEMACS_MODULE"); /* Cover both cases */ add_to_argv ("-Dxemacs"); #endif add_to_argv ("-Demacs"); sprintf (ts, "-I%s/include", ELLCC_ARCHDIR); add_to_argv (ts); add_to_argv (ELLCC_CF_ALL); for (i = 1; i < exec_argc; i++) exec_argv[real_argc++] = strdup (prog_argv[exec_args[i]]); } /* * For link mode, things are a little bit more complicated. We need to * insert the linker commands first, replace any occurrence of ELLSONAME * with the desired output file name, insert the output arguments, then * all of the provided arguments, then the final post arguments. Once * all of this has been done, the argument vector is ready to run. */ static void do_link_mode (void) { int i,x; char *t, ts[4096]; /* Plenty big enough */ add_to_argv (ellld); add_to_argv (ellldflags); add_to_argv (elldllflags); add_to_argv (ELLCC_DLL_LDO); add_to_argv (mod_output); for (i = 1; i < exec_argc; i++) exec_argv[real_argc++] = strdup (prog_argv[exec_args[i]]); add_to_argv (ELLCC_DLL_POST); /* * Now go through each argument and replace ELLSONAME with mod_output. */ for (i = 0; i < real_argc; i++) { x = 0; ts[0] = '\0'; t = exec_argv[i]; while (*t) { if (*t == 'E') { if (strncmp (t, "ELLSONAME", 9) == 0) { strcat (ts, mod_output); t += 8; x += strlen (mod_output); } else { ts[x] = *t; x++; ts[x] = '\0'; } } else { ts[x] = *t; x++; ts[x] = '\0'; } t++; } free (exec_argv[i]); exec_argv[i] = strdup (ts); } } /* * In init mode, things are a bit easier. We assume that the only things * passed on the command line are the names of source files which the * make-doc program will be processing. We prepare the output file with * the header information first, as make-doc will append to the file by * special dispensation. */ static void do_init_mode (void) { int i; char ts[4096]; /* Plenty big enough */ char *mdocprog; FILE *mout = fopen (mod_output, "w"); if (mout == (FILE *)0) fatal ("failed to open output file", mod_output); fprintf (mout, "/* DO NOT EDIT - AUTOMATICALLY GENERATED */\n\n"); fprintf (mout, "#include <emodules.h>\n\n"); fprintf (mout, "const long emodule_compiler = %ld;\n", EMODULES_REVISION); fprintf (mout, "const char *emodule_name = \"%s\";\n", SSTR(mod_name)); fprintf (mout, "const char *emodule_version = \"%s\";\n", SSTR(mod_version)); fprintf (mout, "const char *emodule_title = \"%s\";\n", SSTR(mod_title)); fprintf (mout, "\n\n"); fprintf (mout, "void docs_of_%s()\n", SSTR(mod_name)); fclose (mout); sprintf (ts, "%s/make-docfile", ELLCC_ARCHDIR); OVERENV(mdocprog, "ELLMAKEDOC", ts); add_to_argv (mdocprog); sprintf (ts, "-E %s", mod_output); add_to_argv (ts); for (i = 1; i < exec_argc; i++) exec_argv[real_argc++] = strdup (prog_argv[exec_args[i]]); } #endif /* HAVE_SHLIB */