Mercurial > hg > xemacs-beta
annotate src/unexencap.c @ 4677:8f1ee2d15784
Support full Common Lisp multiple values in C.
lisp/ChangeLog
2009-08-11 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el :
Update this file to support full C-level multiple values. This
involves:
-- Four new bytecodes, and special compiler functions to compile
multiple-value-call, multiple-value-list-internal, values,
values-list, and, since it now needs to pass back multiple values
and is a special form, throw.
-- There's a new compiler variable, byte-compile-checks-on-load,
which is a list of forms that are evaluated at the very start of a
file, with an error thrown if any of them give nil.
-- The header is now inserted *after* compilation, giving a chance
for the compilation process to influence what those checks
are. There is still a check done before compilation for non-ASCII
characters, to try to turn off dynamic docstrings if appopriate,
in `byte-compile-maybe-reset-coding'.
Space is reserved for checks; comments describing the version of
the byte compiler generating the file are inserted if space
remains for them.
* bytecomp.el (byte-compile-version):
Update this, we're a newer version of the byte compiler.
* byte-optimize.el (byte-optimize-funcall):
Correct a comment.
* bytecomp.el (byte-compile-lapcode):
Discard the arg with byte-multiple-value-call.
* bytecomp.el (byte-compile-checks-and-comments-space):
New variable, describe how many octets to reserve for checks at
the start of byte-compiled files.
* cl-compat.el:
Remove the fake multiple-value implementation. Have the functions
that use it use the real multiple-value implementation instead.
* cl-macs.el (cl-block-wrapper, cl-block-throw):
Revise the byte-compile properties of these symbols to work now
we've made throw into a special form; keep the byte-compile
properties as anonymous lambdas, since we don't have docstrings
for them.
* cl-macs.el (multiple-value-bind, multiple-value-setq)
(multiple-value-list, nth-value):
Update these functions to work with the C support for multiple
values.
* cl-macs.el (values):
Modify the setf handler for this to call
#'multiple-value-list-internal appropriately.
* cl-macs.el (cl-setf-do-store):
If the store form is a cons, treat it specially as wrapping the
store value.
* cl.el (cl-block-wrapper):
Make this an alias of #'and, not #'identity, since it needs to
pass back multiple values.
* cl.el (multiple-value-apply):
We no longer support this, mark it obsolete.
* lisp-mode.el (eval-interactive-verbose):
Remove a useless space in the docstring.
* lisp-mode.el (eval-interactive):
Update this function and its docstring. It now passes back a list,
basically wrapping any eval calls with multiple-value-list. This
allows multiple values to be printed by default in *scratch*.
* lisp-mode.el (prin1-list-as-multiple-values):
New function, printing a list as multiple values in the manner of
Bruno Haible's clisp, separating each entry with " ;\n".
* lisp-mode.el (eval-last-sexp):
Call #'prin1-list-as-multiple-values on the return value of
#'eval-interactive.
* lisp-mode.el (eval-defun):
Call #'prin1-list-as-multiple-values on the return value of
#'eval-interactive.
* mouse.el (mouse-eval-sexp):
Deal with lists corresponding to multiple values from
#'eval-interactive. Call #'cl-prettyprint, which is always
available, instead of sometimes calling #'pprint and sometimes
falling back to prin1.
* obsolete.el (obsolete-throw):
New function, called from eval.c when #'funcall encounters an
attempt to call #'throw (now a special form) as a function. Only
needed for compatibility with 21.4 byte-code.
man/ChangeLog addition:
2009-08-11 Aidan Kehoe <kehoea@parhasard.net>
* cl.texi (Organization):
Remove references to the obsolete multiple-value emulating code.
src/ChangeLog addition:
2009-08-11 Aidan Kehoe <kehoea@parhasard.net>
* bytecode.c (enum Opcode /* Byte codes */):
Add four new bytecodes, to deal with multiple values.
(POP_WITH_MULTIPLE_VALUES): New macro.
(POP): Modify this macro to ignore multiple values.
(DISCARD_PRESERVING_MULTIPLE_VALUES): New macro.
(DISCARD): Modify this macro to ignore multiple values.
(TOP_WITH_MULTIPLE_VALUES): New macro.
(TOP_ADDRESS): New macro.
(TOP): Modify this macro to ignore multiple values.
(TOP_LVALUE): New macro.
(Bcall): Ignore multiple values where appropriate.
(Breturn): Pass back multiple values.
(Bdup): Preserve multiple values.
Use TOP_LVALUE with most bytecodes that assign anything to
anything.
(Bbind_multiple_value_limits, Bmultiple_value_call,
Bmultiple_value_list_internal, Bthrow): Implement the new
bytecodes.
(Bgotoifnilelsepop, Bgotoifnonnilelsepop, BRgotoifnilelsepop,
BRgotoifnonnilelsepop):
Discard any multiple values.
* callint.c (Fcall_interactively):
Ignore multiple values when calling #'eval, in two places.
* device-x.c (x_IO_error_handler):
* macros.c (pop_kbd_macro_event):
* eval.c (Fsignal):
* eval.c (flagged_a_squirmer):
Call throw_or_bomb_out, not Fthrow, now that the latter is a
special form.
* eval.c:
Make Qthrow, Qobsolete_throw available as symbols.
Provide multiple_value_current_limit, multiple-values-limit (the
latter as specified by Common Lisp.
* eval.c (For):
Ignore multiple values when comparing with Qnil, but pass any
multiple values back for the last arg.
* eval.c (Fand):
Ditto.
* eval.c (Fif):
Ignore multiple values when examining the result of the
condition.
* eval.c (Fcond):
Ignore multiple values when comparing what the clauses give, but
pass them back if a clause gave non-nil.
* eval.c (Fprog2):
Never pass back multiple values.
* eval.c (FletX, Flet):
Ignore multiple when evaluating what exactly symbols should be
bound to.
* eval.c (Fwhile):
Ignore multiple values when evaluating the test.
* eval.c (Fsetq, Fdefvar, Fdefconst):
Ignore multiple values.
* eval.c (Fthrow):
Declare this as a special form; ignore multiple values for TAG,
preserve them for VALUE.
* eval.c (throw_or_bomb_out):
Make this available to other files, now Fthrow is a special form.
* eval.c (Feval):
Ignore multiple values when calling a compiled function, a
non-special-form subr, or a lambda expression.
* eval.c (Ffuncall):
If we attempt to call #'throw (now a special form) as a function,
don't error, call #'obsolete-throw instead.
* eval.c (make_multiple_value, multiple_value_aset)
(multiple_value_aref, print_multiple_value, mark_multiple_value)
(size_multiple_value):
Implement the multiple_value type. Add a long comment describing
our implementation.
* eval.c (bind_multiple_value_limits):
New function, used by the bytecode and by #'multiple-value-call,
#'multiple-value-list-internal.
* eval.c (multiple_value_call):
New function, used by the bytecode and #'multiple-value-call.
* eval.c (Fmultiple_value_call):
New special form.
* eval.c (multiple_value_list_internal):
New function, used by the byte code and
#'multiple-value-list-internal.
* eval.c (Fmultiple_value_list_internal, Fmultiple_value_prog1):
New special forms.
* eval.c (Fvalues, Fvalues_list):
New Lisp functions.
* eval.c (values2):
New function, for C code returning multiple values.
* eval.c (syms_of_eval):
Make our new Lisp functions and symbols available.
* eval.c (multiple-values-limit):
Make this available to Lisp.
* event-msw.c (dde_eval_string):
* event-stream.c (execute_help_form):
* glade.c (connector):
* glyphs-widget.c (glyph_instantiator_to_glyph):
* glyphs.c (evaluate_xpm_color_symbols):
* gui-x.c (wv_set_evalable_slot, button_item_to_widget_value):
* gui.c (gui_item_value, gui_item_display_flush_left):
* lread.c (check_if_suppressed):
* menubar-gtk.c (menu_convert, menu_descriptor_to_widget_1):
* menubar-msw.c (populate_menu_add_item):
* print.c (Fwith_output_to_temp_buffer):
* symbols.c (Fsetq_default):
Ignore multiple values when calling Feval.
* symeval.h:
Add the header declarations necessary for the multiple-values
implementation.
* inline.c:
#include symeval.h, now that it has some inline functions.
* lisp.h:
Update Fthrow's declaration. Make throw_or_bomb_out available to
all files.
* lrecord.h (enum lrecord_type):
Add the multiple_value type here.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Sun, 16 Aug 2009 20:55:49 +0100 |
| parents | 04bc9d2f42c7 |
| children |
| rev | line source |
|---|---|
| 0 | 1 /* Waiting for papers! */ |
| 2 | |
| 3 /* Synched up with: FSF 19.31. */ | |
| 4 | |
| 5 /* | |
| 6 * Do an unexec() for coff encapsulation. Uses the approach I took | |
| 7 * for AKCL, so don't be surprised if it doesn't look too much like | |
| 8 * the other unexec() routines. Assumes NO_REMAP. Should be easy to | |
| 9 * adapt to the emacs style unexec() if that is desired, but this works | |
| 10 * just fine for me with GCC/GAS/GLD under System V. - Jordan | |
| 11 */ | |
| 12 | |
| 13 #include <sys/types.h> | |
| 14 #include <sys/fcntl.h> | |
| 15 #include <sys/file.h> | |
| 16 #include <stdio.h> | |
| 17 #include "/usr/gnu/lib/gcc/gcc-include/a.out.h" | |
| 2286 | 18 #include "compiler.h" |
| 0 | 19 |
| 20 filecpy(to, from, n) | |
| 21 FILE *to, *from; | |
| 22 int n; | |
| 23 { | |
| 24 char buffer[BUFSIZ]; | |
| 25 | |
| 26 for (;;) | |
| 27 if (n > BUFSIZ) { | |
| 28 fread(buffer, BUFSIZ, 1, from); | |
| 29 fwrite(buffer, BUFSIZ, 1, to); | |
| 30 n -= BUFSIZ; | |
| 31 } else if (n > 0) { | |
| 32 fread(buffer, 1, n, from); | |
| 33 fwrite(buffer, 1, n, to); | |
| 34 break; | |
| 35 } else | |
| 36 break; | |
| 37 } | |
| 38 /* **************************************************************** | |
| 39 * unexec | |
| 40 * | |
| 41 * driving logic. | |
| 42 * ****************************************************************/ | |
| 43 unexec (new_name, a_name, data_start, bss_start, entry_address) | |
| 44 char *new_name, *a_name; | |
| 2286 | 45 unsigned UNUSED (data_start); |
| 46 unsigned UNUSED (bss_start); | |
| 47 unsigned UNUSED (entry_address); | |
| 0 | 48 { |
| 49 struct coffheader header1; | |
| 50 struct coffscn *tp, *dp, *bp; | |
| 51 struct exec header; | |
| 52 int stsize; | |
| 53 char *original_file = a_name; | |
| 54 char *save_file = new_name; | |
| 55 | |
| 56 char *data_begin, *data_end; | |
| 57 int original_data; | |
| 58 FILE *original, *save; | |
| 59 int n; | |
| 60 char *p; | |
| 61 extern char *sbrk(); | |
| 62 char stdin_buf[BUFSIZ], stdout_buf[BUFSIZ]; | |
| 63 | |
| 64 | |
| 65 fclose(stdin); | |
| 66 original = fopen(original_file, "r"); | |
| 67 if (stdin != original || original->_file != 0) { | |
| 68 fprintf(stderr, "unexec: Can't open the original file.\n"); | |
| 69 exit(1); | |
| 70 } | |
| 71 setbuf(original, stdin_buf); | |
| 72 fclose(stdout); | |
| 73 unlink(save_file); | |
| 74 n = open (save_file, O_CREAT|O_WRONLY, 0777); | |
| 75 if (n != 1 || (save = fdopen(n, "w")) != stdout) { | |
| 76 fprintf(stderr, "unexec: Can't open the save file.\n"); | |
| 77 exit(1); | |
| 78 } | |
| 79 setbuf(save, stdout_buf); | |
| 80 | |
| 81 fread(&header1, sizeof(header1), 1, original); | |
| 82 tp = &header1.scns[0]; | |
| 83 dp = &header1.scns[1]; | |
| 84 bp = &header1.scns[2]; | |
| 85 fread(&header, sizeof(header), 1, original); | |
| 86 data_begin=(char *)N_DATADDR(header); | |
| 87 data_end = sbrk(0); | |
| 88 original_data = header.a_data; | |
| 89 header.a_data = data_end - data_begin; | |
| 90 header.a_bss = 0; | |
| 91 dp->s_size = header.a_data; | |
| 92 bp->s_paddr = dp->s_vaddr + dp->s_size; | |
| 93 bp->s_vaddr = bp->s_paddr; | |
| 94 bp->s_size = 0; | |
| 95 header1.tsize = tp->s_size; | |
| 96 header1.dsize = dp->s_size; | |
| 97 header1.bsize = bp->s_size; | |
| 98 fwrite(&header1, sizeof(header1), 1, save); | |
| 99 fwrite(&header, sizeof(header), 1, save); | |
| 100 | |
| 101 filecpy(save, original, header.a_text); | |
| 102 | |
| 103 for (n = header.a_data, p = data_begin; ; n -= BUFSIZ, p += BUFSIZ) | |
| 104 if (n > BUFSIZ) | |
| 105 fwrite(p, BUFSIZ, 1, save); | |
| 106 else if (n > 0) { | |
| 107 fwrite(p, 1, n, save); | |
| 108 break; | |
| 109 } else | |
| 110 break; | |
| 111 | |
| 112 fseek(original, original_data, 1); | |
| 113 | |
| 114 filecpy(save, original, header.a_syms+header.a_trsize+header.a_drsize); | |
| 115 fread(&stsize, sizeof(stsize), 1, original); | |
| 116 fwrite(&stsize, sizeof(stsize), 1, save); | |
| 117 filecpy(save, original, stsize - sizeof(stsize)); | |
| 118 | |
| 119 fclose(original); | |
| 120 fclose(save); | |
| 121 } |