annotate src/unexencap.c @ 4539:061e030e3270

Fix some bugs in load-history construction, built-in symbol file names. lib-src/ChangeLog addition: 2008-12-27 Aidan Kehoe <kehoea@parhasard.net> * make-docfile.c (main): Allow more than one -d argument, followed by a directory to change to. (put_filename): Don't strip directory information; with previous change, allows retrieval of Lisp function and variable origin files from #'built-in-symbol-file relative to lisp-directory. (scan_lisp_file): Don't add an extraneous newline after the file name, put_filename has added the newline already. lisp/ChangeLog addition: 2008-12-27 Aidan Kehoe <kehoea@parhasard.net> * loadup.el (load-history): Add the contents of current-load-list to load-history before clearing it. Move the variable declarations earlier in the file to a format understood by make-docfile.c. * custom.el (custom-declare-variable): Add the variable's symbol to the current file's load history entry correctly, don't use a cons. Eliminate a comment that we don't need to worry about, we don't need to check the `initialized' C variable in Lisp. * bytecomp.el (byte-compile-output-file-form): Merge Andreas Schwab's pre-GPLv3 GNU change of 19970831 here; treat #'custom-declare-variable correctly, generating the docstrings in a format understood by make-docfile.c. * loadhist.el (symbol-file): Correct behaviour for checking autoloaded macros and functions when supplied with a TYPE argument. Accept fully-qualified paths from #'built-in-symbol-file; if a path is not fully-qualified, return it relative to lisp-directory if the filename corresponds to a Lisp file, and relative to (concat source-directory "/src/") otherwise. * make-docfile.el (preloaded-file-list): Rationalise some let bindings a little. Use the "-d" argument to make-docfile.c to supply Lisp paths relative to lisp-directory, not absolutely. Add in loadup.el explicitly to the list of files to be processed by make-docfile.c--it doesn't make sense to add it to preloaded-file-list, since that is used for purposes of byte-compilation too. src/ChangeLog addition: 2008-12-27 Aidan Kehoe <kehoea@parhasard.net> * doc.c (Fbuilt_in_symbol_file): Return a subr's filename immediately if we've found it. Check for compiled function and compiled macro docstrings in DOC too, and return them if they exist. The branch of the if statement focused on functions may have executed, but we may still want to check variable bindings; an else clause isn't appropriate.
author Aidan Kehoe <kehoea@parhasard.net>
date Sat, 27 Dec 2008 14:05:50 +0000
parents 04bc9d2f42c7
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1 /* Waiting for papers! */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3 /* Synched up with: FSF 19.31. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5 /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6 * Do an unexec() for coff encapsulation. Uses the approach I took
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7 * for AKCL, so don't be surprised if it doesn't look too much like
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8 * the other unexec() routines. Assumes NO_REMAP. Should be easy to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
9 * adapt to the emacs style unexec() if that is desired, but this works
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
10 * just fine for me with GCC/GAS/GLD under System V. - Jordan
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
11 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
12
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
13 #include <sys/types.h>
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
14 #include <sys/fcntl.h>
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
15 #include <sys/file.h>
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
16 #include <stdio.h>
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
17 #include "/usr/gnu/lib/gcc/gcc-include/a.out.h"
2286
04bc9d2f42c7 [xemacs-hg @ 2004-09-20 19:18:55 by james]
james
parents: 0
diff changeset
18 #include "compiler.h"
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
19
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
20 filecpy(to, from, n)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
21 FILE *to, *from;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
22 int n;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
23 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
24 char buffer[BUFSIZ];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
25
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
26 for (;;)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
27 if (n > BUFSIZ) {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
28 fread(buffer, BUFSIZ, 1, from);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
29 fwrite(buffer, BUFSIZ, 1, to);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
30 n -= BUFSIZ;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
31 } else if (n > 0) {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
32 fread(buffer, 1, n, from);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
33 fwrite(buffer, 1, n, to);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
34 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
35 } else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
36 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
37 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
38 /* ****************************************************************
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
39 * unexec
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
40 *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
41 * driving logic.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
42 * ****************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
43 unexec (new_name, a_name, data_start, bss_start, entry_address)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
44 char *new_name, *a_name;
2286
04bc9d2f42c7 [xemacs-hg @ 2004-09-20 19:18:55 by james]
james
parents: 0
diff changeset
45 unsigned UNUSED (data_start);
04bc9d2f42c7 [xemacs-hg @ 2004-09-20 19:18:55 by james]
james
parents: 0
diff changeset
46 unsigned UNUSED (bss_start);
04bc9d2f42c7 [xemacs-hg @ 2004-09-20 19:18:55 by james]
james
parents: 0
diff changeset
47 unsigned UNUSED (entry_address);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
48 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
49 struct coffheader header1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
50 struct coffscn *tp, *dp, *bp;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
51 struct exec header;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
52 int stsize;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
53 char *original_file = a_name;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
54 char *save_file = new_name;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
55
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
56 char *data_begin, *data_end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
57 int original_data;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
58 FILE *original, *save;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
59 int n;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
60 char *p;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
61 extern char *sbrk();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
62 char stdin_buf[BUFSIZ], stdout_buf[BUFSIZ];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
63
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
64
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
65 fclose(stdin);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
66 original = fopen(original_file, "r");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
67 if (stdin != original || original->_file != 0) {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
68 fprintf(stderr, "unexec: Can't open the original file.\n");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
69 exit(1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
70 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
71 setbuf(original, stdin_buf);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
72 fclose(stdout);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
73 unlink(save_file);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
74 n = open (save_file, O_CREAT|O_WRONLY, 0777);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
75 if (n != 1 || (save = fdopen(n, "w")) != stdout) {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
76 fprintf(stderr, "unexec: Can't open the save file.\n");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
77 exit(1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
78 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
79 setbuf(save, stdout_buf);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
80
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
81 fread(&header1, sizeof(header1), 1, original);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
82 tp = &header1.scns[0];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
83 dp = &header1.scns[1];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
84 bp = &header1.scns[2];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
85 fread(&header, sizeof(header), 1, original);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
86 data_begin=(char *)N_DATADDR(header);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
87 data_end = sbrk(0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
88 original_data = header.a_data;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
89 header.a_data = data_end - data_begin;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
90 header.a_bss = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
91 dp->s_size = header.a_data;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
92 bp->s_paddr = dp->s_vaddr + dp->s_size;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
93 bp->s_vaddr = bp->s_paddr;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
94 bp->s_size = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
95 header1.tsize = tp->s_size;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
96 header1.dsize = dp->s_size;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
97 header1.bsize = bp->s_size;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
98 fwrite(&header1, sizeof(header1), 1, save);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
99 fwrite(&header, sizeof(header), 1, save);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
100
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
101 filecpy(save, original, header.a_text);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
102
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
103 for (n = header.a_data, p = data_begin; ; n -= BUFSIZ, p += BUFSIZ)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
104 if (n > BUFSIZ)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
105 fwrite(p, BUFSIZ, 1, save);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
106 else if (n > 0) {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
107 fwrite(p, 1, n, save);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
108 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
109 } else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
110 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
111
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
112 fseek(original, original_data, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
113
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
114 filecpy(save, original, header.a_syms+header.a_trsize+header.a_drsize);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
115 fread(&stsize, sizeof(stsize), 1, original);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
116 fwrite(&stsize, sizeof(stsize), 1, save);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
117 filecpy(save, original, stsize - sizeof(stsize));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
118
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
119 fclose(original);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
120 fclose(save);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
121 }