Mercurial > emacs
annotate src/alloc.c @ 25544:693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Likewise for upper-case etc.
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Sun, 05 Sep 1999 15:49:07 +0000 |
| parents | 4d553f7390dc |
| children | a14111a2a100 |
| rev | line source |
|---|---|
| 300 | 1 /* Storage allocation and gc for GNU Emacs Lisp interpreter. |
| 20708 | 2 Copyright (C) 1985, 86, 88, 93, 94, 95, 97, 1998 |
| 3 Free Software Foundation, Inc. | |
| 300 | 4 |
| 5 This file is part of GNU Emacs. | |
| 6 | |
| 7 GNU Emacs is free software; you can redistribute it and/or modify | |
| 8 it under the terms of the GNU General Public License as published by | |
|
1784
11f62e53acff
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1562
diff
changeset
|
9 the Free Software Foundation; either version 2, or (at your option) |
| 300 | 10 any later version. |
| 11 | |
| 12 GNU Emacs is distributed in the hope that it will be useful, | |
| 13 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 15 GNU General Public License for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
| 18 along with GNU Emacs; see the file COPYING. If not, write to | |
|
14186
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
14095
diff
changeset
|
19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
|
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
14095
diff
changeset
|
20 Boston, MA 02111-1307, USA. */ |
| 300 | 21 |
|
13320
e0f3a961851a
Cast first arg to bzero.
Richard M. Stallman <rms@gnu.org>
parents:
13219
diff
changeset
|
22 /* Note that this declares bzero on OSF/1. How dumb. */ |
|
3003
5a73d384f45e
* syssignal.h: Don't #include <signal.h>
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
23 #include <signal.h> |
| 300 | 24 |
|
4696
1fc792473491
Include <config.h> instead of "config.h".
Roland McGrath <roland@gnu.org>
parents:
4494
diff
changeset
|
25 #include <config.h> |
|
25452
4d553f7390dc
Include <stdlib.h> if available.
Andreas Schwab <schwab@suse.de>
parents:
25367
diff
changeset
|
26 |
|
4d553f7390dc
Include <stdlib.h> if available.
Andreas Schwab <schwab@suse.de>
parents:
25367
diff
changeset
|
27 #ifdef STDC_HEADERS |
|
4d553f7390dc
Include <stdlib.h> if available.
Andreas Schwab <schwab@suse.de>
parents:
25367
diff
changeset
|
28 #include <stdlib.h> |
|
4d553f7390dc
Include <stdlib.h> if available.
Andreas Schwab <schwab@suse.de>
parents:
25367
diff
changeset
|
29 #endif |
|
4d553f7390dc
Include <stdlib.h> if available.
Andreas Schwab <schwab@suse.de>
parents:
25367
diff
changeset
|
30 |
| 300 | 31 #include "lisp.h" |
|
1300
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
32 #include "intervals.h" |
| 356 | 33 #include "puresize.h" |
| 300 | 34 #ifndef standalone |
| 35 #include "buffer.h" | |
| 36 #include "window.h" | |
| 764 | 37 #include "frame.h" |
|
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
38 #include "blockinput.h" |
| 11341 | 39 #include "keyboard.h" |
|
21084
371ed7bdfd2b
(Fmake_string): Handle the case INIT is a multibyte character correctly.
Richard M. Stallman <rms@gnu.org>
parents:
20849
diff
changeset
|
40 #include "charset.h" |
| 300 | 41 #endif |
| 42 | |
| 638 | 43 #include "syssignal.h" |
| 44 | |
| 12096 | 45 extern char *sbrk (); |
| 46 | |
|
17345
4e11e27ce1f1
For glibc's malloc, include <malloc.h> for mallinfo,
Richard M. Stallman <rms@gnu.org>
parents:
17328
diff
changeset
|
47 #ifdef DOUG_LEA_MALLOC |
|
4e11e27ce1f1
For glibc's malloc, include <malloc.h> for mallinfo,
Richard M. Stallman <rms@gnu.org>
parents:
17328
diff
changeset
|
48 #include <malloc.h> |
|
4e11e27ce1f1
For glibc's malloc, include <malloc.h> for mallinfo,
Richard M. Stallman <rms@gnu.org>
parents:
17328
diff
changeset
|
49 #define __malloc_size_t int |
|
23973
2eb9e2f5aa33
(MMAP_MAX_AREAS): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
23958
diff
changeset
|
50 |
|
2eb9e2f5aa33
(MMAP_MAX_AREAS): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
23958
diff
changeset
|
51 /* Specify maximum number of areas to mmap. |
|
2eb9e2f5aa33
(MMAP_MAX_AREAS): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
23958
diff
changeset
|
52 It would be nice to use a value that explicitly |
|
2eb9e2f5aa33
(MMAP_MAX_AREAS): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
23958
diff
changeset
|
53 means "no limit". */ |
|
2eb9e2f5aa33
(MMAP_MAX_AREAS): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
23958
diff
changeset
|
54 #define MMAP_MAX_AREAS 100000000 |
|
2eb9e2f5aa33
(MMAP_MAX_AREAS): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
23958
diff
changeset
|
55 |
|
17345
4e11e27ce1f1
For glibc's malloc, include <malloc.h> for mallinfo,
Richard M. Stallman <rms@gnu.org>
parents:
17328
diff
changeset
|
56 #else |
|
10673
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
57 /* The following come from gmalloc.c. */ |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
58 |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
59 #if defined (__STDC__) && __STDC__ |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
60 #include <stddef.h> |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
61 #define __malloc_size_t size_t |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
62 #else |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
63 #define __malloc_size_t unsigned int |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
64 #endif |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
65 extern __malloc_size_t _bytes_used; |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
66 extern int __malloc_extra_blocks; |
|
17345
4e11e27ce1f1
For glibc's malloc, include <malloc.h> for mallinfo,
Richard M. Stallman <rms@gnu.org>
parents:
17328
diff
changeset
|
67 #endif /* !defined(DOUG_LEA_MALLOC) */ |
|
10673
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
68 |
| 300 | 69 #define max(A,B) ((A) > (B) ? (A) : (B)) |
|
11727
53ccd2d608ee
(gc_cons_threshold): Change back to int.
Richard M. Stallman <rms@gnu.org>
parents:
11679
diff
changeset
|
70 #define min(A,B) ((A) < (B) ? (A) : (B)) |
| 300 | 71 |
| 72 /* Macro to verify that storage intended for Lisp objects is not | |
| 73 out of range to fit in the space for a pointer. | |
| 74 ADDRESS is the start of the block, and SIZE | |
| 75 is the amount of space within which objects can start. */ | |
| 76 #define VALIDATE_LISP_STORAGE(address, size) \ | |
| 77 do \ | |
| 78 { \ | |
| 79 Lisp_Object val; \ | |
|
9261
e5ba7993d378
(VALIDATE_LISP_STORAGE, make_float, Fcons, Fmake_vector, Fmake_symbol,
Karl Heuer <kwzh@gnu.org>
parents:
9144
diff
changeset
|
80 XSETCONS (val, (char *) address + size); \ |
| 300 | 81 if ((char *) XCONS (val) != (char *) address + size) \ |
| 82 { \ | |
|
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
83 xfree (address); \ |
| 300 | 84 memory_full (); \ |
| 85 } \ | |
| 86 } while (0) | |
| 87 | |
|
10673
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
88 /* Value of _bytes_used, when spare_memory was freed. */ |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
89 static __malloc_size_t bytes_used_when_full; |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
90 |
| 300 | 91 /* Number of bytes of consing done since the last gc */ |
| 92 int consing_since_gc; | |
| 93 | |
|
12748
3433bb446e06
(cons_cells_consed, floats_consed, vector_cells_consed)
Richard M. Stallman <rms@gnu.org>
parents:
12605
diff
changeset
|
94 /* Count the amount of consing of various sorts of space. */ |
|
3433bb446e06
(cons_cells_consed, floats_consed, vector_cells_consed)
Richard M. Stallman <rms@gnu.org>
parents:
12605
diff
changeset
|
95 int cons_cells_consed; |
|
3433bb446e06
(cons_cells_consed, floats_consed, vector_cells_consed)
Richard M. Stallman <rms@gnu.org>
parents:
12605
diff
changeset
|
96 int floats_consed; |
|
3433bb446e06
(cons_cells_consed, floats_consed, vector_cells_consed)
Richard M. Stallman <rms@gnu.org>
parents:
12605
diff
changeset
|
97 int vector_cells_consed; |
|
3433bb446e06
(cons_cells_consed, floats_consed, vector_cells_consed)
Richard M. Stallman <rms@gnu.org>
parents:
12605
diff
changeset
|
98 int symbols_consed; |
|
3433bb446e06
(cons_cells_consed, floats_consed, vector_cells_consed)
Richard M. Stallman <rms@gnu.org>
parents:
12605
diff
changeset
|
99 int string_chars_consed; |
|
3433bb446e06
(cons_cells_consed, floats_consed, vector_cells_consed)
Richard M. Stallman <rms@gnu.org>
parents:
12605
diff
changeset
|
100 int misc_objects_consed; |
|
3433bb446e06
(cons_cells_consed, floats_consed, vector_cells_consed)
Richard M. Stallman <rms@gnu.org>
parents:
12605
diff
changeset
|
101 int intervals_consed; |
|
3433bb446e06
(cons_cells_consed, floats_consed, vector_cells_consed)
Richard M. Stallman <rms@gnu.org>
parents:
12605
diff
changeset
|
102 |
| 300 | 103 /* Number of bytes of consing since gc before another gc should be done. */ |
|
11727
53ccd2d608ee
(gc_cons_threshold): Change back to int.
Richard M. Stallman <rms@gnu.org>
parents:
11679
diff
changeset
|
104 int gc_cons_threshold; |
| 300 | 105 |
| 106 /* Nonzero during gc */ | |
| 107 int gc_in_progress; | |
| 108 | |
|
14959
f2b5d784fa88
(garbage_collection_messages): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
14764
diff
changeset
|
109 /* Nonzero means display messages at beginning and end of GC. */ |
|
f2b5d784fa88
(garbage_collection_messages): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
14764
diff
changeset
|
110 int garbage_collection_messages; |
|
f2b5d784fa88
(garbage_collection_messages): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
14764
diff
changeset
|
111 |
| 300 | 112 #ifndef VIRT_ADDR_VARIES |
| 113 extern | |
| 114 #endif /* VIRT_ADDR_VARIES */ | |
| 115 int malloc_sbrk_used; | |
| 116 | |
| 117 #ifndef VIRT_ADDR_VARIES | |
| 118 extern | |
| 119 #endif /* VIRT_ADDR_VARIES */ | |
| 120 int malloc_sbrk_unused; | |
| 121 | |
| 764 | 122 /* Two limits controlling how much undo information to keep. */ |
| 123 int undo_limit; | |
| 124 int undo_strong_limit; | |
| 300 | 125 |
|
19332
58f14958f5d5
(free_marker): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18621
diff
changeset
|
126 int total_conses, total_markers, total_symbols, total_string_size, total_vector_size; |
|
58f14958f5d5
(free_marker): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18621
diff
changeset
|
127 int total_free_conses, total_free_markers, total_free_symbols; |
|
58f14958f5d5
(free_marker): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18621
diff
changeset
|
128 #ifdef LISP_FLOAT_TYPE |
|
58f14958f5d5
(free_marker): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18621
diff
changeset
|
129 int total_free_floats, total_floats; |
|
58f14958f5d5
(free_marker): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18621
diff
changeset
|
130 #endif /* LISP_FLOAT_TYPE */ |
|
58f14958f5d5
(free_marker): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18621
diff
changeset
|
131 |
|
10673
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
132 /* Points to memory space allocated as "spare", |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
133 to be freed if we run out of memory. */ |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
134 static char *spare_memory; |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
135 |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
136 /* Amount of spare memory to keep in reserve. */ |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
137 #define SPARE_MEMORY (1 << 14) |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
138 |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
139 /* Number of extra blocks malloc should get when it needs more core. */ |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
140 static int malloc_hysteresis; |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
141 |
| 12529 | 142 /* Nonzero when malloc is called for allocating Lisp object space. */ |
| 143 int allocating_for_lisp; | |
| 144 | |
| 300 | 145 /* Non-nil means defun should do purecopy on the function definition */ |
| 146 Lisp_Object Vpurify_flag; | |
| 147 | |
| 148 #ifndef HAVE_SHM | |
|
8817
48ff00bebef6
(pure, pure_size): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
149 EMACS_INT pure[PURESIZE / sizeof (EMACS_INT)] = {0,}; /* Force it into data space! */ |
| 300 | 150 #define PUREBEG (char *) pure |
| 151 #else | |
| 152 #define pure PURE_SEG_BITS /* Use shared memory segment */ | |
| 153 #define PUREBEG (char *)PURE_SEG_BITS | |
| 356 | 154 |
| 155 /* This variable is used only by the XPNTR macro when HAVE_SHM is | |
| 156 defined. If we used the PURESIZE macro directly there, that would | |
| 157 make most of emacs dependent on puresize.h, which we don't want - | |
| 158 you should be able to change that without too much recompilation. | |
| 159 So map_in_data initializes pure_size, and the dependencies work | |
| 160 out. */ | |
|
8817
48ff00bebef6
(pure, pure_size): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
161 EMACS_INT pure_size; |
| 300 | 162 #endif /* not HAVE_SHM */ |
| 163 | |
| 164 /* Index in pure at which next pure object will be allocated. */ | |
| 165 int pureptr; | |
| 166 | |
| 167 /* If nonzero, this is a warning delivered by malloc and not yet displayed. */ | |
| 168 char *pending_malloc_warning; | |
| 169 | |
|
6116
64417bbbb128
(memory_full): Use new variable memory_signal_data with precomputed value
Karl Heuer <kwzh@gnu.org>
parents:
5874
diff
changeset
|
170 /* Pre-computed signal argument for use when memory is exhausted. */ |
|
6133
752d4237f869
(memory_signal_data): No longer static.
Richard M. Stallman <rms@gnu.org>
parents:
6116
diff
changeset
|
171 Lisp_Object memory_signal_data; |
|
6116
64417bbbb128
(memory_full): Use new variable memory_signal_data with precomputed value
Karl Heuer <kwzh@gnu.org>
parents:
5874
diff
changeset
|
172 |
| 300 | 173 /* Maximum amount of C stack to save when a GC happens. */ |
| 174 | |
| 175 #ifndef MAX_SAVE_STACK | |
| 176 #define MAX_SAVE_STACK 16000 | |
| 177 #endif | |
| 178 | |
|
10413
bfe591f66299
(DONT_COPY_FLAG): Default this to 1.
Karl Heuer <kwzh@gnu.org>
parents:
10398
diff
changeset
|
179 /* Define DONT_COPY_FLAG to be some bit which will always be zero in a |
|
bfe591f66299
(DONT_COPY_FLAG): Default this to 1.
Karl Heuer <kwzh@gnu.org>
parents:
10398
diff
changeset
|
180 pointer to a Lisp_Object, when that pointer is viewed as an integer. |
|
bfe591f66299
(DONT_COPY_FLAG): Default this to 1.
Karl Heuer <kwzh@gnu.org>
parents:
10398
diff
changeset
|
181 (On most machines, pointers are even, so we can use the low bit. |
| 14036 | 182 Word-addressable architectures may need to override this in the m-file.) |
|
10413
bfe591f66299
(DONT_COPY_FLAG): Default this to 1.
Karl Heuer <kwzh@gnu.org>
parents:
10398
diff
changeset
|
183 When linking references to small strings through the size field, we |
|
bfe591f66299
(DONT_COPY_FLAG): Default this to 1.
Karl Heuer <kwzh@gnu.org>
parents:
10398
diff
changeset
|
184 use this slot to hold the bit that would otherwise be interpreted as |
|
bfe591f66299
(DONT_COPY_FLAG): Default this to 1.
Karl Heuer <kwzh@gnu.org>
parents:
10398
diff
changeset
|
185 the GC mark bit. */ |
|
10389
162b3e6c4610
(DONT_COPY_FLAG): New bit flag.
Richard M. Stallman <rms@gnu.org>
parents:
10340
diff
changeset
|
186 #ifndef DONT_COPY_FLAG |
|
10413
bfe591f66299
(DONT_COPY_FLAG): Default this to 1.
Karl Heuer <kwzh@gnu.org>
parents:
10398
diff
changeset
|
187 #define DONT_COPY_FLAG 1 |
|
10389
162b3e6c4610
(DONT_COPY_FLAG): New bit flag.
Richard M. Stallman <rms@gnu.org>
parents:
10340
diff
changeset
|
188 #endif /* no DONT_COPY_FLAG */ |
|
162b3e6c4610
(DONT_COPY_FLAG): New bit flag.
Richard M. Stallman <rms@gnu.org>
parents:
10340
diff
changeset
|
189 |
| 300 | 190 /* Buffer in which we save a copy of the C stack at each GC. */ |
| 191 | |
| 192 char *stack_copy; | |
| 193 int stack_copy_size; | |
| 194 | |
| 195 /* Non-zero means ignore malloc warnings. Set during initialization. */ | |
| 196 int ignore_warnings; | |
| 1318 | 197 |
|
13219
99b5164a319d
(Qchar_table_extra_slots): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13150
diff
changeset
|
198 Lisp_Object Qgc_cons_threshold, Qchar_table_extra_slots; |
|
11374
1ebc81f84aa4
(inhibit_garbage_collection): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11341
diff
changeset
|
199 |
|
25024
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
200 static void mark_buffer (), mark_kboards (); |
| 1318 | 201 static void clear_marks (), gc_sweep (); |
| 202 static void compact_strings (); | |
|
25024
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
203 static void mark_glyph_matrix P_ ((struct glyph_matrix *)); |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
204 static void mark_face_cache P_ ((struct face_cache *)); |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
205 |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
206 #ifdef HAVE_WINDOW_SYSTEM |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
207 static void mark_image P_ ((struct image *)); |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
208 static void mark_image_cache P_ ((struct frame *)); |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
209 #endif /* HAVE_WINDOW_SYSTEM */ |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
210 |
| 20495 | 211 |
| 212 extern int message_enable_multibyte; | |
| 300 | 213 |
|
1908
d649f2179d67
* alloc.c (make_pure_float): Align pureptr on a sizeof (double)
Jim Blandy <jimb@redhat.com>
parents:
1893
diff
changeset
|
214 /* Versions of malloc and realloc that print warnings as memory gets full. */ |
|
d649f2179d67
* alloc.c (make_pure_float): Align pureptr on a sizeof (double)
Jim Blandy <jimb@redhat.com>
parents:
1893
diff
changeset
|
215 |
| 300 | 216 Lisp_Object |
| 217 malloc_warning_1 (str) | |
| 218 Lisp_Object str; | |
| 219 { | |
| 220 Fprinc (str, Vstandard_output); | |
| 221 write_string ("\nKilling some buffers may delay running out of memory.\n", -1); | |
| 222 write_string ("However, certainly by the time you receive the 95% warning,\n", -1); | |
| 223 write_string ("you should clean up, kill this Emacs, and start a new one.", -1); | |
| 224 return Qnil; | |
| 225 } | |
| 226 | |
| 227 /* malloc calls this if it finds we are near exhausting storage */ | |
|
20375
1dd0bd0749b5
(malloc_warning, display_malloc_warning): Return void.
Andreas Schwab <schwab@suse.de>
parents:
20057
diff
changeset
|
228 |
|
1dd0bd0749b5
(malloc_warning, display_malloc_warning): Return void.
Andreas Schwab <schwab@suse.de>
parents:
20057
diff
changeset
|
229 void |
| 300 | 230 malloc_warning (str) |
| 231 char *str; | |
| 232 { | |
| 233 pending_malloc_warning = str; | |
| 234 } | |
| 235 | |
|
20375
1dd0bd0749b5
(malloc_warning, display_malloc_warning): Return void.
Andreas Schwab <schwab@suse.de>
parents:
20057
diff
changeset
|
236 void |
| 300 | 237 display_malloc_warning () |
| 238 { | |
| 239 register Lisp_Object val; | |
| 240 | |
| 241 val = build_string (pending_malloc_warning); | |
| 242 pending_malloc_warning = 0; | |
| 243 internal_with_output_to_temp_buffer (" *Danger*", malloc_warning_1, val); | |
| 244 } | |
| 245 | |
|
17345
4e11e27ce1f1
For glibc's malloc, include <malloc.h> for mallinfo,
Richard M. Stallman <rms@gnu.org>
parents:
17328
diff
changeset
|
246 #ifdef DOUG_LEA_MALLOC |
|
17831
9238a2254a23
(BYTES_USED): Put # at the beginning of line.
Kenichi Handa <handa@m17n.org>
parents:
17348
diff
changeset
|
247 # define BYTES_USED (mallinfo ().arena) |
|
17345
4e11e27ce1f1
For glibc's malloc, include <malloc.h> for mallinfo,
Richard M. Stallman <rms@gnu.org>
parents:
17328
diff
changeset
|
248 #else |
|
17831
9238a2254a23
(BYTES_USED): Put # at the beginning of line.
Kenichi Handa <handa@m17n.org>
parents:
17348
diff
changeset
|
249 # define BYTES_USED _bytes_used |
|
17345
4e11e27ce1f1
For glibc's malloc, include <malloc.h> for mallinfo,
Richard M. Stallman <rms@gnu.org>
parents:
17328
diff
changeset
|
250 #endif |
|
4e11e27ce1f1
For glibc's malloc, include <malloc.h> for mallinfo,
Richard M. Stallman <rms@gnu.org>
parents:
17328
diff
changeset
|
251 |
| 300 | 252 /* Called if malloc returns zero */ |
|
10673
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
253 |
|
20375
1dd0bd0749b5
(malloc_warning, display_malloc_warning): Return void.
Andreas Schwab <schwab@suse.de>
parents:
20057
diff
changeset
|
254 void |
| 300 | 255 memory_full () |
| 256 { | |
|
10673
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
257 #ifndef SYSTEM_MALLOC |
|
17345
4e11e27ce1f1
For glibc's malloc, include <malloc.h> for mallinfo,
Richard M. Stallman <rms@gnu.org>
parents:
17328
diff
changeset
|
258 bytes_used_when_full = BYTES_USED; |
|
10673
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
259 #endif |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
260 |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
261 /* The first time we get here, free the spare memory. */ |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
262 if (spare_memory) |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
263 { |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
264 free (spare_memory); |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
265 spare_memory = 0; |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
266 } |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
267 |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
268 /* This used to call error, but if we've run out of memory, we could get |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
269 infinite recursion trying to build the string. */ |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
270 while (1) |
|
18621
53b95f307c75
(memory_full): Pass Qnil to Fsignal for ERROR_SYMBOL.
Richard M. Stallman <rms@gnu.org>
parents:
18104
diff
changeset
|
271 Fsignal (Qnil, memory_signal_data); |
|
10673
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
272 } |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
273 |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
274 /* Called if we can't allocate relocatable space for a buffer. */ |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
275 |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
276 void |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
277 buffer_memory_full () |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
278 { |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
279 /* If buffers use the relocating allocator, |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
280 no need to free spare_memory, because we may have plenty of malloc |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
281 space left that we could get, and if we don't, the malloc that fails |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
282 will itself cause spare_memory to be freed. |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
283 If buffers don't use the relocating allocator, |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
284 treat this like any other failing malloc. */ |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
285 |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
286 #ifndef REL_ALLOC |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
287 memory_full (); |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
288 #endif |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
289 |
|
6116
64417bbbb128
(memory_full): Use new variable memory_signal_data with precomputed value
Karl Heuer <kwzh@gnu.org>
parents:
5874
diff
changeset
|
290 /* This used to call error, but if we've run out of memory, we could get |
|
64417bbbb128
(memory_full): Use new variable memory_signal_data with precomputed value
Karl Heuer <kwzh@gnu.org>
parents:
5874
diff
changeset
|
291 infinite recursion trying to build the string. */ |
|
64417bbbb128
(memory_full): Use new variable memory_signal_data with precomputed value
Karl Heuer <kwzh@gnu.org>
parents:
5874
diff
changeset
|
292 while (1) |
|
64417bbbb128
(memory_full): Use new variable memory_signal_data with precomputed value
Karl Heuer <kwzh@gnu.org>
parents:
5874
diff
changeset
|
293 Fsignal (Qerror, memory_signal_data); |
| 300 | 294 } |
| 295 | |
|
23958
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
296 /* Like malloc routines but check for no memory and block interrupt input. */ |
| 300 | 297 |
| 298 long * | |
| 299 xmalloc (size) | |
| 300 int size; | |
| 301 { | |
| 302 register long *val; | |
| 303 | |
|
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
304 BLOCK_INPUT; |
| 300 | 305 val = (long *) malloc (size); |
|
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
306 UNBLOCK_INPUT; |
| 300 | 307 |
| 308 if (!val && size) memory_full (); | |
| 309 return val; | |
| 310 } | |
| 311 | |
| 312 long * | |
| 313 xrealloc (block, size) | |
| 314 long *block; | |
| 315 int size; | |
| 316 { | |
| 317 register long *val; | |
| 318 | |
|
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
319 BLOCK_INPUT; |
| 590 | 320 /* We must call malloc explicitly when BLOCK is 0, since some |
| 321 reallocs don't do this. */ | |
| 322 if (! block) | |
| 323 val = (long *) malloc (size); | |
|
600
a8d78999e46d
*** empty log message ***
Noah Friedman <friedman@splode.com>
parents:
590
diff
changeset
|
324 else |
| 590 | 325 val = (long *) realloc (block, size); |
|
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
326 UNBLOCK_INPUT; |
| 300 | 327 |
| 328 if (!val && size) memory_full (); | |
| 329 return val; | |
| 330 } | |
|
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
331 |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
332 void |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
333 xfree (block) |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
334 long *block; |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
335 { |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
336 BLOCK_INPUT; |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
337 free (block); |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
338 UNBLOCK_INPUT; |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
339 } |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
340 |
|
23958
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
341 /* Like malloc but used for allocating Lisp data. */ |
|
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
342 |
|
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
343 long * |
|
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
344 lisp_malloc (size) |
|
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
345 int size; |
|
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
346 { |
|
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
347 register long *val; |
|
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
348 |
|
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
349 BLOCK_INPUT; |
|
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
350 allocating_for_lisp++; |
|
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
351 val = (long *) malloc (size); |
|
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
352 allocating_for_lisp--; |
|
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
353 UNBLOCK_INPUT; |
|
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
354 |
|
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
355 if (!val && size) memory_full (); |
|
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
356 return val; |
|
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
357 } |
|
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
358 |
|
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
359 void |
|
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
360 lisp_free (block) |
|
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
361 long *block; |
|
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
362 { |
|
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
363 BLOCK_INPUT; |
|
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
364 allocating_for_lisp++; |
|
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
365 free (block); |
|
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
366 allocating_for_lisp--; |
|
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
367 UNBLOCK_INPUT; |
|
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
368 } |
|
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
369 |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
370 /* Arranging to disable input signals while we're in malloc. |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
371 |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
372 This only works with GNU malloc. To help out systems which can't |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
373 use GNU malloc, all the calls to malloc, realloc, and free |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
374 elsewhere in the code should be inside a BLOCK_INPUT/UNBLOCK_INPUT |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
375 pairs; unfortunately, we have no idea what C library functions |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
376 might call malloc, so we can't really protect them unless you're |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
377 using GNU malloc. Fortunately, most of the major operating can use |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
378 GNU malloc. */ |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
379 |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
380 #ifndef SYSTEM_MALLOC |
|
2507
7ba4316ae840
* alloc.c (__malloc_hook, __realloc_hook, __free_hook): Declare
Jim Blandy <jimb@redhat.com>
parents:
2439
diff
changeset
|
381 extern void * (*__malloc_hook) (); |
|
7ba4316ae840
* alloc.c (__malloc_hook, __realloc_hook, __free_hook): Declare
Jim Blandy <jimb@redhat.com>
parents:
2439
diff
changeset
|
382 static void * (*old_malloc_hook) (); |
|
7ba4316ae840
* alloc.c (__malloc_hook, __realloc_hook, __free_hook): Declare
Jim Blandy <jimb@redhat.com>
parents:
2439
diff
changeset
|
383 extern void * (*__realloc_hook) (); |
|
7ba4316ae840
* alloc.c (__malloc_hook, __realloc_hook, __free_hook): Declare
Jim Blandy <jimb@redhat.com>
parents:
2439
diff
changeset
|
384 static void * (*old_realloc_hook) (); |
|
7ba4316ae840
* alloc.c (__malloc_hook, __realloc_hook, __free_hook): Declare
Jim Blandy <jimb@redhat.com>
parents:
2439
diff
changeset
|
385 extern void (*__free_hook) (); |
|
7ba4316ae840
* alloc.c (__malloc_hook, __realloc_hook, __free_hook): Declare
Jim Blandy <jimb@redhat.com>
parents:
2439
diff
changeset
|
386 static void (*old_free_hook) (); |
|
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
387 |
|
10673
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
388 /* This function is used as the hook for free to call. */ |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
389 |
|
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
390 static void |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
391 emacs_blocked_free (ptr) |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
392 void *ptr; |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
393 { |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
394 BLOCK_INPUT; |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
395 __free_hook = old_free_hook; |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
396 free (ptr); |
|
10673
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
397 /* If we released our reserve (due to running out of memory), |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
398 and we have a fair amount free once again, |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
399 try to set aside another reserve in case we run out once more. */ |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
400 if (spare_memory == 0 |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
401 /* Verify there is enough space that even with the malloc |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
402 hysteresis this call won't run out again. |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
403 The code here is correct as long as SPARE_MEMORY |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
404 is substantially larger than the block size malloc uses. */ |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
405 && (bytes_used_when_full |
|
17345
4e11e27ce1f1
For glibc's malloc, include <malloc.h> for mallinfo,
Richard M. Stallman <rms@gnu.org>
parents:
17328
diff
changeset
|
406 > BYTES_USED + max (malloc_hysteresis, 4) * SPARE_MEMORY)) |
|
10673
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
407 spare_memory = (char *) malloc (SPARE_MEMORY); |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
408 |
|
2507
7ba4316ae840
* alloc.c (__malloc_hook, __realloc_hook, __free_hook): Declare
Jim Blandy <jimb@redhat.com>
parents:
2439
diff
changeset
|
409 __free_hook = emacs_blocked_free; |
|
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
410 UNBLOCK_INPUT; |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
411 } |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
412 |
|
10673
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
413 /* If we released our reserve (due to running out of memory), |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
414 and we have a fair amount free once again, |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
415 try to set aside another reserve in case we run out once more. |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
416 |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
417 This is called when a relocatable block is freed in ralloc.c. */ |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
418 |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
419 void |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
420 refill_memory_reserve () |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
421 { |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
422 if (spare_memory == 0) |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
423 spare_memory = (char *) malloc (SPARE_MEMORY); |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
424 } |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
425 |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
426 /* This function is the malloc hook that Emacs uses. */ |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
427 |
|
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
428 static void * |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
429 emacs_blocked_malloc (size) |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
430 unsigned size; |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
431 { |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
432 void *value; |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
433 |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
434 BLOCK_INPUT; |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
435 __malloc_hook = old_malloc_hook; |
|
17831
9238a2254a23
(BYTES_USED): Put # at the beginning of line.
Kenichi Handa <handa@m17n.org>
parents:
17348
diff
changeset
|
436 #ifdef DOUG_LEA_MALLOC |
|
17345
4e11e27ce1f1
For glibc's malloc, include <malloc.h> for mallinfo,
Richard M. Stallman <rms@gnu.org>
parents:
17328
diff
changeset
|
437 mallopt (M_TOP_PAD, malloc_hysteresis * 4096); |
|
17831
9238a2254a23
(BYTES_USED): Put # at the beginning of line.
Kenichi Handa <handa@m17n.org>
parents:
17348
diff
changeset
|
438 #else |
|
17345
4e11e27ce1f1
For glibc's malloc, include <malloc.h> for mallinfo,
Richard M. Stallman <rms@gnu.org>
parents:
17328
diff
changeset
|
439 __malloc_extra_blocks = malloc_hysteresis; |
|
17831
9238a2254a23
(BYTES_USED): Put # at the beginning of line.
Kenichi Handa <handa@m17n.org>
parents:
17348
diff
changeset
|
440 #endif |
|
3581
152fd924c7bb
* alloc.c (emacs_blocked_malloc, emacs_blocked_realloc): Cast the
Jim Blandy <jimb@redhat.com>
parents:
3536
diff
changeset
|
441 value = (void *) malloc (size); |
|
2507
7ba4316ae840
* alloc.c (__malloc_hook, __realloc_hook, __free_hook): Declare
Jim Blandy <jimb@redhat.com>
parents:
2439
diff
changeset
|
442 __malloc_hook = emacs_blocked_malloc; |
|
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
443 UNBLOCK_INPUT; |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
444 |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
445 return value; |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
446 } |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
447 |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
448 static void * |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
449 emacs_blocked_realloc (ptr, size) |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
450 void *ptr; |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
451 unsigned size; |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
452 { |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
453 void *value; |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
454 |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
455 BLOCK_INPUT; |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
456 __realloc_hook = old_realloc_hook; |
|
3581
152fd924c7bb
* alloc.c (emacs_blocked_malloc, emacs_blocked_realloc): Cast the
Jim Blandy <jimb@redhat.com>
parents:
3536
diff
changeset
|
457 value = (void *) realloc (ptr, size); |
|
2507
7ba4316ae840
* alloc.c (__malloc_hook, __realloc_hook, __free_hook): Declare
Jim Blandy <jimb@redhat.com>
parents:
2439
diff
changeset
|
458 __realloc_hook = emacs_blocked_realloc; |
|
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
459 UNBLOCK_INPUT; |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
460 |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
461 return value; |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
462 } |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
463 |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
464 void |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
465 uninterrupt_malloc () |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
466 { |
|
23958
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
467 if (__free_hook != emacs_blocked_free) |
|
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
468 old_free_hook = __free_hook; |
|
2507
7ba4316ae840
* alloc.c (__malloc_hook, __realloc_hook, __free_hook): Declare
Jim Blandy <jimb@redhat.com>
parents:
2439
diff
changeset
|
469 __free_hook = emacs_blocked_free; |
|
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
470 |
|
23958
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
471 if (__malloc_hook != emacs_blocked_malloc) |
|
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
472 old_malloc_hook = __malloc_hook; |
|
2507
7ba4316ae840
* alloc.c (__malloc_hook, __realloc_hook, __free_hook): Declare
Jim Blandy <jimb@redhat.com>
parents:
2439
diff
changeset
|
473 __malloc_hook = emacs_blocked_malloc; |
|
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
474 |
|
23958
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
475 if (__realloc_hook != emacs_blocked_realloc) |
|
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
476 old_realloc_hook = __realloc_hook; |
|
2507
7ba4316ae840
* alloc.c (__malloc_hook, __realloc_hook, __free_hook): Declare
Jim Blandy <jimb@redhat.com>
parents:
2439
diff
changeset
|
477 __realloc_hook = emacs_blocked_realloc; |
|
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
478 } |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
479 #endif |
| 300 | 480 |
|
1908
d649f2179d67
* alloc.c (make_pure_float): Align pureptr on a sizeof (double)
Jim Blandy <jimb@redhat.com>
parents:
1893
diff
changeset
|
481 /* Interval allocation. */ |
|
d649f2179d67
* alloc.c (make_pure_float): Align pureptr on a sizeof (double)
Jim Blandy <jimb@redhat.com>
parents:
1893
diff
changeset
|
482 |
|
1300
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
483 #ifdef USE_TEXT_PROPERTIES |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
484 #define INTERVAL_BLOCK_SIZE \ |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
485 ((1020 - sizeof (struct interval_block *)) / sizeof (struct interval)) |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
486 |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
487 struct interval_block |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
488 { |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
489 struct interval_block *next; |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
490 struct interval intervals[INTERVAL_BLOCK_SIZE]; |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
491 }; |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
492 |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
493 struct interval_block *interval_block; |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
494 static int interval_block_index; |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
495 |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
496 INTERVAL interval_free_list; |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
497 |
|
23958
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
498 /* Total number of interval blocks now in use. */ |
|
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
499 int n_interval_blocks; |
|
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
500 |
|
1300
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
501 static void |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
502 init_intervals () |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
503 { |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
504 interval_block |
|
23958
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
505 = (struct interval_block *) lisp_malloc (sizeof (struct interval_block)); |
|
1300
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
506 interval_block->next = 0; |
|
13320
e0f3a961851a
Cast first arg to bzero.
Richard M. Stallman <rms@gnu.org>
parents:
13219
diff
changeset
|
507 bzero ((char *) interval_block->intervals, sizeof interval_block->intervals); |
|
1300
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
508 interval_block_index = 0; |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
509 interval_free_list = 0; |
|
23958
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
510 n_interval_blocks = 1; |
|
1300
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
511 } |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
512 |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
513 #define INIT_INTERVALS init_intervals () |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
514 |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
515 INTERVAL |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
516 make_interval () |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
517 { |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
518 INTERVAL val; |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
519 |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
520 if (interval_free_list) |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
521 { |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
522 val = interval_free_list; |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
523 interval_free_list = interval_free_list->parent; |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
524 } |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
525 else |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
526 { |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
527 if (interval_block_index == INTERVAL_BLOCK_SIZE) |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
528 { |
| 12529 | 529 register struct interval_block *newi; |
|
1300
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
530 |
|
23958
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
531 newi = (struct interval_block *) lisp_malloc (sizeof (struct interval_block)); |
|
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
532 |
|
1300
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
533 VALIDATE_LISP_STORAGE (newi, sizeof *newi); |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
534 newi->next = interval_block; |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
535 interval_block = newi; |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
536 interval_block_index = 0; |
|
23958
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
537 n_interval_blocks++; |
|
1300
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
538 } |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
539 val = &interval_block->intervals[interval_block_index++]; |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
540 } |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
541 consing_since_gc += sizeof (struct interval); |
|
12748
3433bb446e06
(cons_cells_consed, floats_consed, vector_cells_consed)
Richard M. Stallman <rms@gnu.org>
parents:
12605
diff
changeset
|
542 intervals_consed++; |
|
1300
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
543 RESET_INTERVAL (val); |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
544 return val; |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
545 } |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
546 |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
547 static int total_free_intervals, total_intervals; |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
548 |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
549 /* Mark the pointers of one interval. */ |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
550 |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
551 static void |
|
1957
54c8c66cd9ac
(mark_interval): Add ignored arg.
Richard M. Stallman <rms@gnu.org>
parents:
1939
diff
changeset
|
552 mark_interval (i, dummy) |
|
1300
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
553 register INTERVAL i; |
|
1957
54c8c66cd9ac
(mark_interval): Add ignored arg.
Richard M. Stallman <rms@gnu.org>
parents:
1939
diff
changeset
|
554 Lisp_Object dummy; |
|
1300
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
555 { |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
556 if (XMARKBIT (i->plist)) |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
557 abort (); |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
558 mark_object (&i->plist); |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
559 XMARK (i->plist); |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
560 } |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
561 |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
562 static void |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
563 mark_interval_tree (tree) |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
564 register INTERVAL tree; |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
565 { |
|
4139
0b32ee899a3a
Consistently use the mark bit of the root interval's parent field
Jim Blandy <jimb@redhat.com>
parents:
4087
diff
changeset
|
566 /* No need to test if this tree has been marked already; this |
|
0b32ee899a3a
Consistently use the mark bit of the root interval's parent field
Jim Blandy <jimb@redhat.com>
parents:
4087
diff
changeset
|
567 function is always called through the MARK_INTERVAL_TREE macro, |
|
0b32ee899a3a
Consistently use the mark bit of the root interval's parent field
Jim Blandy <jimb@redhat.com>
parents:
4087
diff
changeset
|
568 which takes care of that. */ |
|
0b32ee899a3a
Consistently use the mark bit of the root interval's parent field
Jim Blandy <jimb@redhat.com>
parents:
4087
diff
changeset
|
569 |
|
0b32ee899a3a
Consistently use the mark bit of the root interval's parent field
Jim Blandy <jimb@redhat.com>
parents:
4087
diff
changeset
|
570 /* XMARK expands to an assignment; the LHS of an assignment can't be |
|
0b32ee899a3a
Consistently use the mark bit of the root interval's parent field
Jim Blandy <jimb@redhat.com>
parents:
4087
diff
changeset
|
571 a cast. */ |
|
0b32ee899a3a
Consistently use the mark bit of the root interval's parent field
Jim Blandy <jimb@redhat.com>
parents:
4087
diff
changeset
|
572 XMARK (* (Lisp_Object *) &tree->parent); |
|
1300
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
573 |
|
1957
54c8c66cd9ac
(mark_interval): Add ignored arg.
Richard M. Stallman <rms@gnu.org>
parents:
1939
diff
changeset
|
574 traverse_intervals (tree, 1, 0, mark_interval, Qnil); |
|
1300
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
575 } |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
576 |
|
4139
0b32ee899a3a
Consistently use the mark bit of the root interval's parent field
Jim Blandy <jimb@redhat.com>
parents:
4087
diff
changeset
|
577 #define MARK_INTERVAL_TREE(i) \ |
|
0b32ee899a3a
Consistently use the mark bit of the root interval's parent field
Jim Blandy <jimb@redhat.com>
parents:
4087
diff
changeset
|
578 do { \ |
|
0b32ee899a3a
Consistently use the mark bit of the root interval's parent field
Jim Blandy <jimb@redhat.com>
parents:
4087
diff
changeset
|
579 if (!NULL_INTERVAL_P (i) \ |
|
18621
53b95f307c75
(memory_full): Pass Qnil to Fsignal for ERROR_SYMBOL.
Richard M. Stallman <rms@gnu.org>
parents:
18104
diff
changeset
|
580 && ! XMARKBIT (*(Lisp_Object *) &i->parent)) \ |
|
4139
0b32ee899a3a
Consistently use the mark bit of the root interval's parent field
Jim Blandy <jimb@redhat.com>
parents:
4087
diff
changeset
|
581 mark_interval_tree (i); \ |
|
0b32ee899a3a
Consistently use the mark bit of the root interval's parent field
Jim Blandy <jimb@redhat.com>
parents:
4087
diff
changeset
|
582 } while (0) |
|
1300
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
583 |
|
1908
d649f2179d67
* alloc.c (make_pure_float): Align pureptr on a sizeof (double)
Jim Blandy <jimb@redhat.com>
parents:
1893
diff
changeset
|
584 /* The oddity in the call to XUNMARK is necessary because XUNMARK |
|
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3581
diff
changeset
|
585 expands to an assignment to its argument, and most C compilers don't |
|
1908
d649f2179d67
* alloc.c (make_pure_float): Align pureptr on a sizeof (double)
Jim Blandy <jimb@redhat.com>
parents:
1893
diff
changeset
|
586 support casts on the left operand of `='. */ |
|
d649f2179d67
* alloc.c (make_pure_float): Align pureptr on a sizeof (double)
Jim Blandy <jimb@redhat.com>
parents:
1893
diff
changeset
|
587 #define UNMARK_BALANCE_INTERVALS(i) \ |
|
d649f2179d67
* alloc.c (make_pure_float): Align pureptr on a sizeof (double)
Jim Blandy <jimb@redhat.com>
parents:
1893
diff
changeset
|
588 { \ |
|
d649f2179d67
* alloc.c (make_pure_float): Align pureptr on a sizeof (double)
Jim Blandy <jimb@redhat.com>
parents:
1893
diff
changeset
|
589 if (! NULL_INTERVAL_P (i)) \ |
|
d649f2179d67
* alloc.c (make_pure_float): Align pureptr on a sizeof (double)
Jim Blandy <jimb@redhat.com>
parents:
1893
diff
changeset
|
590 { \ |
|
d649f2179d67
* alloc.c (make_pure_float): Align pureptr on a sizeof (double)
Jim Blandy <jimb@redhat.com>
parents:
1893
diff
changeset
|
591 XUNMARK (* (Lisp_Object *) (&(i)->parent)); \ |
|
d649f2179d67
* alloc.c (make_pure_float): Align pureptr on a sizeof (double)
Jim Blandy <jimb@redhat.com>
parents:
1893
diff
changeset
|
592 (i) = balance_intervals (i); \ |
|
d649f2179d67
* alloc.c (make_pure_float): Align pureptr on a sizeof (double)
Jim Blandy <jimb@redhat.com>
parents:
1893
diff
changeset
|
593 } \ |
|
1300
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
594 } |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
595 |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
596 #else /* no interval use */ |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
597 |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
598 #define INIT_INTERVALS |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
599 |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
600 #define UNMARK_BALANCE_INTERVALS(i) |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
601 #define MARK_INTERVAL_TREE(i) |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
602 |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
603 #endif /* no interval use */ |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
604 |
|
1908
d649f2179d67
* alloc.c (make_pure_float): Align pureptr on a sizeof (double)
Jim Blandy <jimb@redhat.com>
parents:
1893
diff
changeset
|
605 /* Floating point allocation. */ |
|
d649f2179d67
* alloc.c (make_pure_float): Align pureptr on a sizeof (double)
Jim Blandy <jimb@redhat.com>
parents:
1893
diff
changeset
|
606 |
| 300 | 607 #ifdef LISP_FLOAT_TYPE |
| 608 /* Allocation of float cells, just like conses */ | |
| 609 /* We store float cells inside of float_blocks, allocating a new | |
| 610 float_block with malloc whenever necessary. Float cells reclaimed by | |
| 611 GC are put on a free list to be reallocated before allocating | |
| 612 any new float cells from the latest float_block. | |
| 613 | |
| 614 Each float_block is just under 1020 bytes long, | |
| 615 since malloc really allocates in units of powers of two | |
| 616 and uses 4 bytes for its own overhead. */ | |
| 617 | |
| 618 #define FLOAT_BLOCK_SIZE \ | |
| 619 ((1020 - sizeof (struct float_block *)) / sizeof (struct Lisp_Float)) | |
| 620 | |
| 621 struct float_block | |
| 622 { | |
| 623 struct float_block *next; | |
| 624 struct Lisp_Float floats[FLOAT_BLOCK_SIZE]; | |
| 625 }; | |
| 626 | |
| 627 struct float_block *float_block; | |
| 628 int float_block_index; | |
| 629 | |
|
23958
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
630 /* Total number of float blocks now in use. */ |
|
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
631 int n_float_blocks; |
|
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
632 |
| 300 | 633 struct Lisp_Float *float_free_list; |
| 634 | |
| 635 void | |
| 636 init_float () | |
| 637 { | |
|
23958
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
638 float_block = (struct float_block *) lisp_malloc (sizeof (struct float_block)); |
| 300 | 639 float_block->next = 0; |
|
13320
e0f3a961851a
Cast first arg to bzero.
Richard M. Stallman <rms@gnu.org>
parents:
13219
diff
changeset
|
640 bzero ((char *) float_block->floats, sizeof float_block->floats); |
| 300 | 641 float_block_index = 0; |
| 642 float_free_list = 0; | |
|
23958
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
643 n_float_blocks = 1; |
| 300 | 644 } |
| 645 | |
| 646 /* Explicitly free a float cell. */ | |
| 21514 | 647 void |
| 300 | 648 free_float (ptr) |
| 649 struct Lisp_Float *ptr; | |
| 650 { | |
|
19666
81957e8b80e2
(free_float, free_cons): Don't use the same field for chaining as for marking.
Richard M. Stallman <rms@gnu.org>
parents:
19621
diff
changeset
|
651 *(struct Lisp_Float **)&ptr->data = float_free_list; |
| 300 | 652 float_free_list = ptr; |
| 653 } | |
| 654 | |
| 655 Lisp_Object | |
| 656 make_float (float_value) | |
| 657 double float_value; | |
| 658 { | |
| 659 register Lisp_Object val; | |
| 660 | |
| 661 if (float_free_list) | |
| 662 { | |
|
19666
81957e8b80e2
(free_float, free_cons): Don't use the same field for chaining as for marking.
Richard M. Stallman <rms@gnu.org>
parents:
19621
diff
changeset
|
663 /* We use the data field for chaining the free list |
|
81957e8b80e2
(free_float, free_cons): Don't use the same field for chaining as for marking.
Richard M. Stallman <rms@gnu.org>
parents:
19621
diff
changeset
|
664 so that we won't use the same field that has the mark bit. */ |
|
9261
e5ba7993d378
(VALIDATE_LISP_STORAGE, make_float, Fcons, Fmake_vector, Fmake_symbol,
Karl Heuer <kwzh@gnu.org>
parents:
9144
diff
changeset
|
665 XSETFLOAT (val, float_free_list); |
|
19666
81957e8b80e2
(free_float, free_cons): Don't use the same field for chaining as for marking.
Richard M. Stallman <rms@gnu.org>
parents:
19621
diff
changeset
|
666 float_free_list = *(struct Lisp_Float **)&float_free_list->data; |
| 300 | 667 } |
| 668 else | |
| 669 { | |
| 670 if (float_block_index == FLOAT_BLOCK_SIZE) | |
| 671 { | |
| 12529 | 672 register struct float_block *new; |
| 673 | |
|
23958
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
674 new = (struct float_block *) lisp_malloc (sizeof (struct float_block)); |
| 300 | 675 VALIDATE_LISP_STORAGE (new, sizeof *new); |
| 676 new->next = float_block; | |
| 677 float_block = new; | |
| 678 float_block_index = 0; | |
|
23958
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
679 n_float_blocks++; |
| 300 | 680 } |
|
9261
e5ba7993d378
(VALIDATE_LISP_STORAGE, make_float, Fcons, Fmake_vector, Fmake_symbol,
Karl Heuer <kwzh@gnu.org>
parents:
9144
diff
changeset
|
681 XSETFLOAT (val, &float_block->floats[float_block_index++]); |
| 300 | 682 } |
| 683 XFLOAT (val)->data = float_value; | |
|
9295
17d393a8eed6
(free_float, make_float, free_cons, Flist, Fvector, Fmake_byte_code,
Karl Heuer <kwzh@gnu.org>
parents:
9261
diff
changeset
|
684 XSETFASTINT (XFLOAT (val)->type, 0); /* bug chasing -wsr */ |
| 300 | 685 consing_since_gc += sizeof (struct Lisp_Float); |
|
12748
3433bb446e06
(cons_cells_consed, floats_consed, vector_cells_consed)
Richard M. Stallman <rms@gnu.org>
parents:
12605
diff
changeset
|
686 floats_consed++; |
| 300 | 687 return val; |
| 688 } | |
| 689 | |
| 690 #endif /* LISP_FLOAT_TYPE */ | |
| 691 | |
| 692 /* Allocation of cons cells */ | |
| 693 /* We store cons cells inside of cons_blocks, allocating a new | |
| 694 cons_block with malloc whenever necessary. Cons cells reclaimed by | |
| 695 GC are put on a free list to be reallocated before allocating | |
| 696 any new cons cells from the latest cons_block. | |
| 697 | |
| 698 Each cons_block is just under 1020 bytes long, | |
| 699 since malloc really allocates in units of powers of two | |
| 700 and uses 4 bytes for its own overhead. */ | |
| 701 | |
| 702 #define CONS_BLOCK_SIZE \ | |
| 703 ((1020 - sizeof (struct cons_block *)) / sizeof (struct Lisp_Cons)) | |
| 704 | |
| 705 struct cons_block | |
| 706 { | |
| 707 struct cons_block *next; | |
| 708 struct Lisp_Cons conses[CONS_BLOCK_SIZE]; | |
| 709 }; | |
| 710 | |
| 711 struct cons_block *cons_block; | |
| 712 int cons_block_index; | |
| 713 | |
| 714 struct Lisp_Cons *cons_free_list; | |
| 715 | |
|
23958
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
716 /* Total number of cons blocks now in use. */ |
|
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
717 int n_cons_blocks; |
|
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
718 |
| 300 | 719 void |
| 720 init_cons () | |
| 721 { | |
|
23958
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
722 cons_block = (struct cons_block *) lisp_malloc (sizeof (struct cons_block)); |
| 300 | 723 cons_block->next = 0; |
|
13320
e0f3a961851a
Cast first arg to bzero.
Richard M. Stallman <rms@gnu.org>
parents:
13219
diff
changeset
|
724 bzero ((char *) cons_block->conses, sizeof cons_block->conses); |
| 300 | 725 cons_block_index = 0; |
| 726 cons_free_list = 0; | |
|
23958
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
727 n_cons_blocks = 1; |
| 300 | 728 } |
| 729 | |
| 730 /* Explicitly free a cons cell. */ | |
|
20375
1dd0bd0749b5
(malloc_warning, display_malloc_warning): Return void.
Andreas Schwab <schwab@suse.de>
parents:
20057
diff
changeset
|
731 |
|
1dd0bd0749b5
(malloc_warning, display_malloc_warning): Return void.
Andreas Schwab <schwab@suse.de>
parents:
20057
diff
changeset
|
732 void |
| 300 | 733 free_cons (ptr) |
| 734 struct Lisp_Cons *ptr; | |
| 735 { | |
|
19666
81957e8b80e2
(free_float, free_cons): Don't use the same field for chaining as for marking.
Richard M. Stallman <rms@gnu.org>
parents:
19621
diff
changeset
|
736 *(struct Lisp_Cons **)&ptr->cdr = cons_free_list; |
| 300 | 737 cons_free_list = ptr; |
| 738 } | |
| 739 | |
| 740 DEFUN ("cons", Fcons, Scons, 2, 2, 0, | |
| 741 "Create a new cons, give it CAR and CDR as components, and return it.") | |
| 742 (car, cdr) | |
| 743 Lisp_Object car, cdr; | |
| 744 { | |
| 745 register Lisp_Object val; | |
| 746 | |
| 747 if (cons_free_list) | |
| 748 { | |
|
19666
81957e8b80e2
(free_float, free_cons): Don't use the same field for chaining as for marking.
Richard M. Stallman <rms@gnu.org>
parents:
19621
diff
changeset
|
749 /* We use the cdr for chaining the free list |
|
81957e8b80e2
(free_float, free_cons): Don't use the same field for chaining as for marking.
Richard M. Stallman <rms@gnu.org>
parents:
19621
diff
changeset
|
750 so that we won't use the same field that has the mark bit. */ |
|
9261
e5ba7993d378
(VALIDATE_LISP_STORAGE, make_float, Fcons, Fmake_vector, Fmake_symbol,
Karl Heuer <kwzh@gnu.org>
parents:
9144
diff
changeset
|
751 XSETCONS (val, cons_free_list); |
|
19666
81957e8b80e2
(free_float, free_cons): Don't use the same field for chaining as for marking.
Richard M. Stallman <rms@gnu.org>
parents:
19621
diff
changeset
|
752 cons_free_list = *(struct Lisp_Cons **)&cons_free_list->cdr; |
| 300 | 753 } |
| 754 else | |
| 755 { | |
| 756 if (cons_block_index == CONS_BLOCK_SIZE) | |
| 757 { | |
| 12529 | 758 register struct cons_block *new; |
|
23958
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
759 new = (struct cons_block *) lisp_malloc (sizeof (struct cons_block)); |
| 300 | 760 VALIDATE_LISP_STORAGE (new, sizeof *new); |
| 761 new->next = cons_block; | |
| 762 cons_block = new; | |
| 763 cons_block_index = 0; | |
|
23958
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
764 n_cons_blocks++; |
| 300 | 765 } |
|
9261
e5ba7993d378
(VALIDATE_LISP_STORAGE, make_float, Fcons, Fmake_vector, Fmake_symbol,
Karl Heuer <kwzh@gnu.org>
parents:
9144
diff
changeset
|
766 XSETCONS (val, &cons_block->conses[cons_block_index++]); |
| 300 | 767 } |
| 768 XCONS (val)->car = car; | |
| 769 XCONS (val)->cdr = cdr; | |
| 770 consing_since_gc += sizeof (struct Lisp_Cons); | |
|
12748
3433bb446e06
(cons_cells_consed, floats_consed, vector_cells_consed)
Richard M. Stallman <rms@gnu.org>
parents:
12605
diff
changeset
|
771 cons_cells_consed++; |
| 300 | 772 return val; |
| 773 } | |
|
20849
3b2f72ed135c
(list2, list3, list4, list5): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
20768
diff
changeset
|
774 |
|
3b2f72ed135c
(list2, list3, list4, list5): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
20768
diff
changeset
|
775 /* Make a list of 2, 3, 4 or 5 specified objects. */ |
|
3b2f72ed135c
(list2, list3, list4, list5): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
20768
diff
changeset
|
776 |
|
3b2f72ed135c
(list2, list3, list4, list5): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
20768
diff
changeset
|
777 Lisp_Object |
|
3b2f72ed135c
(list2, list3, list4, list5): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
20768
diff
changeset
|
778 list2 (arg1, arg2) |
|
3b2f72ed135c
(list2, list3, list4, list5): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
20768
diff
changeset
|
779 Lisp_Object arg1, arg2; |
|
3b2f72ed135c
(list2, list3, list4, list5): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
20768
diff
changeset
|
780 { |
|
3b2f72ed135c
(list2, list3, list4, list5): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
20768
diff
changeset
|
781 return Fcons (arg1, Fcons (arg2, Qnil)); |
|
3b2f72ed135c
(list2, list3, list4, list5): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
20768
diff
changeset
|
782 } |
|
3b2f72ed135c
(list2, list3, list4, list5): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
20768
diff
changeset
|
783 |
|
3b2f72ed135c
(list2, list3, list4, list5): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
20768
diff
changeset
|
784 Lisp_Object |
|
3b2f72ed135c
(list2, list3, list4, list5): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
20768
diff
changeset
|
785 list3 (arg1, arg2, arg3) |
|
3b2f72ed135c
(list2, list3, list4, list5): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
20768
diff
changeset
|
786 Lisp_Object arg1, arg2, arg3; |
|
3b2f72ed135c
(list2, list3, list4, list5): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
20768
diff
changeset
|
787 { |
|
3b2f72ed135c
(list2, list3, list4, list5): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
20768
diff
changeset
|
788 return Fcons (arg1, Fcons (arg2, Fcons (arg3, Qnil))); |
|
3b2f72ed135c
(list2, list3, list4, list5): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
20768
diff
changeset
|
789 } |
|
3b2f72ed135c
(list2, list3, list4, list5): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
20768
diff
changeset
|
790 |
|
3b2f72ed135c
(list2, list3, list4, list5): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
20768
diff
changeset
|
791 Lisp_Object |
|
3b2f72ed135c
(list2, list3, list4, list5): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
20768
diff
changeset
|
792 list4 (arg1, arg2, arg3, arg4) |
|
3b2f72ed135c
(list2, list3, list4, list5): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
20768
diff
changeset
|
793 Lisp_Object arg1, arg2, arg3, arg4; |
|
3b2f72ed135c
(list2, list3, list4, list5): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
20768
diff
changeset
|
794 { |
|
3b2f72ed135c
(list2, list3, list4, list5): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
20768
diff
changeset
|
795 return Fcons (arg1, Fcons (arg2, Fcons (arg3, Fcons (arg4, Qnil)))); |
|
3b2f72ed135c
(list2, list3, list4, list5): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
20768
diff
changeset
|
796 } |
|
3b2f72ed135c
(list2, list3, list4, list5): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
20768
diff
changeset
|
797 |
|
3b2f72ed135c
(list2, list3, list4, list5): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
20768
diff
changeset
|
798 Lisp_Object |
|
3b2f72ed135c
(list2, list3, list4, list5): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
20768
diff
changeset
|
799 list5 (arg1, arg2, arg3, arg4, arg5) |
|
3b2f72ed135c
(list2, list3, list4, list5): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
20768
diff
changeset
|
800 Lisp_Object arg1, arg2, arg3, arg4, arg5; |
|
3b2f72ed135c
(list2, list3, list4, list5): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
20768
diff
changeset
|
801 { |
|
3b2f72ed135c
(list2, list3, list4, list5): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
20768
diff
changeset
|
802 return Fcons (arg1, Fcons (arg2, Fcons (arg3, Fcons (arg4, |
|
3b2f72ed135c
(list2, list3, list4, list5): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
20768
diff
changeset
|
803 Fcons (arg5, Qnil))))); |
|
3b2f72ed135c
(list2, list3, list4, list5): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
20768
diff
changeset
|
804 } |
| 300 | 805 |
| 806 DEFUN ("list", Flist, Slist, 0, MANY, 0, | |
| 807 "Return a newly created list with specified arguments as elements.\n\ | |
| 808 Any number of arguments, even zero arguments, are allowed.") | |
| 809 (nargs, args) | |
| 810 int nargs; | |
| 811 register Lisp_Object *args; | |
| 812 { | |
|
13610
8e82e46aa77b
(Flist): Avoid using -- in while condition.
Richard M. Stallman <rms@gnu.org>
parents:
13553
diff
changeset
|
813 register Lisp_Object val; |
|
8e82e46aa77b
(Flist): Avoid using -- in while condition.
Richard M. Stallman <rms@gnu.org>
parents:
13553
diff
changeset
|
814 val = Qnil; |
| 300 | 815 |
|
13610
8e82e46aa77b
(Flist): Avoid using -- in while condition.
Richard M. Stallman <rms@gnu.org>
parents:
13553
diff
changeset
|
816 while (nargs > 0) |
|
8e82e46aa77b
(Flist): Avoid using -- in while condition.
Richard M. Stallman <rms@gnu.org>
parents:
13553
diff
changeset
|
817 { |
|
8e82e46aa77b
(Flist): Avoid using -- in while condition.
Richard M. Stallman <rms@gnu.org>
parents:
13553
diff
changeset
|
818 nargs--; |
|
8e82e46aa77b
(Flist): Avoid using -- in while condition.
Richard M. Stallman <rms@gnu.org>
parents:
13553
diff
changeset
|
819 val = Fcons (args[nargs], val); |
|
8e82e46aa77b
(Flist): Avoid using -- in while condition.
Richard M. Stallman <rms@gnu.org>
parents:
13553
diff
changeset
|
820 } |
| 300 | 821 return val; |
| 822 } | |
| 823 | |
| 824 DEFUN ("make-list", Fmake_list, Smake_list, 2, 2, 0, | |
| 825 "Return a newly created list of length LENGTH, with each element being INIT.") | |
| 826 (length, init) | |
| 827 register Lisp_Object length, init; | |
| 828 { | |
| 829 register Lisp_Object val; | |
| 830 register int size; | |
| 831 | |
|
9953
e0672d4cf470
(Fmake_list, Fmake_vector, Fmake_string): Use CHECK_NATNUM instead of its
Karl Heuer <kwzh@gnu.org>
parents:
9942
diff
changeset
|
832 CHECK_NATNUM (length, 0); |
|
e0672d4cf470
(Fmake_list, Fmake_vector, Fmake_string): Use CHECK_NATNUM instead of its
Karl Heuer <kwzh@gnu.org>
parents:
9942
diff
changeset
|
833 size = XFASTINT (length); |
| 300 | 834 |
| 835 val = Qnil; | |
| 836 while (size-- > 0) | |
| 837 val = Fcons (init, val); | |
| 838 return val; | |
| 839 } | |
| 840 | |
| 841 /* Allocation of vectors */ | |
| 842 | |
| 843 struct Lisp_Vector *all_vectors; | |
| 844 | |
|
23958
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
845 /* Total number of vectorlike objects now in use. */ |
|
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
846 int n_vectors; |
|
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
847 |
|
9968
943a61c764a5
(Fmake_vector): Call allocate_vectorlike.
Karl Heuer <kwzh@gnu.org>
parents:
9953
diff
changeset
|
848 struct Lisp_Vector * |
|
943a61c764a5
(Fmake_vector): Call allocate_vectorlike.
Karl Heuer <kwzh@gnu.org>
parents:
9953
diff
changeset
|
849 allocate_vectorlike (len) |
|
943a61c764a5
(Fmake_vector): Call allocate_vectorlike.
Karl Heuer <kwzh@gnu.org>
parents:
9953
diff
changeset
|
850 EMACS_INT len; |
|
943a61c764a5
(Fmake_vector): Call allocate_vectorlike.
Karl Heuer <kwzh@gnu.org>
parents:
9953
diff
changeset
|
851 { |
|
943a61c764a5
(Fmake_vector): Call allocate_vectorlike.
Karl Heuer <kwzh@gnu.org>
parents:
9953
diff
changeset
|
852 struct Lisp_Vector *p; |
|
943a61c764a5
(Fmake_vector): Call allocate_vectorlike.
Karl Heuer <kwzh@gnu.org>
parents:
9953
diff
changeset
|
853 |
|
17345
4e11e27ce1f1
For glibc's malloc, include <malloc.h> for mallinfo,
Richard M. Stallman <rms@gnu.org>
parents:
17328
diff
changeset
|
854 #ifdef DOUG_LEA_MALLOC |
|
4e11e27ce1f1
For glibc's malloc, include <malloc.h> for mallinfo,
Richard M. Stallman <rms@gnu.org>
parents:
17328
diff
changeset
|
855 /* Prevent mmap'ing the chunk (which is potentially very large). */ |
|
4e11e27ce1f1
For glibc's malloc, include <malloc.h> for mallinfo,
Richard M. Stallman <rms@gnu.org>
parents:
17328
diff
changeset
|
856 mallopt (M_MMAP_MAX, 0); |
|
4e11e27ce1f1
For glibc's malloc, include <malloc.h> for mallinfo,
Richard M. Stallman <rms@gnu.org>
parents:
17328
diff
changeset
|
857 #endif |
|
23958
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
858 p = (struct Lisp_Vector *)lisp_malloc (sizeof (struct Lisp_Vector) |
|
9968
943a61c764a5
(Fmake_vector): Call allocate_vectorlike.
Karl Heuer <kwzh@gnu.org>
parents:
9953
diff
changeset
|
859 + (len - 1) * sizeof (Lisp_Object)); |
|
17345
4e11e27ce1f1
For glibc's malloc, include <malloc.h> for mallinfo,
Richard M. Stallman <rms@gnu.org>
parents:
17328
diff
changeset
|
860 #ifdef DOUG_LEA_MALLOC |
|
4e11e27ce1f1
For glibc's malloc, include <malloc.h> for mallinfo,
Richard M. Stallman <rms@gnu.org>
parents:
17328
diff
changeset
|
861 /* Back to a reasonable maximum of mmap'ed areas. */ |
|
23973
2eb9e2f5aa33
(MMAP_MAX_AREAS): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
23958
diff
changeset
|
862 mallopt (M_MMAP_MAX, MMAP_MAX_AREAS); |
|
17345
4e11e27ce1f1
For glibc's malloc, include <malloc.h> for mallinfo,
Richard M. Stallman <rms@gnu.org>
parents:
17328
diff
changeset
|
863 #endif |
|
9968
943a61c764a5
(Fmake_vector): Call allocate_vectorlike.
Karl Heuer <kwzh@gnu.org>
parents:
9953
diff
changeset
|
864 VALIDATE_LISP_STORAGE (p, 0); |
|
943a61c764a5
(Fmake_vector): Call allocate_vectorlike.
Karl Heuer <kwzh@gnu.org>
parents:
9953
diff
changeset
|
865 consing_since_gc += (sizeof (struct Lisp_Vector) |
|
943a61c764a5
(Fmake_vector): Call allocate_vectorlike.
Karl Heuer <kwzh@gnu.org>
parents:
9953
diff
changeset
|
866 + (len - 1) * sizeof (Lisp_Object)); |
|
12748
3433bb446e06
(cons_cells_consed, floats_consed, vector_cells_consed)
Richard M. Stallman <rms@gnu.org>
parents:
12605
diff
changeset
|
867 vector_cells_consed += len; |
|
25133
11070f3c5b59
(allocate_vectorlike): Add missing increment.
Karl Heuer <kwzh@gnu.org>
parents:
25024
diff
changeset
|
868 n_vectors++; |
|
9968
943a61c764a5
(Fmake_vector): Call allocate_vectorlike.
Karl Heuer <kwzh@gnu.org>
parents:
9953
diff
changeset
|
869 |
|
943a61c764a5
(Fmake_vector): Call allocate_vectorlike.
Karl Heuer <kwzh@gnu.org>
parents:
9953
diff
changeset
|
870 p->next = all_vectors; |
|
943a61c764a5
(Fmake_vector): Call allocate_vectorlike.
Karl Heuer <kwzh@gnu.org>
parents:
9953
diff
changeset
|
871 all_vectors = p; |
|
943a61c764a5
(Fmake_vector): Call allocate_vectorlike.
Karl Heuer <kwzh@gnu.org>
parents:
9953
diff
changeset
|
872 return p; |
|
943a61c764a5
(Fmake_vector): Call allocate_vectorlike.
Karl Heuer <kwzh@gnu.org>
parents:
9953
diff
changeset
|
873 } |
|
943a61c764a5
(Fmake_vector): Call allocate_vectorlike.
Karl Heuer <kwzh@gnu.org>
parents:
9953
diff
changeset
|
874 |
| 300 | 875 DEFUN ("make-vector", Fmake_vector, Smake_vector, 2, 2, 0, |
| 876 "Return a newly created vector of length LENGTH, with each element being INIT.\n\ | |
| 877 See also the function `vector'.") | |
| 878 (length, init) | |
| 879 register Lisp_Object length, init; | |
| 880 { | |
|
9968
943a61c764a5
(Fmake_vector): Call allocate_vectorlike.
Karl Heuer <kwzh@gnu.org>
parents:
9953
diff
changeset
|
881 Lisp_Object vector; |
|
943a61c764a5
(Fmake_vector): Call allocate_vectorlike.
Karl Heuer <kwzh@gnu.org>
parents:
9953
diff
changeset
|
882 register EMACS_INT sizei; |
|
943a61c764a5
(Fmake_vector): Call allocate_vectorlike.
Karl Heuer <kwzh@gnu.org>
parents:
9953
diff
changeset
|
883 register int index; |
| 300 | 884 register struct Lisp_Vector *p; |
| 885 | |
|
9953
e0672d4cf470
(Fmake_list, Fmake_vector, Fmake_string): Use CHECK_NATNUM instead of its
Karl Heuer <kwzh@gnu.org>
parents:
9942
diff
changeset
|
886 CHECK_NATNUM (length, 0); |
|
e0672d4cf470
(Fmake_list, Fmake_vector, Fmake_string): Use CHECK_NATNUM instead of its
Karl Heuer <kwzh@gnu.org>
parents:
9942
diff
changeset
|
887 sizei = XFASTINT (length); |
| 300 | 888 |
|
9968
943a61c764a5
(Fmake_vector): Call allocate_vectorlike.
Karl Heuer <kwzh@gnu.org>
parents:
9953
diff
changeset
|
889 p = allocate_vectorlike (sizei); |
| 300 | 890 p->size = sizei; |
| 891 for (index = 0; index < sizei; index++) | |
| 892 p->contents[index] = init; | |
| 893 | |
|
9968
943a61c764a5
(Fmake_vector): Call allocate_vectorlike.
Karl Heuer <kwzh@gnu.org>
parents:
9953
diff
changeset
|
894 XSETVECTOR (vector, p); |
| 300 | 895 return vector; |
| 896 } | |
| 897 | |
|
13219
99b5164a319d
(Qchar_table_extra_slots): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13150
diff
changeset
|
898 DEFUN ("make-char-table", Fmake_char_table, Smake_char_table, 1, 2, 0, |
|
13322
336cbb88a1e3
(Fmake_char_table): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
13320
diff
changeset
|
899 "Return a newly created char-table, with purpose PURPOSE.\n\ |
|
13141
4a4d1d8e89e5
(Fmake_chartable, Fmake_boolvector): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
13008
diff
changeset
|
900 Each element is initialized to INIT, which defaults to nil.\n\ |
|
16479
52eaaf1cc0e3
(Fmake_char_table): Doc fix.
Erik Naggum <erik@naggum.no>
parents:
16231
diff
changeset
|
901 PURPOSE should be a symbol which has a `char-table-extra-slots' property.\n\ |
|
13219
99b5164a319d
(Qchar_table_extra_slots): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13150
diff
changeset
|
902 The property's value should be an integer between 0 and 10.") |
|
99b5164a319d
(Qchar_table_extra_slots): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13150
diff
changeset
|
903 (purpose, init) |
|
99b5164a319d
(Qchar_table_extra_slots): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13150
diff
changeset
|
904 register Lisp_Object purpose, init; |
|
13141
4a4d1d8e89e5
(Fmake_chartable, Fmake_boolvector): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
13008
diff
changeset
|
905 { |
|
4a4d1d8e89e5
(Fmake_chartable, Fmake_boolvector): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
13008
diff
changeset
|
906 Lisp_Object vector; |
|
13219
99b5164a319d
(Qchar_table_extra_slots): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13150
diff
changeset
|
907 Lisp_Object n; |
|
99b5164a319d
(Qchar_table_extra_slots): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13150
diff
changeset
|
908 CHECK_SYMBOL (purpose, 1); |
|
17328
e2a6f31ee014
(Fmake_char_table): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17217
diff
changeset
|
909 n = Fget (purpose, Qchar_table_extra_slots); |
|
13219
99b5164a319d
(Qchar_table_extra_slots): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13150
diff
changeset
|
910 CHECK_NUMBER (n, 0); |
|
13141
4a4d1d8e89e5
(Fmake_chartable, Fmake_boolvector): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
13008
diff
changeset
|
911 if (XINT (n) < 0 || XINT (n) > 10) |
|
4a4d1d8e89e5
(Fmake_chartable, Fmake_boolvector): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
13008
diff
changeset
|
912 args_out_of_range (n, Qnil); |
|
4a4d1d8e89e5
(Fmake_chartable, Fmake_boolvector): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
13008
diff
changeset
|
913 /* Add 2 to the size for the defalt and parent slots. */ |
|
4a4d1d8e89e5
(Fmake_chartable, Fmake_boolvector): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
13008
diff
changeset
|
914 vector = Fmake_vector (make_number (CHAR_TABLE_STANDARD_SLOTS + XINT (n)), |
|
4a4d1d8e89e5
(Fmake_chartable, Fmake_boolvector): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
13008
diff
changeset
|
915 init); |
|
17328
e2a6f31ee014
(Fmake_char_table): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17217
diff
changeset
|
916 XCHAR_TABLE (vector)->top = Qt; |
|
13150
3778c95adca9
(Fmake_char_table): Initialize parent to nil.
Erik Naggum <erik@naggum.no>
parents:
13141
diff
changeset
|
917 XCHAR_TABLE (vector)->parent = Qnil; |
|
13219
99b5164a319d
(Qchar_table_extra_slots): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13150
diff
changeset
|
918 XCHAR_TABLE (vector)->purpose = purpose; |
|
13141
4a4d1d8e89e5
(Fmake_chartable, Fmake_boolvector): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
13008
diff
changeset
|
919 XSETCHAR_TABLE (vector, XCHAR_TABLE (vector)); |
|
4a4d1d8e89e5
(Fmake_chartable, Fmake_boolvector): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
13008
diff
changeset
|
920 return vector; |
|
4a4d1d8e89e5
(Fmake_chartable, Fmake_boolvector): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
13008
diff
changeset
|
921 } |
|
4a4d1d8e89e5
(Fmake_chartable, Fmake_boolvector): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
13008
diff
changeset
|
922 |
|
17328
e2a6f31ee014
(Fmake_char_table): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17217
diff
changeset
|
923 /* Return a newly created sub char table with default value DEFALT. |
|
e2a6f31ee014
(Fmake_char_table): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17217
diff
changeset
|
924 Since a sub char table does not appear as a top level Emacs Lisp |
|
e2a6f31ee014
(Fmake_char_table): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17217
diff
changeset
|
925 object, we don't need a Lisp interface to make it. */ |
|
e2a6f31ee014
(Fmake_char_table): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17217
diff
changeset
|
926 |
|
e2a6f31ee014
(Fmake_char_table): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17217
diff
changeset
|
927 Lisp_Object |
|
e2a6f31ee014
(Fmake_char_table): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17217
diff
changeset
|
928 make_sub_char_table (defalt) |
|
e2a6f31ee014
(Fmake_char_table): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17217
diff
changeset
|
929 Lisp_Object defalt; |
|
e2a6f31ee014
(Fmake_char_table): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17217
diff
changeset
|
930 { |
|
e2a6f31ee014
(Fmake_char_table): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17217
diff
changeset
|
931 Lisp_Object vector |
|
e2a6f31ee014
(Fmake_char_table): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17217
diff
changeset
|
932 = Fmake_vector (make_number (SUB_CHAR_TABLE_STANDARD_SLOTS), Qnil); |
|
e2a6f31ee014
(Fmake_char_table): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17217
diff
changeset
|
933 XCHAR_TABLE (vector)->top = Qnil; |
|
e2a6f31ee014
(Fmake_char_table): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17217
diff
changeset
|
934 XCHAR_TABLE (vector)->defalt = defalt; |
|
e2a6f31ee014
(Fmake_char_table): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17217
diff
changeset
|
935 XSETCHAR_TABLE (vector, XCHAR_TABLE (vector)); |
|
e2a6f31ee014
(Fmake_char_table): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17217
diff
changeset
|
936 return vector; |
|
e2a6f31ee014
(Fmake_char_table): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17217
diff
changeset
|
937 } |
|
e2a6f31ee014
(Fmake_char_table): Adjusted for the new structure of
Kenichi Handa <handa@m17n.org>
parents:
17217
diff
changeset
|
938 |
| 300 | 939 DEFUN ("vector", Fvector, Svector, 0, MANY, 0, |
| 940 "Return a newly created vector with specified arguments as elements.\n\ | |
| 941 Any number of arguments, even zero arguments, are allowed.") | |
| 942 (nargs, args) | |
| 943 register int nargs; | |
| 944 Lisp_Object *args; | |
| 945 { | |
| 946 register Lisp_Object len, val; | |
| 947 register int index; | |
| 948 register struct Lisp_Vector *p; | |
| 949 | |
|
9295
17d393a8eed6
(free_float, make_float, free_cons, Flist, Fvector, Fmake_byte_code,
Karl Heuer <kwzh@gnu.org>
parents:
9261
diff
changeset
|
950 XSETFASTINT (len, nargs); |
| 300 | 951 val = Fmake_vector (len, Qnil); |
| 952 p = XVECTOR (val); | |
| 953 for (index = 0; index < nargs; index++) | |
| 954 p->contents[index] = args[index]; | |
| 955 return val; | |
| 956 } | |
| 957 | |
| 958 DEFUN ("make-byte-code", Fmake_byte_code, Smake_byte_code, 4, MANY, 0, | |
| 959 "Create a byte-code object with specified arguments as elements.\n\ | |
| 960 The arguments should be the arglist, bytecode-string, constant vector,\n\ | |
| 961 stack size, (optional) doc string, and (optional) interactive spec.\n\ | |
| 962 The first four arguments are required; at most six have any\n\ | |
| 963 significance.") | |
| 964 (nargs, args) | |
| 965 register int nargs; | |
| 966 Lisp_Object *args; | |
| 967 { | |
| 968 register Lisp_Object len, val; | |
| 969 register int index; | |
| 970 register struct Lisp_Vector *p; | |
| 971 | |
|
9295
17d393a8eed6
(free_float, make_float, free_cons, Flist, Fvector, Fmake_byte_code,
Karl Heuer <kwzh@gnu.org>
parents:
9261
diff
changeset
|
972 XSETFASTINT (len, nargs); |
| 485 | 973 if (!NILP (Vpurify_flag)) |
|
16101
039e96495054
(Fmake_byte_code): Call make_pure_vector using nargs.
Richard M. Stallman <rms@gnu.org>
parents:
16100
diff
changeset
|
974 val = make_pure_vector ((EMACS_INT) nargs); |
| 300 | 975 else |
| 976 val = Fmake_vector (len, Qnil); | |
| 977 p = XVECTOR (val); | |
| 978 for (index = 0; index < nargs; index++) | |
| 979 { | |
| 485 | 980 if (!NILP (Vpurify_flag)) |
| 300 | 981 args[index] = Fpurecopy (args[index]); |
| 982 p->contents[index] = args[index]; | |
| 983 } | |
|
18104
b2a669ef69b1
(Fmake_byte_code): Set val from p, not from val.
Richard M. Stallman <rms@gnu.org>
parents:
18010
diff
changeset
|
984 XSETCOMPILED (val, p); |
| 300 | 985 return val; |
| 986 } | |
| 987 | |
| 988 /* Allocation of symbols. | |
| 989 Just like allocation of conses! | |
| 990 | |
| 991 Each symbol_block is just under 1020 bytes long, | |
| 992 since malloc really allocates in units of powers of two | |
| 993 and uses 4 bytes for its own overhead. */ | |
| 994 | |
| 995 #define SYMBOL_BLOCK_SIZE \ | |
| 996 ((1020 - sizeof (struct symbol_block *)) / sizeof (struct Lisp_Symbol)) | |
| 997 | |
| 998 struct symbol_block | |
| 999 { | |
| 1000 struct symbol_block *next; | |
| 1001 struct Lisp_Symbol symbols[SYMBOL_BLOCK_SIZE]; | |
| 1002 }; | |
| 1003 | |
| 1004 struct symbol_block *symbol_block; | |
| 1005 int symbol_block_index; | |
| 1006 | |
| 1007 struct Lisp_Symbol *symbol_free_list; | |
| 1008 | |
|
23958
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
1009 /* Total number of symbol blocks now in use. */ |
|
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
1010 int n_symbol_blocks; |
|
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
1011 |
| 300 | 1012 void |
| 1013 init_symbol () | |
| 1014 { | |
|
23958
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
1015 symbol_block = (struct symbol_block *) lisp_malloc (sizeof (struct symbol_block)); |
| 300 | 1016 symbol_block->next = 0; |
|
13320
e0f3a961851a
Cast first arg to bzero.
Richard M. Stallman <rms@gnu.org>
parents:
13219
diff
changeset
|
1017 bzero ((char *) symbol_block->symbols, sizeof symbol_block->symbols); |
| 300 | 1018 symbol_block_index = 0; |
| 1019 symbol_free_list = 0; | |
|
23958
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
1020 n_symbol_blocks = 1; |
| 300 | 1021 } |
| 1022 | |
| 1023 DEFUN ("make-symbol", Fmake_symbol, Smake_symbol, 1, 1, 0, | |
| 1024 "Return a newly allocated uninterned symbol whose name is NAME.\n\ | |
| 1025 Its value and function definition are void, and its property list is nil.") | |
|
14093
338f645e6b9a
(Fmake_symbol): Harmonize arguments with documentation.
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1026 (name) |
|
338f645e6b9a
(Fmake_symbol): Harmonize arguments with documentation.
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1027 Lisp_Object name; |
| 300 | 1028 { |
| 1029 register Lisp_Object val; | |
| 1030 register struct Lisp_Symbol *p; | |
| 1031 | |
|
14093
338f645e6b9a
(Fmake_symbol): Harmonize arguments with documentation.
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1032 CHECK_STRING (name, 0); |
| 300 | 1033 |
| 1034 if (symbol_free_list) | |
| 1035 { | |
|
9261
e5ba7993d378
(VALIDATE_LISP_STORAGE, make_float, Fcons, Fmake_vector, Fmake_symbol,
Karl Heuer <kwzh@gnu.org>
parents:
9144
diff
changeset
|
1036 XSETSYMBOL (val, symbol_free_list); |
|
9942
c189487b08dd
(free_float): Don't assume XFASTINT accesses the raw bits.
Karl Heuer <kwzh@gnu.org>
parents:
9926
diff
changeset
|
1037 symbol_free_list = *(struct Lisp_Symbol **)&symbol_free_list->value; |
| 300 | 1038 } |
| 1039 else | |
| 1040 { | |
| 1041 if (symbol_block_index == SYMBOL_BLOCK_SIZE) | |
| 1042 { | |
| 12529 | 1043 struct symbol_block *new; |
|
23958
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
1044 new = (struct symbol_block *) lisp_malloc (sizeof (struct symbol_block)); |
| 300 | 1045 VALIDATE_LISP_STORAGE (new, sizeof *new); |
| 1046 new->next = symbol_block; | |
| 1047 symbol_block = new; | |
| 1048 symbol_block_index = 0; | |
|
23958
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
1049 n_symbol_blocks++; |
| 300 | 1050 } |
|
9261
e5ba7993d378
(VALIDATE_LISP_STORAGE, make_float, Fcons, Fmake_vector, Fmake_symbol,
Karl Heuer <kwzh@gnu.org>
parents:
9144
diff
changeset
|
1051 XSETSYMBOL (val, &symbol_block->symbols[symbol_block_index++]); |
| 300 | 1052 } |
| 1053 p = XSYMBOL (val); | |
|
14095
d612434249db
(Fmake_symbol): Harmonize arguments with documentation (correctly).
Erik Naggum <erik@naggum.no>
parents:
14093
diff
changeset
|
1054 p->name = XSTRING (name); |
|
16223
bab3f12493b6
(Fmake_symbol): Initialize `obarray' field.
Erik Naggum <erik@naggum.no>
parents:
16101
diff
changeset
|
1055 p->obarray = Qnil; |
| 300 | 1056 p->plist = Qnil; |
| 1057 p->value = Qunbound; | |
| 1058 p->function = Qunbound; | |
| 1059 p->next = 0; | |
| 1060 consing_since_gc += sizeof (struct Lisp_Symbol); | |
|
12748
3433bb446e06
(cons_cells_consed, floats_consed, vector_cells_consed)
Richard M. Stallman <rms@gnu.org>
parents:
12605
diff
changeset
|
1061 symbols_consed++; |
| 300 | 1062 return val; |
| 1063 } | |
| 1064 | |
|
9437
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
1065 /* Allocation of markers and other objects that share that structure. |
| 300 | 1066 Works like allocation of conses. */ |
| 1067 | |
| 1068 #define MARKER_BLOCK_SIZE \ | |
|
9437
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
1069 ((1020 - sizeof (struct marker_block *)) / sizeof (union Lisp_Misc)) |
| 300 | 1070 |
| 1071 struct marker_block | |
|
23958
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
1072 { |
| 300 | 1073 struct marker_block *next; |
|
9437
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
1074 union Lisp_Misc markers[MARKER_BLOCK_SIZE]; |
| 300 | 1075 }; |
| 1076 | |
| 1077 struct marker_block *marker_block; | |
| 1078 int marker_block_index; | |
| 1079 | |
|
9437
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
1080 union Lisp_Misc *marker_free_list; |
| 300 | 1081 |
|
23958
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
1082 /* Total number of marker blocks now in use. */ |
|
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
1083 int n_marker_blocks; |
|
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
1084 |
| 300 | 1085 void |
| 1086 init_marker () | |
| 1087 { | |
|
23958
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
1088 marker_block = (struct marker_block *) lisp_malloc (sizeof (struct marker_block)); |
| 300 | 1089 marker_block->next = 0; |
|
13320
e0f3a961851a
Cast first arg to bzero.
Richard M. Stallman <rms@gnu.org>
parents:
13219
diff
changeset
|
1090 bzero ((char *) marker_block->markers, sizeof marker_block->markers); |
| 300 | 1091 marker_block_index = 0; |
| 1092 marker_free_list = 0; | |
|
23958
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
1093 n_marker_blocks = 1; |
| 300 | 1094 } |
| 1095 | |
|
9437
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
1096 /* Return a newly allocated Lisp_Misc object, with no substructure. */ |
|
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
1097 Lisp_Object |
|
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
1098 allocate_misc () |
|
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
1099 { |
|
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
1100 Lisp_Object val; |
|
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
1101 |
|
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
1102 if (marker_free_list) |
|
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
1103 { |
|
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
1104 XSETMISC (val, marker_free_list); |
|
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
1105 marker_free_list = marker_free_list->u_free.chain; |
|
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
1106 } |
|
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
1107 else |
|
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
1108 { |
|
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
1109 if (marker_block_index == MARKER_BLOCK_SIZE) |
|
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
1110 { |
| 12529 | 1111 struct marker_block *new; |
|
23958
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
1112 new = (struct marker_block *) lisp_malloc (sizeof (struct marker_block)); |
|
9437
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
1113 VALIDATE_LISP_STORAGE (new, sizeof *new); |
|
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
1114 new->next = marker_block; |
|
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
1115 marker_block = new; |
|
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
1116 marker_block_index = 0; |
|
23958
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
1117 n_marker_blocks++; |
|
9437
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
1118 } |
|
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
1119 XSETMISC (val, &marker_block->markers[marker_block_index++]); |
|
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
1120 } |
|
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
1121 consing_since_gc += sizeof (union Lisp_Misc); |
|
12748
3433bb446e06
(cons_cells_consed, floats_consed, vector_cells_consed)
Richard M. Stallman <rms@gnu.org>
parents:
12605
diff
changeset
|
1122 misc_objects_consed++; |
|
9437
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
1123 return val; |
|
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
1124 } |
|
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
1125 |
| 300 | 1126 DEFUN ("make-marker", Fmake_marker, Smake_marker, 0, 0, 0, |
| 1127 "Return a newly allocated marker which does not point at any place.") | |
| 1128 () | |
| 1129 { | |
| 1130 register Lisp_Object val; | |
| 1131 register struct Lisp_Marker *p; | |
| 638 | 1132 |
|
9437
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
1133 val = allocate_misc (); |
|
11243
054ecfce1820
(Fmake_marker, mark_object): Use XMISCTYPE.
Richard M. Stallman <rms@gnu.org>
parents:
11048
diff
changeset
|
1134 XMISCTYPE (val) = Lisp_Misc_Marker; |
| 300 | 1135 p = XMARKER (val); |
| 1136 p->buffer = 0; | |
|
20565
aa9b7c5f0f62
(Fmake_marker): Initialize marker's bytepos and charpos.
Richard M. Stallman <rms@gnu.org>
parents:
20495
diff
changeset
|
1137 p->bytepos = 0; |
|
aa9b7c5f0f62
(Fmake_marker): Initialize marker's bytepos and charpos.
Richard M. Stallman <rms@gnu.org>
parents:
20495
diff
changeset
|
1138 p->charpos = 0; |
| 300 | 1139 p->chain = Qnil; |
|
13008
f042ef632b22
(Fmake_marker): Initialize insertion_type to 0.
Richard M. Stallman <rms@gnu.org>
parents:
12748
diff
changeset
|
1140 p->insertion_type = 0; |
| 300 | 1141 return val; |
| 1142 } | |
|
19332
58f14958f5d5
(free_marker): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18621
diff
changeset
|
1143 |
|
58f14958f5d5
(free_marker): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18621
diff
changeset
|
1144 /* Put MARKER back on the free list after using it temporarily. */ |
|
58f14958f5d5
(free_marker): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18621
diff
changeset
|
1145 |
|
20375
1dd0bd0749b5
(malloc_warning, display_malloc_warning): Return void.
Andreas Schwab <schwab@suse.de>
parents:
20057
diff
changeset
|
1146 void |
|
19332
58f14958f5d5
(free_marker): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18621
diff
changeset
|
1147 free_marker (marker) |
|
58f14958f5d5
(free_marker): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18621
diff
changeset
|
1148 Lisp_Object marker; |
|
58f14958f5d5
(free_marker): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18621
diff
changeset
|
1149 { |
|
19621
74151390752c
(free_marker): Call unchain_marker.
Richard M. Stallman <rms@gnu.org>
parents:
19332
diff
changeset
|
1150 unchain_marker (marker); |
|
74151390752c
(free_marker): Call unchain_marker.
Richard M. Stallman <rms@gnu.org>
parents:
19332
diff
changeset
|
1151 |
|
19332
58f14958f5d5
(free_marker): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18621
diff
changeset
|
1152 XMISC (marker)->u_marker.type = Lisp_Misc_Free; |
|
58f14958f5d5
(free_marker): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18621
diff
changeset
|
1153 XMISC (marker)->u_free.chain = marker_free_list; |
|
58f14958f5d5
(free_marker): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18621
diff
changeset
|
1154 marker_free_list = XMISC (marker); |
|
58f14958f5d5
(free_marker): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18621
diff
changeset
|
1155 |
|
58f14958f5d5
(free_marker): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18621
diff
changeset
|
1156 total_free_markers++; |
|
58f14958f5d5
(free_marker): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18621
diff
changeset
|
1157 } |
| 300 | 1158 |
| 1159 /* Allocation of strings */ | |
| 1160 | |
| 1161 /* Strings reside inside of string_blocks. The entire data of the string, | |
| 1162 both the size and the contents, live in part of the `chars' component of a string_block. | |
| 1163 The `pos' component is the index within `chars' of the first free byte. | |
| 1164 | |
| 1165 first_string_block points to the first string_block ever allocated. | |
| 1166 Each block points to the next one with its `next' field. | |
| 1167 The `prev' fields chain in reverse order. | |
| 1168 The last one allocated is the one currently being filled. | |
| 1169 current_string_block points to it. | |
| 1170 | |
| 1171 The string_blocks that hold individual large strings | |
| 1172 go in a separate chain, started by large_string_blocks. */ | |
| 1173 | |
| 1174 | |
| 1175 /* String blocks contain this many useful bytes. | |
| 1176 8188 is power of 2, minus 4 for malloc overhead. */ | |
| 1177 #define STRING_BLOCK_SIZE (8188 - sizeof (struct string_block_head)) | |
| 1178 | |
| 1179 /* A string bigger than this gets its own specially-made string block | |
| 1180 if it doesn't fit in the current one. */ | |
| 1181 #define STRING_BLOCK_OUTSIZE 1024 | |
| 1182 | |
| 1183 struct string_block_head | |
| 1184 { | |
| 1185 struct string_block *next, *prev; | |
|
14764
26224976a917
(struct string_block_head): Change to match string_block.
Karl Heuer <kwzh@gnu.org>
parents:
14216
diff
changeset
|
1186 EMACS_INT pos; |
| 300 | 1187 }; |
| 1188 | |
| 1189 struct string_block | |
| 1190 { | |
| 1191 struct string_block *next, *prev; | |
|
8817
48ff00bebef6
(pure, pure_size): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
1192 EMACS_INT pos; |
| 300 | 1193 char chars[STRING_BLOCK_SIZE]; |
| 1194 }; | |
| 1195 | |
| 1196 /* This points to the string block we are now allocating strings. */ | |
| 1197 | |
| 1198 struct string_block *current_string_block; | |
| 1199 | |
| 1200 /* This points to the oldest string block, the one that starts the chain. */ | |
| 1201 | |
| 1202 struct string_block *first_string_block; | |
| 1203 | |
| 1204 /* Last string block in chain of those made for individual large strings. */ | |
| 1205 | |
| 1206 struct string_block *large_string_blocks; | |
| 1207 | |
| 1208 /* If SIZE is the length of a string, this returns how many bytes | |
| 1209 the string occupies in a string_block (including padding). */ | |
| 1210 | |
| 20659 | 1211 #define STRING_FULLSIZE(size) (((size) + 1 + STRING_BASE_SIZE + STRING_PAD - 1) \ |
| 1212 & ~(STRING_PAD - 1)) | |
| 1213 /* Add 1 for the null terminator, | |
| 1214 and add STRING_PAD - 1 as part of rounding up. */ | |
| 1215 | |
| 1216 #define STRING_PAD (sizeof (EMACS_INT)) | |
| 1217 /* Size of the stuff in the string not including its data. */ | |
| 1218 #define STRING_BASE_SIZE (((sizeof (struct Lisp_String) - 1) / STRING_PAD) * STRING_PAD) | |
| 300 | 1219 |
| 1220 #if 0 | |
| 1221 #define STRING_FULLSIZE(SIZE) \ | |
|
8817
48ff00bebef6
(pure, pure_size): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
1222 (((SIZE) + 2 * sizeof (EMACS_INT)) & ~(sizeof (EMACS_INT) - 1)) |
| 300 | 1223 #endif |
| 1224 | |
|
23958
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
1225 /* Total number of string blocks now in use. */ |
|
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
1226 int n_string_blocks; |
|
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
1227 |
| 300 | 1228 void |
| 1229 init_strings () | |
| 1230 { | |
|
23958
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
1231 current_string_block = (struct string_block *) lisp_malloc (sizeof (struct string_block)); |
| 300 | 1232 first_string_block = current_string_block; |
| 1233 consing_since_gc += sizeof (struct string_block); | |
| 1234 current_string_block->next = 0; | |
| 1235 current_string_block->prev = 0; | |
| 1236 current_string_block->pos = 0; | |
| 1237 large_string_blocks = 0; | |
|
23958
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
1238 n_string_blocks = 1; |
| 300 | 1239 } |
|
21258
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1240 |
| 300 | 1241 DEFUN ("make-string", Fmake_string, Smake_string, 2, 2, 0, |
| 1242 "Return a newly created string of length LENGTH, with each element being INIT.\n\ | |
| 1243 Both LENGTH and INIT must be numbers.") | |
| 1244 (length, init) | |
| 1245 Lisp_Object length, init; | |
| 1246 { | |
| 1247 register Lisp_Object val; | |
|
21084
371ed7bdfd2b
(Fmake_string): Handle the case INIT is a multibyte character correctly.
Richard M. Stallman <rms@gnu.org>
parents:
20849
diff
changeset
|
1248 register unsigned char *p, *end; |
|
371ed7bdfd2b
(Fmake_string): Handle the case INIT is a multibyte character correctly.
Richard M. Stallman <rms@gnu.org>
parents:
20849
diff
changeset
|
1249 int c, nbytes; |
| 300 | 1250 |
|
9953
e0672d4cf470
(Fmake_list, Fmake_vector, Fmake_string): Use CHECK_NATNUM instead of its
Karl Heuer <kwzh@gnu.org>
parents:
9942
diff
changeset
|
1251 CHECK_NATNUM (length, 0); |
| 300 | 1252 CHECK_NUMBER (init, 1); |
|
21084
371ed7bdfd2b
(Fmake_string): Handle the case INIT is a multibyte character correctly.
Richard M. Stallman <rms@gnu.org>
parents:
20849
diff
changeset
|
1253 |
| 300 | 1254 c = XINT (init); |
|
21084
371ed7bdfd2b
(Fmake_string): Handle the case INIT is a multibyte character correctly.
Richard M. Stallman <rms@gnu.org>
parents:
20849
diff
changeset
|
1255 if (SINGLE_BYTE_CHAR_P (c)) |
|
371ed7bdfd2b
(Fmake_string): Handle the case INIT is a multibyte character correctly.
Richard M. Stallman <rms@gnu.org>
parents:
20849
diff
changeset
|
1256 { |
|
371ed7bdfd2b
(Fmake_string): Handle the case INIT is a multibyte character correctly.
Richard M. Stallman <rms@gnu.org>
parents:
20849
diff
changeset
|
1257 nbytes = XINT (length); |
|
21258
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1258 val = make_uninit_string (nbytes); |
|
21084
371ed7bdfd2b
(Fmake_string): Handle the case INIT is a multibyte character correctly.
Richard M. Stallman <rms@gnu.org>
parents:
20849
diff
changeset
|
1259 p = XSTRING (val)->data; |
|
371ed7bdfd2b
(Fmake_string): Handle the case INIT is a multibyte character correctly.
Richard M. Stallman <rms@gnu.org>
parents:
20849
diff
changeset
|
1260 end = p + XSTRING (val)->size; |
|
371ed7bdfd2b
(Fmake_string): Handle the case INIT is a multibyte character correctly.
Richard M. Stallman <rms@gnu.org>
parents:
20849
diff
changeset
|
1261 while (p != end) |
|
371ed7bdfd2b
(Fmake_string): Handle the case INIT is a multibyte character correctly.
Richard M. Stallman <rms@gnu.org>
parents:
20849
diff
changeset
|
1262 *p++ = c; |
|
371ed7bdfd2b
(Fmake_string): Handle the case INIT is a multibyte character correctly.
Richard M. Stallman <rms@gnu.org>
parents:
20849
diff
changeset
|
1263 } |
|
371ed7bdfd2b
(Fmake_string): Handle the case INIT is a multibyte character correctly.
Richard M. Stallman <rms@gnu.org>
parents:
20849
diff
changeset
|
1264 else |
|
371ed7bdfd2b
(Fmake_string): Handle the case INIT is a multibyte character correctly.
Richard M. Stallman <rms@gnu.org>
parents:
20849
diff
changeset
|
1265 { |
|
371ed7bdfd2b
(Fmake_string): Handle the case INIT is a multibyte character correctly.
Richard M. Stallman <rms@gnu.org>
parents:
20849
diff
changeset
|
1266 unsigned char work[4], *str; |
|
371ed7bdfd2b
(Fmake_string): Handle the case INIT is a multibyte character correctly.
Richard M. Stallman <rms@gnu.org>
parents:
20849
diff
changeset
|
1267 int len = CHAR_STRING (c, work, str); |
|
371ed7bdfd2b
(Fmake_string): Handle the case INIT is a multibyte character correctly.
Richard M. Stallman <rms@gnu.org>
parents:
20849
diff
changeset
|
1268 |
|
371ed7bdfd2b
(Fmake_string): Handle the case INIT is a multibyte character correctly.
Richard M. Stallman <rms@gnu.org>
parents:
20849
diff
changeset
|
1269 nbytes = len * XINT (length); |
|
371ed7bdfd2b
(Fmake_string): Handle the case INIT is a multibyte character correctly.
Richard M. Stallman <rms@gnu.org>
parents:
20849
diff
changeset
|
1270 val = make_uninit_multibyte_string (XINT (length), nbytes); |
|
371ed7bdfd2b
(Fmake_string): Handle the case INIT is a multibyte character correctly.
Richard M. Stallman <rms@gnu.org>
parents:
20849
diff
changeset
|
1271 p = XSTRING (val)->data; |
|
371ed7bdfd2b
(Fmake_string): Handle the case INIT is a multibyte character correctly.
Richard M. Stallman <rms@gnu.org>
parents:
20849
diff
changeset
|
1272 end = p + nbytes; |
|
371ed7bdfd2b
(Fmake_string): Handle the case INIT is a multibyte character correctly.
Richard M. Stallman <rms@gnu.org>
parents:
20849
diff
changeset
|
1273 while (p != end) |
|
371ed7bdfd2b
(Fmake_string): Handle the case INIT is a multibyte character correctly.
Richard M. Stallman <rms@gnu.org>
parents:
20849
diff
changeset
|
1274 { |
|
371ed7bdfd2b
(Fmake_string): Handle the case INIT is a multibyte character correctly.
Richard M. Stallman <rms@gnu.org>
parents:
20849
diff
changeset
|
1275 bcopy (str, p, len); |
|
371ed7bdfd2b
(Fmake_string): Handle the case INIT is a multibyte character correctly.
Richard M. Stallman <rms@gnu.org>
parents:
20849
diff
changeset
|
1276 p += len; |
|
371ed7bdfd2b
(Fmake_string): Handle the case INIT is a multibyte character correctly.
Richard M. Stallman <rms@gnu.org>
parents:
20849
diff
changeset
|
1277 } |
|
371ed7bdfd2b
(Fmake_string): Handle the case INIT is a multibyte character correctly.
Richard M. Stallman <rms@gnu.org>
parents:
20849
diff
changeset
|
1278 } |
| 300 | 1279 *p = 0; |
| 1280 return val; | |
| 1281 } | |
| 1282 | |
|
13141
4a4d1d8e89e5
(Fmake_chartable, Fmake_boolvector): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
13008
diff
changeset
|
1283 DEFUN ("make-bool-vector", Fmake_bool_vector, Smake_bool_vector, 2, 2, 0, |
|
18010
7a38a8767242
(Fmake_bool_vector): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
17831
diff
changeset
|
1284 "Return a new bool-vector of length LENGTH, using INIT for as each element.\n\ |
|
7a38a8767242
(Fmake_bool_vector): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
17831
diff
changeset
|
1285 LENGTH must be a number. INIT matters only in whether it is t or nil.") |
|
13141
4a4d1d8e89e5
(Fmake_chartable, Fmake_boolvector): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
13008
diff
changeset
|
1286 (length, init) |
|
4a4d1d8e89e5
(Fmake_chartable, Fmake_boolvector): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
13008
diff
changeset
|
1287 Lisp_Object length, init; |
|
4a4d1d8e89e5
(Fmake_chartable, Fmake_boolvector): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
13008
diff
changeset
|
1288 { |
|
4a4d1d8e89e5
(Fmake_chartable, Fmake_boolvector): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
13008
diff
changeset
|
1289 register Lisp_Object val; |
|
4a4d1d8e89e5
(Fmake_chartable, Fmake_boolvector): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
13008
diff
changeset
|
1290 struct Lisp_Bool_Vector *p; |
|
4a4d1d8e89e5
(Fmake_chartable, Fmake_boolvector): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
13008
diff
changeset
|
1291 int real_init, i; |
|
4a4d1d8e89e5
(Fmake_chartable, Fmake_boolvector): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
13008
diff
changeset
|
1292 int length_in_chars, length_in_elts, bits_per_value; |
|
4a4d1d8e89e5
(Fmake_chartable, Fmake_boolvector): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
13008
diff
changeset
|
1293 |
|
4a4d1d8e89e5
(Fmake_chartable, Fmake_boolvector): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
13008
diff
changeset
|
1294 CHECK_NATNUM (length, 0); |
|
4a4d1d8e89e5
(Fmake_chartable, Fmake_boolvector): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
13008
diff
changeset
|
1295 |
|
13363
941c37982f37
(BITS_PER_SHORT, BITS_PER_INT, BITS_PER_LONG):
Karl Heuer <kwzh@gnu.org>
parents:
13322
diff
changeset
|
1296 bits_per_value = sizeof (EMACS_INT) * BITS_PER_CHAR; |
|
13141
4a4d1d8e89e5
(Fmake_chartable, Fmake_boolvector): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
13008
diff
changeset
|
1297 |
|
4a4d1d8e89e5
(Fmake_chartable, Fmake_boolvector): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
13008
diff
changeset
|
1298 length_in_elts = (XFASTINT (length) + bits_per_value - 1) / bits_per_value; |
|
21948
d366b3e31fae
(Fmake_bool_vector): Clear out extraneous bits at end.
Richard M. Stallman <rms@gnu.org>
parents:
21680
diff
changeset
|
1299 length_in_chars = ((XFASTINT (length) + BITS_PER_CHAR - 1) / BITS_PER_CHAR); |
|
13141
4a4d1d8e89e5
(Fmake_chartable, Fmake_boolvector): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
13008
diff
changeset
|
1300 |
|
17021
35f01092d865
(Fmake_char_table): Typo in doc-string fixed. Handle
Karl Heuer <kwzh@gnu.org>
parents:
16538
diff
changeset
|
1301 /* We must allocate one more elements than LENGTH_IN_ELTS for the |
|
35f01092d865
(Fmake_char_table): Typo in doc-string fixed. Handle
Karl Heuer <kwzh@gnu.org>
parents:
16538
diff
changeset
|
1302 slot `size' of the struct Lisp_Bool_Vector. */ |
|
35f01092d865
(Fmake_char_table): Typo in doc-string fixed. Handle
Karl Heuer <kwzh@gnu.org>
parents:
16538
diff
changeset
|
1303 val = Fmake_vector (make_number (length_in_elts + 1), Qnil); |
|
13141
4a4d1d8e89e5
(Fmake_chartable, Fmake_boolvector): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
13008
diff
changeset
|
1304 p = XBOOL_VECTOR (val); |
|
4a4d1d8e89e5
(Fmake_chartable, Fmake_boolvector): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
13008
diff
changeset
|
1305 /* Get rid of any bits that would cause confusion. */ |
|
4a4d1d8e89e5
(Fmake_chartable, Fmake_boolvector): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
13008
diff
changeset
|
1306 p->vector_size = 0; |
|
4a4d1d8e89e5
(Fmake_chartable, Fmake_boolvector): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
13008
diff
changeset
|
1307 XSETBOOL_VECTOR (val, p); |
|
4a4d1d8e89e5
(Fmake_chartable, Fmake_boolvector): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
13008
diff
changeset
|
1308 p->size = XFASTINT (length); |
|
4a4d1d8e89e5
(Fmake_chartable, Fmake_boolvector): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
13008
diff
changeset
|
1309 |
|
4a4d1d8e89e5
(Fmake_chartable, Fmake_boolvector): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
13008
diff
changeset
|
1310 real_init = (NILP (init) ? 0 : -1); |
|
4a4d1d8e89e5
(Fmake_chartable, Fmake_boolvector): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
13008
diff
changeset
|
1311 for (i = 0; i < length_in_chars ; i++) |
|
4a4d1d8e89e5
(Fmake_chartable, Fmake_boolvector): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
13008
diff
changeset
|
1312 p->data[i] = real_init; |
|
21948
d366b3e31fae
(Fmake_bool_vector): Clear out extraneous bits at end.
Richard M. Stallman <rms@gnu.org>
parents:
21680
diff
changeset
|
1313 /* Clear the extraneous bits in the last byte. */ |
|
d366b3e31fae
(Fmake_bool_vector): Clear out extraneous bits at end.
Richard M. Stallman <rms@gnu.org>
parents:
21680
diff
changeset
|
1314 if (XINT (length) != length_in_chars * BITS_PER_CHAR) |
|
d366b3e31fae
(Fmake_bool_vector): Clear out extraneous bits at end.
Richard M. Stallman <rms@gnu.org>
parents:
21680
diff
changeset
|
1315 XBOOL_VECTOR (val)->data[length_in_chars - 1] |
|
d366b3e31fae
(Fmake_bool_vector): Clear out extraneous bits at end.
Richard M. Stallman <rms@gnu.org>
parents:
21680
diff
changeset
|
1316 &= (1 << (XINT (length) % BITS_PER_CHAR)) - 1; |
|
13141
4a4d1d8e89e5
(Fmake_chartable, Fmake_boolvector): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
13008
diff
changeset
|
1317 |
|
4a4d1d8e89e5
(Fmake_chartable, Fmake_boolvector): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
13008
diff
changeset
|
1318 return val; |
|
4a4d1d8e89e5
(Fmake_chartable, Fmake_boolvector): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
13008
diff
changeset
|
1319 } |
|
21258
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1320 |
|
20587
eaf988c7e291
(make_pure_string): New arg length_byte.
Richard M. Stallman <rms@gnu.org>
parents:
20565
diff
changeset
|
1321 /* Make a string from NBYTES bytes at CONTENTS, |
|
21258
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1322 and compute the number of characters from the contents. |
|
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1323 This string may be unibyte or multibyte, depending on the contents. */ |
|
20587
eaf988c7e291
(make_pure_string): New arg length_byte.
Richard M. Stallman <rms@gnu.org>
parents:
20565
diff
changeset
|
1324 |
| 300 | 1325 Lisp_Object |
|
20587
eaf988c7e291
(make_pure_string): New arg length_byte.
Richard M. Stallman <rms@gnu.org>
parents:
20565
diff
changeset
|
1326 make_string (contents, nbytes) |
|
eaf988c7e291
(make_pure_string): New arg length_byte.
Richard M. Stallman <rms@gnu.org>
parents:
20565
diff
changeset
|
1327 char *contents; |
|
eaf988c7e291
(make_pure_string): New arg length_byte.
Richard M. Stallman <rms@gnu.org>
parents:
20565
diff
changeset
|
1328 int nbytes; |
|
eaf988c7e291
(make_pure_string): New arg length_byte.
Richard M. Stallman <rms@gnu.org>
parents:
20565
diff
changeset
|
1329 { |
|
eaf988c7e291
(make_pure_string): New arg length_byte.
Richard M. Stallman <rms@gnu.org>
parents:
20565
diff
changeset
|
1330 register Lisp_Object val; |
|
eaf988c7e291
(make_pure_string): New arg length_byte.
Richard M. Stallman <rms@gnu.org>
parents:
20565
diff
changeset
|
1331 int nchars = chars_in_text (contents, nbytes); |
|
eaf988c7e291
(make_pure_string): New arg length_byte.
Richard M. Stallman <rms@gnu.org>
parents:
20565
diff
changeset
|
1332 val = make_uninit_multibyte_string (nchars, nbytes); |
|
eaf988c7e291
(make_pure_string): New arg length_byte.
Richard M. Stallman <rms@gnu.org>
parents:
20565
diff
changeset
|
1333 bcopy (contents, XSTRING (val)->data, nbytes); |
|
21258
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1334 if (STRING_BYTES (XSTRING (val)) == XSTRING (val)->size) |
|
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1335 SET_STRING_BYTES (XSTRING (val), -1); |
|
20587
eaf988c7e291
(make_pure_string): New arg length_byte.
Richard M. Stallman <rms@gnu.org>
parents:
20565
diff
changeset
|
1336 return val; |
|
eaf988c7e291
(make_pure_string): New arg length_byte.
Richard M. Stallman <rms@gnu.org>
parents:
20565
diff
changeset
|
1337 } |
|
eaf988c7e291
(make_pure_string): New arg length_byte.
Richard M. Stallman <rms@gnu.org>
parents:
20565
diff
changeset
|
1338 |
|
21258
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1339 /* Make a unibyte string from LENGTH bytes at CONTENTS. */ |
|
20587
eaf988c7e291
(make_pure_string): New arg length_byte.
Richard M. Stallman <rms@gnu.org>
parents:
20565
diff
changeset
|
1340 |
|
eaf988c7e291
(make_pure_string): New arg length_byte.
Richard M. Stallman <rms@gnu.org>
parents:
20565
diff
changeset
|
1341 Lisp_Object |
|
eaf988c7e291
(make_pure_string): New arg length_byte.
Richard M. Stallman <rms@gnu.org>
parents:
20565
diff
changeset
|
1342 make_unibyte_string (contents, length) |
| 300 | 1343 char *contents; |
| 1344 int length; | |
| 1345 { | |
| 1346 register Lisp_Object val; | |
| 1347 val = make_uninit_string (length); | |
| 1348 bcopy (contents, XSTRING (val)->data, length); | |
|
21258
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1349 SET_STRING_BYTES (XSTRING (val), -1); |
| 300 | 1350 return val; |
| 1351 } | |
| 1352 | |
|
21258
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1353 /* Make a multibyte string from NCHARS characters |
|
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1354 occupying NBYTES bytes at CONTENTS. */ |
|
20587
eaf988c7e291
(make_pure_string): New arg length_byte.
Richard M. Stallman <rms@gnu.org>
parents:
20565
diff
changeset
|
1355 |
|
eaf988c7e291
(make_pure_string): New arg length_byte.
Richard M. Stallman <rms@gnu.org>
parents:
20565
diff
changeset
|
1356 Lisp_Object |
|
eaf988c7e291
(make_pure_string): New arg length_byte.
Richard M. Stallman <rms@gnu.org>
parents:
20565
diff
changeset
|
1357 make_multibyte_string (contents, nchars, nbytes) |
|
eaf988c7e291
(make_pure_string): New arg length_byte.
Richard M. Stallman <rms@gnu.org>
parents:
20565
diff
changeset
|
1358 char *contents; |
|
eaf988c7e291
(make_pure_string): New arg length_byte.
Richard M. Stallman <rms@gnu.org>
parents:
20565
diff
changeset
|
1359 int nchars, nbytes; |
|
eaf988c7e291
(make_pure_string): New arg length_byte.
Richard M. Stallman <rms@gnu.org>
parents:
20565
diff
changeset
|
1360 { |
|
eaf988c7e291
(make_pure_string): New arg length_byte.
Richard M. Stallman <rms@gnu.org>
parents:
20565
diff
changeset
|
1361 register Lisp_Object val; |
|
eaf988c7e291
(make_pure_string): New arg length_byte.
Richard M. Stallman <rms@gnu.org>
parents:
20565
diff
changeset
|
1362 val = make_uninit_multibyte_string (nchars, nbytes); |
|
eaf988c7e291
(make_pure_string): New arg length_byte.
Richard M. Stallman <rms@gnu.org>
parents:
20565
diff
changeset
|
1363 bcopy (contents, XSTRING (val)->data, nbytes); |
|
eaf988c7e291
(make_pure_string): New arg length_byte.
Richard M. Stallman <rms@gnu.org>
parents:
20565
diff
changeset
|
1364 return val; |
|
eaf988c7e291
(make_pure_string): New arg length_byte.
Richard M. Stallman <rms@gnu.org>
parents:
20565
diff
changeset
|
1365 } |
|
eaf988c7e291
(make_pure_string): New arg length_byte.
Richard M. Stallman <rms@gnu.org>
parents:
20565
diff
changeset
|
1366 |
|
21258
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1367 /* Make a string from NCHARS characters |
|
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1368 occupying NBYTES bytes at CONTENTS. |
|
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1369 It is a multibyte string if NBYTES != NCHARS. */ |
|
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1370 |
|
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1371 Lisp_Object |
|
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1372 make_string_from_bytes (contents, nchars, nbytes) |
|
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1373 char *contents; |
|
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1374 int nchars, nbytes; |
|
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1375 { |
|
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1376 register Lisp_Object val; |
|
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1377 val = make_uninit_multibyte_string (nchars, nbytes); |
|
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1378 bcopy (contents, XSTRING (val)->data, nbytes); |
|
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1379 if (STRING_BYTES (XSTRING (val)) == XSTRING (val)->size) |
|
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1380 SET_STRING_BYTES (XSTRING (val), -1); |
|
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1381 return val; |
|
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1382 } |
|
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1383 |
|
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1384 /* Make a multibyte string from NCHARS characters |
|
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1385 occupying NBYTES bytes at CONTENTS. */ |
|
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1386 |
|
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1387 Lisp_Object |
|
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1388 make_specified_string (contents, nchars, nbytes, multibyte) |
|
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1389 char *contents; |
|
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1390 int nchars, nbytes; |
|
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1391 int multibyte; |
|
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1392 { |
|
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1393 register Lisp_Object val; |
|
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1394 val = make_uninit_multibyte_string (nchars, nbytes); |
|
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1395 bcopy (contents, XSTRING (val)->data, nbytes); |
|
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1396 if (!multibyte) |
|
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1397 SET_STRING_BYTES (XSTRING (val), -1); |
|
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1398 return val; |
|
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1399 } |
|
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1400 |
|
20587
eaf988c7e291
(make_pure_string): New arg length_byte.
Richard M. Stallman <rms@gnu.org>
parents:
20565
diff
changeset
|
1401 /* Make a string from the data at STR, |
|
eaf988c7e291
(make_pure_string): New arg length_byte.
Richard M. Stallman <rms@gnu.org>
parents:
20565
diff
changeset
|
1402 treating it as multibyte if the data warrants. */ |
|
eaf988c7e291
(make_pure_string): New arg length_byte.
Richard M. Stallman <rms@gnu.org>
parents:
20565
diff
changeset
|
1403 |
| 300 | 1404 Lisp_Object |
| 1405 build_string (str) | |
| 1406 char *str; | |
| 1407 { | |
| 1408 return make_string (str, strlen (str)); | |
| 1409 } | |
|
21258
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1410 |
| 300 | 1411 Lisp_Object |
| 1412 make_uninit_string (length) | |
| 1413 int length; | |
| 1414 { | |
|
21258
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1415 Lisp_Object val; |
|
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1416 val = make_uninit_multibyte_string (length, length); |
|
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1417 SET_STRING_BYTES (XSTRING (val), -1); |
|
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1418 return val; |
|
20587
eaf988c7e291
(make_pure_string): New arg length_byte.
Richard M. Stallman <rms@gnu.org>
parents:
20565
diff
changeset
|
1419 } |
|
eaf988c7e291
(make_pure_string): New arg length_byte.
Richard M. Stallman <rms@gnu.org>
parents:
20565
diff
changeset
|
1420 |
|
eaf988c7e291
(make_pure_string): New arg length_byte.
Richard M. Stallman <rms@gnu.org>
parents:
20565
diff
changeset
|
1421 Lisp_Object |
|
eaf988c7e291
(make_pure_string): New arg length_byte.
Richard M. Stallman <rms@gnu.org>
parents:
20565
diff
changeset
|
1422 make_uninit_multibyte_string (length, length_byte) |
|
eaf988c7e291
(make_pure_string): New arg length_byte.
Richard M. Stallman <rms@gnu.org>
parents:
20565
diff
changeset
|
1423 int length, length_byte; |
|
eaf988c7e291
(make_pure_string): New arg length_byte.
Richard M. Stallman <rms@gnu.org>
parents:
20565
diff
changeset
|
1424 { |
| 300 | 1425 register Lisp_Object val; |
|
20587
eaf988c7e291
(make_pure_string): New arg length_byte.
Richard M. Stallman <rms@gnu.org>
parents:
20565
diff
changeset
|
1426 register int fullsize = STRING_FULLSIZE (length_byte); |
| 300 | 1427 |
| 1428 if (length < 0) abort (); | |
| 1429 | |
| 1430 if (fullsize <= STRING_BLOCK_SIZE - current_string_block->pos) | |
| 1431 /* This string can fit in the current string block */ | |
| 1432 { | |
|
9261
e5ba7993d378
(VALIDATE_LISP_STORAGE, make_float, Fcons, Fmake_vector, Fmake_symbol,
Karl Heuer <kwzh@gnu.org>
parents:
9144
diff
changeset
|
1433 XSETSTRING (val, |
|
e5ba7993d378
(VALIDATE_LISP_STORAGE, make_float, Fcons, Fmake_vector, Fmake_symbol,
Karl Heuer <kwzh@gnu.org>
parents:
9144
diff
changeset
|
1434 ((struct Lisp_String *) |
|
e5ba7993d378
(VALIDATE_LISP_STORAGE, make_float, Fcons, Fmake_vector, Fmake_symbol,
Karl Heuer <kwzh@gnu.org>
parents:
9144
diff
changeset
|
1435 (current_string_block->chars + current_string_block->pos))); |
| 300 | 1436 current_string_block->pos += fullsize; |
| 1437 } | |
| 1438 else if (fullsize > STRING_BLOCK_OUTSIZE) | |
| 1439 /* This string gets its own string block */ | |
| 1440 { | |
| 12529 | 1441 register struct string_block *new; |
|
17345
4e11e27ce1f1
For glibc's malloc, include <malloc.h> for mallinfo,
Richard M. Stallman <rms@gnu.org>
parents:
17328
diff
changeset
|
1442 #ifdef DOUG_LEA_MALLOC |
|
4e11e27ce1f1
For glibc's malloc, include <malloc.h> for mallinfo,
Richard M. Stallman <rms@gnu.org>
parents:
17328
diff
changeset
|
1443 /* Prevent mmap'ing the chunk (which is potentially very large). */ |
|
4e11e27ce1f1
For glibc's malloc, include <malloc.h> for mallinfo,
Richard M. Stallman <rms@gnu.org>
parents:
17328
diff
changeset
|
1444 mallopt (M_MMAP_MAX, 0); |
|
4e11e27ce1f1
For glibc's malloc, include <malloc.h> for mallinfo,
Richard M. Stallman <rms@gnu.org>
parents:
17328
diff
changeset
|
1445 #endif |
|
23958
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
1446 new = (struct string_block *) lisp_malloc (sizeof (struct string_block_head) + fullsize); |
|
17345
4e11e27ce1f1
For glibc's malloc, include <malloc.h> for mallinfo,
Richard M. Stallman <rms@gnu.org>
parents:
17328
diff
changeset
|
1447 #ifdef DOUG_LEA_MALLOC |
|
4e11e27ce1f1
For glibc's malloc, include <malloc.h> for mallinfo,
Richard M. Stallman <rms@gnu.org>
parents:
17328
diff
changeset
|
1448 /* Back to a reasonable maximum of mmap'ed areas. */ |
|
23973
2eb9e2f5aa33
(MMAP_MAX_AREAS): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
23958
diff
changeset
|
1449 mallopt (M_MMAP_MAX, MMAP_MAX_AREAS); |
|
17345
4e11e27ce1f1
For glibc's malloc, include <malloc.h> for mallinfo,
Richard M. Stallman <rms@gnu.org>
parents:
17328
diff
changeset
|
1450 #endif |
|
23958
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
1451 n_string_blocks++; |
| 300 | 1452 VALIDATE_LISP_STORAGE (new, 0); |
| 1453 consing_since_gc += sizeof (struct string_block_head) + fullsize; | |
| 1454 new->pos = fullsize; | |
| 1455 new->next = large_string_blocks; | |
| 1456 large_string_blocks = new; | |
|
9261
e5ba7993d378
(VALIDATE_LISP_STORAGE, make_float, Fcons, Fmake_vector, Fmake_symbol,
Karl Heuer <kwzh@gnu.org>
parents:
9144
diff
changeset
|
1457 XSETSTRING (val, |
|
e5ba7993d378
(VALIDATE_LISP_STORAGE, make_float, Fcons, Fmake_vector, Fmake_symbol,
Karl Heuer <kwzh@gnu.org>
parents:
9144
diff
changeset
|
1458 ((struct Lisp_String *) |
|
e5ba7993d378
(VALIDATE_LISP_STORAGE, make_float, Fcons, Fmake_vector, Fmake_symbol,
Karl Heuer <kwzh@gnu.org>
parents:
9144
diff
changeset
|
1459 ((struct string_block_head *)new + 1))); |
| 300 | 1460 } |
| 1461 else | |
| 1462 /* Make a new current string block and start it off with this string */ | |
| 1463 { | |
| 12529 | 1464 register struct string_block *new; |
|
23958
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
1465 new = (struct string_block *) lisp_malloc (sizeof (struct string_block)); |
|
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
1466 n_string_blocks++; |
| 300 | 1467 VALIDATE_LISP_STORAGE (new, sizeof *new); |
| 1468 consing_since_gc += sizeof (struct string_block); | |
| 1469 current_string_block->next = new; | |
| 1470 new->prev = current_string_block; | |
| 1471 new->next = 0; | |
| 1472 current_string_block = new; | |
| 1473 new->pos = fullsize; | |
|
9261
e5ba7993d378
(VALIDATE_LISP_STORAGE, make_float, Fcons, Fmake_vector, Fmake_symbol,
Karl Heuer <kwzh@gnu.org>
parents:
9144
diff
changeset
|
1474 XSETSTRING (val, |
|
e5ba7993d378
(VALIDATE_LISP_STORAGE, make_float, Fcons, Fmake_vector, Fmake_symbol,
Karl Heuer <kwzh@gnu.org>
parents:
9144
diff
changeset
|
1475 (struct Lisp_String *) current_string_block->chars); |
| 300 | 1476 } |
| 1477 | |
|
12748
3433bb446e06
(cons_cells_consed, floats_consed, vector_cells_consed)
Richard M. Stallman <rms@gnu.org>
parents:
12605
diff
changeset
|
1478 string_chars_consed += fullsize; |
| 300 | 1479 XSTRING (val)->size = length; |
|
21244
50929073a0ba
Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents:
21143
diff
changeset
|
1480 SET_STRING_BYTES (XSTRING (val), length_byte); |
|
20587
eaf988c7e291
(make_pure_string): New arg length_byte.
Richard M. Stallman <rms@gnu.org>
parents:
20565
diff
changeset
|
1481 XSTRING (val)->data[length_byte] = 0; |
|
1300
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
1482 INITIALIZE_INTERVAL (XSTRING (val), NULL_INTERVAL); |
| 300 | 1483 |
| 1484 return val; | |
| 1485 } | |
|
21258
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1486 |
| 300 | 1487 /* Return a newly created vector or string with specified arguments as |
|
2013
e2a164ac4088
(Fmake_rope, Frope_elt): Fns deleted.
Richard M. Stallman <rms@gnu.org>
parents:
1994
diff
changeset
|
1488 elements. If all the arguments are characters that can fit |
|
e2a164ac4088
(Fmake_rope, Frope_elt): Fns deleted.
Richard M. Stallman <rms@gnu.org>
parents:
1994
diff
changeset
|
1489 in a string of events, make a string; otherwise, make a vector. |
|
e2a164ac4088
(Fmake_rope, Frope_elt): Fns deleted.
Richard M. Stallman <rms@gnu.org>
parents:
1994
diff
changeset
|
1490 |
|
e2a164ac4088
(Fmake_rope, Frope_elt): Fns deleted.
Richard M. Stallman <rms@gnu.org>
parents:
1994
diff
changeset
|
1491 Any number of arguments, even zero arguments, are allowed. */ |
| 300 | 1492 |
| 1493 Lisp_Object | |
|
2013
e2a164ac4088
(Fmake_rope, Frope_elt): Fns deleted.
Richard M. Stallman <rms@gnu.org>
parents:
1994
diff
changeset
|
1494 make_event_array (nargs, args) |
| 300 | 1495 register int nargs; |
| 1496 Lisp_Object *args; | |
| 1497 { | |
| 1498 int i; | |
| 1499 | |
| 1500 for (i = 0; i < nargs; i++) | |
|
2013
e2a164ac4088
(Fmake_rope, Frope_elt): Fns deleted.
Richard M. Stallman <rms@gnu.org>
parents:
1994
diff
changeset
|
1501 /* The things that fit in a string |
|
3536
58d5ee6ec253
(make_event_array): Ignore bits above CHAR_META.
Richard M. Stallman <rms@gnu.org>
parents:
3181
diff
changeset
|
1502 are characters that are in 0...127, |
|
58d5ee6ec253
(make_event_array): Ignore bits above CHAR_META.
Richard M. Stallman <rms@gnu.org>
parents:
3181
diff
changeset
|
1503 after discarding the meta bit and all the bits above it. */ |
|
9144
0e29f6a4fe7c
(Fmake_list, Fmake_vector, Fmake_string, make_event_array): Use type test
Karl Heuer <kwzh@gnu.org>
parents:
8940
diff
changeset
|
1504 if (!INTEGERP (args[i]) |
|
3536
58d5ee6ec253
(make_event_array): Ignore bits above CHAR_META.
Richard M. Stallman <rms@gnu.org>
parents:
3181
diff
changeset
|
1505 || (XUINT (args[i]) & ~(-CHAR_META)) >= 0200) |
| 300 | 1506 return Fvector (nargs, args); |
| 1507 | |
| 1508 /* Since the loop exited, we know that all the things in it are | |
| 1509 characters, so we can make a string. */ | |
| 1510 { | |
|
6492
8372dce85f8a
(make_event_array): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6227
diff
changeset
|
1511 Lisp_Object result; |
| 300 | 1512 |
|
18104
b2a669ef69b1
(Fmake_byte_code): Set val from p, not from val.
Richard M. Stallman <rms@gnu.org>
parents:
18010
diff
changeset
|
1513 result = Fmake_string (make_number (nargs), make_number (0)); |
| 300 | 1514 for (i = 0; i < nargs; i++) |
|
2013
e2a164ac4088
(Fmake_rope, Frope_elt): Fns deleted.
Richard M. Stallman <rms@gnu.org>
parents:
1994
diff
changeset
|
1515 { |
|
e2a164ac4088
(Fmake_rope, Frope_elt): Fns deleted.
Richard M. Stallman <rms@gnu.org>
parents:
1994
diff
changeset
|
1516 XSTRING (result)->data[i] = XINT (args[i]); |
|
e2a164ac4088
(Fmake_rope, Frope_elt): Fns deleted.
Richard M. Stallman <rms@gnu.org>
parents:
1994
diff
changeset
|
1517 /* Move the meta bit to the right place for a string char. */ |
|
e2a164ac4088
(Fmake_rope, Frope_elt): Fns deleted.
Richard M. Stallman <rms@gnu.org>
parents:
1994
diff
changeset
|
1518 if (XINT (args[i]) & CHAR_META) |
|
e2a164ac4088
(Fmake_rope, Frope_elt): Fns deleted.
Richard M. Stallman <rms@gnu.org>
parents:
1994
diff
changeset
|
1519 XSTRING (result)->data[i] |= 0x80; |
|
e2a164ac4088
(Fmake_rope, Frope_elt): Fns deleted.
Richard M. Stallman <rms@gnu.org>
parents:
1994
diff
changeset
|
1520 } |
| 300 | 1521 |
| 1522 return result; | |
| 1523 } | |
| 1524 } | |
| 1525 | |
|
1908
d649f2179d67
* alloc.c (make_pure_float): Align pureptr on a sizeof (double)
Jim Blandy <jimb@redhat.com>
parents:
1893
diff
changeset
|
1526 /* Pure storage management. */ |
|
d649f2179d67
* alloc.c (make_pure_float): Align pureptr on a sizeof (double)
Jim Blandy <jimb@redhat.com>
parents:
1893
diff
changeset
|
1527 |
| 300 | 1528 /* Must get an error if pure storage is full, |
| 1529 since if it cannot hold a large string | |
| 1530 it may be able to hold conses that point to that string; | |
| 1531 then the string is not protected from gc. */ | |
| 1532 | |
| 1533 Lisp_Object | |
|
21258
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1534 make_pure_string (data, length, length_byte, multibyte) |
| 300 | 1535 char *data; |
| 1536 int length; | |
|
20587
eaf988c7e291
(make_pure_string): New arg length_byte.
Richard M. Stallman <rms@gnu.org>
parents:
20565
diff
changeset
|
1537 int length_byte; |
|
21258
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1538 int multibyte; |
| 300 | 1539 { |
|
21258
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1540 |
| 300 | 1541 register Lisp_Object new; |
| 20659 | 1542 register int size = STRING_FULLSIZE (length_byte); |
| 300 | 1543 |
| 1544 if (pureptr + size > PURESIZE) | |
| 1545 error ("Pure Lisp storage exhausted"); | |
|
9261
e5ba7993d378
(VALIDATE_LISP_STORAGE, make_float, Fcons, Fmake_vector, Fmake_symbol,
Karl Heuer <kwzh@gnu.org>
parents:
9144
diff
changeset
|
1546 XSETSTRING (new, PUREBEG + pureptr); |
| 300 | 1547 XSTRING (new)->size = length; |
|
21258
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1548 SET_STRING_BYTES (XSTRING (new), (multibyte ? length_byte : -1)); |
|
20587
eaf988c7e291
(make_pure_string): New arg length_byte.
Richard M. Stallman <rms@gnu.org>
parents:
20565
diff
changeset
|
1549 bcopy (data, XSTRING (new)->data, length_byte); |
|
eaf988c7e291
(make_pure_string): New arg length_byte.
Richard M. Stallman <rms@gnu.org>
parents:
20565
diff
changeset
|
1550 XSTRING (new)->data[length_byte] = 0; |
|
4956
0f94e1e7d273
(make_pure_string): If we USE_TEXT_PROPERTIES, set the
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1551 |
|
0f94e1e7d273
(make_pure_string): If we USE_TEXT_PROPERTIES, set the
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1552 /* We must give strings in pure storage some kind of interval. So we |
|
0f94e1e7d273
(make_pure_string): If we USE_TEXT_PROPERTIES, set the
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1553 give them a null one. */ |
|
0f94e1e7d273
(make_pure_string): If we USE_TEXT_PROPERTIES, set the
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1554 #if defined (USE_TEXT_PROPERTIES) |
|
0f94e1e7d273
(make_pure_string): If we USE_TEXT_PROPERTIES, set the
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1555 XSTRING (new)->intervals = NULL_INTERVAL; |
|
0f94e1e7d273
(make_pure_string): If we USE_TEXT_PROPERTIES, set the
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1556 #endif |
| 20659 | 1557 pureptr += size; |
| 300 | 1558 return new; |
| 1559 } | |
| 1560 | |
| 1561 Lisp_Object | |
| 1562 pure_cons (car, cdr) | |
| 1563 Lisp_Object car, cdr; | |
| 1564 { | |
| 1565 register Lisp_Object new; | |
| 1566 | |
| 1567 if (pureptr + sizeof (struct Lisp_Cons) > PURESIZE) | |
| 1568 error ("Pure Lisp storage exhausted"); | |
|
9261
e5ba7993d378
(VALIDATE_LISP_STORAGE, make_float, Fcons, Fmake_vector, Fmake_symbol,
Karl Heuer <kwzh@gnu.org>
parents:
9144
diff
changeset
|
1569 XSETCONS (new, PUREBEG + pureptr); |
| 300 | 1570 pureptr += sizeof (struct Lisp_Cons); |
| 1571 XCONS (new)->car = Fpurecopy (car); | |
| 1572 XCONS (new)->cdr = Fpurecopy (cdr); | |
| 1573 return new; | |
| 1574 } | |
| 1575 | |
| 1576 #ifdef LISP_FLOAT_TYPE | |
| 1577 | |
| 1578 Lisp_Object | |
| 1579 make_pure_float (num) | |
| 1580 double num; | |
| 1581 { | |
| 1582 register Lisp_Object new; | |
| 1583 | |
|
1939
def7b9c64935
* alloc.c (make_pure_float): Assure that PUREBEG + pureptr is
Jim Blandy <jimb@redhat.com>
parents:
1936
diff
changeset
|
1584 /* Make sure that PUREBEG + pureptr is aligned on at least a sizeof |
|
def7b9c64935
* alloc.c (make_pure_float): Assure that PUREBEG + pureptr is
Jim Blandy <jimb@redhat.com>
parents:
1936
diff
changeset
|
1585 (double) boundary. Some architectures (like the sparc) require |
|
def7b9c64935
* alloc.c (make_pure_float): Assure that PUREBEG + pureptr is
Jim Blandy <jimb@redhat.com>
parents:
1936
diff
changeset
|
1586 this, and I suspect that floats are rare enough that it's no |
|
def7b9c64935
* alloc.c (make_pure_float): Assure that PUREBEG + pureptr is
Jim Blandy <jimb@redhat.com>
parents:
1936
diff
changeset
|
1587 tragedy for those that do. */ |
|
def7b9c64935
* alloc.c (make_pure_float): Assure that PUREBEG + pureptr is
Jim Blandy <jimb@redhat.com>
parents:
1936
diff
changeset
|
1588 { |
|
def7b9c64935
* alloc.c (make_pure_float): Assure that PUREBEG + pureptr is
Jim Blandy <jimb@redhat.com>
parents:
1936
diff
changeset
|
1589 int alignment; |
|
def7b9c64935
* alloc.c (make_pure_float): Assure that PUREBEG + pureptr is
Jim Blandy <jimb@redhat.com>
parents:
1936
diff
changeset
|
1590 char *p = PUREBEG + pureptr; |
|
def7b9c64935
* alloc.c (make_pure_float): Assure that PUREBEG + pureptr is
Jim Blandy <jimb@redhat.com>
parents:
1936
diff
changeset
|
1591 |
|
1936
82bbf90208d4
* alloc.c (make_pure_float): Align pureptr according to __alignof,
Jim Blandy <jimb@redhat.com>
parents:
1908
diff
changeset
|
1592 #ifdef __GNUC__ |
|
82bbf90208d4
* alloc.c (make_pure_float): Align pureptr according to __alignof,
Jim Blandy <jimb@redhat.com>
parents:
1908
diff
changeset
|
1593 #if __GNUC__ >= 2 |
|
1939
def7b9c64935
* alloc.c (make_pure_float): Assure that PUREBEG + pureptr is
Jim Blandy <jimb@redhat.com>
parents:
1936
diff
changeset
|
1594 alignment = __alignof (struct Lisp_Float); |
|
1936
82bbf90208d4
* alloc.c (make_pure_float): Align pureptr according to __alignof,
Jim Blandy <jimb@redhat.com>
parents:
1908
diff
changeset
|
1595 #else |
|
1939
def7b9c64935
* alloc.c (make_pure_float): Assure that PUREBEG + pureptr is
Jim Blandy <jimb@redhat.com>
parents:
1936
diff
changeset
|
1596 alignment = sizeof (struct Lisp_Float); |
|
1936
82bbf90208d4
* alloc.c (make_pure_float): Align pureptr according to __alignof,
Jim Blandy <jimb@redhat.com>
parents:
1908
diff
changeset
|
1597 #endif |
|
82bbf90208d4
* alloc.c (make_pure_float): Align pureptr according to __alignof,
Jim Blandy <jimb@redhat.com>
parents:
1908
diff
changeset
|
1598 #else |
|
1939
def7b9c64935
* alloc.c (make_pure_float): Assure that PUREBEG + pureptr is
Jim Blandy <jimb@redhat.com>
parents:
1936
diff
changeset
|
1599 alignment = sizeof (struct Lisp_Float); |
|
1936
82bbf90208d4
* alloc.c (make_pure_float): Align pureptr according to __alignof,
Jim Blandy <jimb@redhat.com>
parents:
1908
diff
changeset
|
1600 #endif |
|
1939
def7b9c64935
* alloc.c (make_pure_float): Assure that PUREBEG + pureptr is
Jim Blandy <jimb@redhat.com>
parents:
1936
diff
changeset
|
1601 p = (char *) (((unsigned long) p + alignment - 1) & - alignment); |
|
def7b9c64935
* alloc.c (make_pure_float): Assure that PUREBEG + pureptr is
Jim Blandy <jimb@redhat.com>
parents:
1936
diff
changeset
|
1602 pureptr = p - PUREBEG; |
|
def7b9c64935
* alloc.c (make_pure_float): Assure that PUREBEG + pureptr is
Jim Blandy <jimb@redhat.com>
parents:
1936
diff
changeset
|
1603 } |
|
1908
d649f2179d67
* alloc.c (make_pure_float): Align pureptr on a sizeof (double)
Jim Blandy <jimb@redhat.com>
parents:
1893
diff
changeset
|
1604 |
| 300 | 1605 if (pureptr + sizeof (struct Lisp_Float) > PURESIZE) |
| 1606 error ("Pure Lisp storage exhausted"); | |
|
9261
e5ba7993d378
(VALIDATE_LISP_STORAGE, make_float, Fcons, Fmake_vector, Fmake_symbol,
Karl Heuer <kwzh@gnu.org>
parents:
9144
diff
changeset
|
1607 XSETFLOAT (new, PUREBEG + pureptr); |
| 300 | 1608 pureptr += sizeof (struct Lisp_Float); |
| 1609 XFLOAT (new)->data = num; | |
|
9295
17d393a8eed6
(free_float, make_float, free_cons, Flist, Fvector, Fmake_byte_code,
Karl Heuer <kwzh@gnu.org>
parents:
9261
diff
changeset
|
1610 XSETFASTINT (XFLOAT (new)->type, 0); /* bug chasing -wsr */ |
| 300 | 1611 return new; |
| 1612 } | |
| 1613 | |
| 1614 #endif /* LISP_FLOAT_TYPE */ | |
| 1615 | |
| 1616 Lisp_Object | |
| 1617 make_pure_vector (len) | |
|
8817
48ff00bebef6
(pure, pure_size): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
1618 EMACS_INT len; |
| 300 | 1619 { |
| 1620 register Lisp_Object new; | |
|
8817
48ff00bebef6
(pure, pure_size): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
1621 register EMACS_INT size = sizeof (struct Lisp_Vector) + (len - 1) * sizeof (Lisp_Object); |
| 300 | 1622 |
| 1623 if (pureptr + size > PURESIZE) | |
| 1624 error ("Pure Lisp storage exhausted"); | |
| 1625 | |
|
9261
e5ba7993d378
(VALIDATE_LISP_STORAGE, make_float, Fcons, Fmake_vector, Fmake_symbol,
Karl Heuer <kwzh@gnu.org>
parents:
9144
diff
changeset
|
1626 XSETVECTOR (new, PUREBEG + pureptr); |
| 300 | 1627 pureptr += size; |
| 1628 XVECTOR (new)->size = len; | |
| 1629 return new; | |
| 1630 } | |
| 1631 | |
| 1632 DEFUN ("purecopy", Fpurecopy, Spurecopy, 1, 1, 0, | |
| 1633 "Make a copy of OBJECT in pure storage.\n\ | |
| 1634 Recursively copies contents of vectors and cons cells.\n\ | |
| 1635 Does not copy symbols.") | |
| 1636 (obj) | |
| 1637 register Lisp_Object obj; | |
| 1638 { | |
| 485 | 1639 if (NILP (Vpurify_flag)) |
| 300 | 1640 return obj; |
| 1641 | |
| 1642 if ((PNTR_COMPARISON_TYPE) XPNTR (obj) < (PNTR_COMPARISON_TYPE) ((char *) pure + PURESIZE) | |
| 1643 && (PNTR_COMPARISON_TYPE) XPNTR (obj) >= (PNTR_COMPARISON_TYPE) pure) | |
| 1644 return obj; | |
| 1645 | |
|
10004
2c57cb7eba5f
(Fpurecopy): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9968
diff
changeset
|
1646 if (CONSP (obj)) |
|
2c57cb7eba5f
(Fpurecopy): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9968
diff
changeset
|
1647 return pure_cons (XCONS (obj)->car, XCONS (obj)->cdr); |
| 300 | 1648 #ifdef LISP_FLOAT_TYPE |
|
10004
2c57cb7eba5f
(Fpurecopy): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9968
diff
changeset
|
1649 else if (FLOATP (obj)) |
|
2c57cb7eba5f
(Fpurecopy): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9968
diff
changeset
|
1650 return make_pure_float (XFLOAT (obj)->data); |
| 300 | 1651 #endif /* LISP_FLOAT_TYPE */ |
|
10004
2c57cb7eba5f
(Fpurecopy): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9968
diff
changeset
|
1652 else if (STRINGP (obj)) |
|
20587
eaf988c7e291
(make_pure_string): New arg length_byte.
Richard M. Stallman <rms@gnu.org>
parents:
20565
diff
changeset
|
1653 return make_pure_string (XSTRING (obj)->data, XSTRING (obj)->size, |
|
21258
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1654 STRING_BYTES (XSTRING (obj)), |
|
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1655 STRING_MULTIBYTE (obj)); |
|
10004
2c57cb7eba5f
(Fpurecopy): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9968
diff
changeset
|
1656 else if (COMPILEDP (obj) || VECTORP (obj)) |
|
2c57cb7eba5f
(Fpurecopy): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9968
diff
changeset
|
1657 { |
|
2c57cb7eba5f
(Fpurecopy): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9968
diff
changeset
|
1658 register struct Lisp_Vector *vec; |
|
2c57cb7eba5f
(Fpurecopy): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9968
diff
changeset
|
1659 register int i, size; |
| 300 | 1660 |
|
10004
2c57cb7eba5f
(Fpurecopy): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9968
diff
changeset
|
1661 size = XVECTOR (obj)->size; |
|
10427
5faba1b094d5
(Fpurecopy): Mask size field when copying pseudovector.
Karl Heuer <kwzh@gnu.org>
parents:
10414
diff
changeset
|
1662 if (size & PSEUDOVECTOR_FLAG) |
|
5faba1b094d5
(Fpurecopy): Mask size field when copying pseudovector.
Karl Heuer <kwzh@gnu.org>
parents:
10414
diff
changeset
|
1663 size &= PSEUDOVECTOR_SIZE_MASK; |
|
16100
ccd19852de65
(Fpurecopy): Cast arg to make_pure_vector.
Richard M. Stallman <rms@gnu.org>
parents:
16051
diff
changeset
|
1664 vec = XVECTOR (make_pure_vector ((EMACS_INT) size)); |
|
10004
2c57cb7eba5f
(Fpurecopy): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9968
diff
changeset
|
1665 for (i = 0; i < size; i++) |
|
2c57cb7eba5f
(Fpurecopy): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9968
diff
changeset
|
1666 vec->contents[i] = Fpurecopy (XVECTOR (obj)->contents[i]); |
|
2c57cb7eba5f
(Fpurecopy): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9968
diff
changeset
|
1667 if (COMPILEDP (obj)) |
|
2c57cb7eba5f
(Fpurecopy): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9968
diff
changeset
|
1668 XSETCOMPILED (obj, vec); |
|
2c57cb7eba5f
(Fpurecopy): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9968
diff
changeset
|
1669 else |
|
2c57cb7eba5f
(Fpurecopy): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9968
diff
changeset
|
1670 XSETVECTOR (obj, vec); |
| 300 | 1671 return obj; |
| 1672 } | |
|
10004
2c57cb7eba5f
(Fpurecopy): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9968
diff
changeset
|
1673 else if (MARKERP (obj)) |
|
2c57cb7eba5f
(Fpurecopy): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9968
diff
changeset
|
1674 error ("Attempt to copy a marker to pure storage"); |
|
2c57cb7eba5f
(Fpurecopy): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9968
diff
changeset
|
1675 else |
|
2c57cb7eba5f
(Fpurecopy): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9968
diff
changeset
|
1676 return obj; |
| 300 | 1677 } |
| 1678 | |
| 1679 /* Recording what needs to be marked for gc. */ | |
| 1680 | |
| 1681 struct gcpro *gcprolist; | |
| 1682 | |
|
25024
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
1683 #define NSTATICS 1024 |
| 300 | 1684 |
| 1685 Lisp_Object *staticvec[NSTATICS] = {0}; | |
| 1686 | |
| 1687 int staticidx = 0; | |
| 1688 | |
| 1689 /* Put an entry in staticvec, pointing at the variable whose address is given */ | |
| 1690 | |
| 1691 void | |
| 1692 staticpro (varaddress) | |
| 1693 Lisp_Object *varaddress; | |
| 1694 { | |
| 1695 staticvec[staticidx++] = varaddress; | |
| 1696 if (staticidx >= NSTATICS) | |
| 1697 abort (); | |
| 1698 } | |
| 1699 | |
| 1700 struct catchtag | |
| 1701 { | |
| 1702 Lisp_Object tag; | |
| 1703 Lisp_Object val; | |
| 1704 struct catchtag *next; | |
|
20391
d6605eeb5bd5
Comment fix (to avoid "unterminated comment" warning).
Karl Heuer <kwzh@gnu.org>
parents:
20375
diff
changeset
|
1705 #if 0 /* We don't need this for GC purposes */ |
|
d6605eeb5bd5
Comment fix (to avoid "unterminated comment" warning).
Karl Heuer <kwzh@gnu.org>
parents:
20375
diff
changeset
|
1706 jmp_buf jmp; |
|
d6605eeb5bd5
Comment fix (to avoid "unterminated comment" warning).
Karl Heuer <kwzh@gnu.org>
parents:
20375
diff
changeset
|
1707 #endif |
| 300 | 1708 }; |
| 1709 | |
| 1710 struct backtrace | |
| 1711 { | |
| 1712 struct backtrace *next; | |
| 1713 Lisp_Object *function; | |
| 1714 Lisp_Object *args; /* Points to vector of args. */ | |
| 1715 int nargs; /* length of vector */ | |
| 1716 /* if nargs is UNEVALLED, args points to slot holding list of unevalled args */ | |
| 1717 char evalargs; | |
| 1718 }; | |
| 1719 | |
|
1908
d649f2179d67
* alloc.c (make_pure_float): Align pureptr on a sizeof (double)
Jim Blandy <jimb@redhat.com>
parents:
1893
diff
changeset
|
1720 /* Garbage collection! */ |
|
d649f2179d67
* alloc.c (make_pure_float): Align pureptr on a sizeof (double)
Jim Blandy <jimb@redhat.com>
parents:
1893
diff
changeset
|
1721 |
|
11374
1ebc81f84aa4
(inhibit_garbage_collection): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11341
diff
changeset
|
1722 /* Temporarily prevent garbage collection. */ |
|
1ebc81f84aa4
(inhibit_garbage_collection): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11341
diff
changeset
|
1723 |
|
1ebc81f84aa4
(inhibit_garbage_collection): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11341
diff
changeset
|
1724 int |
|
1ebc81f84aa4
(inhibit_garbage_collection): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11341
diff
changeset
|
1725 inhibit_garbage_collection () |
|
1ebc81f84aa4
(inhibit_garbage_collection): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11341
diff
changeset
|
1726 { |
|
1ebc81f84aa4
(inhibit_garbage_collection): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11341
diff
changeset
|
1727 int count = specpdl_ptr - specpdl; |
|
11679
1ced2d67d411
(gc_cons_threshold): Make this an EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
11593
diff
changeset
|
1728 Lisp_Object number; |
|
13363
941c37982f37
(BITS_PER_SHORT, BITS_PER_INT, BITS_PER_LONG):
Karl Heuer <kwzh@gnu.org>
parents:
13322
diff
changeset
|
1729 int nbits = min (VALBITS, BITS_PER_INT); |
|
11374
1ebc81f84aa4
(inhibit_garbage_collection): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11341
diff
changeset
|
1730 |
|
11727
53ccd2d608ee
(gc_cons_threshold): Change back to int.
Richard M. Stallman <rms@gnu.org>
parents:
11679
diff
changeset
|
1731 XSETINT (number, ((EMACS_INT) 1 << (nbits - 1)) - 1); |
|
11679
1ced2d67d411
(gc_cons_threshold): Make this an EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
11593
diff
changeset
|
1732 |
|
1ced2d67d411
(gc_cons_threshold): Make this an EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
11593
diff
changeset
|
1733 specbind (Qgc_cons_threshold, number); |
|
11374
1ebc81f84aa4
(inhibit_garbage_collection): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11341
diff
changeset
|
1734 |
|
1ebc81f84aa4
(inhibit_garbage_collection): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11341
diff
changeset
|
1735 return count; |
|
1ebc81f84aa4
(inhibit_garbage_collection): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11341
diff
changeset
|
1736 } |
|
1ebc81f84aa4
(inhibit_garbage_collection): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11341
diff
changeset
|
1737 |
| 300 | 1738 DEFUN ("garbage-collect", Fgarbage_collect, Sgarbage_collect, 0, 0, "", |
| 1739 "Reclaim storage for Lisp objects no longer needed.\n\ | |
| 1740 Returns info on amount of space in use:\n\ | |
| 1741 ((USED-CONSES . FREE-CONSES) (USED-SYMS . FREE-SYMS)\n\ | |
| 1742 (USED-MARKERS . FREE-MARKERS) USED-STRING-CHARS USED-VECTOR-SLOTS\n\ | |
|
16001
36d2c4a8e064
(Fgarbage_collect): Report used and free intervals.
Richard M. Stallman <rms@gnu.org>
parents:
15960
diff
changeset
|
1743 (USED-FLOATS . FREE-FLOATS) (USED-INTERVALS . FREE-INTERVALS))\n\ |
| 300 | 1744 Garbage collection happens automatically if you cons more than\n\ |
| 1745 `gc-cons-threshold' bytes of Lisp data since previous garbage collection.") | |
| 1746 () | |
| 1747 { | |
| 1748 register struct gcpro *tail; | |
| 1749 register struct specbinding *bind; | |
| 1750 struct catchtag *catch; | |
| 1751 struct handler *handler; | |
| 1752 register struct backtrace *backlist; | |
| 1753 register Lisp_Object tem; | |
| 1754 char stack_top_variable; | |
| 1755 register int i; | |
|
25343
fe92158a9e83
(Fgarbage_collect): Use push_message, restore_message,
Gerd Moellmann <gerd@gnu.org>
parents:
25133
diff
changeset
|
1756 int message_p; |
| 300 | 1757 |
|
11892
6be0b7a0ac44
(Fgarbage_collect): Clear consing_since_gc first thing.
Karl Heuer <kwzh@gnu.org>
parents:
11727
diff
changeset
|
1758 /* In case user calls debug_print during GC, |
|
6be0b7a0ac44
(Fgarbage_collect): Clear consing_since_gc first thing.
Karl Heuer <kwzh@gnu.org>
parents:
11727
diff
changeset
|
1759 don't let that cause a recursive GC. */ |
|
6be0b7a0ac44
(Fgarbage_collect): Clear consing_since_gc first thing.
Karl Heuer <kwzh@gnu.org>
parents:
11727
diff
changeset
|
1760 consing_since_gc = 0; |
|
6be0b7a0ac44
(Fgarbage_collect): Clear consing_since_gc first thing.
Karl Heuer <kwzh@gnu.org>
parents:
11727
diff
changeset
|
1761 |
|
25343
fe92158a9e83
(Fgarbage_collect): Use push_message, restore_message,
Gerd Moellmann <gerd@gnu.org>
parents:
25133
diff
changeset
|
1762 /* Save what's currently displayed in the echo area. */ |
|
fe92158a9e83
(Fgarbage_collect): Use push_message, restore_message,
Gerd Moellmann <gerd@gnu.org>
parents:
25133
diff
changeset
|
1763 message_p = push_message (); |
|
25024
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
1764 |
| 300 | 1765 /* Save a copy of the contents of the stack, for debugging. */ |
| 1766 #if MAX_SAVE_STACK > 0 | |
| 485 | 1767 if (NILP (Vpurify_flag)) |
| 300 | 1768 { |
| 1769 i = &stack_top_variable - stack_bottom; | |
| 1770 if (i < 0) i = -i; | |
| 1771 if (i < MAX_SAVE_STACK) | |
| 1772 { | |
| 1773 if (stack_copy == 0) | |
|
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
1774 stack_copy = (char *) xmalloc (stack_copy_size = i); |
| 300 | 1775 else if (stack_copy_size < i) |
|
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
1776 stack_copy = (char *) xrealloc (stack_copy, (stack_copy_size = i)); |
| 300 | 1777 if (stack_copy) |
| 1778 { | |
|
8817
48ff00bebef6
(pure, pure_size): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
1779 if ((EMACS_INT) (&stack_top_variable - stack_bottom) > 0) |
| 300 | 1780 bcopy (stack_bottom, stack_copy, i); |
| 1781 else | |
| 1782 bcopy (&stack_top_variable, stack_copy, i); | |
| 1783 } | |
| 1784 } | |
| 1785 } | |
| 1786 #endif /* MAX_SAVE_STACK > 0 */ | |
| 1787 | |
|
14959
f2b5d784fa88
(garbage_collection_messages): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
14764
diff
changeset
|
1788 if (garbage_collection_messages) |
|
10395
c121703d35c7
(Fgarbage_collect): Don't log the GC message.
Karl Heuer <kwzh@gnu.org>
parents:
10389
diff
changeset
|
1789 message1_nolog ("Garbage collecting..."); |
| 300 | 1790 |
|
23534
6f9c70db3a58
(Fgarbage_collect): Block input around most of the function.
Richard M. Stallman <rms@gnu.org>
parents:
22382
diff
changeset
|
1791 BLOCK_INPUT; |
|
6f9c70db3a58
(Fgarbage_collect): Block input around most of the function.
Richard M. Stallman <rms@gnu.org>
parents:
22382
diff
changeset
|
1792 |
|
22220
a0cd311af6e3
(Fgarbage_collect): Call shrink_regexp_cache.
Richard M. Stallman <rms@gnu.org>
parents:
21948
diff
changeset
|
1793 shrink_regexp_cache (); |
|
a0cd311af6e3
(Fgarbage_collect): Call shrink_regexp_cache.
Richard M. Stallman <rms@gnu.org>
parents:
21948
diff
changeset
|
1794 |
|
21680
c744d468bfb6
(Fgarbage_collect): Don't truncate command-history here.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
1795 /* Don't keep undo information around forever. */ |
| 300 | 1796 { |
| 1797 register struct buffer *nextb = all_buffers; | |
| 1798 | |
| 1799 while (nextb) | |
| 1800 { | |
| 648 | 1801 /* If a buffer's undo list is Qt, that means that undo is |
| 1802 turned off in that buffer. Calling truncate_undo_list on | |
| 1803 Qt tends to return NULL, which effectively turns undo back on. | |
| 1804 So don't call truncate_undo_list if undo_list is Qt. */ | |
| 1805 if (! EQ (nextb->undo_list, Qt)) | |
| 1806 nextb->undo_list | |
| 764 | 1807 = truncate_undo_list (nextb->undo_list, undo_limit, |
| 1808 undo_strong_limit); | |
| 300 | 1809 nextb = nextb->next; |
| 1810 } | |
| 1811 } | |
| 1812 | |
| 1813 gc_in_progress = 1; | |
| 1814 | |
| 16231 | 1815 /* clear_marks (); */ |
| 300 | 1816 |
| 1817 /* In each "large string", set the MARKBIT of the size field. | |
| 1818 That enables mark_object to recognize them. */ | |
| 1819 { | |
| 1820 register struct string_block *b; | |
| 1821 for (b = large_string_blocks; b; b = b->next) | |
| 1822 ((struct Lisp_String *)(&b->chars[0]))->size |= MARKBIT; | |
| 1823 } | |
| 1824 | |
| 1825 /* Mark all the special slots that serve as the roots of accessibility. | |
| 1826 | |
| 1827 Usually the special slots to mark are contained in particular structures. | |
| 1828 Then we know no slot is marked twice because the structures don't overlap. | |
| 1829 In some cases, the structures point to the slots to be marked. | |
| 1830 For these, we use MARKBIT to avoid double marking of the slot. */ | |
| 1831 | |
| 1832 for (i = 0; i < staticidx; i++) | |
| 1833 mark_object (staticvec[i]); | |
| 1834 for (tail = gcprolist; tail; tail = tail->next) | |
| 1835 for (i = 0; i < tail->nvars; i++) | |
| 1836 if (!XMARKBIT (tail->var[i])) | |
| 1837 { | |
| 1838 mark_object (&tail->var[i]); | |
| 1839 XMARK (tail->var[i]); | |
| 1840 } | |
| 1841 for (bind = specpdl; bind != specpdl_ptr; bind++) | |
| 1842 { | |
| 1843 mark_object (&bind->symbol); | |
| 1844 mark_object (&bind->old_value); | |
| 1845 } | |
| 1846 for (catch = catchlist; catch; catch = catch->next) | |
| 1847 { | |
| 1848 mark_object (&catch->tag); | |
| 1849 mark_object (&catch->val); | |
| 1850 } | |
| 1851 for (handler = handlerlist; handler; handler = handler->next) | |
| 1852 { | |
| 1853 mark_object (&handler->handler); | |
| 1854 mark_object (&handler->var); | |
| 1855 } | |
| 1856 for (backlist = backtrace_list; backlist; backlist = backlist->next) | |
| 1857 { | |
| 1858 if (!XMARKBIT (*backlist->function)) | |
| 1859 { | |
| 1860 mark_object (backlist->function); | |
| 1861 XMARK (*backlist->function); | |
| 1862 } | |
| 1863 if (backlist->nargs == UNEVALLED || backlist->nargs == MANY) | |
| 1864 i = 0; | |
| 1865 else | |
| 1866 i = backlist->nargs - 1; | |
| 1867 for (; i >= 0; i--) | |
| 1868 if (!XMARKBIT (backlist->args[i])) | |
| 1869 { | |
| 1870 mark_object (&backlist->args[i]); | |
| 1871 XMARK (backlist->args[i]); | |
| 1872 } | |
| 1873 } | |
|
11018
2d9bdf1ba3d1
(mark_kboards): Renamed from mark_perdisplays.
Karl Heuer <kwzh@gnu.org>
parents:
10936
diff
changeset
|
1874 mark_kboards (); |
| 300 | 1875 |
|
21306
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
1876 /* Look thru every buffer's undo list |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
1877 for elements that update markers that were not marked, |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
1878 and delete them. */ |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
1879 { |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
1880 register struct buffer *nextb = all_buffers; |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
1881 |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
1882 while (nextb) |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
1883 { |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
1884 /* If a buffer's undo list is Qt, that means that undo is |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
1885 turned off in that buffer. Calling truncate_undo_list on |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
1886 Qt tends to return NULL, which effectively turns undo back on. |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
1887 So don't call truncate_undo_list if undo_list is Qt. */ |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
1888 if (! EQ (nextb->undo_list, Qt)) |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
1889 { |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
1890 Lisp_Object tail, prev; |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
1891 tail = nextb->undo_list; |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
1892 prev = Qnil; |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
1893 while (CONSP (tail)) |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
1894 { |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
1895 if (GC_CONSP (XCONS (tail)->car) |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
1896 && GC_MARKERP (XCONS (XCONS (tail)->car)->car) |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
1897 && ! XMARKBIT (XMARKER (XCONS (XCONS (tail)->car)->car)->chain)) |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
1898 { |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
1899 if (NILP (prev)) |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
1900 nextb->undo_list = tail = XCONS (tail)->cdr; |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
1901 else |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
1902 tail = XCONS (prev)->cdr = XCONS (tail)->cdr; |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
1903 } |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
1904 else |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
1905 { |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
1906 prev = tail; |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
1907 tail = XCONS (tail)->cdr; |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
1908 } |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
1909 } |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
1910 } |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
1911 |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
1912 nextb = nextb->next; |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
1913 } |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
1914 } |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
1915 |
| 300 | 1916 gc_sweep (); |
| 1917 | |
| 1918 /* Clear the mark bits that we set in certain root slots. */ | |
| 1919 | |
| 1920 for (tail = gcprolist; tail; tail = tail->next) | |
| 1921 for (i = 0; i < tail->nvars; i++) | |
| 1922 XUNMARK (tail->var[i]); | |
| 1923 for (backlist = backtrace_list; backlist; backlist = backlist->next) | |
| 1924 { | |
| 1925 XUNMARK (*backlist->function); | |
| 1926 if (backlist->nargs == UNEVALLED || backlist->nargs == MANY) | |
| 1927 i = 0; | |
| 1928 else | |
| 1929 i = backlist->nargs - 1; | |
| 1930 for (; i >= 0; i--) | |
| 1931 XUNMARK (backlist->args[i]); | |
| 1932 } | |
| 1933 XUNMARK (buffer_defaults.name); | |
| 1934 XUNMARK (buffer_local_symbols.name); | |
| 1935 | |
|
23534
6f9c70db3a58
(Fgarbage_collect): Block input around most of the function.
Richard M. Stallman <rms@gnu.org>
parents:
22382
diff
changeset
|
1936 UNBLOCK_INPUT; |
|
6f9c70db3a58
(Fgarbage_collect): Block input around most of the function.
Richard M. Stallman <rms@gnu.org>
parents:
22382
diff
changeset
|
1937 |
| 16231 | 1938 /* clear_marks (); */ |
| 300 | 1939 gc_in_progress = 0; |
| 1940 | |
| 1941 consing_since_gc = 0; | |
| 1942 if (gc_cons_threshold < 10000) | |
| 1943 gc_cons_threshold = 10000; | |
| 1944 | |
|
14959
f2b5d784fa88
(garbage_collection_messages): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
14764
diff
changeset
|
1945 if (garbage_collection_messages) |
|
f2b5d784fa88
(garbage_collection_messages): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
14764
diff
changeset
|
1946 { |
|
25343
fe92158a9e83
(Fgarbage_collect): Use push_message, restore_message,
Gerd Moellmann <gerd@gnu.org>
parents:
25133
diff
changeset
|
1947 if (message_p || minibuf_level > 0) |
|
fe92158a9e83
(Fgarbage_collect): Use push_message, restore_message,
Gerd Moellmann <gerd@gnu.org>
parents:
25133
diff
changeset
|
1948 restore_message (); |
|
14959
f2b5d784fa88
(garbage_collection_messages): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
14764
diff
changeset
|
1949 else |
|
f2b5d784fa88
(garbage_collection_messages): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
14764
diff
changeset
|
1950 message1_nolog ("Garbage collecting...done"); |
|
f2b5d784fa88
(garbage_collection_messages): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
14764
diff
changeset
|
1951 } |
| 300 | 1952 |
|
25343
fe92158a9e83
(Fgarbage_collect): Use push_message, restore_message,
Gerd Moellmann <gerd@gnu.org>
parents:
25133
diff
changeset
|
1953 pop_message (); |
|
fe92158a9e83
(Fgarbage_collect): Use push_message, restore_message,
Gerd Moellmann <gerd@gnu.org>
parents:
25133
diff
changeset
|
1954 |
| 300 | 1955 return Fcons (Fcons (make_number (total_conses), |
| 1956 make_number (total_free_conses)), | |
| 1957 Fcons (Fcons (make_number (total_symbols), | |
| 1958 make_number (total_free_symbols)), | |
| 1959 Fcons (Fcons (make_number (total_markers), | |
| 1960 make_number (total_free_markers)), | |
| 1961 Fcons (make_number (total_string_size), | |
| 1962 Fcons (make_number (total_vector_size), | |
|
16001
36d2c4a8e064
(Fgarbage_collect): Report used and free intervals.
Richard M. Stallman <rms@gnu.org>
parents:
15960
diff
changeset
|
1963 Fcons (Fcons |
| 300 | 1964 #ifdef LISP_FLOAT_TYPE |
|
16001
36d2c4a8e064
(Fgarbage_collect): Report used and free intervals.
Richard M. Stallman <rms@gnu.org>
parents:
15960
diff
changeset
|
1965 (make_number (total_floats), |
|
36d2c4a8e064
(Fgarbage_collect): Report used and free intervals.
Richard M. Stallman <rms@gnu.org>
parents:
15960
diff
changeset
|
1966 make_number (total_free_floats)), |
| 300 | 1967 #else /* not LISP_FLOAT_TYPE */ |
|
16001
36d2c4a8e064
(Fgarbage_collect): Report used and free intervals.
Richard M. Stallman <rms@gnu.org>
parents:
15960
diff
changeset
|
1968 (make_number (0), make_number (0)), |
| 300 | 1969 #endif /* not LISP_FLOAT_TYPE */ |
|
16001
36d2c4a8e064
(Fgarbage_collect): Report used and free intervals.
Richard M. Stallman <rms@gnu.org>
parents:
15960
diff
changeset
|
1970 Fcons (Fcons |
|
36d2c4a8e064
(Fgarbage_collect): Report used and free intervals.
Richard M. Stallman <rms@gnu.org>
parents:
15960
diff
changeset
|
1971 #ifdef USE_TEXT_PROPERTIES |
|
36d2c4a8e064
(Fgarbage_collect): Report used and free intervals.
Richard M. Stallman <rms@gnu.org>
parents:
15960
diff
changeset
|
1972 (make_number (total_intervals), |
|
36d2c4a8e064
(Fgarbage_collect): Report used and free intervals.
Richard M. Stallman <rms@gnu.org>
parents:
15960
diff
changeset
|
1973 make_number (total_free_intervals)), |
|
36d2c4a8e064
(Fgarbage_collect): Report used and free intervals.
Richard M. Stallman <rms@gnu.org>
parents:
15960
diff
changeset
|
1974 #else /* not USE_TEXT_PROPERTIES */ |
|
36d2c4a8e064
(Fgarbage_collect): Report used and free intervals.
Richard M. Stallman <rms@gnu.org>
parents:
15960
diff
changeset
|
1975 (make_number (0), make_number (0)), |
|
36d2c4a8e064
(Fgarbage_collect): Report used and free intervals.
Richard M. Stallman <rms@gnu.org>
parents:
15960
diff
changeset
|
1976 #endif /* not USE_TEXT_PROPERTIES */ |
|
36d2c4a8e064
(Fgarbage_collect): Report used and free intervals.
Richard M. Stallman <rms@gnu.org>
parents:
15960
diff
changeset
|
1977 Qnil))))))); |
| 300 | 1978 } |
| 1979 | |
| 1980 #if 0 | |
| 1981 static void | |
| 1982 clear_marks () | |
| 1983 { | |
| 1984 /* Clear marks on all conses */ | |
| 1985 { | |
| 1986 register struct cons_block *cblk; | |
| 1987 register int lim = cons_block_index; | |
| 1988 | |
| 1989 for (cblk = cons_block; cblk; cblk = cblk->next) | |
| 1990 { | |
| 1991 register int i; | |
| 1992 for (i = 0; i < lim; i++) | |
| 1993 XUNMARK (cblk->conses[i].car); | |
| 1994 lim = CONS_BLOCK_SIZE; | |
| 1995 } | |
| 1996 } | |
| 1997 /* Clear marks on all symbols */ | |
| 1998 { | |
| 1999 register struct symbol_block *sblk; | |
| 2000 register int lim = symbol_block_index; | |
| 2001 | |
| 2002 for (sblk = symbol_block; sblk; sblk = sblk->next) | |
| 2003 { | |
| 2004 register int i; | |
| 2005 for (i = 0; i < lim; i++) | |
| 2006 { | |
| 2007 XUNMARK (sblk->symbols[i].plist); | |
| 2008 } | |
| 2009 lim = SYMBOL_BLOCK_SIZE; | |
| 2010 } | |
| 2011 } | |
| 2012 /* Clear marks on all markers */ | |
| 2013 { | |
| 2014 register struct marker_block *sblk; | |
| 2015 register int lim = marker_block_index; | |
| 2016 | |
| 2017 for (sblk = marker_block; sblk; sblk = sblk->next) | |
| 2018 { | |
| 2019 register int i; | |
| 2020 for (i = 0; i < lim; i++) | |
|
11243
054ecfce1820
(Fmake_marker, mark_object): Use XMISCTYPE.
Richard M. Stallman <rms@gnu.org>
parents:
11048
diff
changeset
|
2021 if (sblk->markers[i].u_marker.type == Lisp_Misc_Marker) |
|
9437
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
2022 XUNMARK (sblk->markers[i].u_marker.chain); |
| 300 | 2023 lim = MARKER_BLOCK_SIZE; |
| 2024 } | |
| 2025 } | |
| 2026 /* Clear mark bits on all buffers */ | |
| 2027 { | |
| 2028 register struct buffer *nextb = all_buffers; | |
| 2029 | |
| 2030 while (nextb) | |
| 2031 { | |
| 2032 XUNMARK (nextb->name); | |
| 2033 nextb = nextb->next; | |
| 2034 } | |
| 2035 } | |
| 2036 } | |
| 2037 #endif | |
|
25024
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2038 |
|
25367
823e14641544
(mark_glyph_matrix): Mark strings only.
Gerd Moellmann <gerd@gnu.org>
parents:
25343
diff
changeset
|
2039 /* Mark Lisp objects in glyph matrix MATRIX. Currently the |
|
823e14641544
(mark_glyph_matrix): Mark strings only.
Gerd Moellmann <gerd@gnu.org>
parents:
25343
diff
changeset
|
2040 only interesting objects referenced from glyphs are strings. */ |
|
25024
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2041 |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2042 static void |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2043 mark_glyph_matrix (matrix) |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2044 struct glyph_matrix *matrix; |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2045 { |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2046 struct glyph_row *row = matrix->rows; |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2047 struct glyph_row *end = row + matrix->nrows; |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2048 |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2049 while (row < end) |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2050 { |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2051 if (row->enabled_p) |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2052 { |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2053 int area; |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2054 for (area = LEFT_MARGIN_AREA; area < LAST_AREA; ++area) |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2055 { |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2056 struct glyph *glyph = row->glyphs[area]; |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2057 struct glyph *end_glyph = glyph + row->used[area]; |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2058 |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2059 while (glyph < end_glyph) |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2060 { |
|
25367
823e14641544
(mark_glyph_matrix): Mark strings only.
Gerd Moellmann <gerd@gnu.org>
parents:
25343
diff
changeset
|
2061 if (GC_STRINGP (glyph->object)) |
|
25024
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2062 mark_object (&glyph->object); |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2063 ++glyph; |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2064 } |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2065 } |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2066 } |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2067 |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2068 ++row; |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2069 } |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2070 } |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2071 |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2072 /* Mark Lisp faces in the face cache C. */ |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2073 |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2074 static void |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2075 mark_face_cache (c) |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2076 struct face_cache *c; |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2077 { |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2078 if (c) |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2079 { |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2080 int i, j; |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2081 for (i = 0; i < c->used; ++i) |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2082 { |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2083 struct face *face = FACE_FROM_ID (c->f, i); |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2084 |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2085 if (face) |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2086 { |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2087 for (j = 0; j < LFACE_VECTOR_SIZE; ++j) |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2088 mark_object (&face->lface[j]); |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2089 mark_object (&face->registry); |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2090 } |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2091 } |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2092 } |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2093 } |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2094 |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2095 |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2096 #ifdef HAVE_WINDOW_SYSTEM |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2097 |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2098 /* Mark Lisp objects in image IMG. */ |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2099 |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2100 static void |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2101 mark_image (img) |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2102 struct image *img; |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2103 { |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2104 mark_object (&img->spec); |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2105 |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2106 if (!NILP (img->data.lisp_val)) |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2107 mark_object (&img->data.lisp_val); |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2108 } |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2109 |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2110 |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2111 /* Mark Lisp objects in image cache of frame F. It's done this way so |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2112 that we don't have to include xterm.h here. */ |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2113 |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2114 static void |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2115 mark_image_cache (f) |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2116 struct frame *f; |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2117 { |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2118 forall_images_in_image_cache (f, mark_image); |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2119 } |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2120 |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2121 #endif /* HAVE_X_WINDOWS */ |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2122 |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2123 |
| 300 | 2124 |
|
1908
d649f2179d67
* alloc.c (make_pure_float): Align pureptr on a sizeof (double)
Jim Blandy <jimb@redhat.com>
parents:
1893
diff
changeset
|
2125 /* Mark reference to a Lisp_Object. |
|
d649f2179d67
* alloc.c (make_pure_float): Align pureptr on a sizeof (double)
Jim Blandy <jimb@redhat.com>
parents:
1893
diff
changeset
|
2126 If the object referred to has not been seen yet, recursively mark |
|
d649f2179d67
* alloc.c (make_pure_float): Align pureptr on a sizeof (double)
Jim Blandy <jimb@redhat.com>
parents:
1893
diff
changeset
|
2127 all the references contained in it. |
| 300 | 2128 |
|
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3581
diff
changeset
|
2129 If the object referenced is a short string, the referencing slot |
| 300 | 2130 is threaded into a chain of such slots, pointed to from |
| 2131 the `size' field of the string. The actual string size | |
| 2132 lives in the last slot in the chain. We recognize the end | |
| 2133 because it is < (unsigned) STRING_BLOCK_SIZE. */ | |
| 2134 | |
|
1168
2b07af77d7ec
(mark_object): Save last 500 values of objptr.
Richard M. Stallman <rms@gnu.org>
parents:
1114
diff
changeset
|
2135 #define LAST_MARKED_SIZE 500 |
|
2b07af77d7ec
(mark_object): Save last 500 values of objptr.
Richard M. Stallman <rms@gnu.org>
parents:
1114
diff
changeset
|
2136 Lisp_Object *last_marked[LAST_MARKED_SIZE]; |
|
2b07af77d7ec
(mark_object): Save last 500 values of objptr.
Richard M. Stallman <rms@gnu.org>
parents:
1114
diff
changeset
|
2137 int last_marked_index; |
|
2b07af77d7ec
(mark_object): Save last 500 values of objptr.
Richard M. Stallman <rms@gnu.org>
parents:
1114
diff
changeset
|
2138 |
|
25024
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2139 void |
|
13553
fb12156faaf5
(mark_object): Don't overwrite original argument value.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
2140 mark_object (argptr) |
|
fb12156faaf5
(mark_object): Don't overwrite original argument value.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
2141 Lisp_Object *argptr; |
| 300 | 2142 { |
|
13553
fb12156faaf5
(mark_object): Don't overwrite original argument value.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
2143 Lisp_Object *objptr = argptr; |
| 300 | 2144 register Lisp_Object obj; |
| 2145 | |
|
5868
a7bd57a60cb8
(mark_object): Fetch obj from *objptr at loop, not at the gotos.
Karl Heuer <kwzh@gnu.org>
parents:
5353
diff
changeset
|
2146 loop: |
| 300 | 2147 obj = *objptr; |
|
5868
a7bd57a60cb8
(mark_object): Fetch obj from *objptr at loop, not at the gotos.
Karl Heuer <kwzh@gnu.org>
parents:
5353
diff
changeset
|
2148 loop2: |
| 300 | 2149 XUNMARK (obj); |
| 2150 | |
| 2151 if ((PNTR_COMPARISON_TYPE) XPNTR (obj) < (PNTR_COMPARISON_TYPE) ((char *) pure + PURESIZE) | |
| 2152 && (PNTR_COMPARISON_TYPE) XPNTR (obj) >= (PNTR_COMPARISON_TYPE) pure) | |
| 2153 return; | |
| 2154 | |
|
1168
2b07af77d7ec
(mark_object): Save last 500 values of objptr.
Richard M. Stallman <rms@gnu.org>
parents:
1114
diff
changeset
|
2155 last_marked[last_marked_index++] = objptr; |
|
2b07af77d7ec
(mark_object): Save last 500 values of objptr.
Richard M. Stallman <rms@gnu.org>
parents:
1114
diff
changeset
|
2156 if (last_marked_index == LAST_MARKED_SIZE) |
|
2b07af77d7ec
(mark_object): Save last 500 values of objptr.
Richard M. Stallman <rms@gnu.org>
parents:
1114
diff
changeset
|
2157 last_marked_index = 0; |
|
2b07af77d7ec
(mark_object): Save last 500 values of objptr.
Richard M. Stallman <rms@gnu.org>
parents:
1114
diff
changeset
|
2158 |
|
10457
2ab3bd0288a9
Change all occurences of SWITCH_ENUM_BUG to use SWITCH_ENUM_CAST instead.
Karl Heuer <kwzh@gnu.org>
parents:
10427
diff
changeset
|
2159 switch (SWITCH_ENUM_CAST (XGCTYPE (obj))) |
| 300 | 2160 { |
| 2161 case Lisp_String: | |
| 2162 { | |
| 2163 register struct Lisp_String *ptr = XSTRING (obj); | |
| 2164 | |
|
1300
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
2165 MARK_INTERVAL_TREE (ptr->intervals); |
| 300 | 2166 if (ptr->size & MARKBIT) |
| 2167 /* A large string. Just set ARRAY_MARK_FLAG. */ | |
| 2168 ptr->size |= ARRAY_MARK_FLAG; | |
| 2169 else | |
| 2170 { | |
| 2171 /* A small string. Put this reference | |
| 2172 into the chain of references to it. | |
|
10413
bfe591f66299
(DONT_COPY_FLAG): Default this to 1.
Karl Heuer <kwzh@gnu.org>
parents:
10398
diff
changeset
|
2173 If the address includes MARKBIT, put that bit elsewhere |
| 300 | 2174 when we store OBJPTR into the size field. */ |
| 2175 | |
| 2176 if (XMARKBIT (*objptr)) | |
| 2177 { | |
|
9295
17d393a8eed6
(free_float, make_float, free_cons, Flist, Fvector, Fmake_byte_code,
Karl Heuer <kwzh@gnu.org>
parents:
9261
diff
changeset
|
2178 XSETFASTINT (*objptr, ptr->size); |
| 300 | 2179 XMARK (*objptr); |
| 2180 } | |
| 2181 else | |
|
9295
17d393a8eed6
(free_float, make_float, free_cons, Flist, Fvector, Fmake_byte_code,
Karl Heuer <kwzh@gnu.org>
parents:
9261
diff
changeset
|
2182 XSETFASTINT (*objptr, ptr->size); |
|
10389
162b3e6c4610
(DONT_COPY_FLAG): New bit flag.
Richard M. Stallman <rms@gnu.org>
parents:
10340
diff
changeset
|
2183 |
|
162b3e6c4610
(DONT_COPY_FLAG): New bit flag.
Richard M. Stallman <rms@gnu.org>
parents:
10340
diff
changeset
|
2184 if ((EMACS_INT) objptr & DONT_COPY_FLAG) |
|
162b3e6c4610
(DONT_COPY_FLAG): New bit flag.
Richard M. Stallman <rms@gnu.org>
parents:
10340
diff
changeset
|
2185 abort (); |
|
10413
bfe591f66299
(DONT_COPY_FLAG): Default this to 1.
Karl Heuer <kwzh@gnu.org>
parents:
10398
diff
changeset
|
2186 ptr->size = (EMACS_INT) objptr; |
|
bfe591f66299
(DONT_COPY_FLAG): Default this to 1.
Karl Heuer <kwzh@gnu.org>
parents:
10398
diff
changeset
|
2187 if (ptr->size & MARKBIT) |
|
bfe591f66299
(DONT_COPY_FLAG): Default this to 1.
Karl Heuer <kwzh@gnu.org>
parents:
10398
diff
changeset
|
2188 ptr->size ^= MARKBIT | DONT_COPY_FLAG; |
| 300 | 2189 } |
| 2190 } | |
| 2191 break; | |
| 2192 | |
|
10009
82f3daf76995
(Fpurecopy): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
10004
diff
changeset
|
2193 case Lisp_Vectorlike: |
|
10307
e6e75fd0916d
(mark_buffer, gc_sweep): Use BUF_INTERVALS.
Richard M. Stallman <rms@gnu.org>
parents:
10291
diff
changeset
|
2194 if (GC_BUFFERP (obj)) |
|
10340
ef58c7a5a4d6
(mark_object, mark_buffer): Don't mark buffer twice.
Karl Heuer <kwzh@gnu.org>
parents:
10320
diff
changeset
|
2195 { |
|
ef58c7a5a4d6
(mark_object, mark_buffer): Don't mark buffer twice.
Karl Heuer <kwzh@gnu.org>
parents:
10320
diff
changeset
|
2196 if (!XMARKBIT (XBUFFER (obj)->name)) |
|
ef58c7a5a4d6
(mark_object, mark_buffer): Don't mark buffer twice.
Karl Heuer <kwzh@gnu.org>
parents:
10320
diff
changeset
|
2197 mark_buffer (obj); |
|
ef58c7a5a4d6
(mark_object, mark_buffer): Don't mark buffer twice.
Karl Heuer <kwzh@gnu.org>
parents:
10320
diff
changeset
|
2198 } |
|
10307
e6e75fd0916d
(mark_buffer, gc_sweep): Use BUF_INTERVALS.
Richard M. Stallman <rms@gnu.org>
parents:
10291
diff
changeset
|
2199 else if (GC_SUBRP (obj)) |
|
10291
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2200 break; |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2201 else if (GC_COMPILEDP (obj)) |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2202 /* We could treat this just like a vector, but it is better |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2203 to save the COMPILED_CONSTANTS element for last and avoid recursion |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2204 there. */ |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2205 { |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2206 register struct Lisp_Vector *ptr = XVECTOR (obj); |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2207 register EMACS_INT size = ptr->size; |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2208 /* See comment above under Lisp_Vector. */ |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2209 struct Lisp_Vector *volatile ptr1 = ptr; |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2210 register int i; |
| 300 | 2211 |
|
10291
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2212 if (size & ARRAY_MARK_FLAG) |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2213 break; /* Already marked */ |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2214 ptr->size |= ARRAY_MARK_FLAG; /* Else mark it */ |
|
10009
82f3daf76995
(Fpurecopy): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
10004
diff
changeset
|
2215 size &= PSEUDOVECTOR_SIZE_MASK; |
|
10291
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2216 for (i = 0; i < size; i++) /* and then mark its elements */ |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2217 { |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2218 if (i != COMPILED_CONSTANTS) |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2219 mark_object (&ptr1->contents[i]); |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2220 } |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2221 /* This cast should be unnecessary, but some Mips compiler complains |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2222 (MIPS-ABI + SysVR4, DC/OSx, etc). */ |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2223 objptr = (Lisp_Object *) &ptr1->contents[COMPILED_CONSTANTS]; |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2224 goto loop; |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2225 } |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2226 else if (GC_FRAMEP (obj)) |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2227 { |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2228 /* See comment above under Lisp_Vector for why this is volatile. */ |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2229 register struct frame *volatile ptr = XFRAME (obj); |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2230 register EMACS_INT size = ptr->size; |
|
1295
a9241dc503ab
(mark_object): Avoid car recursion on cons with nil in cdr.
Richard M. Stallman <rms@gnu.org>
parents:
1168
diff
changeset
|
2231 |
|
10291
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2232 if (size & ARRAY_MARK_FLAG) break; /* Already marked */ |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2233 ptr->size |= ARRAY_MARK_FLAG; /* Else mark it */ |
|
1295
a9241dc503ab
(mark_object): Avoid car recursion on cons with nil in cdr.
Richard M. Stallman <rms@gnu.org>
parents:
1168
diff
changeset
|
2234 |
|
10291
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2235 mark_object (&ptr->name); |
|
12273
377cbbd8a2ad
(mark_object): Mark icon_name field.
Richard M. Stallman <rms@gnu.org>
parents:
12175
diff
changeset
|
2236 mark_object (&ptr->icon_name); |
|
14216
5970a52070bb
(mark_object): Mark frame title field.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
2237 mark_object (&ptr->title); |
|
10291
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2238 mark_object (&ptr->focus_frame); |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2239 mark_object (&ptr->selected_window); |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2240 mark_object (&ptr->minibuffer_window); |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2241 mark_object (&ptr->param_alist); |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2242 mark_object (&ptr->scroll_bars); |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2243 mark_object (&ptr->condemned_scroll_bars); |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2244 mark_object (&ptr->menu_bar_items); |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2245 mark_object (&ptr->face_alist); |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2246 mark_object (&ptr->menu_bar_vector); |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2247 mark_object (&ptr->buffer_predicate); |
|
17217
571d0c136e48
(mark_object): Mark the buffer_list field.
Richard M. Stallman <rms@gnu.org>
parents:
17021
diff
changeset
|
2248 mark_object (&ptr->buffer_list); |
|
25024
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2249 mark_object (&ptr->menu_bar_window); |
|
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25452
diff
changeset
|
2250 mark_object (&ptr->tool_bar_window); |
|
25024
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2251 mark_face_cache (ptr->face_cache); |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2252 #ifdef HAVE_WINDOW_SYSTEM |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2253 mark_image_cache (ptr); |
|
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25452
diff
changeset
|
2254 mark_object (&ptr->desired_tool_bar_items); |
|
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25452
diff
changeset
|
2255 mark_object (&ptr->current_tool_bar_items); |
|
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25452
diff
changeset
|
2256 mark_object (&ptr->desired_tool_bar_string); |
|
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25452
diff
changeset
|
2257 mark_object (&ptr->current_tool_bar_string); |
|
25024
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2258 #endif /* HAVE_WINDOW_SYSTEM */ |
|
10291
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2259 } |
|
13141
4a4d1d8e89e5
(Fmake_chartable, Fmake_boolvector): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
13008
diff
changeset
|
2260 else if (GC_BOOL_VECTOR_P (obj)) |
|
15379
5cd52d4838f8
(mark_object): Do set ARRAY_MARK_FLAG for bool-vectors.
Richard M. Stallman <rms@gnu.org>
parents:
14959
diff
changeset
|
2261 { |
|
5cd52d4838f8
(mark_object): Do set ARRAY_MARK_FLAG for bool-vectors.
Richard M. Stallman <rms@gnu.org>
parents:
14959
diff
changeset
|
2262 register struct Lisp_Vector *ptr = XVECTOR (obj); |
|
5cd52d4838f8
(mark_object): Do set ARRAY_MARK_FLAG for bool-vectors.
Richard M. Stallman <rms@gnu.org>
parents:
14959
diff
changeset
|
2263 |
|
5cd52d4838f8
(mark_object): Do set ARRAY_MARK_FLAG for bool-vectors.
Richard M. Stallman <rms@gnu.org>
parents:
14959
diff
changeset
|
2264 if (ptr->size & ARRAY_MARK_FLAG) |
|
5cd52d4838f8
(mark_object): Do set ARRAY_MARK_FLAG for bool-vectors.
Richard M. Stallman <rms@gnu.org>
parents:
14959
diff
changeset
|
2265 break; /* Already marked */ |
|
5cd52d4838f8
(mark_object): Do set ARRAY_MARK_FLAG for bool-vectors.
Richard M. Stallman <rms@gnu.org>
parents:
14959
diff
changeset
|
2266 ptr->size |= ARRAY_MARK_FLAG; /* Else mark it */ |
|
5cd52d4838f8
(mark_object): Do set ARRAY_MARK_FLAG for bool-vectors.
Richard M. Stallman <rms@gnu.org>
parents:
14959
diff
changeset
|
2267 } |
|
25024
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2268 else if (GC_WINDOWP (obj)) |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2269 { |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2270 register struct Lisp_Vector *ptr = XVECTOR (obj); |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2271 struct window *w = XWINDOW (obj); |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2272 register EMACS_INT size = ptr->size; |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2273 /* The reason we use ptr1 is to avoid an apparent hardware bug |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2274 that happens occasionally on the FSF's HP 300s. |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2275 The bug is that a2 gets clobbered by recursive calls to mark_object. |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2276 The clobberage seems to happen during function entry, |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2277 perhaps in the moveml instruction. |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2278 Yes, this is a crock, but we have to do it. */ |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2279 struct Lisp_Vector *volatile ptr1 = ptr; |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2280 register int i; |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2281 |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2282 /* Stop if already marked. */ |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2283 if (size & ARRAY_MARK_FLAG) |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2284 break; |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2285 |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2286 /* Mark it. */ |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2287 ptr->size |= ARRAY_MARK_FLAG; |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2288 |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2289 /* There is no Lisp data above The member CURRENT_MATRIX in |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2290 struct WINDOW. Stop marking when that slot is reached. */ |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2291 for (i = 0; |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2292 (char *) &ptr1->contents[i] < (char *) &w->current_matrix; |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2293 i++) |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2294 mark_object (&ptr1->contents[i]); |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2295 |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2296 /* Mark glyphs for leaf windows. Marking window matrices is |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2297 sufficient because frame matrices use the same glyph |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2298 memory. */ |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2299 if (NILP (w->hchild) |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2300 && NILP (w->vchild) |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2301 && w->current_matrix) |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2302 { |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2303 mark_glyph_matrix (w->current_matrix); |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2304 mark_glyph_matrix (w->desired_matrix); |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2305 } |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2306 } |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2307 else if (GC_HASH_TABLE_P (obj)) |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2308 { |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2309 struct Lisp_Hash_Table *h = XHASH_TABLE (obj); |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2310 EMACS_INT size = h->size; |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2311 |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2312 /* Stop if already marked. */ |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2313 if (size & ARRAY_MARK_FLAG) |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2314 break; |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2315 |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2316 /* Mark it. */ |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2317 h->size |= ARRAY_MARK_FLAG; |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2318 |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2319 /* Mark contents. */ |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2320 mark_object (&h->test); |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2321 mark_object (&h->weak); |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2322 mark_object (&h->rehash_size); |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2323 mark_object (&h->rehash_threshold); |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2324 mark_object (&h->hash); |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2325 mark_object (&h->next); |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2326 mark_object (&h->index); |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2327 mark_object (&h->user_hash_function); |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2328 mark_object (&h->user_cmp_function); |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2329 |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2330 /* If hash table is not weak, mark all keys and values. |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2331 For weak tables, mark only the vector. */ |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2332 if (GC_NILP (h->weak)) |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2333 mark_object (&h->key_and_value); |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2334 else |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2335 XVECTOR (h->key_and_value)->size |= ARRAY_MARK_FLAG; |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2336 |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2337 } |
|
10291
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2338 else |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2339 { |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2340 register struct Lisp_Vector *ptr = XVECTOR (obj); |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2341 register EMACS_INT size = ptr->size; |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2342 /* The reason we use ptr1 is to avoid an apparent hardware bug |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2343 that happens occasionally on the FSF's HP 300s. |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2344 The bug is that a2 gets clobbered by recursive calls to mark_object. |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2345 The clobberage seems to happen during function entry, |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2346 perhaps in the moveml instruction. |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2347 Yes, this is a crock, but we have to do it. */ |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2348 struct Lisp_Vector *volatile ptr1 = ptr; |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2349 register int i; |
| 300 | 2350 |
|
10291
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2351 if (size & ARRAY_MARK_FLAG) break; /* Already marked */ |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2352 ptr->size |= ARRAY_MARK_FLAG; /* Else mark it */ |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2353 if (size & PSEUDOVECTOR_FLAG) |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2354 size &= PSEUDOVECTOR_SIZE_MASK; |
|
25024
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2355 |
|
10291
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2356 for (i = 0; i < size; i++) /* and then mark its elements */ |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2357 mark_object (&ptr1->contents[i]); |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
2358 } |
| 300 | 2359 break; |
| 2360 | |
| 2361 case Lisp_Symbol: | |
| 2362 { | |
|
4494
15b073a6c860
(mark_object): Declare ptr volatile, or don't use it
Richard M. Stallman <rms@gnu.org>
parents:
4212
diff
changeset
|
2363 /* See comment above under Lisp_Vector for why this is volatile. */ |
|
15b073a6c860
(mark_object): Declare ptr volatile, or don't use it
Richard M. Stallman <rms@gnu.org>
parents:
4212
diff
changeset
|
2364 register struct Lisp_Symbol *volatile ptr = XSYMBOL (obj); |
| 300 | 2365 struct Lisp_Symbol *ptrx; |
| 2366 | |
| 2367 if (XMARKBIT (ptr->plist)) break; | |
| 2368 XMARK (ptr->plist); | |
| 2369 mark_object ((Lisp_Object *) &ptr->value); | |
| 2370 mark_object (&ptr->function); | |
| 2371 mark_object (&ptr->plist); | |
|
1114
903883eed4de
* alloc.c (mark_object): mark a symbol's name after marking its
Jim Blandy <jimb@redhat.com>
parents:
1000
diff
changeset
|
2372 XSETTYPE (*(Lisp_Object *) &ptr->name, Lisp_String); |
|
25024
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2373 mark_object ((Lisp_Object *) &ptr->name); |
| 20768 | 2374 /* Note that we do not mark the obarray of the symbol. |
| 2375 It is safe not to do so because nothing accesses that | |
| 2376 slot except to check whether it is nil. */ | |
| 300 | 2377 ptr = ptr->next; |
| 2378 if (ptr) | |
| 2379 { | |
|
5868
a7bd57a60cb8
(mark_object): Fetch obj from *objptr at loop, not at the gotos.
Karl Heuer <kwzh@gnu.org>
parents:
5353
diff
changeset
|
2380 /* For the benefit of the last_marked log. */ |
|
a7bd57a60cb8
(mark_object): Fetch obj from *objptr at loop, not at the gotos.
Karl Heuer <kwzh@gnu.org>
parents:
5353
diff
changeset
|
2381 objptr = (Lisp_Object *)&XSYMBOL (obj)->next; |
|
2507
7ba4316ae840
* alloc.c (__malloc_hook, __realloc_hook, __free_hook): Declare
Jim Blandy <jimb@redhat.com>
parents:
2439
diff
changeset
|
2382 ptrx = ptr; /* Use of ptrx avoids compiler bug on Sun */ |
| 300 | 2383 XSETSYMBOL (obj, ptrx); |
|
5868
a7bd57a60cb8
(mark_object): Fetch obj from *objptr at loop, not at the gotos.
Karl Heuer <kwzh@gnu.org>
parents:
5353
diff
changeset
|
2384 /* We can't goto loop here because *objptr doesn't contain an |
|
a7bd57a60cb8
(mark_object): Fetch obj from *objptr at loop, not at the gotos.
Karl Heuer <kwzh@gnu.org>
parents:
5353
diff
changeset
|
2385 actual Lisp_Object with valid datatype field. */ |
|
a7bd57a60cb8
(mark_object): Fetch obj from *objptr at loop, not at the gotos.
Karl Heuer <kwzh@gnu.org>
parents:
5353
diff
changeset
|
2386 goto loop2; |
| 300 | 2387 } |
| 2388 } | |
| 2389 break; | |
| 2390 | |
|
9437
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
2391 case Lisp_Misc: |
|
11243
054ecfce1820
(Fmake_marker, mark_object): Use XMISCTYPE.
Richard M. Stallman <rms@gnu.org>
parents:
11048
diff
changeset
|
2392 switch (XMISCTYPE (obj)) |
|
9437
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
2393 { |
|
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
2394 case Lisp_Misc_Marker: |
|
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
2395 XMARK (XMARKER (obj)->chain); |
|
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
2396 /* DO NOT mark thru the marker's chain. |
|
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
2397 The buffer's markers chain does not preserve markers from gc; |
|
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
2398 instead, markers are removed from the chain when freed by gc. */ |
|
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
2399 break; |
|
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
2400 |
|
9893
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2401 case Lisp_Misc_Buffer_Local_Value: |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2402 case Lisp_Misc_Some_Buffer_Local_Value: |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2403 { |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2404 register struct Lisp_Buffer_Local_Value *ptr |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2405 = XBUFFER_LOCAL_VALUE (obj); |
|
21143
ce12eac1ee45
(gc_sweep, mark_object): Handle new data structure
Richard M. Stallman <rms@gnu.org>
parents:
21084
diff
changeset
|
2406 if (XMARKBIT (ptr->realvalue)) break; |
|
ce12eac1ee45
(gc_sweep, mark_object): Handle new data structure
Richard M. Stallman <rms@gnu.org>
parents:
21084
diff
changeset
|
2407 XMARK (ptr->realvalue); |
|
9893
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2408 /* If the cdr is nil, avoid recursion for the car. */ |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2409 if (EQ (ptr->cdr, Qnil)) |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2410 { |
|
21143
ce12eac1ee45
(gc_sweep, mark_object): Handle new data structure
Richard M. Stallman <rms@gnu.org>
parents:
21084
diff
changeset
|
2411 objptr = &ptr->realvalue; |
|
9893
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2412 goto loop; |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2413 } |
|
21143
ce12eac1ee45
(gc_sweep, mark_object): Handle new data structure
Richard M. Stallman <rms@gnu.org>
parents:
21084
diff
changeset
|
2414 mark_object (&ptr->realvalue); |
|
ce12eac1ee45
(gc_sweep, mark_object): Handle new data structure
Richard M. Stallman <rms@gnu.org>
parents:
21084
diff
changeset
|
2415 mark_object (&ptr->buffer); |
|
ce12eac1ee45
(gc_sweep, mark_object): Handle new data structure
Richard M. Stallman <rms@gnu.org>
parents:
21084
diff
changeset
|
2416 mark_object (&ptr->frame); |
|
9893
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2417 /* See comment above under Lisp_Vector for why not use ptr here. */ |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2418 objptr = &XBUFFER_LOCAL_VALUE (obj)->cdr; |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2419 goto loop; |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2420 } |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2421 |
|
9463
a40af805e036
(mark_object): Use the new substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9437
diff
changeset
|
2422 case Lisp_Misc_Intfwd: |
|
a40af805e036
(mark_object): Use the new substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9437
diff
changeset
|
2423 case Lisp_Misc_Boolfwd: |
|
a40af805e036
(mark_object): Use the new substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9437
diff
changeset
|
2424 case Lisp_Misc_Objfwd: |
|
a40af805e036
(mark_object): Use the new substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9437
diff
changeset
|
2425 case Lisp_Misc_Buffer_Objfwd: |
|
11018
2d9bdf1ba3d1
(mark_kboards): Renamed from mark_perdisplays.
Karl Heuer <kwzh@gnu.org>
parents:
10936
diff
changeset
|
2426 case Lisp_Misc_Kboard_Objfwd: |
|
9463
a40af805e036
(mark_object): Use the new substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9437
diff
changeset
|
2427 /* Don't bother with Lisp_Buffer_Objfwd, |
|
a40af805e036
(mark_object): Use the new substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9437
diff
changeset
|
2428 since all markable slots in current buffer marked anyway. */ |
|
a40af805e036
(mark_object): Use the new substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9437
diff
changeset
|
2429 /* Don't need to do Lisp_Objfwd, since the places they point |
|
a40af805e036
(mark_object): Use the new substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9437
diff
changeset
|
2430 are protected with staticpro. */ |
|
a40af805e036
(mark_object): Use the new substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9437
diff
changeset
|
2431 break; |
|
a40af805e036
(mark_object): Use the new substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9437
diff
changeset
|
2432 |
|
9926
2a9f99682f82
(mark_object, gc_sweep): Use new overlay substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9893
diff
changeset
|
2433 case Lisp_Misc_Overlay: |
|
2a9f99682f82
(mark_object, gc_sweep): Use new overlay substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9893
diff
changeset
|
2434 { |
|
2a9f99682f82
(mark_object, gc_sweep): Use new overlay substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9893
diff
changeset
|
2435 struct Lisp_Overlay *ptr = XOVERLAY (obj); |
|
2a9f99682f82
(mark_object, gc_sweep): Use new overlay substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9893
diff
changeset
|
2436 if (!XMARKBIT (ptr->plist)) |
|
2a9f99682f82
(mark_object, gc_sweep): Use new overlay substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9893
diff
changeset
|
2437 { |
|
2a9f99682f82
(mark_object, gc_sweep): Use new overlay substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9893
diff
changeset
|
2438 XMARK (ptr->plist); |
|
2a9f99682f82
(mark_object, gc_sweep): Use new overlay substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9893
diff
changeset
|
2439 mark_object (&ptr->start); |
|
2a9f99682f82
(mark_object, gc_sweep): Use new overlay substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9893
diff
changeset
|
2440 mark_object (&ptr->end); |
|
2a9f99682f82
(mark_object, gc_sweep): Use new overlay substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9893
diff
changeset
|
2441 objptr = &ptr->plist; |
|
2a9f99682f82
(mark_object, gc_sweep): Use new overlay substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9893
diff
changeset
|
2442 goto loop; |
|
2a9f99682f82
(mark_object, gc_sweep): Use new overlay substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9893
diff
changeset
|
2443 } |
|
2a9f99682f82
(mark_object, gc_sweep): Use new overlay substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9893
diff
changeset
|
2444 } |
|
2a9f99682f82
(mark_object, gc_sweep): Use new overlay substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9893
diff
changeset
|
2445 break; |
|
2a9f99682f82
(mark_object, gc_sweep): Use new overlay substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9893
diff
changeset
|
2446 |
|
9437
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
2447 default: |
|
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
2448 abort (); |
|
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
2449 } |
| 300 | 2450 break; |
| 2451 | |
| 2452 case Lisp_Cons: | |
| 2453 { | |
| 2454 register struct Lisp_Cons *ptr = XCONS (obj); | |
| 2455 if (XMARKBIT (ptr->car)) break; | |
| 2456 XMARK (ptr->car); | |
|
1295
a9241dc503ab
(mark_object): Avoid car recursion on cons with nil in cdr.
Richard M. Stallman <rms@gnu.org>
parents:
1168
diff
changeset
|
2457 /* If the cdr is nil, avoid recursion for the car. */ |
|
a9241dc503ab
(mark_object): Avoid car recursion on cons with nil in cdr.
Richard M. Stallman <rms@gnu.org>
parents:
1168
diff
changeset
|
2458 if (EQ (ptr->cdr, Qnil)) |
|
a9241dc503ab
(mark_object): Avoid car recursion on cons with nil in cdr.
Richard M. Stallman <rms@gnu.org>
parents:
1168
diff
changeset
|
2459 { |
|
a9241dc503ab
(mark_object): Avoid car recursion on cons with nil in cdr.
Richard M. Stallman <rms@gnu.org>
parents:
1168
diff
changeset
|
2460 objptr = &ptr->car; |
|
a9241dc503ab
(mark_object): Avoid car recursion on cons with nil in cdr.
Richard M. Stallman <rms@gnu.org>
parents:
1168
diff
changeset
|
2461 goto loop; |
|
a9241dc503ab
(mark_object): Avoid car recursion on cons with nil in cdr.
Richard M. Stallman <rms@gnu.org>
parents:
1168
diff
changeset
|
2462 } |
| 300 | 2463 mark_object (&ptr->car); |
|
4494
15b073a6c860
(mark_object): Declare ptr volatile, or don't use it
Richard M. Stallman <rms@gnu.org>
parents:
4212
diff
changeset
|
2464 /* See comment above under Lisp_Vector for why not use ptr here. */ |
|
15b073a6c860
(mark_object): Declare ptr volatile, or don't use it
Richard M. Stallman <rms@gnu.org>
parents:
4212
diff
changeset
|
2465 objptr = &XCONS (obj)->cdr; |
| 300 | 2466 goto loop; |
| 2467 } | |
| 2468 | |
| 2469 #ifdef LISP_FLOAT_TYPE | |
| 2470 case Lisp_Float: | |
| 2471 XMARK (XFLOAT (obj)->type); | |
| 2472 break; | |
| 2473 #endif /* LISP_FLOAT_TYPE */ | |
| 2474 | |
| 2475 case Lisp_Int: | |
| 2476 break; | |
| 2477 | |
| 2478 default: | |
| 2479 abort (); | |
| 2480 } | |
| 2481 } | |
| 2482 | |
| 2483 /* Mark the pointers in a buffer structure. */ | |
| 2484 | |
| 2485 static void | |
| 2486 mark_buffer (buf) | |
| 2487 Lisp_Object buf; | |
| 2488 { | |
| 2489 register struct buffer *buffer = XBUFFER (buf); | |
| 2490 register Lisp_Object *ptr; | |
|
10307
e6e75fd0916d
(mark_buffer, gc_sweep): Use BUF_INTERVALS.
Richard M. Stallman <rms@gnu.org>
parents:
10291
diff
changeset
|
2491 Lisp_Object base_buffer; |
| 300 | 2492 |
| 2493 /* This is the buffer's markbit */ | |
| 2494 mark_object (&buffer->name); | |
| 2495 XMARK (buffer->name); | |
| 2496 | |
|
10307
e6e75fd0916d
(mark_buffer, gc_sweep): Use BUF_INTERVALS.
Richard M. Stallman <rms@gnu.org>
parents:
10291
diff
changeset
|
2497 MARK_INTERVAL_TREE (BUF_INTERVALS (buffer)); |
|
1300
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
2498 |
|
21306
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
2499 if (CONSP (buffer->undo_list)) |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
2500 { |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
2501 Lisp_Object tail; |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
2502 tail = buffer->undo_list; |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
2503 |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
2504 while (CONSP (tail)) |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
2505 { |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
2506 register struct Lisp_Cons *ptr = XCONS (tail); |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
2507 |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
2508 if (XMARKBIT (ptr->car)) |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
2509 break; |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
2510 XMARK (ptr->car); |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
2511 if (GC_CONSP (ptr->car) |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
2512 && ! XMARKBIT (XCONS (ptr->car)->car) |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
2513 && GC_MARKERP (XCONS (ptr->car)->car)) |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
2514 { |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
2515 XMARK (XCONS (ptr->car)->car); |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
2516 mark_object (&XCONS (ptr->car)->cdr); |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
2517 } |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
2518 else |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
2519 mark_object (&ptr->car); |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
2520 |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
2521 if (CONSP (ptr->cdr)) |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
2522 tail = ptr->cdr; |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
2523 else |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
2524 break; |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
2525 } |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
2526 |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
2527 mark_object (&XCONS (tail)->cdr); |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
2528 } |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
2529 else |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
2530 mark_object (&buffer->undo_list); |
|
dc2cbd40703c
(mark_buffer): Mark the undo_list slot specially;
Richard M. Stallman <rms@gnu.org>
parents:
21258
diff
changeset
|
2531 |
| 300 | 2532 #if 0 |
| 2533 mark_object (buffer->syntax_table); | |
| 2534 | |
| 2535 /* Mark the various string-pointers in the buffer object. | |
| 2536 Since the strings may be relocated, we must mark them | |
| 2537 in their actual slots. So gc_sweep must convert each slot | |
| 2538 back to an ordinary C pointer. */ | |
|
9261
e5ba7993d378
(VALIDATE_LISP_STORAGE, make_float, Fcons, Fmake_vector, Fmake_symbol,
Karl Heuer <kwzh@gnu.org>
parents:
9144
diff
changeset
|
2539 XSETSTRING (*(Lisp_Object *)&buffer->upcase_table, buffer->upcase_table); |
| 300 | 2540 mark_object ((Lisp_Object *)&buffer->upcase_table); |
|
9261
e5ba7993d378
(VALIDATE_LISP_STORAGE, make_float, Fcons, Fmake_vector, Fmake_symbol,
Karl Heuer <kwzh@gnu.org>
parents:
9144
diff
changeset
|
2541 XSETSTRING (*(Lisp_Object *)&buffer->downcase_table, buffer->downcase_table); |
| 300 | 2542 mark_object ((Lisp_Object *)&buffer->downcase_table); |
| 2543 | |
|
9261
e5ba7993d378
(VALIDATE_LISP_STORAGE, make_float, Fcons, Fmake_vector, Fmake_symbol,
Karl Heuer <kwzh@gnu.org>
parents:
9144
diff
changeset
|
2544 XSETSTRING (*(Lisp_Object *)&buffer->sort_table, buffer->sort_table); |
| 300 | 2545 mark_object ((Lisp_Object *)&buffer->sort_table); |
|
9261
e5ba7993d378
(VALIDATE_LISP_STORAGE, make_float, Fcons, Fmake_vector, Fmake_symbol,
Karl Heuer <kwzh@gnu.org>
parents:
9144
diff
changeset
|
2546 XSETSTRING (*(Lisp_Object *)&buffer->folding_sort_table, buffer->folding_sort_table); |
| 300 | 2547 mark_object ((Lisp_Object *)&buffer->folding_sort_table); |
| 2548 #endif | |
| 2549 | |
| 2550 for (ptr = &buffer->name + 1; | |
| 2551 (char *)ptr < (char *)buffer + sizeof (struct buffer); | |
| 2552 ptr++) | |
| 2553 mark_object (ptr); | |
|
10307
e6e75fd0916d
(mark_buffer, gc_sweep): Use BUF_INTERVALS.
Richard M. Stallman <rms@gnu.org>
parents:
10291
diff
changeset
|
2554 |
|
e6e75fd0916d
(mark_buffer, gc_sweep): Use BUF_INTERVALS.
Richard M. Stallman <rms@gnu.org>
parents:
10291
diff
changeset
|
2555 /* If this is an indirect buffer, mark its base buffer. */ |
|
10340
ef58c7a5a4d6
(mark_object, mark_buffer): Don't mark buffer twice.
Karl Heuer <kwzh@gnu.org>
parents:
10320
diff
changeset
|
2556 if (buffer->base_buffer && !XMARKBIT (buffer->base_buffer->name)) |
|
10307
e6e75fd0916d
(mark_buffer, gc_sweep): Use BUF_INTERVALS.
Richard M. Stallman <rms@gnu.org>
parents:
10291
diff
changeset
|
2557 { |
|
e6e75fd0916d
(mark_buffer, gc_sweep): Use BUF_INTERVALS.
Richard M. Stallman <rms@gnu.org>
parents:
10291
diff
changeset
|
2558 XSETBUFFER (base_buffer, buffer->base_buffer); |
|
e6e75fd0916d
(mark_buffer, gc_sweep): Use BUF_INTERVALS.
Richard M. Stallman <rms@gnu.org>
parents:
10291
diff
changeset
|
2559 mark_buffer (base_buffer); |
|
e6e75fd0916d
(mark_buffer, gc_sweep): Use BUF_INTERVALS.
Richard M. Stallman <rms@gnu.org>
parents:
10291
diff
changeset
|
2560 } |
| 300 | 2561 } |
|
10649
52cdd8cc8d3e
(mark_perdisplays): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10581
diff
changeset
|
2562 |
|
52cdd8cc8d3e
(mark_perdisplays): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10581
diff
changeset
|
2563 |
|
11018
2d9bdf1ba3d1
(mark_kboards): Renamed from mark_perdisplays.
Karl Heuer <kwzh@gnu.org>
parents:
10936
diff
changeset
|
2564 /* Mark the pointers in the kboard objects. */ |
|
10649
52cdd8cc8d3e
(mark_perdisplays): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10581
diff
changeset
|
2565 |
|
52cdd8cc8d3e
(mark_perdisplays): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10581
diff
changeset
|
2566 static void |
|
11018
2d9bdf1ba3d1
(mark_kboards): Renamed from mark_perdisplays.
Karl Heuer <kwzh@gnu.org>
parents:
10936
diff
changeset
|
2567 mark_kboards () |
|
10649
52cdd8cc8d3e
(mark_perdisplays): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10581
diff
changeset
|
2568 { |
|
11018
2d9bdf1ba3d1
(mark_kboards): Renamed from mark_perdisplays.
Karl Heuer <kwzh@gnu.org>
parents:
10936
diff
changeset
|
2569 KBOARD *kb; |
|
11593
f5385353aae3
(mark_kboards): Mark the kbd macro and Vsystem_key_alist.
Karl Heuer <kwzh@gnu.org>
parents:
11430
diff
changeset
|
2570 Lisp_Object *p; |
|
11018
2d9bdf1ba3d1
(mark_kboards): Renamed from mark_perdisplays.
Karl Heuer <kwzh@gnu.org>
parents:
10936
diff
changeset
|
2571 for (kb = all_kboards; kb; kb = kb->next_kboard) |
|
10649
52cdd8cc8d3e
(mark_perdisplays): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10581
diff
changeset
|
2572 { |
|
11593
f5385353aae3
(mark_kboards): Mark the kbd macro and Vsystem_key_alist.
Karl Heuer <kwzh@gnu.org>
parents:
11430
diff
changeset
|
2573 if (kb->kbd_macro_buffer) |
|
f5385353aae3
(mark_kboards): Mark the kbd macro and Vsystem_key_alist.
Karl Heuer <kwzh@gnu.org>
parents:
11430
diff
changeset
|
2574 for (p = kb->kbd_macro_buffer; p < kb->kbd_macro_ptr; p++) |
|
f5385353aae3
(mark_kboards): Mark the kbd macro and Vsystem_key_alist.
Karl Heuer <kwzh@gnu.org>
parents:
11430
diff
changeset
|
2575 mark_object (p); |
|
22381
50e1804145be
(mark_kboards): Mark all the Lisp_Object fields.
Richard M. Stallman <rms@gnu.org>
parents:
22220
diff
changeset
|
2576 mark_object (&kb->Voverriding_terminal_local_map); |
|
50e1804145be
(mark_kboards): Mark all the Lisp_Object fields.
Richard M. Stallman <rms@gnu.org>
parents:
22220
diff
changeset
|
2577 mark_object (&kb->Vlast_command); |
|
50e1804145be
(mark_kboards): Mark all the Lisp_Object fields.
Richard M. Stallman <rms@gnu.org>
parents:
22220
diff
changeset
|
2578 mark_object (&kb->Vreal_last_command); |
|
12120
1fc112b5fdc4
(mark_kboards): Mark Vprefix_arg instead of
Karl Heuer <kwzh@gnu.org>
parents:
12096
diff
changeset
|
2579 mark_object (&kb->Vprefix_arg); |
|
22382
f7d2bdefcff7
(mark_kboards): Mark Vlast_prefix_arg too.
Richard M. Stallman <rms@gnu.org>
parents:
22381
diff
changeset
|
2580 mark_object (&kb->Vlast_prefix_arg); |
|
11018
2d9bdf1ba3d1
(mark_kboards): Renamed from mark_perdisplays.
Karl Heuer <kwzh@gnu.org>
parents:
10936
diff
changeset
|
2581 mark_object (&kb->kbd_queue); |
|
22381
50e1804145be
(mark_kboards): Mark all the Lisp_Object fields.
Richard M. Stallman <rms@gnu.org>
parents:
22220
diff
changeset
|
2582 mark_object (&kb->defining_kbd_macro); |
|
11018
2d9bdf1ba3d1
(mark_kboards): Renamed from mark_perdisplays.
Karl Heuer <kwzh@gnu.org>
parents:
10936
diff
changeset
|
2583 mark_object (&kb->Vlast_kbd_macro); |
|
11593
f5385353aae3
(mark_kboards): Mark the kbd macro and Vsystem_key_alist.
Karl Heuer <kwzh@gnu.org>
parents:
11430
diff
changeset
|
2584 mark_object (&kb->Vsystem_key_alist); |
|
12175
4e36e9e99082
(mark_kboards): Mark system_key_syms member.
Karl Heuer <kwzh@gnu.org>
parents:
12120
diff
changeset
|
2585 mark_object (&kb->system_key_syms); |
|
22381
50e1804145be
(mark_kboards): Mark all the Lisp_Object fields.
Richard M. Stallman <rms@gnu.org>
parents:
22220
diff
changeset
|
2586 mark_object (&kb->Vdefault_minibuffer_frame); |
|
10649
52cdd8cc8d3e
(mark_perdisplays): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10581
diff
changeset
|
2587 } |
|
52cdd8cc8d3e
(mark_perdisplays): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10581
diff
changeset
|
2588 } |
|
25024
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2589 |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2590 |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2591 /* Value is non-zero if OBJ will survive the current GC because it's |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2592 either marked or does not need to be marked to survive. */ |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2593 |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2594 int |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2595 survives_gc_p (obj) |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2596 Lisp_Object obj; |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2597 { |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2598 int survives_p; |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2599 |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2600 switch (XGCTYPE (obj)) |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2601 { |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2602 case Lisp_Int: |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2603 survives_p = 1; |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2604 break; |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2605 |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2606 case Lisp_Symbol: |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2607 survives_p = XMARKBIT (XSYMBOL (obj)->plist); |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2608 break; |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2609 |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2610 case Lisp_Misc: |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2611 switch (XMISCTYPE (obj)) |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2612 { |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2613 case Lisp_Misc_Marker: |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2614 survives_p = XMARKBIT (obj); |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2615 break; |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2616 |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2617 case Lisp_Misc_Buffer_Local_Value: |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2618 case Lisp_Misc_Some_Buffer_Local_Value: |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2619 survives_p = XMARKBIT (XBUFFER_LOCAL_VALUE (obj)->realvalue); |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2620 break; |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2621 |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2622 case Lisp_Misc_Intfwd: |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2623 case Lisp_Misc_Boolfwd: |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2624 case Lisp_Misc_Objfwd: |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2625 case Lisp_Misc_Buffer_Objfwd: |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2626 case Lisp_Misc_Kboard_Objfwd: |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2627 survives_p = 1; |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2628 break; |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2629 |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2630 case Lisp_Misc_Overlay: |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2631 survives_p = XMARKBIT (XOVERLAY (obj)->plist); |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2632 break; |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2633 |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2634 default: |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2635 abort (); |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2636 } |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2637 break; |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2638 |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2639 case Lisp_String: |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2640 { |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2641 struct Lisp_String *s = XSTRING (obj); |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2642 |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2643 if (s->size & MARKBIT) |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2644 survives_p = s->size & ARRAY_MARK_FLAG; |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2645 else |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2646 survives_p = (s->size & ~DONT_COPY_FLAG) > STRING_BLOCK_SIZE; |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2647 } |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2648 break; |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2649 |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2650 case Lisp_Vectorlike: |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2651 if (GC_BUFFERP (obj)) |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2652 survives_p = XMARKBIT (XBUFFER (obj)->name); |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2653 else if (GC_SUBRP (obj)) |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2654 survives_p = 1; |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2655 else |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2656 survives_p = XVECTOR (obj)->size & ARRAY_MARK_FLAG; |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2657 break; |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2658 |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2659 case Lisp_Cons: |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2660 survives_p = XMARKBIT (XCAR (obj)); |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2661 break; |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2662 |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2663 #ifdef LISP_FLOAT_TYPE |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2664 case Lisp_Float: |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2665 survives_p = XMARKBIT (XFLOAT (obj)->type); |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2666 break; |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2667 #endif /* LISP_FLOAT_TYPE */ |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2668 |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2669 default: |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2670 abort (); |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2671 } |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2672 |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2673 return survives_p; |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2674 } |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2675 |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2676 |
| 300 | 2677 |
|
1908
d649f2179d67
* alloc.c (make_pure_float): Align pureptr on a sizeof (double)
Jim Blandy <jimb@redhat.com>
parents:
1893
diff
changeset
|
2678 /* Sweep: find all structures not marked, and free them. */ |
| 300 | 2679 |
| 2680 static void | |
| 2681 gc_sweep () | |
| 2682 { | |
|
25024
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2683 /* Remove or mark entries in weak hash tables. |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2684 This must be done before any object is unmarked. */ |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2685 sweep_weak_hash_tables (); |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
2686 |
| 300 | 2687 total_string_size = 0; |
| 2688 compact_strings (); | |
| 2689 | |
| 2690 /* Put all unmarked conses on free list */ | |
| 2691 { | |
| 2692 register struct cons_block *cblk; | |
|
20057
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2693 struct cons_block **cprev = &cons_block; |
| 300 | 2694 register int lim = cons_block_index; |
| 2695 register int num_free = 0, num_used = 0; | |
| 2696 | |
| 2697 cons_free_list = 0; | |
| 2698 | |
|
20057
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2699 for (cblk = cons_block; cblk; cblk = *cprev) |
| 300 | 2700 { |
| 2701 register int i; | |
|
20057
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2702 int this_free = 0; |
| 300 | 2703 for (i = 0; i < lim; i++) |
| 2704 if (!XMARKBIT (cblk->conses[i].car)) | |
| 2705 { | |
|
20057
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2706 this_free++; |
|
19666
81957e8b80e2
(free_float, free_cons): Don't use the same field for chaining as for marking.
Richard M. Stallman <rms@gnu.org>
parents:
19621
diff
changeset
|
2707 *(struct Lisp_Cons **)&cblk->conses[i].cdr = cons_free_list; |
| 300 | 2708 cons_free_list = &cblk->conses[i]; |
| 2709 } | |
| 2710 else | |
| 2711 { | |
| 2712 num_used++; | |
| 2713 XUNMARK (cblk->conses[i].car); | |
| 2714 } | |
| 2715 lim = CONS_BLOCK_SIZE; | |
|
20057
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2716 /* If this block contains only free conses and we have already |
|
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2717 seen more than two blocks worth of free conses then deallocate |
|
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2718 this block. */ |
|
21379
1701bf5b9dec
(gc_sweep): Avoid using two loop variables counting the
Andreas Schwab <schwab@suse.de>
parents:
21306
diff
changeset
|
2719 if (this_free == CONS_BLOCK_SIZE && num_free > CONS_BLOCK_SIZE) |
|
20057
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2720 { |
|
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2721 *cprev = cblk->next; |
|
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2722 /* Unhook from the free list. */ |
|
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2723 cons_free_list = *(struct Lisp_Cons **) &cblk->conses[0].cdr; |
|
23958
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
2724 lisp_free (cblk); |
|
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
2725 n_cons_blocks--; |
|
20057
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2726 } |
|
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2727 else |
|
21379
1701bf5b9dec
(gc_sweep): Avoid using two loop variables counting the
Andreas Schwab <schwab@suse.de>
parents:
21306
diff
changeset
|
2728 { |
|
1701bf5b9dec
(gc_sweep): Avoid using two loop variables counting the
Andreas Schwab <schwab@suse.de>
parents:
21306
diff
changeset
|
2729 num_free += this_free; |
|
1701bf5b9dec
(gc_sweep): Avoid using two loop variables counting the
Andreas Schwab <schwab@suse.de>
parents:
21306
diff
changeset
|
2730 cprev = &cblk->next; |
|
1701bf5b9dec
(gc_sweep): Avoid using two loop variables counting the
Andreas Schwab <schwab@suse.de>
parents:
21306
diff
changeset
|
2731 } |
| 300 | 2732 } |
| 2733 total_conses = num_used; | |
| 2734 total_free_conses = num_free; | |
| 2735 } | |
| 2736 | |
| 2737 #ifdef LISP_FLOAT_TYPE | |
| 2738 /* Put all unmarked floats on free list */ | |
| 2739 { | |
| 2740 register struct float_block *fblk; | |
|
20057
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2741 struct float_block **fprev = &float_block; |
| 300 | 2742 register int lim = float_block_index; |
| 2743 register int num_free = 0, num_used = 0; | |
| 2744 | |
| 2745 float_free_list = 0; | |
| 2746 | |
|
20057
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2747 for (fblk = float_block; fblk; fblk = *fprev) |
| 300 | 2748 { |
| 2749 register int i; | |
|
20057
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2750 int this_free = 0; |
| 300 | 2751 for (i = 0; i < lim; i++) |
| 2752 if (!XMARKBIT (fblk->floats[i].type)) | |
| 2753 { | |
|
20057
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2754 this_free++; |
|
19666
81957e8b80e2
(free_float, free_cons): Don't use the same field for chaining as for marking.
Richard M. Stallman <rms@gnu.org>
parents:
19621
diff
changeset
|
2755 *(struct Lisp_Float **)&fblk->floats[i].data = float_free_list; |
| 300 | 2756 float_free_list = &fblk->floats[i]; |
| 2757 } | |
| 2758 else | |
| 2759 { | |
| 2760 num_used++; | |
| 2761 XUNMARK (fblk->floats[i].type); | |
| 2762 } | |
| 2763 lim = FLOAT_BLOCK_SIZE; | |
|
20057
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2764 /* If this block contains only free floats and we have already |
|
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2765 seen more than two blocks worth of free floats then deallocate |
|
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2766 this block. */ |
|
21379
1701bf5b9dec
(gc_sweep): Avoid using two loop variables counting the
Andreas Schwab <schwab@suse.de>
parents:
21306
diff
changeset
|
2767 if (this_free == FLOAT_BLOCK_SIZE && num_free > FLOAT_BLOCK_SIZE) |
|
20057
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2768 { |
|
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2769 *fprev = fblk->next; |
|
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2770 /* Unhook from the free list. */ |
|
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2771 float_free_list = *(struct Lisp_Float **) &fblk->floats[0].data; |
|
23958
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
2772 lisp_free (fblk); |
|
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
2773 n_float_blocks--; |
|
20057
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2774 } |
|
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2775 else |
|
21379
1701bf5b9dec
(gc_sweep): Avoid using two loop variables counting the
Andreas Schwab <schwab@suse.de>
parents:
21306
diff
changeset
|
2776 { |
|
1701bf5b9dec
(gc_sweep): Avoid using two loop variables counting the
Andreas Schwab <schwab@suse.de>
parents:
21306
diff
changeset
|
2777 num_free += this_free; |
|
1701bf5b9dec
(gc_sweep): Avoid using two loop variables counting the
Andreas Schwab <schwab@suse.de>
parents:
21306
diff
changeset
|
2778 fprev = &fblk->next; |
|
1701bf5b9dec
(gc_sweep): Avoid using two loop variables counting the
Andreas Schwab <schwab@suse.de>
parents:
21306
diff
changeset
|
2779 } |
| 300 | 2780 } |
| 2781 total_floats = num_used; | |
| 2782 total_free_floats = num_free; | |
| 2783 } | |
| 2784 #endif /* LISP_FLOAT_TYPE */ | |
| 2785 | |
|
1300
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
2786 #ifdef USE_TEXT_PROPERTIES |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
2787 /* Put all unmarked intervals on free list */ |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
2788 { |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
2789 register struct interval_block *iblk; |
|
20057
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2790 struct interval_block **iprev = &interval_block; |
|
1300
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
2791 register int lim = interval_block_index; |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
2792 register int num_free = 0, num_used = 0; |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
2793 |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
2794 interval_free_list = 0; |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
2795 |
|
20057
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2796 for (iblk = interval_block; iblk; iblk = *iprev) |
|
1300
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
2797 { |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
2798 register int i; |
|
20057
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2799 int this_free = 0; |
|
1300
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
2800 |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
2801 for (i = 0; i < lim; i++) |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
2802 { |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
2803 if (! XMARKBIT (iblk->intervals[i].plist)) |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
2804 { |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
2805 iblk->intervals[i].parent = interval_free_list; |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
2806 interval_free_list = &iblk->intervals[i]; |
|
20057
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2807 this_free++; |
|
1300
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
2808 } |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
2809 else |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
2810 { |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
2811 num_used++; |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
2812 XUNMARK (iblk->intervals[i].plist); |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
2813 } |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
2814 } |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
2815 lim = INTERVAL_BLOCK_SIZE; |
|
20057
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2816 /* If this block contains only free intervals and we have already |
|
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2817 seen more than two blocks worth of free intervals then |
|
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2818 deallocate this block. */ |
|
21379
1701bf5b9dec
(gc_sweep): Avoid using two loop variables counting the
Andreas Schwab <schwab@suse.de>
parents:
21306
diff
changeset
|
2819 if (this_free == INTERVAL_BLOCK_SIZE && num_free > INTERVAL_BLOCK_SIZE) |
|
20057
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2820 { |
|
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2821 *iprev = iblk->next; |
|
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2822 /* Unhook from the free list. */ |
|
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2823 interval_free_list = iblk->intervals[0].parent; |
|
23958
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
2824 lisp_free (iblk); |
|
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
2825 n_interval_blocks--; |
|
20057
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2826 } |
|
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2827 else |
|
21379
1701bf5b9dec
(gc_sweep): Avoid using two loop variables counting the
Andreas Schwab <schwab@suse.de>
parents:
21306
diff
changeset
|
2828 { |
|
1701bf5b9dec
(gc_sweep): Avoid using two loop variables counting the
Andreas Schwab <schwab@suse.de>
parents:
21306
diff
changeset
|
2829 num_free += this_free; |
|
1701bf5b9dec
(gc_sweep): Avoid using two loop variables counting the
Andreas Schwab <schwab@suse.de>
parents:
21306
diff
changeset
|
2830 iprev = &iblk->next; |
|
1701bf5b9dec
(gc_sweep): Avoid using two loop variables counting the
Andreas Schwab <schwab@suse.de>
parents:
21306
diff
changeset
|
2831 } |
|
1300
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
2832 } |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
2833 total_intervals = num_used; |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
2834 total_free_intervals = num_free; |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
2835 } |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
2836 #endif /* USE_TEXT_PROPERTIES */ |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
2837 |
| 300 | 2838 /* Put all unmarked symbols on free list */ |
| 2839 { | |
| 2840 register struct symbol_block *sblk; | |
|
20057
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2841 struct symbol_block **sprev = &symbol_block; |
| 300 | 2842 register int lim = symbol_block_index; |
| 2843 register int num_free = 0, num_used = 0; | |
| 2844 | |
| 2845 symbol_free_list = 0; | |
| 2846 | |
|
20057
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2847 for (sblk = symbol_block; sblk; sblk = *sprev) |
| 300 | 2848 { |
| 2849 register int i; | |
|
20057
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2850 int this_free = 0; |
| 300 | 2851 for (i = 0; i < lim; i++) |
| 2852 if (!XMARKBIT (sblk->symbols[i].plist)) | |
| 2853 { | |
|
9942
c189487b08dd
(free_float): Don't assume XFASTINT accesses the raw bits.
Karl Heuer <kwzh@gnu.org>
parents:
9926
diff
changeset
|
2854 *(struct Lisp_Symbol **)&sblk->symbols[i].value = symbol_free_list; |
| 300 | 2855 symbol_free_list = &sblk->symbols[i]; |
|
20057
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2856 this_free++; |
| 300 | 2857 } |
| 2858 else | |
| 2859 { | |
| 2860 num_used++; | |
| 2861 sblk->symbols[i].name | |
| 2862 = XSTRING (*(Lisp_Object *) &sblk->symbols[i].name); | |
| 2863 XUNMARK (sblk->symbols[i].plist); | |
| 2864 } | |
| 2865 lim = SYMBOL_BLOCK_SIZE; | |
|
20057
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2866 /* If this block contains only free symbols and we have already |
|
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2867 seen more than two blocks worth of free symbols then deallocate |
|
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2868 this block. */ |
|
21379
1701bf5b9dec
(gc_sweep): Avoid using two loop variables counting the
Andreas Schwab <schwab@suse.de>
parents:
21306
diff
changeset
|
2869 if (this_free == SYMBOL_BLOCK_SIZE && num_free > SYMBOL_BLOCK_SIZE) |
|
20057
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2870 { |
|
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2871 *sprev = sblk->next; |
|
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2872 /* Unhook from the free list. */ |
|
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2873 symbol_free_list = *(struct Lisp_Symbol **)&sblk->symbols[0].value; |
|
23958
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
2874 lisp_free (sblk); |
|
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
2875 n_symbol_blocks--; |
|
20057
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2876 } |
|
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2877 else |
|
21379
1701bf5b9dec
(gc_sweep): Avoid using two loop variables counting the
Andreas Schwab <schwab@suse.de>
parents:
21306
diff
changeset
|
2878 { |
|
1701bf5b9dec
(gc_sweep): Avoid using two loop variables counting the
Andreas Schwab <schwab@suse.de>
parents:
21306
diff
changeset
|
2879 num_free += this_free; |
|
1701bf5b9dec
(gc_sweep): Avoid using two loop variables counting the
Andreas Schwab <schwab@suse.de>
parents:
21306
diff
changeset
|
2880 sprev = &sblk->next; |
|
1701bf5b9dec
(gc_sweep): Avoid using two loop variables counting the
Andreas Schwab <schwab@suse.de>
parents:
21306
diff
changeset
|
2881 } |
| 300 | 2882 } |
| 2883 total_symbols = num_used; | |
| 2884 total_free_symbols = num_free; | |
| 2885 } | |
| 2886 | |
| 2887 #ifndef standalone | |
|
21143
ce12eac1ee45
(gc_sweep, mark_object): Handle new data structure
Richard M. Stallman <rms@gnu.org>
parents:
21084
diff
changeset
|
2888 /* Put all unmarked misc's on free list. |
|
ce12eac1ee45
(gc_sweep, mark_object): Handle new data structure
Richard M. Stallman <rms@gnu.org>
parents:
21084
diff
changeset
|
2889 For a marker, first unchain it from the buffer it points into. */ |
| 300 | 2890 { |
| 2891 register struct marker_block *mblk; | |
|
20057
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2892 struct marker_block **mprev = &marker_block; |
| 300 | 2893 register int lim = marker_block_index; |
| 2894 register int num_free = 0, num_used = 0; | |
| 2895 | |
| 2896 marker_free_list = 0; | |
| 2897 | |
|
20057
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2898 for (mblk = marker_block; mblk; mblk = *mprev) |
| 300 | 2899 { |
| 2900 register int i; | |
|
20057
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2901 int this_free = 0; |
|
11679
1ced2d67d411
(gc_cons_threshold): Make this an EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
11593
diff
changeset
|
2902 EMACS_INT already_free = -1; |
|
11403
bd3241a14d0a
(gc_sweep): If a misc has type Lisp_Misc_Free,
Richard M. Stallman <rms@gnu.org>
parents:
11374
diff
changeset
|
2903 |
| 300 | 2904 for (i = 0; i < lim; i++) |
|
9893
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2905 { |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2906 Lisp_Object *markword; |
|
11243
054ecfce1820
(Fmake_marker, mark_object): Use XMISCTYPE.
Richard M. Stallman <rms@gnu.org>
parents:
11048
diff
changeset
|
2907 switch (mblk->markers[i].u_marker.type) |
|
9893
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2908 { |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2909 case Lisp_Misc_Marker: |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2910 markword = &mblk->markers[i].u_marker.chain; |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2911 break; |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2912 case Lisp_Misc_Buffer_Local_Value: |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2913 case Lisp_Misc_Some_Buffer_Local_Value: |
|
21143
ce12eac1ee45
(gc_sweep, mark_object): Handle new data structure
Richard M. Stallman <rms@gnu.org>
parents:
21084
diff
changeset
|
2914 markword = &mblk->markers[i].u_buffer_local_value.realvalue; |
|
9893
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2915 break; |
|
9926
2a9f99682f82
(mark_object, gc_sweep): Use new overlay substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9893
diff
changeset
|
2916 case Lisp_Misc_Overlay: |
|
2a9f99682f82
(mark_object, gc_sweep): Use new overlay substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9893
diff
changeset
|
2917 markword = &mblk->markers[i].u_overlay.plist; |
|
2a9f99682f82
(mark_object, gc_sweep): Use new overlay substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9893
diff
changeset
|
2918 break; |
|
11403
bd3241a14d0a
(gc_sweep): If a misc has type Lisp_Misc_Free,
Richard M. Stallman <rms@gnu.org>
parents:
11374
diff
changeset
|
2919 case Lisp_Misc_Free: |
|
bd3241a14d0a
(gc_sweep): If a misc has type Lisp_Misc_Free,
Richard M. Stallman <rms@gnu.org>
parents:
11374
diff
changeset
|
2920 /* If the object was already free, keep it |
|
bd3241a14d0a
(gc_sweep): If a misc has type Lisp_Misc_Free,
Richard M. Stallman <rms@gnu.org>
parents:
11374
diff
changeset
|
2921 on the free list. */ |
|
18621
53b95f307c75
(memory_full): Pass Qnil to Fsignal for ERROR_SYMBOL.
Richard M. Stallman <rms@gnu.org>
parents:
18104
diff
changeset
|
2922 markword = (Lisp_Object *) &already_free; |
|
11403
bd3241a14d0a
(gc_sweep): If a misc has type Lisp_Misc_Free,
Richard M. Stallman <rms@gnu.org>
parents:
11374
diff
changeset
|
2923 break; |
|
9893
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2924 default: |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2925 markword = 0; |
|
9926
2a9f99682f82
(mark_object, gc_sweep): Use new overlay substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9893
diff
changeset
|
2926 break; |
|
9893
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2927 } |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2928 if (markword && !XMARKBIT (*markword)) |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2929 { |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2930 Lisp_Object tem; |
|
11243
054ecfce1820
(Fmake_marker, mark_object): Use XMISCTYPE.
Richard M. Stallman <rms@gnu.org>
parents:
11048
diff
changeset
|
2931 if (mblk->markers[i].u_marker.type == Lisp_Misc_Marker) |
|
9893
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2932 { |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2933 /* tem1 avoids Sun compiler bug */ |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2934 struct Lisp_Marker *tem1 = &mblk->markers[i].u_marker; |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2935 XSETMARKER (tem, tem1); |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2936 unchain_marker (tem); |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2937 } |
|
11403
bd3241a14d0a
(gc_sweep): If a misc has type Lisp_Misc_Free,
Richard M. Stallman <rms@gnu.org>
parents:
11374
diff
changeset
|
2938 /* Set the type of the freed object to Lisp_Misc_Free. |
|
bd3241a14d0a
(gc_sweep): If a misc has type Lisp_Misc_Free,
Richard M. Stallman <rms@gnu.org>
parents:
11374
diff
changeset
|
2939 We could leave the type alone, since nobody checks it, |
|
9893
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2940 but this might catch bugs faster. */ |
|
11243
054ecfce1820
(Fmake_marker, mark_object): Use XMISCTYPE.
Richard M. Stallman <rms@gnu.org>
parents:
11048
diff
changeset
|
2941 mblk->markers[i].u_marker.type = Lisp_Misc_Free; |
|
9893
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2942 mblk->markers[i].u_free.chain = marker_free_list; |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2943 marker_free_list = &mblk->markers[i]; |
|
20057
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2944 this_free++; |
|
9893
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2945 } |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2946 else |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2947 { |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2948 num_used++; |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2949 if (markword) |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2950 XUNMARK (*markword); |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2951 } |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2952 } |
| 300 | 2953 lim = MARKER_BLOCK_SIZE; |
|
20057
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2954 /* If this block contains only free markers and we have already |
|
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2955 seen more than two blocks worth of free markers then deallocate |
|
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2956 this block. */ |
|
21379
1701bf5b9dec
(gc_sweep): Avoid using two loop variables counting the
Andreas Schwab <schwab@suse.de>
parents:
21306
diff
changeset
|
2957 if (this_free == MARKER_BLOCK_SIZE && num_free > MARKER_BLOCK_SIZE) |
|
20057
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2958 { |
|
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2959 *mprev = mblk->next; |
|
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2960 /* Unhook from the free list. */ |
|
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2961 marker_free_list = mblk->markers[0].u_free.chain; |
|
23958
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
2962 lisp_free (mblk); |
|
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
2963 n_marker_blocks--; |
|
20057
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2964 } |
|
612cd201aea5
(gc_sweep): Free memory blocks that contain only unused
Karl Heuer <kwzh@gnu.org>
parents:
19666
diff
changeset
|
2965 else |
|
21379
1701bf5b9dec
(gc_sweep): Avoid using two loop variables counting the
Andreas Schwab <schwab@suse.de>
parents:
21306
diff
changeset
|
2966 { |
|
1701bf5b9dec
(gc_sweep): Avoid using two loop variables counting the
Andreas Schwab <schwab@suse.de>
parents:
21306
diff
changeset
|
2967 num_free += this_free; |
|
1701bf5b9dec
(gc_sweep): Avoid using two loop variables counting the
Andreas Schwab <schwab@suse.de>
parents:
21306
diff
changeset
|
2968 mprev = &mblk->next; |
|
1701bf5b9dec
(gc_sweep): Avoid using two loop variables counting the
Andreas Schwab <schwab@suse.de>
parents:
21306
diff
changeset
|
2969 } |
| 300 | 2970 } |
| 2971 | |
| 2972 total_markers = num_used; | |
| 2973 total_free_markers = num_free; | |
| 2974 } | |
| 2975 | |
| 2976 /* Free all unmarked buffers */ | |
| 2977 { | |
| 2978 register struct buffer *buffer = all_buffers, *prev = 0, *next; | |
| 2979 | |
| 2980 while (buffer) | |
| 2981 if (!XMARKBIT (buffer->name)) | |
| 2982 { | |
| 2983 if (prev) | |
| 2984 prev->next = buffer->next; | |
| 2985 else | |
| 2986 all_buffers = buffer->next; | |
| 2987 next = buffer->next; | |
|
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
2988 xfree (buffer); |
| 300 | 2989 buffer = next; |
| 2990 } | |
| 2991 else | |
| 2992 { | |
| 2993 XUNMARK (buffer->name); | |
|
10307
e6e75fd0916d
(mark_buffer, gc_sweep): Use BUF_INTERVALS.
Richard M. Stallman <rms@gnu.org>
parents:
10291
diff
changeset
|
2994 UNMARK_BALANCE_INTERVALS (BUF_INTERVALS (buffer)); |
| 300 | 2995 |
| 2996 #if 0 | |
| 2997 /* Each `struct Lisp_String *' was turned into a Lisp_Object | |
| 2998 for purposes of marking and relocation. | |
| 2999 Turn them back into C pointers now. */ | |
| 3000 buffer->upcase_table | |
| 3001 = XSTRING (*(Lisp_Object *)&buffer->upcase_table); | |
| 3002 buffer->downcase_table | |
| 3003 = XSTRING (*(Lisp_Object *)&buffer->downcase_table); | |
| 3004 buffer->sort_table | |
| 3005 = XSTRING (*(Lisp_Object *)&buffer->sort_table); | |
| 3006 buffer->folding_sort_table | |
| 3007 = XSTRING (*(Lisp_Object *)&buffer->folding_sort_table); | |
| 3008 #endif | |
| 3009 | |
| 3010 prev = buffer, buffer = buffer->next; | |
| 3011 } | |
| 3012 } | |
| 3013 | |
| 3014 #endif /* standalone */ | |
| 3015 | |
| 3016 /* Free all unmarked vectors */ | |
| 3017 { | |
| 3018 register struct Lisp_Vector *vector = all_vectors, *prev = 0, *next; | |
| 3019 total_vector_size = 0; | |
| 3020 | |
| 3021 while (vector) | |
| 3022 if (!(vector->size & ARRAY_MARK_FLAG)) | |
| 3023 { | |
|
25024
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
3024 #if 0 |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
3025 if ((vector->size & (PSEUDOVECTOR_FLAG | PVEC_HASH_TABLE)) |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
3026 == (PSEUDOVECTOR_FLAG | PVEC_HASH_TABLE)) |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
3027 fprintf (stderr, "Freeing hash table %p\n", vector); |
|
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
3028 #endif |
| 300 | 3029 if (prev) |
| 3030 prev->next = vector->next; | |
| 3031 else | |
| 3032 all_vectors = vector->next; | |
| 3033 next = vector->next; | |
|
23958
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
3034 lisp_free (vector); |
|
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
3035 n_vectors--; |
| 300 | 3036 vector = next; |
|
25024
3bb745067f0e
(gc_sweep): Call sweep_weak_hash_tables.
Gerd Moellmann <gerd@gnu.org>
parents:
23973
diff
changeset
|
3037 |
| 300 | 3038 } |
| 3039 else | |
| 3040 { | |
| 3041 vector->size &= ~ARRAY_MARK_FLAG; | |
|
11403
bd3241a14d0a
(gc_sweep): If a misc has type Lisp_Misc_Free,
Richard M. Stallman <rms@gnu.org>
parents:
11374
diff
changeset
|
3042 if (vector->size & PSEUDOVECTOR_FLAG) |
|
bd3241a14d0a
(gc_sweep): If a misc has type Lisp_Misc_Free,
Richard M. Stallman <rms@gnu.org>
parents:
11374
diff
changeset
|
3043 total_vector_size += (PSEUDOVECTOR_SIZE_MASK & vector->size); |
|
bd3241a14d0a
(gc_sweep): If a misc has type Lisp_Misc_Free,
Richard M. Stallman <rms@gnu.org>
parents:
11374
diff
changeset
|
3044 else |
|
bd3241a14d0a
(gc_sweep): If a misc has type Lisp_Misc_Free,
Richard M. Stallman <rms@gnu.org>
parents:
11374
diff
changeset
|
3045 total_vector_size += vector->size; |
| 300 | 3046 prev = vector, vector = vector->next; |
| 3047 } | |
| 3048 } | |
| 3049 | |
| 3050 /* Free all "large strings" not marked with ARRAY_MARK_FLAG. */ | |
| 3051 { | |
| 3052 register struct string_block *sb = large_string_blocks, *prev = 0, *next; | |
|
4139
0b32ee899a3a
Consistently use the mark bit of the root interval's parent field
Jim Blandy <jimb@redhat.com>
parents:
4087
diff
changeset
|
3053 struct Lisp_String *s; |
| 300 | 3054 |
| 3055 while (sb) | |
|
4139
0b32ee899a3a
Consistently use the mark bit of the root interval's parent field
Jim Blandy <jimb@redhat.com>
parents:
4087
diff
changeset
|
3056 { |
|
0b32ee899a3a
Consistently use the mark bit of the root interval's parent field
Jim Blandy <jimb@redhat.com>
parents:
4087
diff
changeset
|
3057 s = (struct Lisp_String *) &sb->chars[0]; |
|
0b32ee899a3a
Consistently use the mark bit of the root interval's parent field
Jim Blandy <jimb@redhat.com>
parents:
4087
diff
changeset
|
3058 if (s->size & ARRAY_MARK_FLAG) |
|
0b32ee899a3a
Consistently use the mark bit of the root interval's parent field
Jim Blandy <jimb@redhat.com>
parents:
4087
diff
changeset
|
3059 { |
|
0b32ee899a3a
Consistently use the mark bit of the root interval's parent field
Jim Blandy <jimb@redhat.com>
parents:
4087
diff
changeset
|
3060 ((struct Lisp_String *)(&sb->chars[0]))->size |
|
10413
bfe591f66299
(DONT_COPY_FLAG): Default this to 1.
Karl Heuer <kwzh@gnu.org>
parents:
10398
diff
changeset
|
3061 &= ~ARRAY_MARK_FLAG & ~MARKBIT; |
|
4139
0b32ee899a3a
Consistently use the mark bit of the root interval's parent field
Jim Blandy <jimb@redhat.com>
parents:
4087
diff
changeset
|
3062 UNMARK_BALANCE_INTERVALS (s->intervals); |
|
0b32ee899a3a
Consistently use the mark bit of the root interval's parent field
Jim Blandy <jimb@redhat.com>
parents:
4087
diff
changeset
|
3063 total_string_size += ((struct Lisp_String *)(&sb->chars[0]))->size; |
|
0b32ee899a3a
Consistently use the mark bit of the root interval's parent field
Jim Blandy <jimb@redhat.com>
parents:
4087
diff
changeset
|
3064 prev = sb, sb = sb->next; |
|
0b32ee899a3a
Consistently use the mark bit of the root interval's parent field
Jim Blandy <jimb@redhat.com>
parents:
4087
diff
changeset
|
3065 } |
|
0b32ee899a3a
Consistently use the mark bit of the root interval's parent field
Jim Blandy <jimb@redhat.com>
parents:
4087
diff
changeset
|
3066 else |
|
0b32ee899a3a
Consistently use the mark bit of the root interval's parent field
Jim Blandy <jimb@redhat.com>
parents:
4087
diff
changeset
|
3067 { |
|
0b32ee899a3a
Consistently use the mark bit of the root interval's parent field
Jim Blandy <jimb@redhat.com>
parents:
4087
diff
changeset
|
3068 if (prev) |
|
0b32ee899a3a
Consistently use the mark bit of the root interval's parent field
Jim Blandy <jimb@redhat.com>
parents:
4087
diff
changeset
|
3069 prev->next = sb->next; |
|
0b32ee899a3a
Consistently use the mark bit of the root interval's parent field
Jim Blandy <jimb@redhat.com>
parents:
4087
diff
changeset
|
3070 else |
|
0b32ee899a3a
Consistently use the mark bit of the root interval's parent field
Jim Blandy <jimb@redhat.com>
parents:
4087
diff
changeset
|
3071 large_string_blocks = sb->next; |
|
0b32ee899a3a
Consistently use the mark bit of the root interval's parent field
Jim Blandy <jimb@redhat.com>
parents:
4087
diff
changeset
|
3072 next = sb->next; |
|
23958
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
3073 lisp_free (sb); |
|
4139
0b32ee899a3a
Consistently use the mark bit of the root interval's parent field
Jim Blandy <jimb@redhat.com>
parents:
4087
diff
changeset
|
3074 sb = next; |
|
23958
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
3075 n_string_blocks--; |
|
4139
0b32ee899a3a
Consistently use the mark bit of the root interval's parent field
Jim Blandy <jimb@redhat.com>
parents:
4087
diff
changeset
|
3076 } |
|
0b32ee899a3a
Consistently use the mark bit of the root interval's parent field
Jim Blandy <jimb@redhat.com>
parents:
4087
diff
changeset
|
3077 } |
| 300 | 3078 } |
| 3079 } | |
| 3080 | |
|
1908
d649f2179d67
* alloc.c (make_pure_float): Align pureptr on a sizeof (double)
Jim Blandy <jimb@redhat.com>
parents:
1893
diff
changeset
|
3081 /* Compactify strings, relocate references, and free empty string blocks. */ |
| 300 | 3082 |
| 3083 static void | |
| 3084 compact_strings () | |
| 3085 { | |
| 3086 /* String block of old strings we are scanning. */ | |
| 3087 register struct string_block *from_sb; | |
| 3088 /* A preceding string block (or maybe the same one) | |
| 3089 where we are copying the still-live strings to. */ | |
| 3090 register struct string_block *to_sb; | |
| 3091 int pos; | |
| 3092 int to_pos; | |
| 3093 | |
| 3094 to_sb = first_string_block; | |
| 3095 to_pos = 0; | |
| 3096 | |
| 3097 /* Scan each existing string block sequentially, string by string. */ | |
| 3098 for (from_sb = first_string_block; from_sb; from_sb = from_sb->next) | |
| 3099 { | |
| 3100 pos = 0; | |
| 3101 /* POS is the index of the next string in the block. */ | |
| 3102 while (pos < from_sb->pos) | |
| 3103 { | |
| 3104 register struct Lisp_String *nextstr | |
| 3105 = (struct Lisp_String *) &from_sb->chars[pos]; | |
| 3106 | |
| 3107 register struct Lisp_String *newaddr; | |
|
8817
48ff00bebef6
(pure, pure_size): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
3108 register EMACS_INT size = nextstr->size; |
|
21258
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
3109 EMACS_INT size_byte = nextstr->size_byte; |
| 300 | 3110 |
| 3111 /* NEXTSTR is the old address of the next string. | |
| 3112 Just skip it if it isn't marked. */ | |
|
10389
162b3e6c4610
(DONT_COPY_FLAG): New bit flag.
Richard M. Stallman <rms@gnu.org>
parents:
10340
diff
changeset
|
3113 if (((EMACS_UINT) size & ~DONT_COPY_FLAG) > STRING_BLOCK_SIZE) |
| 300 | 3114 { |
| 3115 /* It is marked, so its size field is really a chain of refs. | |
| 3116 Find the end of the chain, where the actual size lives. */ | |
|
10389
162b3e6c4610
(DONT_COPY_FLAG): New bit flag.
Richard M. Stallman <rms@gnu.org>
parents:
10340
diff
changeset
|
3117 while (((EMACS_UINT) size & ~DONT_COPY_FLAG) > STRING_BLOCK_SIZE) |
| 300 | 3118 { |
|
10389
162b3e6c4610
(DONT_COPY_FLAG): New bit flag.
Richard M. Stallman <rms@gnu.org>
parents:
10340
diff
changeset
|
3119 if (size & DONT_COPY_FLAG) |
|
162b3e6c4610
(DONT_COPY_FLAG): New bit flag.
Richard M. Stallman <rms@gnu.org>
parents:
10340
diff
changeset
|
3120 size ^= MARKBIT | DONT_COPY_FLAG; |
|
8817
48ff00bebef6
(pure, pure_size): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
3121 size = *(EMACS_INT *)size & ~MARKBIT; |
| 300 | 3122 } |
| 3123 | |
|
21258
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
3124 if (size_byte < 0) |
|
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
3125 size_byte = size; |
|
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
3126 |
|
20587
eaf988c7e291
(make_pure_string): New arg length_byte.
Richard M. Stallman <rms@gnu.org>
parents:
20565
diff
changeset
|
3127 total_string_size += size_byte; |
| 300 | 3128 |
| 3129 /* If it won't fit in TO_SB, close it out, | |
| 3130 and move to the next sb. Keep doing so until | |
| 3131 TO_SB reaches a large enough, empty enough string block. | |
| 3132 We know that TO_SB cannot advance past FROM_SB here | |
| 3133 since FROM_SB is large enough to contain this string. | |
| 3134 Any string blocks skipped here | |
| 3135 will be patched out and freed later. */ | |
|
20587
eaf988c7e291
(make_pure_string): New arg length_byte.
Richard M. Stallman <rms@gnu.org>
parents:
20565
diff
changeset
|
3136 while (to_pos + STRING_FULLSIZE (size_byte) |
| 300 | 3137 > max (to_sb->pos, STRING_BLOCK_SIZE)) |
| 3138 { | |
| 3139 to_sb->pos = to_pos; | |
| 3140 to_sb = to_sb->next; | |
| 3141 to_pos = 0; | |
| 3142 } | |
| 3143 /* Compute new address of this string | |
| 3144 and update TO_POS for the space being used. */ | |
| 3145 newaddr = (struct Lisp_String *) &to_sb->chars[to_pos]; | |
|
20587
eaf988c7e291
(make_pure_string): New arg length_byte.
Richard M. Stallman <rms@gnu.org>
parents:
20565
diff
changeset
|
3146 to_pos += STRING_FULLSIZE (size_byte); |
| 300 | 3147 |
| 3148 /* Copy the string itself to the new place. */ | |
| 3149 if (nextstr != newaddr) | |
|
20587
eaf988c7e291
(make_pure_string): New arg length_byte.
Richard M. Stallman <rms@gnu.org>
parents:
20565
diff
changeset
|
3150 bcopy (nextstr, newaddr, STRING_FULLSIZE (size_byte)); |
| 300 | 3151 |
| 3152 /* Go through NEXTSTR's chain of references | |
| 3153 and make each slot in the chain point to | |
| 3154 the new address of this string. */ | |
| 3155 size = newaddr->size; | |
|
10389
162b3e6c4610
(DONT_COPY_FLAG): New bit flag.
Richard M. Stallman <rms@gnu.org>
parents:
10340
diff
changeset
|
3156 while (((EMACS_UINT) size & ~DONT_COPY_FLAG) > STRING_BLOCK_SIZE) |
| 300 | 3157 { |
| 3158 register Lisp_Object *objptr; | |
|
10389
162b3e6c4610
(DONT_COPY_FLAG): New bit flag.
Richard M. Stallman <rms@gnu.org>
parents:
10340
diff
changeset
|
3159 if (size & DONT_COPY_FLAG) |
|
162b3e6c4610
(DONT_COPY_FLAG): New bit flag.
Richard M. Stallman <rms@gnu.org>
parents:
10340
diff
changeset
|
3160 size ^= MARKBIT | DONT_COPY_FLAG; |
| 300 | 3161 objptr = (Lisp_Object *)size; |
| 3162 | |
| 3163 size = XFASTINT (*objptr) & ~MARKBIT; | |
| 3164 if (XMARKBIT (*objptr)) | |
| 3165 { | |
|
9261
e5ba7993d378
(VALIDATE_LISP_STORAGE, make_float, Fcons, Fmake_vector, Fmake_symbol,
Karl Heuer <kwzh@gnu.org>
parents:
9144
diff
changeset
|
3166 XSETSTRING (*objptr, newaddr); |
| 300 | 3167 XMARK (*objptr); |
| 3168 } | |
| 3169 else | |
|
9261
e5ba7993d378
(VALIDATE_LISP_STORAGE, make_float, Fcons, Fmake_vector, Fmake_symbol,
Karl Heuer <kwzh@gnu.org>
parents:
9144
diff
changeset
|
3170 XSETSTRING (*objptr, newaddr); |
| 300 | 3171 } |
| 3172 /* Store the actual size in the size field. */ | |
| 3173 newaddr->size = size; | |
|
4139
0b32ee899a3a
Consistently use the mark bit of the root interval's parent field
Jim Blandy <jimb@redhat.com>
parents:
4087
diff
changeset
|
3174 |
|
4212
a696547fb51e
(compact_strings): Add USE_TEXT_PROPERTIES conditional.
Richard M. Stallman <rms@gnu.org>
parents:
4139
diff
changeset
|
3175 #ifdef USE_TEXT_PROPERTIES |
|
4139
0b32ee899a3a
Consistently use the mark bit of the root interval's parent field
Jim Blandy <jimb@redhat.com>
parents:
4087
diff
changeset
|
3176 /* Now that the string has been relocated, rebalance its |
|
0b32ee899a3a
Consistently use the mark bit of the root interval's parent field
Jim Blandy <jimb@redhat.com>
parents:
4087
diff
changeset
|
3177 interval tree, and update the tree's parent pointer. */ |
|
0b32ee899a3a
Consistently use the mark bit of the root interval's parent field
Jim Blandy <jimb@redhat.com>
parents:
4087
diff
changeset
|
3178 if (! NULL_INTERVAL_P (newaddr->intervals)) |
|
0b32ee899a3a
Consistently use the mark bit of the root interval's parent field
Jim Blandy <jimb@redhat.com>
parents:
4087
diff
changeset
|
3179 { |
|
0b32ee899a3a
Consistently use the mark bit of the root interval's parent field
Jim Blandy <jimb@redhat.com>
parents:
4087
diff
changeset
|
3180 UNMARK_BALANCE_INTERVALS (newaddr->intervals); |
|
9261
e5ba7993d378
(VALIDATE_LISP_STORAGE, make_float, Fcons, Fmake_vector, Fmake_symbol,
Karl Heuer <kwzh@gnu.org>
parents:
9144
diff
changeset
|
3181 XSETSTRING (* (Lisp_Object *) &newaddr->intervals->parent, |
|
e5ba7993d378
(VALIDATE_LISP_STORAGE, make_float, Fcons, Fmake_vector, Fmake_symbol,
Karl Heuer <kwzh@gnu.org>
parents:
9144
diff
changeset
|
3182 newaddr); |
|
4139
0b32ee899a3a
Consistently use the mark bit of the root interval's parent field
Jim Blandy <jimb@redhat.com>
parents:
4087
diff
changeset
|
3183 } |
|
4212
a696547fb51e
(compact_strings): Add USE_TEXT_PROPERTIES conditional.
Richard M. Stallman <rms@gnu.org>
parents:
4139
diff
changeset
|
3184 #endif /* USE_TEXT_PROPERTIES */ |
| 300 | 3185 } |
|
21258
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
3186 else if (size_byte < 0) |
|
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
3187 size_byte = size; |
|
693573ac0944
(make_specified_string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
3188 |
|
20587
eaf988c7e291
(make_pure_string): New arg length_byte.
Richard M. Stallman <rms@gnu.org>
parents:
20565
diff
changeset
|
3189 pos += STRING_FULLSIZE (size_byte); |
| 300 | 3190 } |
| 3191 } | |
| 3192 | |
| 3193 /* Close out the last string block still used and free any that follow. */ | |
| 3194 to_sb->pos = to_pos; | |
| 3195 current_string_block = to_sb; | |
| 3196 | |
| 3197 from_sb = to_sb->next; | |
| 3198 to_sb->next = 0; | |
| 3199 while (from_sb) | |
| 3200 { | |
| 3201 to_sb = from_sb->next; | |
|
23958
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
3202 lisp_free (from_sb); |
|
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
3203 n_string_blocks--; |
| 300 | 3204 from_sb = to_sb; |
| 3205 } | |
| 3206 | |
| 3207 /* Free any empty string blocks further back in the chain. | |
| 3208 This loop will never free first_string_block, but it is very | |
| 3209 unlikely that that one will become empty, so why bother checking? */ | |
| 3210 | |
| 3211 from_sb = first_string_block; | |
| 3212 while (to_sb = from_sb->next) | |
| 3213 { | |
| 3214 if (to_sb->pos == 0) | |
| 3215 { | |
| 3216 if (from_sb->next = to_sb->next) | |
| 3217 from_sb->next->prev = from_sb; | |
|
23958
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
3218 lisp_free (to_sb); |
|
7094b74ce0a6
(lisp_malloc, lisp_free): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
23534
diff
changeset
|
3219 n_string_blocks--; |
| 300 | 3220 } |
| 3221 else | |
| 3222 from_sb = to_sb; | |
| 3223 } | |
| 3224 } | |
| 3225 | |
|
1327
ef16e7c0d402
* alloc.c (Fmemory_limit): New function.
Jim Blandy <jimb@redhat.com>
parents:
1318
diff
changeset
|
3226 /* Debugging aids. */ |
|
ef16e7c0d402
* alloc.c (Fmemory_limit): New function.
Jim Blandy <jimb@redhat.com>
parents:
1318
diff
changeset
|
3227 |
|
5353
6389ed5b45ac
(Fmemory_limit): No longer interactive.
Richard M. Stallman <rms@gnu.org>
parents:
4956
diff
changeset
|
3228 DEFUN ("memory-limit", Fmemory_limit, Smemory_limit, 0, 0, 0, |
|
1327
ef16e7c0d402
* alloc.c (Fmemory_limit): New function.
Jim Blandy <jimb@redhat.com>
parents:
1318
diff
changeset
|
3229 "Return the address of the last byte Emacs has allocated, divided by 1024.\n\ |
|
ef16e7c0d402
* alloc.c (Fmemory_limit): New function.
Jim Blandy <jimb@redhat.com>
parents:
1318
diff
changeset
|
3230 This may be helpful in debugging Emacs's memory usage.\n\ |
|
1893
b047e77f3be4
(Fmemory_limit): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
1784
diff
changeset
|
3231 We divide the value by 1024 to make sure it fits in a Lisp integer.") |
|
1327
ef16e7c0d402
* alloc.c (Fmemory_limit): New function.
Jim Blandy <jimb@redhat.com>
parents:
1318
diff
changeset
|
3232 () |
|
ef16e7c0d402
* alloc.c (Fmemory_limit): New function.
Jim Blandy <jimb@redhat.com>
parents:
1318
diff
changeset
|
3233 { |
|
ef16e7c0d402
* alloc.c (Fmemory_limit): New function.
Jim Blandy <jimb@redhat.com>
parents:
1318
diff
changeset
|
3234 Lisp_Object end; |
|
ef16e7c0d402
* alloc.c (Fmemory_limit): New function.
Jim Blandy <jimb@redhat.com>
parents:
1318
diff
changeset
|
3235 |
|
9261
e5ba7993d378
(VALIDATE_LISP_STORAGE, make_float, Fcons, Fmake_vector, Fmake_symbol,
Karl Heuer <kwzh@gnu.org>
parents:
9144
diff
changeset
|
3236 XSETINT (end, (EMACS_INT) sbrk (0) / 1024); |
|
1327
ef16e7c0d402
* alloc.c (Fmemory_limit): New function.
Jim Blandy <jimb@redhat.com>
parents:
1318
diff
changeset
|
3237 |
|
ef16e7c0d402
* alloc.c (Fmemory_limit): New function.
Jim Blandy <jimb@redhat.com>
parents:
1318
diff
changeset
|
3238 return end; |
|
ef16e7c0d402
* alloc.c (Fmemory_limit): New function.
Jim Blandy <jimb@redhat.com>
parents:
1318
diff
changeset
|
3239 } |
|
ef16e7c0d402
* alloc.c (Fmemory_limit): New function.
Jim Blandy <jimb@redhat.com>
parents:
1318
diff
changeset
|
3240 |
|
12748
3433bb446e06
(cons_cells_consed, floats_consed, vector_cells_consed)
Richard M. Stallman <rms@gnu.org>
parents:
12605
diff
changeset
|
3241 DEFUN ("memory-use-counts", Fmemory_use_counts, Smemory_use_counts, 0, 0, 0, |
|
3433bb446e06
(cons_cells_consed, floats_consed, vector_cells_consed)
Richard M. Stallman <rms@gnu.org>
parents:
12605
diff
changeset
|
3242 "Return a list of counters that measure how much consing there has been.\n\ |
|
3433bb446e06
(cons_cells_consed, floats_consed, vector_cells_consed)
Richard M. Stallman <rms@gnu.org>
parents:
12605
diff
changeset
|
3243 Each of these counters increments for a certain kind of object.\n\ |
|
3433bb446e06
(cons_cells_consed, floats_consed, vector_cells_consed)
Richard M. Stallman <rms@gnu.org>
parents:
12605
diff
changeset
|
3244 The counters wrap around from the largest positive integer to zero.\n\ |
|
3433bb446e06
(cons_cells_consed, floats_consed, vector_cells_consed)
Richard M. Stallman <rms@gnu.org>
parents:
12605
diff
changeset
|
3245 Garbage collection does not decrease them.\n\ |
|
3433bb446e06
(cons_cells_consed, floats_consed, vector_cells_consed)
Richard M. Stallman <rms@gnu.org>
parents:
12605
diff
changeset
|
3246 The elements of the value are as follows:\n\ |
|
3433bb446e06
(cons_cells_consed, floats_consed, vector_cells_consed)
Richard M. Stallman <rms@gnu.org>
parents:
12605
diff
changeset
|
3247 (CONSES FLOATS VECTOR-CELLS SYMBOLS STRING-CHARS MISCS INTERVALS)\n\ |
|
3433bb446e06
(cons_cells_consed, floats_consed, vector_cells_consed)
Richard M. Stallman <rms@gnu.org>
parents:
12605
diff
changeset
|
3248 All are in units of 1 = one object consed\n\ |
|
3433bb446e06
(cons_cells_consed, floats_consed, vector_cells_consed)
Richard M. Stallman <rms@gnu.org>
parents:
12605
diff
changeset
|
3249 except for VECTOR-CELLS and STRING-CHARS, which count the total length of\n\ |
|
3433bb446e06
(cons_cells_consed, floats_consed, vector_cells_consed)
Richard M. Stallman <rms@gnu.org>
parents:
12605
diff
changeset
|
3250 objects consed.\n\ |
|
3433bb446e06
(cons_cells_consed, floats_consed, vector_cells_consed)
Richard M. Stallman <rms@gnu.org>
parents:
12605
diff
changeset
|
3251 MISCS include overlays, markers, and some internal types.\n\ |
|
3433bb446e06
(cons_cells_consed, floats_consed, vector_cells_consed)
Richard M. Stallman <rms@gnu.org>
parents:
12605
diff
changeset
|
3252 Frames, windows, buffers, and subprocesses count as vectors\n\ |
|
3433bb446e06
(cons_cells_consed, floats_consed, vector_cells_consed)
Richard M. Stallman <rms@gnu.org>
parents:
12605
diff
changeset
|
3253 (but the contents of a buffer's text do not count here).") |
|
3433bb446e06
(cons_cells_consed, floats_consed, vector_cells_consed)
Richard M. Stallman <rms@gnu.org>
parents:
12605
diff
changeset
|
3254 () |
|
3433bb446e06
(cons_cells_consed, floats_consed, vector_cells_consed)
Richard M. Stallman <rms@gnu.org>
parents:
12605
diff
changeset
|
3255 { |
|
3433bb446e06
(cons_cells_consed, floats_consed, vector_cells_consed)
Richard M. Stallman <rms@gnu.org>
parents:
12605
diff
changeset
|
3256 Lisp_Object lisp_cons_cells_consed; |
|
3433bb446e06
(cons_cells_consed, floats_consed, vector_cells_consed)
Richard M. Stallman <rms@gnu.org>
parents:
12605
diff
changeset
|
3257 Lisp_Object lisp_floats_consed; |
|
3433bb446e06
(cons_cells_consed, floats_consed, vector_cells_consed)
Richard M. Stallman <rms@gnu.org>
parents:
12605
diff
changeset
|
3258 Lisp_Object lisp_vector_cells_consed; |
|
3433bb446e06
(cons_cells_consed, floats_consed, vector_cells_consed)
Richard M. Stallman <rms@gnu.org>
parents:
12605
diff
changeset
|
3259 Lisp_Object lisp_symbols_consed; |
|
3433bb446e06
(cons_cells_consed, floats_consed, vector_cells_consed)
Richard M. Stallman <rms@gnu.org>
parents:
12605
diff
changeset
|
3260 Lisp_Object lisp_string_chars_consed; |
|
3433bb446e06
(cons_cells_consed, floats_consed, vector_cells_consed)
Richard M. Stallman <rms@gnu.org>
parents:
12605
diff
changeset
|
3261 Lisp_Object lisp_misc_objects_consed; |
|
3433bb446e06
(cons_cells_consed, floats_consed, vector_cells_consed)
Richard M. Stallman <rms@gnu.org>
parents:
12605
diff
changeset
|
3262 Lisp_Object lisp_intervals_consed; |
|
3433bb446e06
(cons_cells_consed, floats_consed, vector_cells_consed)
Richard M. Stallman <rms@gnu.org>
parents:
12605
diff
changeset
|
3263 |
|
3433bb446e06
(cons_cells_consed, floats_consed, vector_cells_consed)
Richard M. Stallman <rms@gnu.org>
parents:
12605
diff
changeset
|
3264 XSETINT (lisp_cons_cells_consed, |
|
13320
e0f3a961851a
Cast first arg to bzero.
Richard M. Stallman <rms@gnu.org>
parents:
13219
diff
changeset
|
3265 cons_cells_consed & ~(((EMACS_INT) 1) << (VALBITS - 1))); |
|
12748
3433bb446e06
(cons_cells_consed, floats_consed, vector_cells_consed)
Richard M. Stallman <rms@gnu.org>
parents:
12605
diff
changeset
|
3266 XSETINT (lisp_floats_consed, |
|
13320
e0f3a961851a
Cast first arg to bzero.
Richard M. Stallman <rms@gnu.org>
parents:
13219
diff
changeset
|
3267 floats_consed & ~(((EMACS_INT) 1) << (VALBITS - 1))); |
|
12748
3433bb446e06
(cons_cells_consed, floats_consed, vector_cells_consed)
Richard M. Stallman <rms@gnu.org>
parents:
12605
diff
changeset
|
3268 XSETINT (lisp_vector_cells_consed, |
|
13320
e0f3a961851a
Cast first arg to bzero.
Richard M. Stallman <rms@gnu.org>
parents:
13219
diff
changeset
|
3269 vector_cells_consed & ~(((EMACS_INT) 1) << (VALBITS - 1))); |
|
12748
3433bb446e06
(cons_cells_consed, floats_consed, vector_cells_consed)
Richard M. Stallman <rms@gnu.org>
parents:
12605
diff
changeset
|
3270 XSETINT (lisp_symbols_consed, |
|
13320
e0f3a961851a
Cast first arg to bzero.
Richard M. Stallman <rms@gnu.org>
parents:
13219
diff
changeset
|
3271 symbols_consed & ~(((EMACS_INT) 1) << (VALBITS - 1))); |
|
12748
3433bb446e06
(cons_cells_consed, floats_consed, vector_cells_consed)
Richard M. Stallman <rms@gnu.org>
parents:
12605
diff
changeset
|
3272 XSETINT (lisp_string_chars_consed, |
|
13320
e0f3a961851a
Cast first arg to bzero.
Richard M. Stallman <rms@gnu.org>
parents:
13219
diff
changeset
|
3273 string_chars_consed & ~(((EMACS_INT) 1) << (VALBITS - 1))); |
|
12748
3433bb446e06
(cons_cells_consed, floats_consed, vector_cells_consed)
Richard M. Stallman <rms@gnu.org>
parents:
12605
diff
changeset
|
3274 XSETINT (lisp_misc_objects_consed, |
|
13320
e0f3a961851a
Cast first arg to bzero.
Richard M. Stallman <rms@gnu.org>
parents:
13219
diff
changeset
|
3275 misc_objects_consed & ~(((EMACS_INT) 1) << (VALBITS - 1))); |
|
12748
3433bb446e06
(cons_cells_consed, floats_consed, vector_cells_consed)
Richard M. Stallman <rms@gnu.org>
parents:
12605
diff
changeset
|
3276 XSETINT (lisp_intervals_consed, |
|
13320
e0f3a961851a
Cast first arg to bzero.
Richard M. Stallman <rms@gnu.org>
parents:
13219
diff
changeset
|
3277 intervals_consed & ~(((EMACS_INT) 1) << (VALBITS - 1))); |
|
12748
3433bb446e06
(cons_cells_consed, floats_consed, vector_cells_consed)
Richard M. Stallman <rms@gnu.org>
parents:
12605
diff
changeset
|
3278 |
|
3433bb446e06
(cons_cells_consed, floats_consed, vector_cells_consed)
Richard M. Stallman <rms@gnu.org>
parents:
12605
diff
changeset
|
3279 return Fcons (lisp_cons_cells_consed, |
|
3433bb446e06
(cons_cells_consed, floats_consed, vector_cells_consed)
Richard M. Stallman <rms@gnu.org>
parents:
12605
diff
changeset
|
3280 Fcons (lisp_floats_consed, |
|
3433bb446e06
(cons_cells_consed, floats_consed, vector_cells_consed)
Richard M. Stallman <rms@gnu.org>
parents:
12605
diff
changeset
|
3281 Fcons (lisp_vector_cells_consed, |
|
3433bb446e06
(cons_cells_consed, floats_consed, vector_cells_consed)
Richard M. Stallman <rms@gnu.org>
parents:
12605
diff
changeset
|
3282 Fcons (lisp_symbols_consed, |
|
3433bb446e06
(cons_cells_consed, floats_consed, vector_cells_consed)
Richard M. Stallman <rms@gnu.org>
parents:
12605
diff
changeset
|
3283 Fcons (lisp_string_chars_consed, |
|
3433bb446e06
(cons_cells_consed, floats_consed, vector_cells_consed)
Richard M. Stallman <rms@gnu.org>
parents:
12605
diff
changeset
|
3284 Fcons (lisp_misc_objects_consed, |
|
3433bb446e06
(cons_cells_consed, floats_consed, vector_cells_consed)
Richard M. Stallman <rms@gnu.org>
parents:
12605
diff
changeset
|
3285 Fcons (lisp_intervals_consed, |
|
3433bb446e06
(cons_cells_consed, floats_consed, vector_cells_consed)
Richard M. Stallman <rms@gnu.org>
parents:
12605
diff
changeset
|
3286 Qnil))))))); |
|
3433bb446e06
(cons_cells_consed, floats_consed, vector_cells_consed)
Richard M. Stallman <rms@gnu.org>
parents:
12605
diff
changeset
|
3287 } |
|
1327
ef16e7c0d402
* alloc.c (Fmemory_limit): New function.
Jim Blandy <jimb@redhat.com>
parents:
1318
diff
changeset
|
3288 |
| 300 | 3289 /* Initialization */ |
| 3290 | |
| 21514 | 3291 void |
| 300 | 3292 init_alloc_once () |
| 3293 { | |
| 3294 /* Used to do Vpurify_flag = Qt here, but Qt isn't set up yet! */ | |
| 3295 pureptr = 0; | |
| 356 | 3296 #ifdef HAVE_SHM |
| 3297 pure_size = PURESIZE; | |
| 3298 #endif | |
| 300 | 3299 all_vectors = 0; |
| 3300 ignore_warnings = 1; | |
|
17345
4e11e27ce1f1
For glibc's malloc, include <malloc.h> for mallinfo,
Richard M. Stallman <rms@gnu.org>
parents:
17328
diff
changeset
|
3301 #ifdef DOUG_LEA_MALLOC |
|
4e11e27ce1f1
For glibc's malloc, include <malloc.h> for mallinfo,
Richard M. Stallman <rms@gnu.org>
parents:
17328
diff
changeset
|
3302 mallopt (M_TRIM_THRESHOLD, 128*1024); /* trim threshold */ |
|
4e11e27ce1f1
For glibc's malloc, include <malloc.h> for mallinfo,
Richard M. Stallman <rms@gnu.org>
parents:
17328
diff
changeset
|
3303 mallopt (M_MMAP_THRESHOLD, 64*1024); /* mmap threshold */ |
|
23973
2eb9e2f5aa33
(MMAP_MAX_AREAS): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
23958
diff
changeset
|
3304 mallopt (M_MMAP_MAX, MMAP_MAX_AREAS); /* max. number of mmap'ed areas */ |
|
17345
4e11e27ce1f1
For glibc's malloc, include <malloc.h> for mallinfo,
Richard M. Stallman <rms@gnu.org>
parents:
17328
diff
changeset
|
3305 #endif |
| 300 | 3306 init_strings (); |
| 3307 init_cons (); | |
| 3308 init_symbol (); | |
| 3309 init_marker (); | |
| 3310 #ifdef LISP_FLOAT_TYPE | |
| 3311 init_float (); | |
| 3312 #endif /* LISP_FLOAT_TYPE */ | |
|
1300
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
3313 INIT_INTERVALS; |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
3314 |
|
10673
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
3315 #ifdef REL_ALLOC |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
3316 malloc_hysteresis = 32; |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
3317 #else |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
3318 malloc_hysteresis = 0; |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
3319 #endif |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
3320 |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
3321 spare_memory = (char *) malloc (SPARE_MEMORY); |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
3322 |
| 300 | 3323 ignore_warnings = 0; |
| 3324 gcprolist = 0; | |
| 3325 staticidx = 0; | |
| 3326 consing_since_gc = 0; | |
|
12605
c5798bb57fdd
(init_alloc_once): Set gc_cons_threshold from Lisp obj size.
Richard M. Stallman <rms@gnu.org>
parents:
12529
diff
changeset
|
3327 gc_cons_threshold = 100000 * sizeof (Lisp_Object); |
| 300 | 3328 #ifdef VIRT_ADDR_VARIES |
| 3329 malloc_sbrk_unused = 1<<22; /* A large number */ | |
| 3330 malloc_sbrk_used = 100000; /* as reasonable as any number */ | |
| 3331 #endif /* VIRT_ADDR_VARIES */ | |
| 3332 } | |
| 3333 | |
| 21514 | 3334 void |
| 300 | 3335 init_alloc () |
| 3336 { | |
| 3337 gcprolist = 0; | |
| 3338 } | |
| 3339 | |
| 3340 void | |
| 3341 syms_of_alloc () | |
| 3342 { | |
| 3343 DEFVAR_INT ("gc-cons-threshold", &gc_cons_threshold, | |
| 3344 "*Number of bytes of consing between garbage collections.\n\ | |
| 3345 Garbage collection can happen automatically once this many bytes have been\n\ | |
| 3346 allocated since the last garbage collection. All data types count.\n\n\ | |
| 3347 Garbage collection happens automatically only when `eval' is called.\n\n\ | |
| 3348 By binding this temporarily to a large number, you can effectively\n\ | |
| 3349 prevent garbage collection during a part of the program."); | |
| 3350 | |
| 3351 DEFVAR_INT ("pure-bytes-used", &pureptr, | |
| 3352 "Number of bytes of sharable Lisp data allocated so far."); | |
| 3353 | |
|
15960
12c61b25b7b6
(syms_of_alloc): Set up Lisp variables ...-consed,
Richard M. Stallman <rms@gnu.org>
parents:
15379
diff
changeset
|
3354 DEFVAR_INT ("cons-cells-consed", &cons_cells_consed, |
|
12c61b25b7b6
(syms_of_alloc): Set up Lisp variables ...-consed,
Richard M. Stallman <rms@gnu.org>
parents:
15379
diff
changeset
|
3355 "Number of cons cells that have been consed so far."); |
|
12c61b25b7b6
(syms_of_alloc): Set up Lisp variables ...-consed,
Richard M. Stallman <rms@gnu.org>
parents:
15379
diff
changeset
|
3356 |
|
12c61b25b7b6
(syms_of_alloc): Set up Lisp variables ...-consed,
Richard M. Stallman <rms@gnu.org>
parents:
15379
diff
changeset
|
3357 DEFVAR_INT ("floats-consed", &floats_consed, |
|
12c61b25b7b6
(syms_of_alloc): Set up Lisp variables ...-consed,
Richard M. Stallman <rms@gnu.org>
parents:
15379
diff
changeset
|
3358 "Number of floats that have been consed so far."); |
|
12c61b25b7b6
(syms_of_alloc): Set up Lisp variables ...-consed,
Richard M. Stallman <rms@gnu.org>
parents:
15379
diff
changeset
|
3359 |
|
12c61b25b7b6
(syms_of_alloc): Set up Lisp variables ...-consed,
Richard M. Stallman <rms@gnu.org>
parents:
15379
diff
changeset
|
3360 DEFVAR_INT ("vector-cells-consed", &vector_cells_consed, |
|
12c61b25b7b6
(syms_of_alloc): Set up Lisp variables ...-consed,
Richard M. Stallman <rms@gnu.org>
parents:
15379
diff
changeset
|
3361 "Number of vector cells that have been consed so far."); |
|
12c61b25b7b6
(syms_of_alloc): Set up Lisp variables ...-consed,
Richard M. Stallman <rms@gnu.org>
parents:
15379
diff
changeset
|
3362 |
|
12c61b25b7b6
(syms_of_alloc): Set up Lisp variables ...-consed,
Richard M. Stallman <rms@gnu.org>
parents:
15379
diff
changeset
|
3363 DEFVAR_INT ("symbols-consed", &symbols_consed, |
|
12c61b25b7b6
(syms_of_alloc): Set up Lisp variables ...-consed,
Richard M. Stallman <rms@gnu.org>
parents:
15379
diff
changeset
|
3364 "Number of symbols that have been consed so far."); |
|
12c61b25b7b6
(syms_of_alloc): Set up Lisp variables ...-consed,
Richard M. Stallman <rms@gnu.org>
parents:
15379
diff
changeset
|
3365 |
|
12c61b25b7b6
(syms_of_alloc): Set up Lisp variables ...-consed,
Richard M. Stallman <rms@gnu.org>
parents:
15379
diff
changeset
|
3366 DEFVAR_INT ("string-chars-consed", &string_chars_consed, |
|
12c61b25b7b6
(syms_of_alloc): Set up Lisp variables ...-consed,
Richard M. Stallman <rms@gnu.org>
parents:
15379
diff
changeset
|
3367 "Number of string characters that have been consed so far."); |
|
12c61b25b7b6
(syms_of_alloc): Set up Lisp variables ...-consed,
Richard M. Stallman <rms@gnu.org>
parents:
15379
diff
changeset
|
3368 |
|
12c61b25b7b6
(syms_of_alloc): Set up Lisp variables ...-consed,
Richard M. Stallman <rms@gnu.org>
parents:
15379
diff
changeset
|
3369 DEFVAR_INT ("misc-objects-consed", &misc_objects_consed, |
|
12c61b25b7b6
(syms_of_alloc): Set up Lisp variables ...-consed,
Richard M. Stallman <rms@gnu.org>
parents:
15379
diff
changeset
|
3370 "Number of miscellaneous objects that have been consed so far."); |
|
12c61b25b7b6
(syms_of_alloc): Set up Lisp variables ...-consed,
Richard M. Stallman <rms@gnu.org>
parents:
15379
diff
changeset
|
3371 |
|
12c61b25b7b6
(syms_of_alloc): Set up Lisp variables ...-consed,
Richard M. Stallman <rms@gnu.org>
parents:
15379
diff
changeset
|
3372 DEFVAR_INT ("intervals-consed", &intervals_consed, |
|
12c61b25b7b6
(syms_of_alloc): Set up Lisp variables ...-consed,
Richard M. Stallman <rms@gnu.org>
parents:
15379
diff
changeset
|
3373 "Number of intervals that have been consed so far."); |
|
12c61b25b7b6
(syms_of_alloc): Set up Lisp variables ...-consed,
Richard M. Stallman <rms@gnu.org>
parents:
15379
diff
changeset
|
3374 |
| 300 | 3375 #if 0 |
| 3376 DEFVAR_INT ("data-bytes-used", &malloc_sbrk_used, | |
| 3377 "Number of bytes of unshared memory allocated in this session."); | |
| 3378 | |
| 3379 DEFVAR_INT ("data-bytes-free", &malloc_sbrk_unused, | |
| 3380 "Number of bytes of unshared memory remaining available in this session."); | |
| 3381 #endif | |
| 3382 | |
| 3383 DEFVAR_LISP ("purify-flag", &Vpurify_flag, | |
| 3384 "Non-nil means loading Lisp code in order to dump an executable.\n\ | |
| 3385 This means that certain objects should be allocated in shared (pure) space."); | |
| 3386 | |
| 764 | 3387 DEFVAR_INT ("undo-limit", &undo_limit, |
| 300 | 3388 "Keep no more undo information once it exceeds this size.\n\ |
| 764 | 3389 This limit is applied when garbage collection happens.\n\ |
| 300 | 3390 The size is counted as the number of bytes occupied,\n\ |
| 3391 which includes both saved text and other data."); | |
| 764 | 3392 undo_limit = 20000; |
| 300 | 3393 |
| 764 | 3394 DEFVAR_INT ("undo-strong-limit", &undo_strong_limit, |
| 300 | 3395 "Don't keep more than this much size of undo information.\n\ |
| 3396 A command which pushes past this size is itself forgotten.\n\ | |
| 764 | 3397 This limit is applied when garbage collection happens.\n\ |
| 300 | 3398 The size is counted as the number of bytes occupied,\n\ |
| 3399 which includes both saved text and other data."); | |
| 764 | 3400 undo_strong_limit = 30000; |
| 300 | 3401 |
|
14959
f2b5d784fa88
(garbage_collection_messages): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
14764
diff
changeset
|
3402 DEFVAR_BOOL ("garbage-collection-messages", &garbage_collection_messages, |
|
f2b5d784fa88
(garbage_collection_messages): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
14764
diff
changeset
|
3403 "Non-nil means display messages at start and end of garbage collection."); |
|
f2b5d784fa88
(garbage_collection_messages): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
14764
diff
changeset
|
3404 garbage_collection_messages = 0; |
|
f2b5d784fa88
(garbage_collection_messages): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
14764
diff
changeset
|
3405 |
|
6116
64417bbbb128
(memory_full): Use new variable memory_signal_data with precomputed value
Karl Heuer <kwzh@gnu.org>
parents:
5874
diff
changeset
|
3406 /* We build this in advance because if we wait until we need it, we might |
|
64417bbbb128
(memory_full): Use new variable memory_signal_data with precomputed value
Karl Heuer <kwzh@gnu.org>
parents:
5874
diff
changeset
|
3407 not be able to allocate the memory to hold it. */ |
|
6133
752d4237f869
(memory_signal_data): No longer static.
Richard M. Stallman <rms@gnu.org>
parents:
6116
diff
changeset
|
3408 memory_signal_data |
|
10673
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
3409 = Fcons (Qerror, Fcons (build_string ("Memory exhausted--use M-x save-some-buffers RET"), Qnil)); |
|
6116
64417bbbb128
(memory_full): Use new variable memory_signal_data with precomputed value
Karl Heuer <kwzh@gnu.org>
parents:
5874
diff
changeset
|
3410 staticpro (&memory_signal_data); |
|
64417bbbb128
(memory_full): Use new variable memory_signal_data with precomputed value
Karl Heuer <kwzh@gnu.org>
parents:
5874
diff
changeset
|
3411 |
|
11374
1ebc81f84aa4
(inhibit_garbage_collection): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11341
diff
changeset
|
3412 staticpro (&Qgc_cons_threshold); |
|
1ebc81f84aa4
(inhibit_garbage_collection): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11341
diff
changeset
|
3413 Qgc_cons_threshold = intern ("gc-cons-threshold"); |
|
1ebc81f84aa4
(inhibit_garbage_collection): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11341
diff
changeset
|
3414 |
|
13219
99b5164a319d
(Qchar_table_extra_slots): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13150
diff
changeset
|
3415 staticpro (&Qchar_table_extra_slots); |
|
99b5164a319d
(Qchar_table_extra_slots): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13150
diff
changeset
|
3416 Qchar_table_extra_slots = intern ("char-table-extra-slots"); |
|
99b5164a319d
(Qchar_table_extra_slots): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13150
diff
changeset
|
3417 |
| 300 | 3418 defsubr (&Scons); |
| 3419 defsubr (&Slist); | |
| 3420 defsubr (&Svector); | |
| 3421 defsubr (&Smake_byte_code); | |
| 3422 defsubr (&Smake_list); | |
| 3423 defsubr (&Smake_vector); | |
|
13141
4a4d1d8e89e5
(Fmake_chartable, Fmake_boolvector): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
13008
diff
changeset
|
3424 defsubr (&Smake_char_table); |
| 300 | 3425 defsubr (&Smake_string); |
|
13141
4a4d1d8e89e5
(Fmake_chartable, Fmake_boolvector): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
13008
diff
changeset
|
3426 defsubr (&Smake_bool_vector); |
| 300 | 3427 defsubr (&Smake_symbol); |
| 3428 defsubr (&Smake_marker); | |
| 3429 defsubr (&Spurecopy); | |
| 3430 defsubr (&Sgarbage_collect); | |
|
1327
ef16e7c0d402
* alloc.c (Fmemory_limit): New function.
Jim Blandy <jimb@redhat.com>
parents:
1318
diff
changeset
|
3431 defsubr (&Smemory_limit); |
|
12748
3433bb446e06
(cons_cells_consed, floats_consed, vector_cells_consed)
Richard M. Stallman <rms@gnu.org>
parents:
12605
diff
changeset
|
3432 defsubr (&Smemory_use_counts); |
| 300 | 3433 } |
