Mercurial > emacs
annotate src/alloc.c @ 11243:054ecfce1820
(Fmake_marker, mark_object): Use XMISCTYPE.
(clear_marks, gc_sweep): Use u_marker union elt to extrat misc type.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Fri, 07 Apr 1995 05:28:07 +0000 |
| parents | 3f19a379eb99 |
| children | e0f3fa4e7bf3 |
| rev | line source |
|---|---|
| 300 | 1 /* Storage allocation and gc for GNU Emacs Lisp interpreter. |
|
10457
2ab3bd0288a9
Change all occurences of SWITCH_ENUM_BUG to use SWITCH_ENUM_CAST instead.
Karl Heuer <kwzh@gnu.org>
parents:
10427
diff
changeset
|
2 Copyright (C) 1985, 86, 88, 93, 94, 95 Free Software Foundation, Inc. |
| 300 | 3 |
| 4 This file is part of GNU Emacs. | |
| 5 | |
| 6 GNU Emacs is free software; you can redistribute it and/or modify | |
| 7 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
|
8 the Free Software Foundation; either version 2, or (at your option) |
| 300 | 9 any later version. |
| 10 | |
| 11 GNU Emacs is distributed in the hope that it will be useful, | |
| 12 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 14 GNU General Public License for more details. | |
| 15 | |
| 16 You should have received a copy of the GNU General Public License | |
| 17 along with GNU Emacs; see the file COPYING. If not, write to | |
| 18 the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ | |
| 19 | |
|
3003
5a73d384f45e
* syssignal.h: Don't #include <signal.h>
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
20 #include <signal.h> |
| 300 | 21 |
|
4696
1fc792473491
Include <config.h> instead of "config.h".
Roland McGrath <roland@gnu.org>
parents:
4494
diff
changeset
|
22 #include <config.h> |
| 300 | 23 #include "lisp.h" |
|
1300
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
24 #include "intervals.h" |
| 356 | 25 #include "puresize.h" |
| 300 | 26 #ifndef standalone |
| 27 #include "buffer.h" | |
| 28 #include "window.h" | |
| 764 | 29 #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
|
30 #include "blockinput.h" |
| 300 | 31 #endif |
| 32 | |
| 638 | 33 #include "syssignal.h" |
| 34 | |
|
10673
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
35 /* 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
|
36 |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
37 #if defined (__STDC__) && __STDC__ |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
38 #include <stddef.h> |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
39 #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
|
40 #else |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
41 #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
|
42 #endif |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
43 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
|
44 extern int __malloc_extra_blocks; |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
45 |
| 300 | 46 #define max(A,B) ((A) > (B) ? (A) : (B)) |
| 47 | |
| 48 /* Macro to verify that storage intended for Lisp objects is not | |
| 49 out of range to fit in the space for a pointer. | |
| 50 ADDRESS is the start of the block, and SIZE | |
| 51 is the amount of space within which objects can start. */ | |
| 52 #define VALIDATE_LISP_STORAGE(address, size) \ | |
| 53 do \ | |
| 54 { \ | |
| 55 Lisp_Object val; \ | |
|
9261
e5ba7993d378
(VALIDATE_LISP_STORAGE, make_float, Fcons, Fmake_vector, Fmake_symbol,
Karl Heuer <kwzh@gnu.org>
parents:
9144
diff
changeset
|
56 XSETCONS (val, (char *) address + size); \ |
| 300 | 57 if ((char *) XCONS (val) != (char *) address + size) \ |
| 58 { \ | |
|
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
59 xfree (address); \ |
| 300 | 60 memory_full (); \ |
| 61 } \ | |
| 62 } while (0) | |
| 63 | |
|
10673
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
64 /* 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
|
65 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
|
66 |
| 300 | 67 /* Number of bytes of consing done since the last gc */ |
| 68 int consing_since_gc; | |
| 69 | |
| 70 /* Number of bytes of consing since gc before another gc should be done. */ | |
| 71 int gc_cons_threshold; | |
| 72 | |
| 73 /* Nonzero during gc */ | |
| 74 int gc_in_progress; | |
| 75 | |
| 76 #ifndef VIRT_ADDR_VARIES | |
| 77 extern | |
| 78 #endif /* VIRT_ADDR_VARIES */ | |
| 79 int malloc_sbrk_used; | |
| 80 | |
| 81 #ifndef VIRT_ADDR_VARIES | |
| 82 extern | |
| 83 #endif /* VIRT_ADDR_VARIES */ | |
| 84 int malloc_sbrk_unused; | |
| 85 | |
| 764 | 86 /* Two limits controlling how much undo information to keep. */ |
| 87 int undo_limit; | |
| 88 int undo_strong_limit; | |
| 300 | 89 |
|
10673
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
90 /* 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
|
91 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
|
92 static char *spare_memory; |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
93 |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
94 /* 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
|
95 #define SPARE_MEMORY (1 << 14) |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
96 |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
97 /* 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
|
98 static int malloc_hysteresis; |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
99 |
| 300 | 100 /* Non-nil means defun should do purecopy on the function definition */ |
| 101 Lisp_Object Vpurify_flag; | |
| 102 | |
| 103 #ifndef HAVE_SHM | |
|
8817
48ff00bebef6
(pure, pure_size): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
104 EMACS_INT pure[PURESIZE / sizeof (EMACS_INT)] = {0,}; /* Force it into data space! */ |
| 300 | 105 #define PUREBEG (char *) pure |
| 106 #else | |
| 107 #define pure PURE_SEG_BITS /* Use shared memory segment */ | |
| 108 #define PUREBEG (char *)PURE_SEG_BITS | |
| 356 | 109 |
| 110 /* This variable is used only by the XPNTR macro when HAVE_SHM is | |
| 111 defined. If we used the PURESIZE macro directly there, that would | |
| 112 make most of emacs dependent on puresize.h, which we don't want - | |
| 113 you should be able to change that without too much recompilation. | |
| 114 So map_in_data initializes pure_size, and the dependencies work | |
| 115 out. */ | |
|
8817
48ff00bebef6
(pure, pure_size): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
116 EMACS_INT pure_size; |
| 300 | 117 #endif /* not HAVE_SHM */ |
| 118 | |
| 119 /* Index in pure at which next pure object will be allocated. */ | |
| 120 int pureptr; | |
| 121 | |
| 122 /* If nonzero, this is a warning delivered by malloc and not yet displayed. */ | |
| 123 char *pending_malloc_warning; | |
| 124 | |
|
6116
64417bbbb128
(memory_full): Use new variable memory_signal_data with precomputed value
Karl Heuer <kwzh@gnu.org>
parents:
5874
diff
changeset
|
125 /* 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
|
126 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
|
127 |
| 300 | 128 /* Maximum amount of C stack to save when a GC happens. */ |
| 129 | |
| 130 #ifndef MAX_SAVE_STACK | |
| 131 #define MAX_SAVE_STACK 16000 | |
| 132 #endif | |
| 133 | |
|
10413
bfe591f66299
(DONT_COPY_FLAG): Default this to 1.
Karl Heuer <kwzh@gnu.org>
parents:
10398
diff
changeset
|
134 /* 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
|
135 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
|
136 (On most machines, pointers are even, so we can use the low bit. |
|
bfe591f66299
(DONT_COPY_FLAG): Default this to 1.
Karl Heuer <kwzh@gnu.org>
parents:
10398
diff
changeset
|
137 Word-addressible architectures may need to override this in the m-file.) |
|
bfe591f66299
(DONT_COPY_FLAG): Default this to 1.
Karl Heuer <kwzh@gnu.org>
parents:
10398
diff
changeset
|
138 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
|
139 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
|
140 the GC mark bit. */ |
|
10389
162b3e6c4610
(DONT_COPY_FLAG): New bit flag.
Richard M. Stallman <rms@gnu.org>
parents:
10340
diff
changeset
|
141 #ifndef DONT_COPY_FLAG |
|
10413
bfe591f66299
(DONT_COPY_FLAG): Default this to 1.
Karl Heuer <kwzh@gnu.org>
parents:
10398
diff
changeset
|
142 #define DONT_COPY_FLAG 1 |
|
10389
162b3e6c4610
(DONT_COPY_FLAG): New bit flag.
Richard M. Stallman <rms@gnu.org>
parents:
10340
diff
changeset
|
143 #endif /* no DONT_COPY_FLAG */ |
|
162b3e6c4610
(DONT_COPY_FLAG): New bit flag.
Richard M. Stallman <rms@gnu.org>
parents:
10340
diff
changeset
|
144 |
|
10414
f4a1838db0bf
Don't allow MARKBIT and DONT_COPY_FLAG to be the same bit.
Karl Heuer <kwzh@gnu.org>
parents:
10413
diff
changeset
|
145 #if DONT_COPY_FLAG == MARKBIT |
|
f4a1838db0bf
Don't allow MARKBIT and DONT_COPY_FLAG to be the same bit.
Karl Heuer <kwzh@gnu.org>
parents:
10413
diff
changeset
|
146 you lose |
|
f4a1838db0bf
Don't allow MARKBIT and DONT_COPY_FLAG to be the same bit.
Karl Heuer <kwzh@gnu.org>
parents:
10413
diff
changeset
|
147 #endif |
|
f4a1838db0bf
Don't allow MARKBIT and DONT_COPY_FLAG to be the same bit.
Karl Heuer <kwzh@gnu.org>
parents:
10413
diff
changeset
|
148 |
| 300 | 149 /* Buffer in which we save a copy of the C stack at each GC. */ |
| 150 | |
| 151 char *stack_copy; | |
| 152 int stack_copy_size; | |
| 153 | |
| 154 /* Non-zero means ignore malloc warnings. Set during initialization. */ | |
| 155 int ignore_warnings; | |
| 1318 | 156 |
|
11018
2d9bdf1ba3d1
(mark_kboards): Renamed from mark_perdisplays.
Karl Heuer <kwzh@gnu.org>
parents:
10936
diff
changeset
|
157 static void mark_object (), mark_buffer (), mark_kboards (); |
| 1318 | 158 static void clear_marks (), gc_sweep (); |
| 159 static void compact_strings (); | |
| 300 | 160 |
|
1908
d649f2179d67
* alloc.c (make_pure_float): Align pureptr on a sizeof (double)
Jim Blandy <jimb@redhat.com>
parents:
1893
diff
changeset
|
161 /* 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
|
162 |
| 300 | 163 Lisp_Object |
| 164 malloc_warning_1 (str) | |
| 165 Lisp_Object str; | |
| 166 { | |
| 167 Fprinc (str, Vstandard_output); | |
| 168 write_string ("\nKilling some buffers may delay running out of memory.\n", -1); | |
| 169 write_string ("However, certainly by the time you receive the 95% warning,\n", -1); | |
| 170 write_string ("you should clean up, kill this Emacs, and start a new one.", -1); | |
| 171 return Qnil; | |
| 172 } | |
| 173 | |
| 174 /* malloc calls this if it finds we are near exhausting storage */ | |
| 175 malloc_warning (str) | |
| 176 char *str; | |
| 177 { | |
| 178 pending_malloc_warning = str; | |
| 179 } | |
| 180 | |
| 181 display_malloc_warning () | |
| 182 { | |
| 183 register Lisp_Object val; | |
| 184 | |
| 185 val = build_string (pending_malloc_warning); | |
| 186 pending_malloc_warning = 0; | |
| 187 internal_with_output_to_temp_buffer (" *Danger*", malloc_warning_1, val); | |
| 188 } | |
| 189 | |
| 190 /* 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
|
191 |
| 300 | 192 memory_full () |
| 193 { | |
|
10673
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
194 #ifndef SYSTEM_MALLOC |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
195 bytes_used_when_full = _bytes_used; |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
196 #endif |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
197 |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
198 /* 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
|
199 if (spare_memory) |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
200 { |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
201 free (spare_memory); |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
202 spare_memory = 0; |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
203 } |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
204 |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
205 /* 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
|
206 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
|
207 while (1) |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
208 Fsignal (Qerror, memory_signal_data); |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
209 } |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
210 |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
211 /* 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
|
212 |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
213 void |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
214 buffer_memory_full () |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
215 { |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
216 /* 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
|
217 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
|
218 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
|
219 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
|
220 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
|
221 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
|
222 |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
223 #ifndef REL_ALLOC |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
224 memory_full (); |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
225 #endif |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
226 |
|
6116
64417bbbb128
(memory_full): Use new variable memory_signal_data with precomputed value
Karl Heuer <kwzh@gnu.org>
parents:
5874
diff
changeset
|
227 /* 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
|
228 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
|
229 while (1) |
|
64417bbbb128
(memory_full): Use new variable memory_signal_data with precomputed value
Karl Heuer <kwzh@gnu.org>
parents:
5874
diff
changeset
|
230 Fsignal (Qerror, memory_signal_data); |
| 300 | 231 } |
| 232 | |
|
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
233 /* like malloc routines but check for no memory and block interrupt input. */ |
| 300 | 234 |
| 235 long * | |
| 236 xmalloc (size) | |
| 237 int size; | |
| 238 { | |
| 239 register long *val; | |
| 240 | |
|
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
241 BLOCK_INPUT; |
| 300 | 242 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
|
243 UNBLOCK_INPUT; |
| 300 | 244 |
| 245 if (!val && size) memory_full (); | |
| 246 return val; | |
| 247 } | |
| 248 | |
| 249 long * | |
| 250 xrealloc (block, size) | |
| 251 long *block; | |
| 252 int size; | |
| 253 { | |
| 254 register long *val; | |
| 255 | |
|
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
256 BLOCK_INPUT; |
| 590 | 257 /* We must call malloc explicitly when BLOCK is 0, since some |
| 258 reallocs don't do this. */ | |
| 259 if (! block) | |
| 260 val = (long *) malloc (size); | |
|
600
a8d78999e46d
*** empty log message ***
Noah Friedman <friedman@splode.com>
parents:
590
diff
changeset
|
261 else |
| 590 | 262 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
|
263 UNBLOCK_INPUT; |
| 300 | 264 |
| 265 if (!val && size) memory_full (); | |
| 266 return val; | |
| 267 } | |
|
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
268 |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
269 void |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
270 xfree (block) |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
271 long *block; |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
272 { |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
273 BLOCK_INPUT; |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
274 free (block); |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
275 UNBLOCK_INPUT; |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
276 } |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
277 |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
278 |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
279 /* 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
|
280 |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
281 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
|
282 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
|
283 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
|
284 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
|
285 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
|
286 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
|
287 GNU malloc. */ |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
288 |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
289 #ifndef SYSTEM_MALLOC |
|
2507
7ba4316ae840
* alloc.c (__malloc_hook, __realloc_hook, __free_hook): Declare
Jim Blandy <jimb@redhat.com>
parents:
2439
diff
changeset
|
290 extern void * (*__malloc_hook) (); |
|
7ba4316ae840
* alloc.c (__malloc_hook, __realloc_hook, __free_hook): Declare
Jim Blandy <jimb@redhat.com>
parents:
2439
diff
changeset
|
291 static void * (*old_malloc_hook) (); |
|
7ba4316ae840
* alloc.c (__malloc_hook, __realloc_hook, __free_hook): Declare
Jim Blandy <jimb@redhat.com>
parents:
2439
diff
changeset
|
292 extern void * (*__realloc_hook) (); |
|
7ba4316ae840
* alloc.c (__malloc_hook, __realloc_hook, __free_hook): Declare
Jim Blandy <jimb@redhat.com>
parents:
2439
diff
changeset
|
293 static void * (*old_realloc_hook) (); |
|
7ba4316ae840
* alloc.c (__malloc_hook, __realloc_hook, __free_hook): Declare
Jim Blandy <jimb@redhat.com>
parents:
2439
diff
changeset
|
294 extern void (*__free_hook) (); |
|
7ba4316ae840
* alloc.c (__malloc_hook, __realloc_hook, __free_hook): Declare
Jim Blandy <jimb@redhat.com>
parents:
2439
diff
changeset
|
295 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
|
296 |
|
10673
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
297 /* 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
|
298 |
|
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
299 static void |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
300 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
|
301 void *ptr; |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
302 { |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
303 BLOCK_INPUT; |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
304 __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
|
305 free (ptr); |
|
10673
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
306 /* 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
|
307 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
|
308 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
|
309 if (spare_memory == 0 |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
310 /* 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
|
311 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
|
312 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
|
313 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
|
314 && (bytes_used_when_full |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
315 > _bytes_used + max (malloc_hysteresis, 4) * SPARE_MEMORY)) |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
316 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
|
317 |
|
2507
7ba4316ae840
* alloc.c (__malloc_hook, __realloc_hook, __free_hook): Declare
Jim Blandy <jimb@redhat.com>
parents:
2439
diff
changeset
|
318 __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
|
319 UNBLOCK_INPUT; |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
320 } |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
321 |
|
10673
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
322 /* 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
|
323 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
|
324 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
|
325 |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
326 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
|
327 |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
328 void |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
329 refill_memory_reserve () |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
330 { |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
331 if (spare_memory == 0) |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
332 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
|
333 } |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
334 |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
335 /* 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
|
336 |
|
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
337 static void * |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
338 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
|
339 unsigned size; |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
340 { |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
341 void *value; |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
342 |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
343 BLOCK_INPUT; |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
344 __malloc_hook = old_malloc_hook; |
|
10673
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
345 __malloc_extra_blocks = malloc_hysteresis; |
|
3581
152fd924c7bb
* alloc.c (emacs_blocked_malloc, emacs_blocked_realloc): Cast the
Jim Blandy <jimb@redhat.com>
parents:
3536
diff
changeset
|
346 value = (void *) malloc (size); |
|
2507
7ba4316ae840
* alloc.c (__malloc_hook, __realloc_hook, __free_hook): Declare
Jim Blandy <jimb@redhat.com>
parents:
2439
diff
changeset
|
347 __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
|
348 UNBLOCK_INPUT; |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
349 |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
350 return value; |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
351 } |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
352 |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
353 static void * |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
354 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
|
355 void *ptr; |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
356 unsigned size; |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
357 { |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
358 void *value; |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
359 |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
360 BLOCK_INPUT; |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
361 __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
|
362 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
|
363 __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
|
364 UNBLOCK_INPUT; |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
365 |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
366 return value; |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
367 } |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
368 |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
369 void |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
370 uninterrupt_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 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
|
373 __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
|
374 |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
375 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
|
376 __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
|
377 |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
378 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
|
379 __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
|
380 } |
|
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
381 #endif |
| 300 | 382 |
|
1908
d649f2179d67
* alloc.c (make_pure_float): Align pureptr on a sizeof (double)
Jim Blandy <jimb@redhat.com>
parents:
1893
diff
changeset
|
383 /* Interval allocation. */ |
|
d649f2179d67
* alloc.c (make_pure_float): Align pureptr on a sizeof (double)
Jim Blandy <jimb@redhat.com>
parents:
1893
diff
changeset
|
384 |
|
1300
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
385 #ifdef USE_TEXT_PROPERTIES |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
386 #define INTERVAL_BLOCK_SIZE \ |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
387 ((1020 - sizeof (struct interval_block *)) / sizeof (struct interval)) |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
388 |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
389 struct interval_block |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
390 { |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
391 struct interval_block *next; |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
392 struct interval intervals[INTERVAL_BLOCK_SIZE]; |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
393 }; |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
394 |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
395 struct interval_block *interval_block; |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
396 static int interval_block_index; |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
397 |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
398 INTERVAL interval_free_list; |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
399 |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
400 static void |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
401 init_intervals () |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
402 { |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
403 interval_block |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
404 = (struct interval_block *) malloc (sizeof (struct interval_block)); |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
405 interval_block->next = 0; |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
406 bzero (interval_block->intervals, sizeof interval_block->intervals); |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
407 interval_block_index = 0; |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
408 interval_free_list = 0; |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
409 } |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
410 |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
411 #define INIT_INTERVALS init_intervals () |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
412 |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
413 INTERVAL |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
414 make_interval () |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
415 { |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
416 INTERVAL val; |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
417 |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
418 if (interval_free_list) |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
419 { |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
420 val = interval_free_list; |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
421 interval_free_list = interval_free_list->parent; |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
422 } |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
423 else |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
424 { |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
425 if (interval_block_index == INTERVAL_BLOCK_SIZE) |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
426 { |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
427 register struct interval_block *newi |
|
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
428 = (struct interval_block *) xmalloc (sizeof (struct interval_block)); |
|
1300
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
429 |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
430 VALIDATE_LISP_STORAGE (newi, sizeof *newi); |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
431 newi->next = interval_block; |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
432 interval_block = newi; |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
433 interval_block_index = 0; |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
434 } |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
435 val = &interval_block->intervals[interval_block_index++]; |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
436 } |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
437 consing_since_gc += sizeof (struct interval); |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
438 RESET_INTERVAL (val); |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
439 return val; |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
440 } |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
441 |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
442 static int total_free_intervals, total_intervals; |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
443 |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
444 /* Mark the pointers of one interval. */ |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
445 |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
446 static void |
|
1957
54c8c66cd9ac
(mark_interval): Add ignored arg.
Richard M. Stallman <rms@gnu.org>
parents:
1939
diff
changeset
|
447 mark_interval (i, dummy) |
|
1300
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
448 register INTERVAL i; |
|
1957
54c8c66cd9ac
(mark_interval): Add ignored arg.
Richard M. Stallman <rms@gnu.org>
parents:
1939
diff
changeset
|
449 Lisp_Object dummy; |
|
1300
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
450 { |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
451 if (XMARKBIT (i->plist)) |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
452 abort (); |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
453 mark_object (&i->plist); |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
454 XMARK (i->plist); |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
455 } |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
456 |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
457 static void |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
458 mark_interval_tree (tree) |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
459 register INTERVAL tree; |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
460 { |
|
4139
0b32ee899a3a
Consistently use the mark bit of the root interval's parent field
Jim Blandy <jimb@redhat.com>
parents:
4087
diff
changeset
|
461 /* 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
|
462 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
|
463 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
|
464 |
|
0b32ee899a3a
Consistently use the mark bit of the root interval's parent field
Jim Blandy <jimb@redhat.com>
parents:
4087
diff
changeset
|
465 /* 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
|
466 a cast. */ |
|
0b32ee899a3a
Consistently use the mark bit of the root interval's parent field
Jim Blandy <jimb@redhat.com>
parents:
4087
diff
changeset
|
467 XMARK (* (Lisp_Object *) &tree->parent); |
|
1300
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
468 |
|
1957
54c8c66cd9ac
(mark_interval): Add ignored arg.
Richard M. Stallman <rms@gnu.org>
parents:
1939
diff
changeset
|
469 traverse_intervals (tree, 1, 0, mark_interval, Qnil); |
|
1300
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
470 } |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
471 |
|
4139
0b32ee899a3a
Consistently use the mark bit of the root interval's parent field
Jim Blandy <jimb@redhat.com>
parents:
4087
diff
changeset
|
472 #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
|
473 do { \ |
|
0b32ee899a3a
Consistently use the mark bit of the root interval's parent field
Jim Blandy <jimb@redhat.com>
parents:
4087
diff
changeset
|
474 if (!NULL_INTERVAL_P (i) \ |
|
0b32ee899a3a
Consistently use the mark bit of the root interval's parent field
Jim Blandy <jimb@redhat.com>
parents:
4087
diff
changeset
|
475 && ! XMARKBIT ((Lisp_Object) i->parent)) \ |
|
0b32ee899a3a
Consistently use the mark bit of the root interval's parent field
Jim Blandy <jimb@redhat.com>
parents:
4087
diff
changeset
|
476 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
|
477 } while (0) |
|
1300
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
478 |
|
1908
d649f2179d67
* alloc.c (make_pure_float): Align pureptr on a sizeof (double)
Jim Blandy <jimb@redhat.com>
parents:
1893
diff
changeset
|
479 /* 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
|
480 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
|
481 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
|
482 #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
|
483 { \ |
|
d649f2179d67
* alloc.c (make_pure_float): Align pureptr on a sizeof (double)
Jim Blandy <jimb@redhat.com>
parents:
1893
diff
changeset
|
484 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
|
485 { \ |
|
d649f2179d67
* alloc.c (make_pure_float): Align pureptr on a sizeof (double)
Jim Blandy <jimb@redhat.com>
parents:
1893
diff
changeset
|
486 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
|
487 (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
|
488 } \ |
|
1300
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
489 } |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
490 |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
491 #else /* no interval use */ |
|
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 #define INIT_INTERVALS |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
494 |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
495 #define UNMARK_BALANCE_INTERVALS(i) |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
496 #define MARK_INTERVAL_TREE(i) |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
497 |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
498 #endif /* no interval use */ |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
499 |
|
1908
d649f2179d67
* alloc.c (make_pure_float): Align pureptr on a sizeof (double)
Jim Blandy <jimb@redhat.com>
parents:
1893
diff
changeset
|
500 /* Floating point allocation. */ |
|
d649f2179d67
* alloc.c (make_pure_float): Align pureptr on a sizeof (double)
Jim Blandy <jimb@redhat.com>
parents:
1893
diff
changeset
|
501 |
| 300 | 502 #ifdef LISP_FLOAT_TYPE |
| 503 /* Allocation of float cells, just like conses */ | |
| 504 /* We store float cells inside of float_blocks, allocating a new | |
| 505 float_block with malloc whenever necessary. Float cells reclaimed by | |
| 506 GC are put on a free list to be reallocated before allocating | |
| 507 any new float cells from the latest float_block. | |
| 508 | |
| 509 Each float_block is just under 1020 bytes long, | |
| 510 since malloc really allocates in units of powers of two | |
| 511 and uses 4 bytes for its own overhead. */ | |
| 512 | |
| 513 #define FLOAT_BLOCK_SIZE \ | |
| 514 ((1020 - sizeof (struct float_block *)) / sizeof (struct Lisp_Float)) | |
| 515 | |
| 516 struct float_block | |
| 517 { | |
| 518 struct float_block *next; | |
| 519 struct Lisp_Float floats[FLOAT_BLOCK_SIZE]; | |
| 520 }; | |
| 521 | |
| 522 struct float_block *float_block; | |
| 523 int float_block_index; | |
| 524 | |
| 525 struct Lisp_Float *float_free_list; | |
| 526 | |
| 527 void | |
| 528 init_float () | |
| 529 { | |
| 530 float_block = (struct float_block *) malloc (sizeof (struct float_block)); | |
| 531 float_block->next = 0; | |
| 532 bzero (float_block->floats, sizeof float_block->floats); | |
| 533 float_block_index = 0; | |
| 534 float_free_list = 0; | |
| 535 } | |
| 536 | |
| 537 /* Explicitly free a float cell. */ | |
| 538 free_float (ptr) | |
| 539 struct Lisp_Float *ptr; | |
| 540 { | |
|
9942
c189487b08dd
(free_float): Don't assume XFASTINT accesses the raw bits.
Karl Heuer <kwzh@gnu.org>
parents:
9926
diff
changeset
|
541 *(struct Lisp_Float **)&ptr->type = float_free_list; |
| 300 | 542 float_free_list = ptr; |
| 543 } | |
| 544 | |
| 545 Lisp_Object | |
| 546 make_float (float_value) | |
| 547 double float_value; | |
| 548 { | |
| 549 register Lisp_Object val; | |
| 550 | |
| 551 if (float_free_list) | |
| 552 { | |
|
9261
e5ba7993d378
(VALIDATE_LISP_STORAGE, make_float, Fcons, Fmake_vector, Fmake_symbol,
Karl Heuer <kwzh@gnu.org>
parents:
9144
diff
changeset
|
553 XSETFLOAT (val, float_free_list); |
|
9942
c189487b08dd
(free_float): Don't assume XFASTINT accesses the raw bits.
Karl Heuer <kwzh@gnu.org>
parents:
9926
diff
changeset
|
554 float_free_list = *(struct Lisp_Float **)&float_free_list->type; |
| 300 | 555 } |
| 556 else | |
| 557 { | |
| 558 if (float_block_index == FLOAT_BLOCK_SIZE) | |
| 559 { | |
|
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
560 register struct float_block *new = (struct float_block *) xmalloc (sizeof (struct float_block)); |
| 300 | 561 VALIDATE_LISP_STORAGE (new, sizeof *new); |
| 562 new->next = float_block; | |
| 563 float_block = new; | |
| 564 float_block_index = 0; | |
| 565 } | |
|
9261
e5ba7993d378
(VALIDATE_LISP_STORAGE, make_float, Fcons, Fmake_vector, Fmake_symbol,
Karl Heuer <kwzh@gnu.org>
parents:
9144
diff
changeset
|
566 XSETFLOAT (val, &float_block->floats[float_block_index++]); |
| 300 | 567 } |
| 568 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
|
569 XSETFASTINT (XFLOAT (val)->type, 0); /* bug chasing -wsr */ |
| 300 | 570 consing_since_gc += sizeof (struct Lisp_Float); |
| 571 return val; | |
| 572 } | |
| 573 | |
| 574 #endif /* LISP_FLOAT_TYPE */ | |
| 575 | |
| 576 /* Allocation of cons cells */ | |
| 577 /* We store cons cells inside of cons_blocks, allocating a new | |
| 578 cons_block with malloc whenever necessary. Cons cells reclaimed by | |
| 579 GC are put on a free list to be reallocated before allocating | |
| 580 any new cons cells from the latest cons_block. | |
| 581 | |
| 582 Each cons_block is just under 1020 bytes long, | |
| 583 since malloc really allocates in units of powers of two | |
| 584 and uses 4 bytes for its own overhead. */ | |
| 585 | |
| 586 #define CONS_BLOCK_SIZE \ | |
| 587 ((1020 - sizeof (struct cons_block *)) / sizeof (struct Lisp_Cons)) | |
| 588 | |
| 589 struct cons_block | |
| 590 { | |
| 591 struct cons_block *next; | |
| 592 struct Lisp_Cons conses[CONS_BLOCK_SIZE]; | |
| 593 }; | |
| 594 | |
| 595 struct cons_block *cons_block; | |
| 596 int cons_block_index; | |
| 597 | |
| 598 struct Lisp_Cons *cons_free_list; | |
| 599 | |
| 600 void | |
| 601 init_cons () | |
| 602 { | |
| 603 cons_block = (struct cons_block *) malloc (sizeof (struct cons_block)); | |
| 604 cons_block->next = 0; | |
| 605 bzero (cons_block->conses, sizeof cons_block->conses); | |
| 606 cons_block_index = 0; | |
| 607 cons_free_list = 0; | |
| 608 } | |
| 609 | |
| 610 /* Explicitly free a cons cell. */ | |
| 611 free_cons (ptr) | |
| 612 struct Lisp_Cons *ptr; | |
| 613 { | |
|
9942
c189487b08dd
(free_float): Don't assume XFASTINT accesses the raw bits.
Karl Heuer <kwzh@gnu.org>
parents:
9926
diff
changeset
|
614 *(struct Lisp_Cons **)&ptr->car = cons_free_list; |
| 300 | 615 cons_free_list = ptr; |
| 616 } | |
| 617 | |
| 618 DEFUN ("cons", Fcons, Scons, 2, 2, 0, | |
| 619 "Create a new cons, give it CAR and CDR as components, and return it.") | |
| 620 (car, cdr) | |
| 621 Lisp_Object car, cdr; | |
| 622 { | |
| 623 register Lisp_Object val; | |
| 624 | |
| 625 if (cons_free_list) | |
| 626 { | |
|
9261
e5ba7993d378
(VALIDATE_LISP_STORAGE, make_float, Fcons, Fmake_vector, Fmake_symbol,
Karl Heuer <kwzh@gnu.org>
parents:
9144
diff
changeset
|
627 XSETCONS (val, cons_free_list); |
|
9942
c189487b08dd
(free_float): Don't assume XFASTINT accesses the raw bits.
Karl Heuer <kwzh@gnu.org>
parents:
9926
diff
changeset
|
628 cons_free_list = *(struct Lisp_Cons **)&cons_free_list->car; |
| 300 | 629 } |
| 630 else | |
| 631 { | |
| 632 if (cons_block_index == CONS_BLOCK_SIZE) | |
| 633 { | |
|
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
634 register struct cons_block *new = (struct cons_block *) xmalloc (sizeof (struct cons_block)); |
| 300 | 635 VALIDATE_LISP_STORAGE (new, sizeof *new); |
| 636 new->next = cons_block; | |
| 637 cons_block = new; | |
| 638 cons_block_index = 0; | |
| 639 } | |
|
9261
e5ba7993d378
(VALIDATE_LISP_STORAGE, make_float, Fcons, Fmake_vector, Fmake_symbol,
Karl Heuer <kwzh@gnu.org>
parents:
9144
diff
changeset
|
640 XSETCONS (val, &cons_block->conses[cons_block_index++]); |
| 300 | 641 } |
| 642 XCONS (val)->car = car; | |
| 643 XCONS (val)->cdr = cdr; | |
| 644 consing_since_gc += sizeof (struct Lisp_Cons); | |
| 645 return val; | |
| 646 } | |
| 647 | |
| 648 DEFUN ("list", Flist, Slist, 0, MANY, 0, | |
| 649 "Return a newly created list with specified arguments as elements.\n\ | |
| 650 Any number of arguments, even zero arguments, are allowed.") | |
| 651 (nargs, args) | |
| 652 int nargs; | |
| 653 register Lisp_Object *args; | |
| 654 { | |
| 655 register Lisp_Object len, val, val_tail; | |
| 656 | |
|
9295
17d393a8eed6
(free_float, make_float, free_cons, Flist, Fvector, Fmake_byte_code,
Karl Heuer <kwzh@gnu.org>
parents:
9261
diff
changeset
|
657 XSETFASTINT (len, nargs); |
| 300 | 658 val = Fmake_list (len, Qnil); |
| 659 val_tail = val; | |
| 485 | 660 while (!NILP (val_tail)) |
| 300 | 661 { |
| 662 XCONS (val_tail)->car = *args++; | |
| 663 val_tail = XCONS (val_tail)->cdr; | |
| 664 } | |
| 665 return val; | |
| 666 } | |
| 667 | |
| 668 DEFUN ("make-list", Fmake_list, Smake_list, 2, 2, 0, | |
| 669 "Return a newly created list of length LENGTH, with each element being INIT.") | |
| 670 (length, init) | |
| 671 register Lisp_Object length, init; | |
| 672 { | |
| 673 register Lisp_Object val; | |
| 674 register int size; | |
| 675 | |
|
9953
e0672d4cf470
(Fmake_list, Fmake_vector, Fmake_string): Use CHECK_NATNUM instead of its
Karl Heuer <kwzh@gnu.org>
parents:
9942
diff
changeset
|
676 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
|
677 size = XFASTINT (length); |
| 300 | 678 |
| 679 val = Qnil; | |
| 680 while (size-- > 0) | |
| 681 val = Fcons (init, val); | |
| 682 return val; | |
| 683 } | |
| 684 | |
| 685 /* Allocation of vectors */ | |
| 686 | |
| 687 struct Lisp_Vector *all_vectors; | |
| 688 | |
|
9968
943a61c764a5
(Fmake_vector): Call allocate_vectorlike.
Karl Heuer <kwzh@gnu.org>
parents:
9953
diff
changeset
|
689 struct Lisp_Vector * |
|
943a61c764a5
(Fmake_vector): Call allocate_vectorlike.
Karl Heuer <kwzh@gnu.org>
parents:
9953
diff
changeset
|
690 allocate_vectorlike (len) |
|
943a61c764a5
(Fmake_vector): Call allocate_vectorlike.
Karl Heuer <kwzh@gnu.org>
parents:
9953
diff
changeset
|
691 EMACS_INT len; |
|
943a61c764a5
(Fmake_vector): Call allocate_vectorlike.
Karl Heuer <kwzh@gnu.org>
parents:
9953
diff
changeset
|
692 { |
|
943a61c764a5
(Fmake_vector): Call allocate_vectorlike.
Karl Heuer <kwzh@gnu.org>
parents:
9953
diff
changeset
|
693 struct Lisp_Vector *p; |
|
943a61c764a5
(Fmake_vector): Call allocate_vectorlike.
Karl Heuer <kwzh@gnu.org>
parents:
9953
diff
changeset
|
694 |
|
943a61c764a5
(Fmake_vector): Call allocate_vectorlike.
Karl Heuer <kwzh@gnu.org>
parents:
9953
diff
changeset
|
695 p = (struct Lisp_Vector *)xmalloc (sizeof (struct Lisp_Vector) |
|
943a61c764a5
(Fmake_vector): Call allocate_vectorlike.
Karl Heuer <kwzh@gnu.org>
parents:
9953
diff
changeset
|
696 + (len - 1) * sizeof (Lisp_Object)); |
|
943a61c764a5
(Fmake_vector): Call allocate_vectorlike.
Karl Heuer <kwzh@gnu.org>
parents:
9953
diff
changeset
|
697 VALIDATE_LISP_STORAGE (p, 0); |
|
943a61c764a5
(Fmake_vector): Call allocate_vectorlike.
Karl Heuer <kwzh@gnu.org>
parents:
9953
diff
changeset
|
698 consing_since_gc += (sizeof (struct Lisp_Vector) |
|
943a61c764a5
(Fmake_vector): Call allocate_vectorlike.
Karl Heuer <kwzh@gnu.org>
parents:
9953
diff
changeset
|
699 + (len - 1) * sizeof (Lisp_Object)); |
|
943a61c764a5
(Fmake_vector): Call allocate_vectorlike.
Karl Heuer <kwzh@gnu.org>
parents:
9953
diff
changeset
|
700 |
|
943a61c764a5
(Fmake_vector): Call allocate_vectorlike.
Karl Heuer <kwzh@gnu.org>
parents:
9953
diff
changeset
|
701 p->next = all_vectors; |
|
943a61c764a5
(Fmake_vector): Call allocate_vectorlike.
Karl Heuer <kwzh@gnu.org>
parents:
9953
diff
changeset
|
702 all_vectors = p; |
|
943a61c764a5
(Fmake_vector): Call allocate_vectorlike.
Karl Heuer <kwzh@gnu.org>
parents:
9953
diff
changeset
|
703 return p; |
|
943a61c764a5
(Fmake_vector): Call allocate_vectorlike.
Karl Heuer <kwzh@gnu.org>
parents:
9953
diff
changeset
|
704 } |
|
943a61c764a5
(Fmake_vector): Call allocate_vectorlike.
Karl Heuer <kwzh@gnu.org>
parents:
9953
diff
changeset
|
705 |
| 300 | 706 DEFUN ("make-vector", Fmake_vector, Smake_vector, 2, 2, 0, |
| 707 "Return a newly created vector of length LENGTH, with each element being INIT.\n\ | |
| 708 See also the function `vector'.") | |
| 709 (length, init) | |
| 710 register Lisp_Object length, init; | |
| 711 { | |
|
9968
943a61c764a5
(Fmake_vector): Call allocate_vectorlike.
Karl Heuer <kwzh@gnu.org>
parents:
9953
diff
changeset
|
712 Lisp_Object vector; |
|
943a61c764a5
(Fmake_vector): Call allocate_vectorlike.
Karl Heuer <kwzh@gnu.org>
parents:
9953
diff
changeset
|
713 register EMACS_INT sizei; |
|
943a61c764a5
(Fmake_vector): Call allocate_vectorlike.
Karl Heuer <kwzh@gnu.org>
parents:
9953
diff
changeset
|
714 register int index; |
| 300 | 715 register struct Lisp_Vector *p; |
| 716 | |
|
9953
e0672d4cf470
(Fmake_list, Fmake_vector, Fmake_string): Use CHECK_NATNUM instead of its
Karl Heuer <kwzh@gnu.org>
parents:
9942
diff
changeset
|
717 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
|
718 sizei = XFASTINT (length); |
| 300 | 719 |
|
9968
943a61c764a5
(Fmake_vector): Call allocate_vectorlike.
Karl Heuer <kwzh@gnu.org>
parents:
9953
diff
changeset
|
720 p = allocate_vectorlike (sizei); |
| 300 | 721 p->size = sizei; |
| 722 for (index = 0; index < sizei; index++) | |
| 723 p->contents[index] = init; | |
| 724 | |
|
9968
943a61c764a5
(Fmake_vector): Call allocate_vectorlike.
Karl Heuer <kwzh@gnu.org>
parents:
9953
diff
changeset
|
725 XSETVECTOR (vector, p); |
| 300 | 726 return vector; |
| 727 } | |
| 728 | |
| 729 DEFUN ("vector", Fvector, Svector, 0, MANY, 0, | |
| 730 "Return a newly created vector with specified arguments as elements.\n\ | |
| 731 Any number of arguments, even zero arguments, are allowed.") | |
| 732 (nargs, args) | |
| 733 register int nargs; | |
| 734 Lisp_Object *args; | |
| 735 { | |
| 736 register Lisp_Object len, val; | |
| 737 register int index; | |
| 738 register struct Lisp_Vector *p; | |
| 739 | |
|
9295
17d393a8eed6
(free_float, make_float, free_cons, Flist, Fvector, Fmake_byte_code,
Karl Heuer <kwzh@gnu.org>
parents:
9261
diff
changeset
|
740 XSETFASTINT (len, nargs); |
| 300 | 741 val = Fmake_vector (len, Qnil); |
| 742 p = XVECTOR (val); | |
| 743 for (index = 0; index < nargs; index++) | |
| 744 p->contents[index] = args[index]; | |
| 745 return val; | |
| 746 } | |
| 747 | |
| 748 DEFUN ("make-byte-code", Fmake_byte_code, Smake_byte_code, 4, MANY, 0, | |
| 749 "Create a byte-code object with specified arguments as elements.\n\ | |
| 750 The arguments should be the arglist, bytecode-string, constant vector,\n\ | |
| 751 stack size, (optional) doc string, and (optional) interactive spec.\n\ | |
| 752 The first four arguments are required; at most six have any\n\ | |
| 753 significance.") | |
| 754 (nargs, args) | |
| 755 register int nargs; | |
| 756 Lisp_Object *args; | |
| 757 { | |
| 758 register Lisp_Object len, val; | |
| 759 register int index; | |
| 760 register struct Lisp_Vector *p; | |
| 761 | |
|
9295
17d393a8eed6
(free_float, make_float, free_cons, Flist, Fvector, Fmake_byte_code,
Karl Heuer <kwzh@gnu.org>
parents:
9261
diff
changeset
|
762 XSETFASTINT (len, nargs); |
| 485 | 763 if (!NILP (Vpurify_flag)) |
| 300 | 764 val = make_pure_vector (len); |
| 765 else | |
| 766 val = Fmake_vector (len, Qnil); | |
| 767 p = XVECTOR (val); | |
| 768 for (index = 0; index < nargs; index++) | |
| 769 { | |
| 485 | 770 if (!NILP (Vpurify_flag)) |
| 300 | 771 args[index] = Fpurecopy (args[index]); |
| 772 p->contents[index] = args[index]; | |
| 773 } | |
|
10291
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
774 XSETCOMPILED (val, val); |
| 300 | 775 return val; |
| 776 } | |
| 777 | |
| 778 /* Allocation of symbols. | |
| 779 Just like allocation of conses! | |
| 780 | |
| 781 Each symbol_block is just under 1020 bytes long, | |
| 782 since malloc really allocates in units of powers of two | |
| 783 and uses 4 bytes for its own overhead. */ | |
| 784 | |
| 785 #define SYMBOL_BLOCK_SIZE \ | |
| 786 ((1020 - sizeof (struct symbol_block *)) / sizeof (struct Lisp_Symbol)) | |
| 787 | |
| 788 struct symbol_block | |
| 789 { | |
| 790 struct symbol_block *next; | |
| 791 struct Lisp_Symbol symbols[SYMBOL_BLOCK_SIZE]; | |
| 792 }; | |
| 793 | |
| 794 struct symbol_block *symbol_block; | |
| 795 int symbol_block_index; | |
| 796 | |
| 797 struct Lisp_Symbol *symbol_free_list; | |
| 798 | |
| 799 void | |
| 800 init_symbol () | |
| 801 { | |
| 802 symbol_block = (struct symbol_block *) malloc (sizeof (struct symbol_block)); | |
| 803 symbol_block->next = 0; | |
| 804 bzero (symbol_block->symbols, sizeof symbol_block->symbols); | |
| 805 symbol_block_index = 0; | |
| 806 symbol_free_list = 0; | |
| 807 } | |
| 808 | |
| 809 DEFUN ("make-symbol", Fmake_symbol, Smake_symbol, 1, 1, 0, | |
| 810 "Return a newly allocated uninterned symbol whose name is NAME.\n\ | |
| 811 Its value and function definition are void, and its property list is nil.") | |
| 812 (str) | |
| 813 Lisp_Object str; | |
| 814 { | |
| 815 register Lisp_Object val; | |
| 816 register struct Lisp_Symbol *p; | |
| 817 | |
| 818 CHECK_STRING (str, 0); | |
| 819 | |
| 820 if (symbol_free_list) | |
| 821 { | |
|
9261
e5ba7993d378
(VALIDATE_LISP_STORAGE, make_float, Fcons, Fmake_vector, Fmake_symbol,
Karl Heuer <kwzh@gnu.org>
parents:
9144
diff
changeset
|
822 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
|
823 symbol_free_list = *(struct Lisp_Symbol **)&symbol_free_list->value; |
| 300 | 824 } |
| 825 else | |
| 826 { | |
| 827 if (symbol_block_index == SYMBOL_BLOCK_SIZE) | |
| 828 { | |
|
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
829 struct symbol_block *new = (struct symbol_block *) xmalloc (sizeof (struct symbol_block)); |
| 300 | 830 VALIDATE_LISP_STORAGE (new, sizeof *new); |
| 831 new->next = symbol_block; | |
| 832 symbol_block = new; | |
| 833 symbol_block_index = 0; | |
| 834 } | |
|
9261
e5ba7993d378
(VALIDATE_LISP_STORAGE, make_float, Fcons, Fmake_vector, Fmake_symbol,
Karl Heuer <kwzh@gnu.org>
parents:
9144
diff
changeset
|
835 XSETSYMBOL (val, &symbol_block->symbols[symbol_block_index++]); |
| 300 | 836 } |
| 837 p = XSYMBOL (val); | |
| 838 p->name = XSTRING (str); | |
| 839 p->plist = Qnil; | |
| 840 p->value = Qunbound; | |
| 841 p->function = Qunbound; | |
| 842 p->next = 0; | |
| 843 consing_since_gc += sizeof (struct Lisp_Symbol); | |
| 844 return val; | |
| 845 } | |
| 846 | |
|
9437
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
847 /* Allocation of markers and other objects that share that structure. |
| 300 | 848 Works like allocation of conses. */ |
| 849 | |
| 850 #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
|
851 ((1020 - sizeof (struct marker_block *)) / sizeof (union Lisp_Misc)) |
| 300 | 852 |
| 853 struct marker_block | |
| 854 { | |
| 855 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
|
856 union Lisp_Misc markers[MARKER_BLOCK_SIZE]; |
| 300 | 857 }; |
| 858 | |
| 859 struct marker_block *marker_block; | |
| 860 int marker_block_index; | |
| 861 | |
|
9437
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
862 union Lisp_Misc *marker_free_list; |
| 300 | 863 |
| 864 void | |
| 865 init_marker () | |
| 866 { | |
| 867 marker_block = (struct marker_block *) malloc (sizeof (struct marker_block)); | |
| 868 marker_block->next = 0; | |
| 869 bzero (marker_block->markers, sizeof marker_block->markers); | |
| 870 marker_block_index = 0; | |
| 871 marker_free_list = 0; | |
| 872 } | |
| 873 | |
|
9437
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
874 /* 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
|
875 Lisp_Object |
|
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
876 allocate_misc () |
|
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
877 { |
|
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
878 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
|
879 |
|
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
880 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
|
881 { |
|
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
882 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
|
883 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
|
884 } |
|
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
885 else |
|
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
886 { |
|
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
887 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
|
888 { |
|
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
889 struct 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
|
890 = (struct marker_block *) xmalloc (sizeof (struct marker_block)); |
|
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
891 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
|
892 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
|
893 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
|
894 marker_block_index = 0; |
|
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
895 } |
|
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
896 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
|
897 } |
|
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
898 consing_since_gc += sizeof (union Lisp_Misc); |
|
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
899 return val; |
|
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
900 } |
|
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
901 |
| 300 | 902 DEFUN ("make-marker", Fmake_marker, Smake_marker, 0, 0, 0, |
| 903 "Return a newly allocated marker which does not point at any place.") | |
| 904 () | |
| 905 { | |
| 906 register Lisp_Object val; | |
| 907 register struct Lisp_Marker *p; | |
| 638 | 908 |
|
9437
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
909 val = allocate_misc (); |
|
11243
054ecfce1820
(Fmake_marker, mark_object): Use XMISCTYPE.
Richard M. Stallman <rms@gnu.org>
parents:
11048
diff
changeset
|
910 XMISCTYPE (val) = Lisp_Misc_Marker; |
| 300 | 911 p = XMARKER (val); |
| 912 p->buffer = 0; | |
| 913 p->bufpos = 0; | |
| 914 p->chain = Qnil; | |
| 915 return val; | |
| 916 } | |
| 917 | |
| 918 /* Allocation of strings */ | |
| 919 | |
| 920 /* Strings reside inside of string_blocks. The entire data of the string, | |
| 921 both the size and the contents, live in part of the `chars' component of a string_block. | |
| 922 The `pos' component is the index within `chars' of the first free byte. | |
| 923 | |
| 924 first_string_block points to the first string_block ever allocated. | |
| 925 Each block points to the next one with its `next' field. | |
| 926 The `prev' fields chain in reverse order. | |
| 927 The last one allocated is the one currently being filled. | |
| 928 current_string_block points to it. | |
| 929 | |
| 930 The string_blocks that hold individual large strings | |
| 931 go in a separate chain, started by large_string_blocks. */ | |
| 932 | |
| 933 | |
| 934 /* String blocks contain this many useful bytes. | |
| 935 8188 is power of 2, minus 4 for malloc overhead. */ | |
| 936 #define STRING_BLOCK_SIZE (8188 - sizeof (struct string_block_head)) | |
| 937 | |
| 938 /* A string bigger than this gets its own specially-made string block | |
| 939 if it doesn't fit in the current one. */ | |
| 940 #define STRING_BLOCK_OUTSIZE 1024 | |
| 941 | |
| 942 struct string_block_head | |
| 943 { | |
| 944 struct string_block *next, *prev; | |
| 945 int pos; | |
| 946 }; | |
| 947 | |
| 948 struct string_block | |
| 949 { | |
| 950 struct string_block *next, *prev; | |
|
8817
48ff00bebef6
(pure, pure_size): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
951 EMACS_INT pos; |
| 300 | 952 char chars[STRING_BLOCK_SIZE]; |
| 953 }; | |
| 954 | |
| 955 /* This points to the string block we are now allocating strings. */ | |
| 956 | |
| 957 struct string_block *current_string_block; | |
| 958 | |
| 959 /* This points to the oldest string block, the one that starts the chain. */ | |
| 960 | |
| 961 struct string_block *first_string_block; | |
| 962 | |
| 963 /* Last string block in chain of those made for individual large strings. */ | |
| 964 | |
| 965 struct string_block *large_string_blocks; | |
| 966 | |
| 967 /* If SIZE is the length of a string, this returns how many bytes | |
| 968 the string occupies in a string_block (including padding). */ | |
| 969 | |
| 970 #define STRING_FULLSIZE(size) (((size) + sizeof (struct Lisp_String) + PAD) \ | |
| 971 & ~(PAD - 1)) | |
|
8817
48ff00bebef6
(pure, pure_size): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
972 #define PAD (sizeof (EMACS_INT)) |
| 300 | 973 |
| 974 #if 0 | |
| 975 #define STRING_FULLSIZE(SIZE) \ | |
|
8817
48ff00bebef6
(pure, pure_size): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
976 (((SIZE) + 2 * sizeof (EMACS_INT)) & ~(sizeof (EMACS_INT) - 1)) |
| 300 | 977 #endif |
| 978 | |
| 979 void | |
| 980 init_strings () | |
| 981 { | |
| 982 current_string_block = (struct string_block *) malloc (sizeof (struct string_block)); | |
| 983 first_string_block = current_string_block; | |
| 984 consing_since_gc += sizeof (struct string_block); | |
| 985 current_string_block->next = 0; | |
| 986 current_string_block->prev = 0; | |
| 987 current_string_block->pos = 0; | |
| 988 large_string_blocks = 0; | |
| 989 } | |
| 990 | |
| 991 DEFUN ("make-string", Fmake_string, Smake_string, 2, 2, 0, | |
| 992 "Return a newly created string of length LENGTH, with each element being INIT.\n\ | |
| 993 Both LENGTH and INIT must be numbers.") | |
| 994 (length, init) | |
| 995 Lisp_Object length, init; | |
| 996 { | |
| 997 register Lisp_Object val; | |
| 998 register unsigned char *p, *end, c; | |
| 999 | |
|
9953
e0672d4cf470
(Fmake_list, Fmake_vector, Fmake_string): Use CHECK_NATNUM instead of its
Karl Heuer <kwzh@gnu.org>
parents:
9942
diff
changeset
|
1000 CHECK_NATNUM (length, 0); |
| 300 | 1001 CHECK_NUMBER (init, 1); |
|
9953
e0672d4cf470
(Fmake_list, Fmake_vector, Fmake_string): Use CHECK_NATNUM instead of its
Karl Heuer <kwzh@gnu.org>
parents:
9942
diff
changeset
|
1002 val = make_uninit_string (XFASTINT (length)); |
| 300 | 1003 c = XINT (init); |
| 1004 p = XSTRING (val)->data; | |
| 1005 end = p + XSTRING (val)->size; | |
| 1006 while (p != end) | |
| 1007 *p++ = c; | |
| 1008 *p = 0; | |
| 1009 return val; | |
| 1010 } | |
| 1011 | |
| 1012 Lisp_Object | |
| 1013 make_string (contents, length) | |
| 1014 char *contents; | |
| 1015 int length; | |
| 1016 { | |
| 1017 register Lisp_Object val; | |
| 1018 val = make_uninit_string (length); | |
| 1019 bcopy (contents, XSTRING (val)->data, length); | |
| 1020 return val; | |
| 1021 } | |
| 1022 | |
| 1023 Lisp_Object | |
| 1024 build_string (str) | |
| 1025 char *str; | |
| 1026 { | |
| 1027 return make_string (str, strlen (str)); | |
| 1028 } | |
| 1029 | |
| 1030 Lisp_Object | |
| 1031 make_uninit_string (length) | |
| 1032 int length; | |
| 1033 { | |
| 1034 register Lisp_Object val; | |
| 1035 register int fullsize = STRING_FULLSIZE (length); | |
| 1036 | |
| 1037 if (length < 0) abort (); | |
| 1038 | |
| 1039 if (fullsize <= STRING_BLOCK_SIZE - current_string_block->pos) | |
| 1040 /* This string can fit in the current string block */ | |
| 1041 { | |
|
9261
e5ba7993d378
(VALIDATE_LISP_STORAGE, make_float, Fcons, Fmake_vector, Fmake_symbol,
Karl Heuer <kwzh@gnu.org>
parents:
9144
diff
changeset
|
1042 XSETSTRING (val, |
|
e5ba7993d378
(VALIDATE_LISP_STORAGE, make_float, Fcons, Fmake_vector, Fmake_symbol,
Karl Heuer <kwzh@gnu.org>
parents:
9144
diff
changeset
|
1043 ((struct Lisp_String *) |
|
e5ba7993d378
(VALIDATE_LISP_STORAGE, make_float, Fcons, Fmake_vector, Fmake_symbol,
Karl Heuer <kwzh@gnu.org>
parents:
9144
diff
changeset
|
1044 (current_string_block->chars + current_string_block->pos))); |
| 300 | 1045 current_string_block->pos += fullsize; |
| 1046 } | |
| 1047 else if (fullsize > STRING_BLOCK_OUTSIZE) | |
| 1048 /* This string gets its own string block */ | |
| 1049 { | |
| 1050 register struct string_block *new | |
|
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
1051 = (struct string_block *) xmalloc (sizeof (struct string_block_head) + fullsize); |
| 300 | 1052 VALIDATE_LISP_STORAGE (new, 0); |
| 1053 consing_since_gc += sizeof (struct string_block_head) + fullsize; | |
| 1054 new->pos = fullsize; | |
| 1055 new->next = large_string_blocks; | |
| 1056 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
|
1057 XSETSTRING (val, |
|
e5ba7993d378
(VALIDATE_LISP_STORAGE, make_float, Fcons, Fmake_vector, Fmake_symbol,
Karl Heuer <kwzh@gnu.org>
parents:
9144
diff
changeset
|
1058 ((struct Lisp_String *) |
|
e5ba7993d378
(VALIDATE_LISP_STORAGE, make_float, Fcons, Fmake_vector, Fmake_symbol,
Karl Heuer <kwzh@gnu.org>
parents:
9144
diff
changeset
|
1059 ((struct string_block_head *)new + 1))); |
| 300 | 1060 } |
| 1061 else | |
| 1062 /* Make a new current string block and start it off with this string */ | |
| 1063 { | |
| 1064 register struct string_block *new | |
|
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
1065 = (struct string_block *) xmalloc (sizeof (struct string_block)); |
| 300 | 1066 VALIDATE_LISP_STORAGE (new, sizeof *new); |
| 1067 consing_since_gc += sizeof (struct string_block); | |
| 1068 current_string_block->next = new; | |
| 1069 new->prev = current_string_block; | |
| 1070 new->next = 0; | |
| 1071 current_string_block = new; | |
| 1072 new->pos = fullsize; | |
|
9261
e5ba7993d378
(VALIDATE_LISP_STORAGE, make_float, Fcons, Fmake_vector, Fmake_symbol,
Karl Heuer <kwzh@gnu.org>
parents:
9144
diff
changeset
|
1073 XSETSTRING (val, |
|
e5ba7993d378
(VALIDATE_LISP_STORAGE, make_float, Fcons, Fmake_vector, Fmake_symbol,
Karl Heuer <kwzh@gnu.org>
parents:
9144
diff
changeset
|
1074 (struct Lisp_String *) current_string_block->chars); |
| 300 | 1075 } |
| 1076 | |
| 1077 XSTRING (val)->size = length; | |
| 1078 XSTRING (val)->data[length] = 0; | |
|
1300
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
1079 INITIALIZE_INTERVAL (XSTRING (val), NULL_INTERVAL); |
| 300 | 1080 |
| 1081 return val; | |
| 1082 } | |
| 1083 | |
| 1084 /* 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
|
1085 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
|
1086 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
|
1087 |
|
e2a164ac4088
(Fmake_rope, Frope_elt): Fns deleted.
Richard M. Stallman <rms@gnu.org>
parents:
1994
diff
changeset
|
1088 Any number of arguments, even zero arguments, are allowed. */ |
| 300 | 1089 |
| 1090 Lisp_Object | |
|
2013
e2a164ac4088
(Fmake_rope, Frope_elt): Fns deleted.
Richard M. Stallman <rms@gnu.org>
parents:
1994
diff
changeset
|
1091 make_event_array (nargs, args) |
| 300 | 1092 register int nargs; |
| 1093 Lisp_Object *args; | |
| 1094 { | |
| 1095 int i; | |
| 1096 | |
| 1097 for (i = 0; i < nargs; i++) | |
|
2013
e2a164ac4088
(Fmake_rope, Frope_elt): Fns deleted.
Richard M. Stallman <rms@gnu.org>
parents:
1994
diff
changeset
|
1098 /* 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
|
1099 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
|
1100 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
|
1101 if (!INTEGERP (args[i]) |
|
3536
58d5ee6ec253
(make_event_array): Ignore bits above CHAR_META.
Richard M. Stallman <rms@gnu.org>
parents:
3181
diff
changeset
|
1102 || (XUINT (args[i]) & ~(-CHAR_META)) >= 0200) |
| 300 | 1103 return Fvector (nargs, args); |
| 1104 | |
| 1105 /* Since the loop exited, we know that all the things in it are | |
| 1106 characters, so we can make a string. */ | |
| 1107 { | |
|
6492
8372dce85f8a
(make_event_array): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6227
diff
changeset
|
1108 Lisp_Object result; |
| 300 | 1109 |
|
6492
8372dce85f8a
(make_event_array): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6227
diff
changeset
|
1110 result = Fmake_string (nargs, make_number (0)); |
| 300 | 1111 for (i = 0; i < nargs; i++) |
|
2013
e2a164ac4088
(Fmake_rope, Frope_elt): Fns deleted.
Richard M. Stallman <rms@gnu.org>
parents:
1994
diff
changeset
|
1112 { |
|
e2a164ac4088
(Fmake_rope, Frope_elt): Fns deleted.
Richard M. Stallman <rms@gnu.org>
parents:
1994
diff
changeset
|
1113 XSTRING (result)->data[i] = XINT (args[i]); |
|
e2a164ac4088
(Fmake_rope, Frope_elt): Fns deleted.
Richard M. Stallman <rms@gnu.org>
parents:
1994
diff
changeset
|
1114 /* 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
|
1115 if (XINT (args[i]) & CHAR_META) |
|
e2a164ac4088
(Fmake_rope, Frope_elt): Fns deleted.
Richard M. Stallman <rms@gnu.org>
parents:
1994
diff
changeset
|
1116 XSTRING (result)->data[i] |= 0x80; |
|
e2a164ac4088
(Fmake_rope, Frope_elt): Fns deleted.
Richard M. Stallman <rms@gnu.org>
parents:
1994
diff
changeset
|
1117 } |
| 300 | 1118 |
| 1119 return result; | |
| 1120 } | |
| 1121 } | |
| 1122 | |
|
1908
d649f2179d67
* alloc.c (make_pure_float): Align pureptr on a sizeof (double)
Jim Blandy <jimb@redhat.com>
parents:
1893
diff
changeset
|
1123 /* Pure storage management. */ |
|
d649f2179d67
* alloc.c (make_pure_float): Align pureptr on a sizeof (double)
Jim Blandy <jimb@redhat.com>
parents:
1893
diff
changeset
|
1124 |
| 300 | 1125 /* Must get an error if pure storage is full, |
| 1126 since if it cannot hold a large string | |
| 1127 it may be able to hold conses that point to that string; | |
| 1128 then the string is not protected from gc. */ | |
| 1129 | |
| 1130 Lisp_Object | |
| 1131 make_pure_string (data, length) | |
| 1132 char *data; | |
| 1133 int length; | |
| 1134 { | |
| 1135 register Lisp_Object new; | |
|
8817
48ff00bebef6
(pure, pure_size): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
1136 register int size = sizeof (EMACS_INT) + INTERVAL_PTR_SIZE + length + 1; |
| 300 | 1137 |
| 1138 if (pureptr + size > PURESIZE) | |
| 1139 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
|
1140 XSETSTRING (new, PUREBEG + pureptr); |
| 300 | 1141 XSTRING (new)->size = length; |
| 1142 bcopy (data, XSTRING (new)->data, length); | |
| 1143 XSTRING (new)->data[length] = 0; | |
|
4956
0f94e1e7d273
(make_pure_string): If we USE_TEXT_PROPERTIES, set the
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1144 |
|
0f94e1e7d273
(make_pure_string): If we USE_TEXT_PROPERTIES, set the
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1145 /* 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
|
1146 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
|
1147 #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
|
1148 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
|
1149 #endif |
|
8817
48ff00bebef6
(pure, pure_size): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
1150 pureptr += (size + sizeof (EMACS_INT) - 1) |
|
48ff00bebef6
(pure, pure_size): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
1151 / sizeof (EMACS_INT) * sizeof (EMACS_INT); |
| 300 | 1152 return new; |
| 1153 } | |
| 1154 | |
| 1155 Lisp_Object | |
| 1156 pure_cons (car, cdr) | |
| 1157 Lisp_Object car, cdr; | |
| 1158 { | |
| 1159 register Lisp_Object new; | |
| 1160 | |
| 1161 if (pureptr + sizeof (struct Lisp_Cons) > PURESIZE) | |
| 1162 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
|
1163 XSETCONS (new, PUREBEG + pureptr); |
| 300 | 1164 pureptr += sizeof (struct Lisp_Cons); |
| 1165 XCONS (new)->car = Fpurecopy (car); | |
| 1166 XCONS (new)->cdr = Fpurecopy (cdr); | |
| 1167 return new; | |
| 1168 } | |
| 1169 | |
| 1170 #ifdef LISP_FLOAT_TYPE | |
| 1171 | |
| 1172 Lisp_Object | |
| 1173 make_pure_float (num) | |
| 1174 double num; | |
| 1175 { | |
| 1176 register Lisp_Object new; | |
| 1177 | |
|
1939
def7b9c64935
* alloc.c (make_pure_float): Assure that PUREBEG + pureptr is
Jim Blandy <jimb@redhat.com>
parents:
1936
diff
changeset
|
1178 /* 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
|
1179 (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
|
1180 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
|
1181 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
|
1182 { |
|
def7b9c64935
* alloc.c (make_pure_float): Assure that PUREBEG + pureptr is
Jim Blandy <jimb@redhat.com>
parents:
1936
diff
changeset
|
1183 int alignment; |
|
def7b9c64935
* alloc.c (make_pure_float): Assure that PUREBEG + pureptr is
Jim Blandy <jimb@redhat.com>
parents:
1936
diff
changeset
|
1184 char *p = PUREBEG + pureptr; |
|
def7b9c64935
* alloc.c (make_pure_float): Assure that PUREBEG + pureptr is
Jim Blandy <jimb@redhat.com>
parents:
1936
diff
changeset
|
1185 |
|
1936
82bbf90208d4
* alloc.c (make_pure_float): Align pureptr according to __alignof,
Jim Blandy <jimb@redhat.com>
parents:
1908
diff
changeset
|
1186 #ifdef __GNUC__ |
|
82bbf90208d4
* alloc.c (make_pure_float): Align pureptr according to __alignof,
Jim Blandy <jimb@redhat.com>
parents:
1908
diff
changeset
|
1187 #if __GNUC__ >= 2 |
|
1939
def7b9c64935
* alloc.c (make_pure_float): Assure that PUREBEG + pureptr is
Jim Blandy <jimb@redhat.com>
parents:
1936
diff
changeset
|
1188 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
|
1189 #else |
|
1939
def7b9c64935
* alloc.c (make_pure_float): Assure that PUREBEG + pureptr is
Jim Blandy <jimb@redhat.com>
parents:
1936
diff
changeset
|
1190 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
|
1191 #endif |
|
82bbf90208d4
* alloc.c (make_pure_float): Align pureptr according to __alignof,
Jim Blandy <jimb@redhat.com>
parents:
1908
diff
changeset
|
1192 #else |
|
1939
def7b9c64935
* alloc.c (make_pure_float): Assure that PUREBEG + pureptr is
Jim Blandy <jimb@redhat.com>
parents:
1936
diff
changeset
|
1193 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
|
1194 #endif |
|
1939
def7b9c64935
* alloc.c (make_pure_float): Assure that PUREBEG + pureptr is
Jim Blandy <jimb@redhat.com>
parents:
1936
diff
changeset
|
1195 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
|
1196 pureptr = p - PUREBEG; |
|
def7b9c64935
* alloc.c (make_pure_float): Assure that PUREBEG + pureptr is
Jim Blandy <jimb@redhat.com>
parents:
1936
diff
changeset
|
1197 } |
|
1908
d649f2179d67
* alloc.c (make_pure_float): Align pureptr on a sizeof (double)
Jim Blandy <jimb@redhat.com>
parents:
1893
diff
changeset
|
1198 |
| 300 | 1199 if (pureptr + sizeof (struct Lisp_Float) > PURESIZE) |
| 1200 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
|
1201 XSETFLOAT (new, PUREBEG + pureptr); |
| 300 | 1202 pureptr += sizeof (struct Lisp_Float); |
| 1203 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
|
1204 XSETFASTINT (XFLOAT (new)->type, 0); /* bug chasing -wsr */ |
| 300 | 1205 return new; |
| 1206 } | |
| 1207 | |
| 1208 #endif /* LISP_FLOAT_TYPE */ | |
| 1209 | |
| 1210 Lisp_Object | |
| 1211 make_pure_vector (len) | |
|
8817
48ff00bebef6
(pure, pure_size): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
1212 EMACS_INT len; |
| 300 | 1213 { |
| 1214 register Lisp_Object new; | |
|
8817
48ff00bebef6
(pure, pure_size): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
1215 register EMACS_INT size = sizeof (struct Lisp_Vector) + (len - 1) * sizeof (Lisp_Object); |
| 300 | 1216 |
| 1217 if (pureptr + size > PURESIZE) | |
| 1218 error ("Pure Lisp storage exhausted"); | |
| 1219 | |
|
9261
e5ba7993d378
(VALIDATE_LISP_STORAGE, make_float, Fcons, Fmake_vector, Fmake_symbol,
Karl Heuer <kwzh@gnu.org>
parents:
9144
diff
changeset
|
1220 XSETVECTOR (new, PUREBEG + pureptr); |
| 300 | 1221 pureptr += size; |
| 1222 XVECTOR (new)->size = len; | |
| 1223 return new; | |
| 1224 } | |
| 1225 | |
| 1226 DEFUN ("purecopy", Fpurecopy, Spurecopy, 1, 1, 0, | |
| 1227 "Make a copy of OBJECT in pure storage.\n\ | |
| 1228 Recursively copies contents of vectors and cons cells.\n\ | |
| 1229 Does not copy symbols.") | |
| 1230 (obj) | |
| 1231 register Lisp_Object obj; | |
| 1232 { | |
| 485 | 1233 if (NILP (Vpurify_flag)) |
| 300 | 1234 return obj; |
| 1235 | |
| 1236 if ((PNTR_COMPARISON_TYPE) XPNTR (obj) < (PNTR_COMPARISON_TYPE) ((char *) pure + PURESIZE) | |
| 1237 && (PNTR_COMPARISON_TYPE) XPNTR (obj) >= (PNTR_COMPARISON_TYPE) pure) | |
| 1238 return obj; | |
| 1239 | |
|
10004
2c57cb7eba5f
(Fpurecopy): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9968
diff
changeset
|
1240 if (CONSP (obj)) |
|
2c57cb7eba5f
(Fpurecopy): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9968
diff
changeset
|
1241 return pure_cons (XCONS (obj)->car, XCONS (obj)->cdr); |
| 300 | 1242 #ifdef LISP_FLOAT_TYPE |
|
10004
2c57cb7eba5f
(Fpurecopy): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9968
diff
changeset
|
1243 else if (FLOATP (obj)) |
|
2c57cb7eba5f
(Fpurecopy): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9968
diff
changeset
|
1244 return make_pure_float (XFLOAT (obj)->data); |
| 300 | 1245 #endif /* LISP_FLOAT_TYPE */ |
|
10004
2c57cb7eba5f
(Fpurecopy): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9968
diff
changeset
|
1246 else if (STRINGP (obj)) |
|
2c57cb7eba5f
(Fpurecopy): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9968
diff
changeset
|
1247 return make_pure_string (XSTRING (obj)->data, XSTRING (obj)->size); |
|
2c57cb7eba5f
(Fpurecopy): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9968
diff
changeset
|
1248 else if (COMPILEDP (obj) || VECTORP (obj)) |
|
2c57cb7eba5f
(Fpurecopy): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9968
diff
changeset
|
1249 { |
|
2c57cb7eba5f
(Fpurecopy): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9968
diff
changeset
|
1250 register struct Lisp_Vector *vec; |
|
2c57cb7eba5f
(Fpurecopy): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9968
diff
changeset
|
1251 register int i, size; |
| 300 | 1252 |
|
10004
2c57cb7eba5f
(Fpurecopy): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9968
diff
changeset
|
1253 size = XVECTOR (obj)->size; |
|
10427
5faba1b094d5
(Fpurecopy): Mask size field when copying pseudovector.
Karl Heuer <kwzh@gnu.org>
parents:
10414
diff
changeset
|
1254 if (size & PSEUDOVECTOR_FLAG) |
|
5faba1b094d5
(Fpurecopy): Mask size field when copying pseudovector.
Karl Heuer <kwzh@gnu.org>
parents:
10414
diff
changeset
|
1255 size &= PSEUDOVECTOR_SIZE_MASK; |
|
10004
2c57cb7eba5f
(Fpurecopy): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9968
diff
changeset
|
1256 vec = XVECTOR (make_pure_vector (size)); |
|
2c57cb7eba5f
(Fpurecopy): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9968
diff
changeset
|
1257 for (i = 0; i < size; i++) |
|
2c57cb7eba5f
(Fpurecopy): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9968
diff
changeset
|
1258 vec->contents[i] = Fpurecopy (XVECTOR (obj)->contents[i]); |
|
2c57cb7eba5f
(Fpurecopy): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9968
diff
changeset
|
1259 if (COMPILEDP (obj)) |
|
2c57cb7eba5f
(Fpurecopy): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9968
diff
changeset
|
1260 XSETCOMPILED (obj, vec); |
|
2c57cb7eba5f
(Fpurecopy): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9968
diff
changeset
|
1261 else |
|
2c57cb7eba5f
(Fpurecopy): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9968
diff
changeset
|
1262 XSETVECTOR (obj, vec); |
| 300 | 1263 return obj; |
| 1264 } | |
|
10004
2c57cb7eba5f
(Fpurecopy): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9968
diff
changeset
|
1265 else if (MARKERP (obj)) |
|
2c57cb7eba5f
(Fpurecopy): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9968
diff
changeset
|
1266 error ("Attempt to copy a marker to pure storage"); |
|
2c57cb7eba5f
(Fpurecopy): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9968
diff
changeset
|
1267 else |
|
2c57cb7eba5f
(Fpurecopy): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9968
diff
changeset
|
1268 return obj; |
| 300 | 1269 } |
| 1270 | |
| 1271 /* Recording what needs to be marked for gc. */ | |
| 1272 | |
| 1273 struct gcpro *gcprolist; | |
| 1274 | |
|
10855
fddf2b79ebcf
(mark_perdisplays): Update to reflect current Lisp_Objects.
Karl Heuer <kwzh@gnu.org>
parents:
10796
diff
changeset
|
1275 #define NSTATICS 768 |
| 300 | 1276 |
| 1277 Lisp_Object *staticvec[NSTATICS] = {0}; | |
| 1278 | |
| 1279 int staticidx = 0; | |
| 1280 | |
| 1281 /* Put an entry in staticvec, pointing at the variable whose address is given */ | |
| 1282 | |
| 1283 void | |
| 1284 staticpro (varaddress) | |
| 1285 Lisp_Object *varaddress; | |
| 1286 { | |
| 1287 staticvec[staticidx++] = varaddress; | |
| 1288 if (staticidx >= NSTATICS) | |
| 1289 abort (); | |
| 1290 } | |
| 1291 | |
| 1292 struct catchtag | |
| 1293 { | |
| 1294 Lisp_Object tag; | |
| 1295 Lisp_Object val; | |
| 1296 struct catchtag *next; | |
| 1297 /* jmp_buf jmp; /* We don't need this for GC purposes */ | |
| 1298 }; | |
| 1299 | |
| 1300 struct backtrace | |
| 1301 { | |
| 1302 struct backtrace *next; | |
| 1303 Lisp_Object *function; | |
| 1304 Lisp_Object *args; /* Points to vector of args. */ | |
| 1305 int nargs; /* length of vector */ | |
| 1306 /* if nargs is UNEVALLED, args points to slot holding list of unevalled args */ | |
| 1307 char evalargs; | |
| 1308 }; | |
| 1309 | |
|
1908
d649f2179d67
* alloc.c (make_pure_float): Align pureptr on a sizeof (double)
Jim Blandy <jimb@redhat.com>
parents:
1893
diff
changeset
|
1310 /* Garbage collection! */ |
|
d649f2179d67
* alloc.c (make_pure_float): Align pureptr on a sizeof (double)
Jim Blandy <jimb@redhat.com>
parents:
1893
diff
changeset
|
1311 |
| 300 | 1312 int total_conses, total_markers, total_symbols, total_string_size, total_vector_size; |
| 1313 int total_free_conses, total_free_markers, total_free_symbols; | |
| 1314 #ifdef LISP_FLOAT_TYPE | |
| 1315 int total_free_floats, total_floats; | |
| 1316 #endif /* LISP_FLOAT_TYPE */ | |
| 1317 | |
| 1318 DEFUN ("garbage-collect", Fgarbage_collect, Sgarbage_collect, 0, 0, "", | |
| 1319 "Reclaim storage for Lisp objects no longer needed.\n\ | |
| 1320 Returns info on amount of space in use:\n\ | |
| 1321 ((USED-CONSES . FREE-CONSES) (USED-SYMS . FREE-SYMS)\n\ | |
| 1322 (USED-MARKERS . FREE-MARKERS) USED-STRING-CHARS USED-VECTOR-SLOTS\n\ | |
| 1323 (USED-FLOATS . FREE-FLOATS))\n\ | |
| 1324 Garbage collection happens automatically if you cons more than\n\ | |
| 1325 `gc-cons-threshold' bytes of Lisp data since previous garbage collection.") | |
| 1326 () | |
| 1327 { | |
| 1328 register struct gcpro *tail; | |
| 1329 register struct specbinding *bind; | |
| 1330 struct catchtag *catch; | |
| 1331 struct handler *handler; | |
| 1332 register struct backtrace *backlist; | |
| 1333 register Lisp_Object tem; | |
| 1334 char *omessage = echo_area_glyphs; | |
|
5874
fbda87c8ad54
(Fgarbage_collect): Save echo_area_glyphs_length.
Karl Heuer <kwzh@gnu.org>
parents:
5868
diff
changeset
|
1335 int omessage_length = echo_area_glyphs_length; |
| 300 | 1336 char stack_top_variable; |
| 1337 register int i; | |
| 1338 | |
| 1339 /* Save a copy of the contents of the stack, for debugging. */ | |
| 1340 #if MAX_SAVE_STACK > 0 | |
| 485 | 1341 if (NILP (Vpurify_flag)) |
| 300 | 1342 { |
| 1343 i = &stack_top_variable - stack_bottom; | |
| 1344 if (i < 0) i = -i; | |
| 1345 if (i < MAX_SAVE_STACK) | |
| 1346 { | |
| 1347 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
|
1348 stack_copy = (char *) xmalloc (stack_copy_size = i); |
| 300 | 1349 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
|
1350 stack_copy = (char *) xrealloc (stack_copy, (stack_copy_size = i)); |
| 300 | 1351 if (stack_copy) |
| 1352 { | |
|
8817
48ff00bebef6
(pure, pure_size): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
1353 if ((EMACS_INT) (&stack_top_variable - stack_bottom) > 0) |
| 300 | 1354 bcopy (stack_bottom, stack_copy, i); |
| 1355 else | |
| 1356 bcopy (&stack_top_variable, stack_copy, i); | |
| 1357 } | |
| 1358 } | |
| 1359 } | |
| 1360 #endif /* MAX_SAVE_STACK > 0 */ | |
| 1361 | |
| 1362 if (!noninteractive) | |
|
10395
c121703d35c7
(Fgarbage_collect): Don't log the GC message.
Karl Heuer <kwzh@gnu.org>
parents:
10389
diff
changeset
|
1363 message1_nolog ("Garbage collecting..."); |
| 300 | 1364 |
| 1365 /* Don't keep command history around forever */ | |
| 1366 tem = Fnthcdr (make_number (30), Vcommand_history); | |
| 1367 if (CONSP (tem)) | |
| 1368 XCONS (tem)->cdr = Qnil; | |
| 648 | 1369 |
| 300 | 1370 /* Likewise for undo information. */ |
| 1371 { | |
| 1372 register struct buffer *nextb = all_buffers; | |
| 1373 | |
| 1374 while (nextb) | |
| 1375 { | |
| 648 | 1376 /* If a buffer's undo list is Qt, that means that undo is |
| 1377 turned off in that buffer. Calling truncate_undo_list on | |
| 1378 Qt tends to return NULL, which effectively turns undo back on. | |
| 1379 So don't call truncate_undo_list if undo_list is Qt. */ | |
| 1380 if (! EQ (nextb->undo_list, Qt)) | |
| 1381 nextb->undo_list | |
| 764 | 1382 = truncate_undo_list (nextb->undo_list, undo_limit, |
| 1383 undo_strong_limit); | |
| 300 | 1384 nextb = nextb->next; |
| 1385 } | |
| 1386 } | |
| 1387 | |
| 1388 gc_in_progress = 1; | |
| 1389 | |
| 1390 /* clear_marks (); */ | |
| 1391 | |
| 1392 /* In each "large string", set the MARKBIT of the size field. | |
| 1393 That enables mark_object to recognize them. */ | |
| 1394 { | |
| 1395 register struct string_block *b; | |
| 1396 for (b = large_string_blocks; b; b = b->next) | |
| 1397 ((struct Lisp_String *)(&b->chars[0]))->size |= MARKBIT; | |
| 1398 } | |
| 1399 | |
| 1400 /* Mark all the special slots that serve as the roots of accessibility. | |
| 1401 | |
| 1402 Usually the special slots to mark are contained in particular structures. | |
| 1403 Then we know no slot is marked twice because the structures don't overlap. | |
| 1404 In some cases, the structures point to the slots to be marked. | |
| 1405 For these, we use MARKBIT to avoid double marking of the slot. */ | |
| 1406 | |
| 1407 for (i = 0; i < staticidx; i++) | |
| 1408 mark_object (staticvec[i]); | |
| 1409 for (tail = gcprolist; tail; tail = tail->next) | |
| 1410 for (i = 0; i < tail->nvars; i++) | |
| 1411 if (!XMARKBIT (tail->var[i])) | |
| 1412 { | |
| 1413 mark_object (&tail->var[i]); | |
| 1414 XMARK (tail->var[i]); | |
| 1415 } | |
| 1416 for (bind = specpdl; bind != specpdl_ptr; bind++) | |
| 1417 { | |
| 1418 mark_object (&bind->symbol); | |
| 1419 mark_object (&bind->old_value); | |
| 1420 } | |
| 1421 for (catch = catchlist; catch; catch = catch->next) | |
| 1422 { | |
| 1423 mark_object (&catch->tag); | |
| 1424 mark_object (&catch->val); | |
| 1425 } | |
| 1426 for (handler = handlerlist; handler; handler = handler->next) | |
| 1427 { | |
| 1428 mark_object (&handler->handler); | |
| 1429 mark_object (&handler->var); | |
| 1430 } | |
| 1431 for (backlist = backtrace_list; backlist; backlist = backlist->next) | |
| 1432 { | |
| 1433 if (!XMARKBIT (*backlist->function)) | |
| 1434 { | |
| 1435 mark_object (backlist->function); | |
| 1436 XMARK (*backlist->function); | |
| 1437 } | |
| 1438 if (backlist->nargs == UNEVALLED || backlist->nargs == MANY) | |
| 1439 i = 0; | |
| 1440 else | |
| 1441 i = backlist->nargs - 1; | |
| 1442 for (; i >= 0; i--) | |
| 1443 if (!XMARKBIT (backlist->args[i])) | |
| 1444 { | |
| 1445 mark_object (&backlist->args[i]); | |
| 1446 XMARK (backlist->args[i]); | |
| 1447 } | |
| 1448 } | |
|
11018
2d9bdf1ba3d1
(mark_kboards): Renamed from mark_perdisplays.
Karl Heuer <kwzh@gnu.org>
parents:
10936
diff
changeset
|
1449 mark_kboards (); |
| 300 | 1450 |
| 1451 gc_sweep (); | |
| 1452 | |
| 1453 /* Clear the mark bits that we set in certain root slots. */ | |
| 1454 | |
| 1455 for (tail = gcprolist; tail; tail = tail->next) | |
| 1456 for (i = 0; i < tail->nvars; i++) | |
| 1457 XUNMARK (tail->var[i]); | |
| 1458 for (backlist = backtrace_list; backlist; backlist = backlist->next) | |
| 1459 { | |
| 1460 XUNMARK (*backlist->function); | |
| 1461 if (backlist->nargs == UNEVALLED || backlist->nargs == MANY) | |
| 1462 i = 0; | |
| 1463 else | |
| 1464 i = backlist->nargs - 1; | |
| 1465 for (; i >= 0; i--) | |
| 1466 XUNMARK (backlist->args[i]); | |
| 1467 } | |
| 1468 XUNMARK (buffer_defaults.name); | |
| 1469 XUNMARK (buffer_local_symbols.name); | |
| 1470 | |
| 1471 /* clear_marks (); */ | |
| 1472 gc_in_progress = 0; | |
| 1473 | |
| 1474 consing_since_gc = 0; | |
| 1475 if (gc_cons_threshold < 10000) | |
| 1476 gc_cons_threshold = 10000; | |
| 1477 | |
|
3851
dbdcbcbe910a
* alloc.c (Fgarbage_collect): If the minibuffer is active, don't
Jim Blandy <jimb@redhat.com>
parents:
3591
diff
changeset
|
1478 if (omessage || minibuf_level > 0) |
|
10395
c121703d35c7
(Fgarbage_collect): Don't log the GC message.
Karl Heuer <kwzh@gnu.org>
parents:
10389
diff
changeset
|
1479 message2_nolog (omessage, omessage_length); |
| 300 | 1480 else if (!noninteractive) |
|
10395
c121703d35c7
(Fgarbage_collect): Don't log the GC message.
Karl Heuer <kwzh@gnu.org>
parents:
10389
diff
changeset
|
1481 message1_nolog ("Garbage collecting...done"); |
| 300 | 1482 |
| 1483 return Fcons (Fcons (make_number (total_conses), | |
| 1484 make_number (total_free_conses)), | |
| 1485 Fcons (Fcons (make_number (total_symbols), | |
| 1486 make_number (total_free_symbols)), | |
| 1487 Fcons (Fcons (make_number (total_markers), | |
| 1488 make_number (total_free_markers)), | |
| 1489 Fcons (make_number (total_string_size), | |
| 1490 Fcons (make_number (total_vector_size), | |
| 1491 | |
| 1492 #ifdef LISP_FLOAT_TYPE | |
| 1493 Fcons (Fcons (make_number (total_floats), | |
| 1494 make_number (total_free_floats)), | |
| 1495 Qnil) | |
| 1496 #else /* not LISP_FLOAT_TYPE */ | |
| 1497 Qnil | |
| 1498 #endif /* not LISP_FLOAT_TYPE */ | |
| 1499 ))))); | |
| 1500 } | |
| 1501 | |
| 1502 #if 0 | |
| 1503 static void | |
| 1504 clear_marks () | |
| 1505 { | |
| 1506 /* Clear marks on all conses */ | |
| 1507 { | |
| 1508 register struct cons_block *cblk; | |
| 1509 register int lim = cons_block_index; | |
| 1510 | |
| 1511 for (cblk = cons_block; cblk; cblk = cblk->next) | |
| 1512 { | |
| 1513 register int i; | |
| 1514 for (i = 0; i < lim; i++) | |
| 1515 XUNMARK (cblk->conses[i].car); | |
| 1516 lim = CONS_BLOCK_SIZE; | |
| 1517 } | |
| 1518 } | |
| 1519 /* Clear marks on all symbols */ | |
| 1520 { | |
| 1521 register struct symbol_block *sblk; | |
| 1522 register int lim = symbol_block_index; | |
| 1523 | |
| 1524 for (sblk = symbol_block; sblk; sblk = sblk->next) | |
| 1525 { | |
| 1526 register int i; | |
| 1527 for (i = 0; i < lim; i++) | |
| 1528 { | |
| 1529 XUNMARK (sblk->symbols[i].plist); | |
| 1530 } | |
| 1531 lim = SYMBOL_BLOCK_SIZE; | |
| 1532 } | |
| 1533 } | |
| 1534 /* Clear marks on all markers */ | |
| 1535 { | |
| 1536 register struct marker_block *sblk; | |
| 1537 register int lim = marker_block_index; | |
| 1538 | |
| 1539 for (sblk = marker_block; sblk; sblk = sblk->next) | |
| 1540 { | |
| 1541 register int i; | |
| 1542 for (i = 0; i < lim; i++) | |
|
11243
054ecfce1820
(Fmake_marker, mark_object): Use XMISCTYPE.
Richard M. Stallman <rms@gnu.org>
parents:
11048
diff
changeset
|
1543 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
|
1544 XUNMARK (sblk->markers[i].u_marker.chain); |
| 300 | 1545 lim = MARKER_BLOCK_SIZE; |
| 1546 } | |
| 1547 } | |
| 1548 /* Clear mark bits on all buffers */ | |
| 1549 { | |
| 1550 register struct buffer *nextb = all_buffers; | |
| 1551 | |
| 1552 while (nextb) | |
| 1553 { | |
| 1554 XUNMARK (nextb->name); | |
| 1555 nextb = nextb->next; | |
| 1556 } | |
| 1557 } | |
| 1558 } | |
| 1559 #endif | |
| 1560 | |
|
1908
d649f2179d67
* alloc.c (make_pure_float): Align pureptr on a sizeof (double)
Jim Blandy <jimb@redhat.com>
parents:
1893
diff
changeset
|
1561 /* 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
|
1562 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
|
1563 all the references contained in it. |
| 300 | 1564 |
|
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3581
diff
changeset
|
1565 If the object referenced is a short string, the referencing slot |
| 300 | 1566 is threaded into a chain of such slots, pointed to from |
| 1567 the `size' field of the string. The actual string size | |
| 1568 lives in the last slot in the chain. We recognize the end | |
| 1569 because it is < (unsigned) STRING_BLOCK_SIZE. */ | |
| 1570 | |
|
1168
2b07af77d7ec
(mark_object): Save last 500 values of objptr.
Richard M. Stallman <rms@gnu.org>
parents:
1114
diff
changeset
|
1571 #define LAST_MARKED_SIZE 500 |
|
2b07af77d7ec
(mark_object): Save last 500 values of objptr.
Richard M. Stallman <rms@gnu.org>
parents:
1114
diff
changeset
|
1572 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
|
1573 int last_marked_index; |
|
2b07af77d7ec
(mark_object): Save last 500 values of objptr.
Richard M. Stallman <rms@gnu.org>
parents:
1114
diff
changeset
|
1574 |
| 300 | 1575 static void |
| 1576 mark_object (objptr) | |
| 1577 Lisp_Object *objptr; | |
| 1578 { | |
| 1579 register Lisp_Object obj; | |
| 1580 | |
|
5868
a7bd57a60cb8
(mark_object): Fetch obj from *objptr at loop, not at the gotos.
Karl Heuer <kwzh@gnu.org>
parents:
5353
diff
changeset
|
1581 loop: |
| 300 | 1582 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
|
1583 loop2: |
| 300 | 1584 XUNMARK (obj); |
| 1585 | |
| 1586 if ((PNTR_COMPARISON_TYPE) XPNTR (obj) < (PNTR_COMPARISON_TYPE) ((char *) pure + PURESIZE) | |
| 1587 && (PNTR_COMPARISON_TYPE) XPNTR (obj) >= (PNTR_COMPARISON_TYPE) pure) | |
| 1588 return; | |
| 1589 | |
|
1168
2b07af77d7ec
(mark_object): Save last 500 values of objptr.
Richard M. Stallman <rms@gnu.org>
parents:
1114
diff
changeset
|
1590 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
|
1591 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
|
1592 last_marked_index = 0; |
|
2b07af77d7ec
(mark_object): Save last 500 values of objptr.
Richard M. Stallman <rms@gnu.org>
parents:
1114
diff
changeset
|
1593 |
|
10457
2ab3bd0288a9
Change all occurences of SWITCH_ENUM_BUG to use SWITCH_ENUM_CAST instead.
Karl Heuer <kwzh@gnu.org>
parents:
10427
diff
changeset
|
1594 switch (SWITCH_ENUM_CAST (XGCTYPE (obj))) |
| 300 | 1595 { |
| 1596 case Lisp_String: | |
| 1597 { | |
| 1598 register struct Lisp_String *ptr = XSTRING (obj); | |
| 1599 | |
|
1300
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
1600 MARK_INTERVAL_TREE (ptr->intervals); |
| 300 | 1601 if (ptr->size & MARKBIT) |
| 1602 /* A large string. Just set ARRAY_MARK_FLAG. */ | |
| 1603 ptr->size |= ARRAY_MARK_FLAG; | |
| 1604 else | |
| 1605 { | |
| 1606 /* A small string. Put this reference | |
| 1607 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
|
1608 If the address includes MARKBIT, put that bit elsewhere |
| 300 | 1609 when we store OBJPTR into the size field. */ |
| 1610 | |
| 1611 if (XMARKBIT (*objptr)) | |
| 1612 { | |
|
9295
17d393a8eed6
(free_float, make_float, free_cons, Flist, Fvector, Fmake_byte_code,
Karl Heuer <kwzh@gnu.org>
parents:
9261
diff
changeset
|
1613 XSETFASTINT (*objptr, ptr->size); |
| 300 | 1614 XMARK (*objptr); |
| 1615 } | |
| 1616 else | |
|
9295
17d393a8eed6
(free_float, make_float, free_cons, Flist, Fvector, Fmake_byte_code,
Karl Heuer <kwzh@gnu.org>
parents:
9261
diff
changeset
|
1617 XSETFASTINT (*objptr, ptr->size); |
|
10389
162b3e6c4610
(DONT_COPY_FLAG): New bit flag.
Richard M. Stallman <rms@gnu.org>
parents:
10340
diff
changeset
|
1618 |
|
162b3e6c4610
(DONT_COPY_FLAG): New bit flag.
Richard M. Stallman <rms@gnu.org>
parents:
10340
diff
changeset
|
1619 if ((EMACS_INT) objptr & DONT_COPY_FLAG) |
|
162b3e6c4610
(DONT_COPY_FLAG): New bit flag.
Richard M. Stallman <rms@gnu.org>
parents:
10340
diff
changeset
|
1620 abort (); |
|
10413
bfe591f66299
(DONT_COPY_FLAG): Default this to 1.
Karl Heuer <kwzh@gnu.org>
parents:
10398
diff
changeset
|
1621 ptr->size = (EMACS_INT) objptr; |
|
bfe591f66299
(DONT_COPY_FLAG): Default this to 1.
Karl Heuer <kwzh@gnu.org>
parents:
10398
diff
changeset
|
1622 if (ptr->size & MARKBIT) |
|
bfe591f66299
(DONT_COPY_FLAG): Default this to 1.
Karl Heuer <kwzh@gnu.org>
parents:
10398
diff
changeset
|
1623 ptr->size ^= MARKBIT | DONT_COPY_FLAG; |
| 300 | 1624 } |
| 1625 } | |
| 1626 break; | |
| 1627 | |
|
10009
82f3daf76995
(Fpurecopy): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
10004
diff
changeset
|
1628 case Lisp_Vectorlike: |
|
10307
e6e75fd0916d
(mark_buffer, gc_sweep): Use BUF_INTERVALS.
Richard M. Stallman <rms@gnu.org>
parents:
10291
diff
changeset
|
1629 if (GC_BUFFERP (obj)) |
|
10340
ef58c7a5a4d6
(mark_object, mark_buffer): Don't mark buffer twice.
Karl Heuer <kwzh@gnu.org>
parents:
10320
diff
changeset
|
1630 { |
|
ef58c7a5a4d6
(mark_object, mark_buffer): Don't mark buffer twice.
Karl Heuer <kwzh@gnu.org>
parents:
10320
diff
changeset
|
1631 if (!XMARKBIT (XBUFFER (obj)->name)) |
|
ef58c7a5a4d6
(mark_object, mark_buffer): Don't mark buffer twice.
Karl Heuer <kwzh@gnu.org>
parents:
10320
diff
changeset
|
1632 mark_buffer (obj); |
|
ef58c7a5a4d6
(mark_object, mark_buffer): Don't mark buffer twice.
Karl Heuer <kwzh@gnu.org>
parents:
10320
diff
changeset
|
1633 } |
|
10307
e6e75fd0916d
(mark_buffer, gc_sweep): Use BUF_INTERVALS.
Richard M. Stallman <rms@gnu.org>
parents:
10291
diff
changeset
|
1634 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
|
1635 break; |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
1636 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
|
1637 /* 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
|
1638 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
|
1639 there. */ |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
1640 { |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
1641 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
|
1642 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
|
1643 /* 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
|
1644 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
|
1645 register int i; |
| 300 | 1646 |
|
10291
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
1647 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
|
1648 break; /* Already marked */ |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
1649 ptr->size |= ARRAY_MARK_FLAG; /* Else mark it */ |
|
10009
82f3daf76995
(Fpurecopy): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
10004
diff
changeset
|
1650 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
|
1651 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
|
1652 { |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
1653 if (i != COMPILED_CONSTANTS) |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
1654 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
|
1655 } |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
1656 /* 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
|
1657 (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
|
1658 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
|
1659 goto loop; |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
1660 } |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
1661 #ifdef MULTI_FRAME |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
1662 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
|
1663 { |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
1664 /* 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
|
1665 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
|
1666 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
|
1667 |
|
10291
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
1668 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
|
1669 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
|
1670 |
|
10291
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
1671 mark_object (&ptr->name); |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
1672 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
|
1673 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
|
1674 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
|
1675 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
|
1676 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
|
1677 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
|
1678 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
|
1679 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
|
1680 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
|
1681 mark_object (&ptr->buffer_predicate); |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
1682 } |
|
10320
a6e67b5ee8b0
(mark_object): Make `else' visible outside MULTI_FRAME.
Karl Heuer <kwzh@gnu.org>
parents:
10307
diff
changeset
|
1683 #endif /* MULTI_FRAME */ |
|
10291
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
1684 else |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
1685 { |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
1686 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
|
1687 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
|
1688 /* 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
|
1689 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
|
1690 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
|
1691 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
|
1692 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
|
1693 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
|
1694 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
|
1695 register int i; |
| 300 | 1696 |
|
10291
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
1697 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
|
1698 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
|
1699 if (size & PSEUDOVECTOR_FLAG) |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
1700 size &= PSEUDOVECTOR_SIZE_MASK; |
|
96273a6ec492
(mark_object): Don't use Lisp_Process, Lisp_Window.
Richard M. Stallman <rms@gnu.org>
parents:
10206
diff
changeset
|
1701 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
|
1702 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
|
1703 } |
| 300 | 1704 break; |
| 1705 | |
| 1706 case Lisp_Symbol: | |
| 1707 { | |
|
4494
15b073a6c860
(mark_object): Declare ptr volatile, or don't use it
Richard M. Stallman <rms@gnu.org>
parents:
4212
diff
changeset
|
1708 /* 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
|
1709 register struct Lisp_Symbol *volatile ptr = XSYMBOL (obj); |
| 300 | 1710 struct Lisp_Symbol *ptrx; |
| 1711 | |
| 1712 if (XMARKBIT (ptr->plist)) break; | |
| 1713 XMARK (ptr->plist); | |
| 1714 mark_object ((Lisp_Object *) &ptr->value); | |
| 1715 mark_object (&ptr->function); | |
| 1716 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
|
1717 XSETTYPE (*(Lisp_Object *) &ptr->name, Lisp_String); |
|
903883eed4de
* alloc.c (mark_object): mark a symbol's name after marking its
Jim Blandy <jimb@redhat.com>
parents:
1000
diff
changeset
|
1718 mark_object (&ptr->name); |
| 300 | 1719 ptr = ptr->next; |
| 1720 if (ptr) | |
| 1721 { | |
|
5868
a7bd57a60cb8
(mark_object): Fetch obj from *objptr at loop, not at the gotos.
Karl Heuer <kwzh@gnu.org>
parents:
5353
diff
changeset
|
1722 /* 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
|
1723 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
|
1724 ptrx = ptr; /* Use of ptrx avoids compiler bug on Sun */ |
| 300 | 1725 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
|
1726 /* 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
|
1727 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
|
1728 goto loop2; |
| 300 | 1729 } |
| 1730 } | |
| 1731 break; | |
| 1732 | |
|
9437
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
1733 case Lisp_Misc: |
|
11243
054ecfce1820
(Fmake_marker, mark_object): Use XMISCTYPE.
Richard M. Stallman <rms@gnu.org>
parents:
11048
diff
changeset
|
1734 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
|
1735 { |
|
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
1736 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
|
1737 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
|
1738 /* 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
|
1739 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
|
1740 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
|
1741 break; |
|
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
1742 |
|
9893
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
1743 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
|
1744 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
|
1745 { |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
1746 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
|
1747 = XBUFFER_LOCAL_VALUE (obj); |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
1748 if (XMARKBIT (ptr->car)) break; |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
1749 XMARK (ptr->car); |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
1750 /* 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
|
1751 if (EQ (ptr->cdr, Qnil)) |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
1752 { |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
1753 objptr = &ptr->car; |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
1754 goto loop; |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
1755 } |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
1756 mark_object (&ptr->car); |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
1757 /* 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
|
1758 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
|
1759 goto loop; |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
1760 } |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
1761 |
|
9463
a40af805e036
(mark_object): Use the new substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9437
diff
changeset
|
1762 case Lisp_Misc_Intfwd: |
|
a40af805e036
(mark_object): Use the new substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9437
diff
changeset
|
1763 case Lisp_Misc_Boolfwd: |
|
a40af805e036
(mark_object): Use the new substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9437
diff
changeset
|
1764 case Lisp_Misc_Objfwd: |
|
a40af805e036
(mark_object): Use the new substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9437
diff
changeset
|
1765 case Lisp_Misc_Buffer_Objfwd: |
|
11018
2d9bdf1ba3d1
(mark_kboards): Renamed from mark_perdisplays.
Karl Heuer <kwzh@gnu.org>
parents:
10936
diff
changeset
|
1766 case Lisp_Misc_Kboard_Objfwd: |
|
9463
a40af805e036
(mark_object): Use the new substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9437
diff
changeset
|
1767 /* Don't bother with Lisp_Buffer_Objfwd, |
|
a40af805e036
(mark_object): Use the new substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9437
diff
changeset
|
1768 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
|
1769 /* 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
|
1770 are protected with staticpro. */ |
|
a40af805e036
(mark_object): Use the new substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9437
diff
changeset
|
1771 break; |
|
a40af805e036
(mark_object): Use the new substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9437
diff
changeset
|
1772 |
|
9926
2a9f99682f82
(mark_object, gc_sweep): Use new overlay substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9893
diff
changeset
|
1773 case Lisp_Misc_Overlay: |
|
2a9f99682f82
(mark_object, gc_sweep): Use new overlay substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9893
diff
changeset
|
1774 { |
|
2a9f99682f82
(mark_object, gc_sweep): Use new overlay substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9893
diff
changeset
|
1775 struct Lisp_Overlay *ptr = XOVERLAY (obj); |
|
2a9f99682f82
(mark_object, gc_sweep): Use new overlay substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9893
diff
changeset
|
1776 if (!XMARKBIT (ptr->plist)) |
|
2a9f99682f82
(mark_object, gc_sweep): Use new overlay substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9893
diff
changeset
|
1777 { |
|
2a9f99682f82
(mark_object, gc_sweep): Use new overlay substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9893
diff
changeset
|
1778 XMARK (ptr->plist); |
|
2a9f99682f82
(mark_object, gc_sweep): Use new overlay substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9893
diff
changeset
|
1779 mark_object (&ptr->start); |
|
2a9f99682f82
(mark_object, gc_sweep): Use new overlay substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9893
diff
changeset
|
1780 mark_object (&ptr->end); |
|
2a9f99682f82
(mark_object, gc_sweep): Use new overlay substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9893
diff
changeset
|
1781 objptr = &ptr->plist; |
|
2a9f99682f82
(mark_object, gc_sweep): Use new overlay substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9893
diff
changeset
|
1782 goto loop; |
|
2a9f99682f82
(mark_object, gc_sweep): Use new overlay substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9893
diff
changeset
|
1783 } |
|
2a9f99682f82
(mark_object, gc_sweep): Use new overlay substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9893
diff
changeset
|
1784 } |
|
2a9f99682f82
(mark_object, gc_sweep): Use new overlay substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9893
diff
changeset
|
1785 break; |
|
2a9f99682f82
(mark_object, gc_sweep): Use new overlay substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9893
diff
changeset
|
1786 |
|
9437
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
1787 default: |
|
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
1788 abort (); |
|
c7d7fb56b42d
(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
Karl Heuer <kwzh@gnu.org>
parents:
9367
diff
changeset
|
1789 } |
| 300 | 1790 break; |
| 1791 | |
| 1792 case Lisp_Cons: | |
| 1793 { | |
| 1794 register struct Lisp_Cons *ptr = XCONS (obj); | |
| 1795 if (XMARKBIT (ptr->car)) break; | |
| 1796 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
|
1797 /* 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
|
1798 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
|
1799 { |
|
a9241dc503ab
(mark_object): Avoid car recursion on cons with nil in cdr.
Richard M. Stallman <rms@gnu.org>
parents:
1168
diff
changeset
|
1800 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
|
1801 goto loop; |
|
a9241dc503ab
(mark_object): Avoid car recursion on cons with nil in cdr.
Richard M. Stallman <rms@gnu.org>
parents:
1168
diff
changeset
|
1802 } |
| 300 | 1803 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
|
1804 /* 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
|
1805 objptr = &XCONS (obj)->cdr; |
| 300 | 1806 goto loop; |
| 1807 } | |
| 1808 | |
| 1809 #ifdef LISP_FLOAT_TYPE | |
| 1810 case Lisp_Float: | |
| 1811 XMARK (XFLOAT (obj)->type); | |
| 1812 break; | |
| 1813 #endif /* LISP_FLOAT_TYPE */ | |
| 1814 | |
| 1815 case Lisp_Int: | |
| 1816 break; | |
| 1817 | |
| 1818 default: | |
| 1819 abort (); | |
| 1820 } | |
| 1821 } | |
| 1822 | |
| 1823 /* Mark the pointers in a buffer structure. */ | |
| 1824 | |
| 1825 static void | |
| 1826 mark_buffer (buf) | |
| 1827 Lisp_Object buf; | |
| 1828 { | |
| 1829 register struct buffer *buffer = XBUFFER (buf); | |
| 1830 register Lisp_Object *ptr; | |
|
10307
e6e75fd0916d
(mark_buffer, gc_sweep): Use BUF_INTERVALS.
Richard M. Stallman <rms@gnu.org>
parents:
10291
diff
changeset
|
1831 Lisp_Object base_buffer; |
| 300 | 1832 |
| 1833 /* This is the buffer's markbit */ | |
| 1834 mark_object (&buffer->name); | |
| 1835 XMARK (buffer->name); | |
| 1836 | |
|
10307
e6e75fd0916d
(mark_buffer, gc_sweep): Use BUF_INTERVALS.
Richard M. Stallman <rms@gnu.org>
parents:
10291
diff
changeset
|
1837 MARK_INTERVAL_TREE (BUF_INTERVALS (buffer)); |
|
1300
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
1838 |
| 300 | 1839 #if 0 |
| 1840 mark_object (buffer->syntax_table); | |
| 1841 | |
| 1842 /* Mark the various string-pointers in the buffer object. | |
| 1843 Since the strings may be relocated, we must mark them | |
| 1844 in their actual slots. So gc_sweep must convert each slot | |
| 1845 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
|
1846 XSETSTRING (*(Lisp_Object *)&buffer->upcase_table, buffer->upcase_table); |
| 300 | 1847 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
|
1848 XSETSTRING (*(Lisp_Object *)&buffer->downcase_table, buffer->downcase_table); |
| 300 | 1849 mark_object ((Lisp_Object *)&buffer->downcase_table); |
| 1850 | |
|
9261
e5ba7993d378
(VALIDATE_LISP_STORAGE, make_float, Fcons, Fmake_vector, Fmake_symbol,
Karl Heuer <kwzh@gnu.org>
parents:
9144
diff
changeset
|
1851 XSETSTRING (*(Lisp_Object *)&buffer->sort_table, buffer->sort_table); |
| 300 | 1852 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
|
1853 XSETSTRING (*(Lisp_Object *)&buffer->folding_sort_table, buffer->folding_sort_table); |
| 300 | 1854 mark_object ((Lisp_Object *)&buffer->folding_sort_table); |
| 1855 #endif | |
| 1856 | |
| 1857 for (ptr = &buffer->name + 1; | |
| 1858 (char *)ptr < (char *)buffer + sizeof (struct buffer); | |
| 1859 ptr++) | |
| 1860 mark_object (ptr); | |
|
10307
e6e75fd0916d
(mark_buffer, gc_sweep): Use BUF_INTERVALS.
Richard M. Stallman <rms@gnu.org>
parents:
10291
diff
changeset
|
1861 |
|
e6e75fd0916d
(mark_buffer, gc_sweep): Use BUF_INTERVALS.
Richard M. Stallman <rms@gnu.org>
parents:
10291
diff
changeset
|
1862 /* 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
|
1863 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
|
1864 { |
|
e6e75fd0916d
(mark_buffer, gc_sweep): Use BUF_INTERVALS.
Richard M. Stallman <rms@gnu.org>
parents:
10291
diff
changeset
|
1865 XSETBUFFER (base_buffer, buffer->base_buffer); |
|
e6e75fd0916d
(mark_buffer, gc_sweep): Use BUF_INTERVALS.
Richard M. Stallman <rms@gnu.org>
parents:
10291
diff
changeset
|
1866 mark_buffer (base_buffer); |
|
e6e75fd0916d
(mark_buffer, gc_sweep): Use BUF_INTERVALS.
Richard M. Stallman <rms@gnu.org>
parents:
10291
diff
changeset
|
1867 } |
| 300 | 1868 } |
|
10649
52cdd8cc8d3e
(mark_perdisplays): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10581
diff
changeset
|
1869 |
|
52cdd8cc8d3e
(mark_perdisplays): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10581
diff
changeset
|
1870 |
|
11018
2d9bdf1ba3d1
(mark_kboards): Renamed from mark_perdisplays.
Karl Heuer <kwzh@gnu.org>
parents:
10936
diff
changeset
|
1871 /* Mark the pointers in the kboard objects. */ |
|
10649
52cdd8cc8d3e
(mark_perdisplays): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10581
diff
changeset
|
1872 |
|
52cdd8cc8d3e
(mark_perdisplays): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10581
diff
changeset
|
1873 static void |
|
11018
2d9bdf1ba3d1
(mark_kboards): Renamed from mark_perdisplays.
Karl Heuer <kwzh@gnu.org>
parents:
10936
diff
changeset
|
1874 mark_kboards () |
|
10649
52cdd8cc8d3e
(mark_perdisplays): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10581
diff
changeset
|
1875 { |
|
11018
2d9bdf1ba3d1
(mark_kboards): Renamed from mark_perdisplays.
Karl Heuer <kwzh@gnu.org>
parents:
10936
diff
changeset
|
1876 KBOARD *kb; |
|
2d9bdf1ba3d1
(mark_kboards): Renamed from mark_perdisplays.
Karl Heuer <kwzh@gnu.org>
parents:
10936
diff
changeset
|
1877 for (kb = all_kboards; kb; kb = kb->next_kboard) |
|
10649
52cdd8cc8d3e
(mark_perdisplays): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10581
diff
changeset
|
1878 { |
|
11018
2d9bdf1ba3d1
(mark_kboards): Renamed from mark_perdisplays.
Karl Heuer <kwzh@gnu.org>
parents:
10936
diff
changeset
|
1879 mark_object (&kb->prefix_factor); |
|
2d9bdf1ba3d1
(mark_kboards): Renamed from mark_perdisplays.
Karl Heuer <kwzh@gnu.org>
parents:
10936
diff
changeset
|
1880 mark_object (&kb->prefix_value); |
|
2d9bdf1ba3d1
(mark_kboards): Renamed from mark_perdisplays.
Karl Heuer <kwzh@gnu.org>
parents:
10936
diff
changeset
|
1881 mark_object (&kb->kbd_queue); |
|
2d9bdf1ba3d1
(mark_kboards): Renamed from mark_perdisplays.
Karl Heuer <kwzh@gnu.org>
parents:
10936
diff
changeset
|
1882 mark_object (&kb->Vlast_kbd_macro); |
|
10649
52cdd8cc8d3e
(mark_perdisplays): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10581
diff
changeset
|
1883 } |
|
52cdd8cc8d3e
(mark_perdisplays): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10581
diff
changeset
|
1884 } |
| 300 | 1885 |
|
1908
d649f2179d67
* alloc.c (make_pure_float): Align pureptr on a sizeof (double)
Jim Blandy <jimb@redhat.com>
parents:
1893
diff
changeset
|
1886 /* Sweep: find all structures not marked, and free them. */ |
| 300 | 1887 |
| 1888 static void | |
| 1889 gc_sweep () | |
| 1890 { | |
| 1891 total_string_size = 0; | |
| 1892 compact_strings (); | |
| 1893 | |
| 1894 /* Put all unmarked conses on free list */ | |
| 1895 { | |
| 1896 register struct cons_block *cblk; | |
| 1897 register int lim = cons_block_index; | |
| 1898 register int num_free = 0, num_used = 0; | |
| 1899 | |
| 1900 cons_free_list = 0; | |
| 1901 | |
| 1902 for (cblk = cons_block; cblk; cblk = cblk->next) | |
| 1903 { | |
| 1904 register int i; | |
| 1905 for (i = 0; i < lim; i++) | |
| 1906 if (!XMARKBIT (cblk->conses[i].car)) | |
| 1907 { | |
| 1908 num_free++; | |
|
9942
c189487b08dd
(free_float): Don't assume XFASTINT accesses the raw bits.
Karl Heuer <kwzh@gnu.org>
parents:
9926
diff
changeset
|
1909 *(struct Lisp_Cons **)&cblk->conses[i].car = cons_free_list; |
| 300 | 1910 cons_free_list = &cblk->conses[i]; |
| 1911 } | |
| 1912 else | |
| 1913 { | |
| 1914 num_used++; | |
| 1915 XUNMARK (cblk->conses[i].car); | |
| 1916 } | |
| 1917 lim = CONS_BLOCK_SIZE; | |
| 1918 } | |
| 1919 total_conses = num_used; | |
| 1920 total_free_conses = num_free; | |
| 1921 } | |
| 1922 | |
| 1923 #ifdef LISP_FLOAT_TYPE | |
| 1924 /* Put all unmarked floats on free list */ | |
| 1925 { | |
| 1926 register struct float_block *fblk; | |
| 1927 register int lim = float_block_index; | |
| 1928 register int num_free = 0, num_used = 0; | |
| 1929 | |
| 1930 float_free_list = 0; | |
| 1931 | |
| 1932 for (fblk = float_block; fblk; fblk = fblk->next) | |
| 1933 { | |
| 1934 register int i; | |
| 1935 for (i = 0; i < lim; i++) | |
| 1936 if (!XMARKBIT (fblk->floats[i].type)) | |
| 1937 { | |
| 1938 num_free++; | |
|
9942
c189487b08dd
(free_float): Don't assume XFASTINT accesses the raw bits.
Karl Heuer <kwzh@gnu.org>
parents:
9926
diff
changeset
|
1939 *(struct Lisp_Float **)&fblk->floats[i].type = float_free_list; |
| 300 | 1940 float_free_list = &fblk->floats[i]; |
| 1941 } | |
| 1942 else | |
| 1943 { | |
| 1944 num_used++; | |
| 1945 XUNMARK (fblk->floats[i].type); | |
| 1946 } | |
| 1947 lim = FLOAT_BLOCK_SIZE; | |
| 1948 } | |
| 1949 total_floats = num_used; | |
| 1950 total_free_floats = num_free; | |
| 1951 } | |
| 1952 #endif /* LISP_FLOAT_TYPE */ | |
| 1953 | |
|
1300
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
1954 #ifdef USE_TEXT_PROPERTIES |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
1955 /* Put all unmarked intervals on free list */ |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
1956 { |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
1957 register struct interval_block *iblk; |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
1958 register int lim = interval_block_index; |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
1959 register int num_free = 0, num_used = 0; |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
1960 |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
1961 interval_free_list = 0; |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
1962 |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
1963 for (iblk = interval_block; iblk; iblk = iblk->next) |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
1964 { |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
1965 register int i; |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
1966 |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
1967 for (i = 0; i < lim; i++) |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
1968 { |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
1969 if (! XMARKBIT (iblk->intervals[i].plist)) |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
1970 { |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
1971 iblk->intervals[i].parent = interval_free_list; |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
1972 interval_free_list = &iblk->intervals[i]; |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
1973 num_free++; |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
1974 } |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
1975 else |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
1976 { |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
1977 num_used++; |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
1978 XUNMARK (iblk->intervals[i].plist); |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
1979 } |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
1980 } |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
1981 lim = INTERVAL_BLOCK_SIZE; |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
1982 } |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
1983 total_intervals = num_used; |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
1984 total_free_intervals = num_free; |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
1985 } |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
1986 #endif /* USE_TEXT_PROPERTIES */ |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
1987 |
| 300 | 1988 /* Put all unmarked symbols on free list */ |
| 1989 { | |
| 1990 register struct symbol_block *sblk; | |
| 1991 register int lim = symbol_block_index; | |
| 1992 register int num_free = 0, num_used = 0; | |
| 1993 | |
| 1994 symbol_free_list = 0; | |
| 1995 | |
| 1996 for (sblk = symbol_block; sblk; sblk = sblk->next) | |
| 1997 { | |
| 1998 register int i; | |
| 1999 for (i = 0; i < lim; i++) | |
| 2000 if (!XMARKBIT (sblk->symbols[i].plist)) | |
| 2001 { | |
|
9942
c189487b08dd
(free_float): Don't assume XFASTINT accesses the raw bits.
Karl Heuer <kwzh@gnu.org>
parents:
9926
diff
changeset
|
2002 *(struct Lisp_Symbol **)&sblk->symbols[i].value = symbol_free_list; |
| 300 | 2003 symbol_free_list = &sblk->symbols[i]; |
| 2004 num_free++; | |
| 2005 } | |
| 2006 else | |
| 2007 { | |
| 2008 num_used++; | |
| 2009 sblk->symbols[i].name | |
| 2010 = XSTRING (*(Lisp_Object *) &sblk->symbols[i].name); | |
| 2011 XUNMARK (sblk->symbols[i].plist); | |
| 2012 } | |
| 2013 lim = SYMBOL_BLOCK_SIZE; | |
| 2014 } | |
| 2015 total_symbols = num_used; | |
| 2016 total_free_symbols = num_free; | |
| 2017 } | |
| 2018 | |
| 2019 #ifndef standalone | |
| 2020 /* Put all unmarked markers on free list. | |
|
9893
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2021 Dechain each one first from the buffer it points into, |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2022 but only if it's a real marker. */ |
| 300 | 2023 { |
| 2024 register struct marker_block *mblk; | |
| 2025 register int lim = marker_block_index; | |
| 2026 register int num_free = 0, num_used = 0; | |
| 2027 | |
| 2028 marker_free_list = 0; | |
| 2029 | |
| 2030 for (mblk = marker_block; mblk; mblk = mblk->next) | |
| 2031 { | |
| 2032 register int i; | |
| 2033 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
|
2034 { |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2035 Lisp_Object *markword; |
|
11243
054ecfce1820
(Fmake_marker, mark_object): Use XMISCTYPE.
Richard M. Stallman <rms@gnu.org>
parents:
11048
diff
changeset
|
2036 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
|
2037 { |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2038 case Lisp_Misc_Marker: |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2039 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
|
2040 break; |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2041 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
|
2042 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
|
2043 markword = &mblk->markers[i].u_buffer_local_value.car; |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2044 break; |
|
9926
2a9f99682f82
(mark_object, gc_sweep): Use new overlay substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9893
diff
changeset
|
2045 case Lisp_Misc_Overlay: |
|
2a9f99682f82
(mark_object, gc_sweep): Use new overlay substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9893
diff
changeset
|
2046 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
|
2047 break; |
|
9893
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2048 default: |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2049 markword = 0; |
|
9926
2a9f99682f82
(mark_object, gc_sweep): Use new overlay substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9893
diff
changeset
|
2050 break; |
|
9893
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2051 } |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2052 if (markword && !XMARKBIT (*markword)) |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2053 { |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2054 Lisp_Object tem; |
|
11243
054ecfce1820
(Fmake_marker, mark_object): Use XMISCTYPE.
Richard M. Stallman <rms@gnu.org>
parents:
11048
diff
changeset
|
2055 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
|
2056 { |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2057 /* tem1 avoids Sun compiler bug */ |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2058 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
|
2059 XSETMARKER (tem, tem1); |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2060 unchain_marker (tem); |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2061 } |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2062 /* We could leave the type alone, since nobody checks it, |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2063 but this might catch bugs faster. */ |
|
11243
054ecfce1820
(Fmake_marker, mark_object): Use XMISCTYPE.
Richard M. Stallman <rms@gnu.org>
parents:
11048
diff
changeset
|
2064 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
|
2065 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
|
2066 marker_free_list = &mblk->markers[i]; |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2067 num_free++; |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2068 } |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2069 else |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2070 { |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2071 num_used++; |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2072 if (markword) |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2073 XUNMARK (*markword); |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2074 } |
|
8421d09f2afe
(mark_object): New code to handle buffer-local substructure.
Karl Heuer <kwzh@gnu.org>
parents:
9463
diff
changeset
|
2075 } |
| 300 | 2076 lim = MARKER_BLOCK_SIZE; |
| 2077 } | |
| 2078 | |
| 2079 total_markers = num_used; | |
| 2080 total_free_markers = num_free; | |
| 2081 } | |
| 2082 | |
| 2083 /* Free all unmarked buffers */ | |
| 2084 { | |
| 2085 register struct buffer *buffer = all_buffers, *prev = 0, *next; | |
| 2086 | |
| 2087 while (buffer) | |
| 2088 if (!XMARKBIT (buffer->name)) | |
| 2089 { | |
| 2090 if (prev) | |
| 2091 prev->next = buffer->next; | |
| 2092 else | |
| 2093 all_buffers = buffer->next; | |
| 2094 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
|
2095 xfree (buffer); |
| 300 | 2096 buffer = next; |
| 2097 } | |
| 2098 else | |
| 2099 { | |
| 2100 XUNMARK (buffer->name); | |
|
10307
e6e75fd0916d
(mark_buffer, gc_sweep): Use BUF_INTERVALS.
Richard M. Stallman <rms@gnu.org>
parents:
10291
diff
changeset
|
2101 UNMARK_BALANCE_INTERVALS (BUF_INTERVALS (buffer)); |
| 300 | 2102 |
| 2103 #if 0 | |
| 2104 /* Each `struct Lisp_String *' was turned into a Lisp_Object | |
| 2105 for purposes of marking and relocation. | |
| 2106 Turn them back into C pointers now. */ | |
| 2107 buffer->upcase_table | |
| 2108 = XSTRING (*(Lisp_Object *)&buffer->upcase_table); | |
| 2109 buffer->downcase_table | |
| 2110 = XSTRING (*(Lisp_Object *)&buffer->downcase_table); | |
| 2111 buffer->sort_table | |
| 2112 = XSTRING (*(Lisp_Object *)&buffer->sort_table); | |
| 2113 buffer->folding_sort_table | |
| 2114 = XSTRING (*(Lisp_Object *)&buffer->folding_sort_table); | |
| 2115 #endif | |
| 2116 | |
| 2117 prev = buffer, buffer = buffer->next; | |
| 2118 } | |
| 2119 } | |
| 2120 | |
| 2121 #endif /* standalone */ | |
| 2122 | |
| 2123 /* Free all unmarked vectors */ | |
| 2124 { | |
| 2125 register struct Lisp_Vector *vector = all_vectors, *prev = 0, *next; | |
| 2126 total_vector_size = 0; | |
| 2127 | |
| 2128 while (vector) | |
| 2129 if (!(vector->size & ARRAY_MARK_FLAG)) | |
| 2130 { | |
| 2131 if (prev) | |
| 2132 prev->next = vector->next; | |
| 2133 else | |
| 2134 all_vectors = vector->next; | |
| 2135 next = vector->next; | |
|
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
2136 xfree (vector); |
| 300 | 2137 vector = next; |
| 2138 } | |
| 2139 else | |
| 2140 { | |
| 2141 vector->size &= ~ARRAY_MARK_FLAG; | |
| 2142 total_vector_size += vector->size; | |
| 2143 prev = vector, vector = vector->next; | |
| 2144 } | |
| 2145 } | |
| 2146 | |
| 2147 /* Free all "large strings" not marked with ARRAY_MARK_FLAG. */ | |
| 2148 { | |
| 2149 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
|
2150 struct Lisp_String *s; |
| 300 | 2151 |
| 2152 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
|
2153 { |
|
0b32ee899a3a
Consistently use the mark bit of the root interval's parent field
Jim Blandy <jimb@redhat.com>
parents:
4087
diff
changeset
|
2154 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
|
2155 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
|
2156 { |
|
0b32ee899a3a
Consistently use the mark bit of the root interval's parent field
Jim Blandy <jimb@redhat.com>
parents:
4087
diff
changeset
|
2157 ((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
|
2158 &= ~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
|
2159 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
|
2160 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
|
2161 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
|
2162 } |
|
0b32ee899a3a
Consistently use the mark bit of the root interval's parent field
Jim Blandy <jimb@redhat.com>
parents:
4087
diff
changeset
|
2163 else |
|
0b32ee899a3a
Consistently use the mark bit of the root interval's parent field
Jim Blandy <jimb@redhat.com>
parents:
4087
diff
changeset
|
2164 { |
|
0b32ee899a3a
Consistently use the mark bit of the root interval's parent field
Jim Blandy <jimb@redhat.com>
parents:
4087
diff
changeset
|
2165 if (prev) |
|
0b32ee899a3a
Consistently use the mark bit of the root interval's parent field
Jim Blandy <jimb@redhat.com>
parents:
4087
diff
changeset
|
2166 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
|
2167 else |
|
0b32ee899a3a
Consistently use the mark bit of the root interval's parent field
Jim Blandy <jimb@redhat.com>
parents:
4087
diff
changeset
|
2168 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
|
2169 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
|
2170 xfree (sb); |
|
0b32ee899a3a
Consistently use the mark bit of the root interval's parent field
Jim Blandy <jimb@redhat.com>
parents:
4087
diff
changeset
|
2171 sb = next; |
|
0b32ee899a3a
Consistently use the mark bit of the root interval's parent field
Jim Blandy <jimb@redhat.com>
parents:
4087
diff
changeset
|
2172 } |
|
0b32ee899a3a
Consistently use the mark bit of the root interval's parent field
Jim Blandy <jimb@redhat.com>
parents:
4087
diff
changeset
|
2173 } |
| 300 | 2174 } |
| 2175 } | |
| 2176 | |
|
1908
d649f2179d67
* alloc.c (make_pure_float): Align pureptr on a sizeof (double)
Jim Blandy <jimb@redhat.com>
parents:
1893
diff
changeset
|
2177 /* Compactify strings, relocate references, and free empty string blocks. */ |
| 300 | 2178 |
| 2179 static void | |
| 2180 compact_strings () | |
| 2181 { | |
| 2182 /* String block of old strings we are scanning. */ | |
| 2183 register struct string_block *from_sb; | |
| 2184 /* A preceding string block (or maybe the same one) | |
| 2185 where we are copying the still-live strings to. */ | |
| 2186 register struct string_block *to_sb; | |
| 2187 int pos; | |
| 2188 int to_pos; | |
| 2189 | |
| 2190 to_sb = first_string_block; | |
| 2191 to_pos = 0; | |
| 2192 | |
| 2193 /* Scan each existing string block sequentially, string by string. */ | |
| 2194 for (from_sb = first_string_block; from_sb; from_sb = from_sb->next) | |
| 2195 { | |
| 2196 pos = 0; | |
| 2197 /* POS is the index of the next string in the block. */ | |
| 2198 while (pos < from_sb->pos) | |
| 2199 { | |
| 2200 register struct Lisp_String *nextstr | |
| 2201 = (struct Lisp_String *) &from_sb->chars[pos]; | |
| 2202 | |
| 2203 register struct Lisp_String *newaddr; | |
|
8817
48ff00bebef6
(pure, pure_size): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
2204 register EMACS_INT size = nextstr->size; |
| 300 | 2205 |
| 2206 /* NEXTSTR is the old address of the next string. | |
| 2207 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
|
2208 if (((EMACS_UINT) size & ~DONT_COPY_FLAG) > STRING_BLOCK_SIZE) |
| 300 | 2209 { |
| 2210 /* It is marked, so its size field is really a chain of refs. | |
| 2211 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
|
2212 while (((EMACS_UINT) size & ~DONT_COPY_FLAG) > STRING_BLOCK_SIZE) |
| 300 | 2213 { |
|
10389
162b3e6c4610
(DONT_COPY_FLAG): New bit flag.
Richard M. Stallman <rms@gnu.org>
parents:
10340
diff
changeset
|
2214 if (size & DONT_COPY_FLAG) |
|
162b3e6c4610
(DONT_COPY_FLAG): New bit flag.
Richard M. Stallman <rms@gnu.org>
parents:
10340
diff
changeset
|
2215 size ^= MARKBIT | DONT_COPY_FLAG; |
|
8817
48ff00bebef6
(pure, pure_size): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
2216 size = *(EMACS_INT *)size & ~MARKBIT; |
| 300 | 2217 } |
| 2218 | |
| 2219 total_string_size += size; | |
| 2220 | |
| 2221 /* If it won't fit in TO_SB, close it out, | |
| 2222 and move to the next sb. Keep doing so until | |
| 2223 TO_SB reaches a large enough, empty enough string block. | |
| 2224 We know that TO_SB cannot advance past FROM_SB here | |
| 2225 since FROM_SB is large enough to contain this string. | |
| 2226 Any string blocks skipped here | |
| 2227 will be patched out and freed later. */ | |
| 2228 while (to_pos + STRING_FULLSIZE (size) | |
| 2229 > max (to_sb->pos, STRING_BLOCK_SIZE)) | |
| 2230 { | |
| 2231 to_sb->pos = to_pos; | |
| 2232 to_sb = to_sb->next; | |
| 2233 to_pos = 0; | |
| 2234 } | |
| 2235 /* Compute new address of this string | |
| 2236 and update TO_POS for the space being used. */ | |
| 2237 newaddr = (struct Lisp_String *) &to_sb->chars[to_pos]; | |
| 2238 to_pos += STRING_FULLSIZE (size); | |
| 2239 | |
| 2240 /* Copy the string itself to the new place. */ | |
| 2241 if (nextstr != newaddr) | |
|
8817
48ff00bebef6
(pure, pure_size): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
2242 bcopy (nextstr, newaddr, size + 1 + sizeof (EMACS_INT) |
|
1300
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
2243 + INTERVAL_PTR_SIZE); |
| 300 | 2244 |
| 2245 /* Go through NEXTSTR's chain of references | |
| 2246 and make each slot in the chain point to | |
| 2247 the new address of this string. */ | |
| 2248 size = newaddr->size; | |
|
10389
162b3e6c4610
(DONT_COPY_FLAG): New bit flag.
Richard M. Stallman <rms@gnu.org>
parents:
10340
diff
changeset
|
2249 while (((EMACS_UINT) size & ~DONT_COPY_FLAG) > STRING_BLOCK_SIZE) |
| 300 | 2250 { |
| 2251 register Lisp_Object *objptr; | |
|
10389
162b3e6c4610
(DONT_COPY_FLAG): New bit flag.
Richard M. Stallman <rms@gnu.org>
parents:
10340
diff
changeset
|
2252 if (size & DONT_COPY_FLAG) |
|
162b3e6c4610
(DONT_COPY_FLAG): New bit flag.
Richard M. Stallman <rms@gnu.org>
parents:
10340
diff
changeset
|
2253 size ^= MARKBIT | DONT_COPY_FLAG; |
| 300 | 2254 objptr = (Lisp_Object *)size; |
| 2255 | |
| 2256 size = XFASTINT (*objptr) & ~MARKBIT; | |
| 2257 if (XMARKBIT (*objptr)) | |
| 2258 { | |
|
9261
e5ba7993d378
(VALIDATE_LISP_STORAGE, make_float, Fcons, Fmake_vector, Fmake_symbol,
Karl Heuer <kwzh@gnu.org>
parents:
9144
diff
changeset
|
2259 XSETSTRING (*objptr, newaddr); |
| 300 | 2260 XMARK (*objptr); |
| 2261 } | |
| 2262 else | |
|
9261
e5ba7993d378
(VALIDATE_LISP_STORAGE, make_float, Fcons, Fmake_vector, Fmake_symbol,
Karl Heuer <kwzh@gnu.org>
parents:
9144
diff
changeset
|
2263 XSETSTRING (*objptr, newaddr); |
| 300 | 2264 } |
| 2265 /* Store the actual size in the size field. */ | |
| 2266 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
|
2267 |
|
4212
a696547fb51e
(compact_strings): Add USE_TEXT_PROPERTIES conditional.
Richard M. Stallman <rms@gnu.org>
parents:
4139
diff
changeset
|
2268 #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
|
2269 /* 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
|
2270 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
|
2271 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
|
2272 { |
|
0b32ee899a3a
Consistently use the mark bit of the root interval's parent field
Jim Blandy <jimb@redhat.com>
parents:
4087
diff
changeset
|
2273 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
|
2274 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
|
2275 newaddr); |
|
4139
0b32ee899a3a
Consistently use the mark bit of the root interval's parent field
Jim Blandy <jimb@redhat.com>
parents:
4087
diff
changeset
|
2276 } |
|
4212
a696547fb51e
(compact_strings): Add USE_TEXT_PROPERTIES conditional.
Richard M. Stallman <rms@gnu.org>
parents:
4139
diff
changeset
|
2277 #endif /* USE_TEXT_PROPERTIES */ |
| 300 | 2278 } |
| 2279 pos += STRING_FULLSIZE (size); | |
| 2280 } | |
| 2281 } | |
| 2282 | |
| 2283 /* Close out the last string block still used and free any that follow. */ | |
| 2284 to_sb->pos = to_pos; | |
| 2285 current_string_block = to_sb; | |
| 2286 | |
| 2287 from_sb = to_sb->next; | |
| 2288 to_sb->next = 0; | |
| 2289 while (from_sb) | |
| 2290 { | |
| 2291 to_sb = from_sb->next; | |
|
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
2292 xfree (from_sb); |
| 300 | 2293 from_sb = to_sb; |
| 2294 } | |
| 2295 | |
| 2296 /* Free any empty string blocks further back in the chain. | |
| 2297 This loop will never free first_string_block, but it is very | |
| 2298 unlikely that that one will become empty, so why bother checking? */ | |
| 2299 | |
| 2300 from_sb = first_string_block; | |
| 2301 while (to_sb = from_sb->next) | |
| 2302 { | |
| 2303 if (to_sb->pos == 0) | |
| 2304 { | |
| 2305 if (from_sb->next = to_sb->next) | |
| 2306 from_sb->next->prev = from_sb; | |
|
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2370
diff
changeset
|
2307 xfree (to_sb); |
| 300 | 2308 } |
| 2309 else | |
| 2310 from_sb = to_sb; | |
| 2311 } | |
| 2312 } | |
| 2313 | |
|
1327
ef16e7c0d402
* alloc.c (Fmemory_limit): New function.
Jim Blandy <jimb@redhat.com>
parents:
1318
diff
changeset
|
2314 /* Debugging aids. */ |
|
ef16e7c0d402
* alloc.c (Fmemory_limit): New function.
Jim Blandy <jimb@redhat.com>
parents:
1318
diff
changeset
|
2315 |
|
5353
6389ed5b45ac
(Fmemory_limit): No longer interactive.
Richard M. Stallman <rms@gnu.org>
parents:
4956
diff
changeset
|
2316 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
|
2317 "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
|
2318 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
|
2319 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
|
2320 () |
|
ef16e7c0d402
* alloc.c (Fmemory_limit): New function.
Jim Blandy <jimb@redhat.com>
parents:
1318
diff
changeset
|
2321 { |
|
ef16e7c0d402
* alloc.c (Fmemory_limit): New function.
Jim Blandy <jimb@redhat.com>
parents:
1318
diff
changeset
|
2322 Lisp_Object end; |
|
ef16e7c0d402
* alloc.c (Fmemory_limit): New function.
Jim Blandy <jimb@redhat.com>
parents:
1318
diff
changeset
|
2323 |
|
9261
e5ba7993d378
(VALIDATE_LISP_STORAGE, make_float, Fcons, Fmake_vector, Fmake_symbol,
Karl Heuer <kwzh@gnu.org>
parents:
9144
diff
changeset
|
2324 XSETINT (end, (EMACS_INT) sbrk (0) / 1024); |
|
1327
ef16e7c0d402
* alloc.c (Fmemory_limit): New function.
Jim Blandy <jimb@redhat.com>
parents:
1318
diff
changeset
|
2325 |
|
ef16e7c0d402
* alloc.c (Fmemory_limit): New function.
Jim Blandy <jimb@redhat.com>
parents:
1318
diff
changeset
|
2326 return end; |
|
ef16e7c0d402
* alloc.c (Fmemory_limit): New function.
Jim Blandy <jimb@redhat.com>
parents:
1318
diff
changeset
|
2327 } |
|
ef16e7c0d402
* alloc.c (Fmemory_limit): New function.
Jim Blandy <jimb@redhat.com>
parents:
1318
diff
changeset
|
2328 |
|
ef16e7c0d402
* alloc.c (Fmemory_limit): New function.
Jim Blandy <jimb@redhat.com>
parents:
1318
diff
changeset
|
2329 |
| 300 | 2330 /* Initialization */ |
| 2331 | |
| 2332 init_alloc_once () | |
| 2333 { | |
| 2334 /* Used to do Vpurify_flag = Qt here, but Qt isn't set up yet! */ | |
| 2335 pureptr = 0; | |
| 356 | 2336 #ifdef HAVE_SHM |
| 2337 pure_size = PURESIZE; | |
| 2338 #endif | |
| 300 | 2339 all_vectors = 0; |
| 2340 ignore_warnings = 1; | |
| 2341 init_strings (); | |
| 2342 init_cons (); | |
| 2343 init_symbol (); | |
| 2344 init_marker (); | |
| 2345 #ifdef LISP_FLOAT_TYPE | |
| 2346 init_float (); | |
| 2347 #endif /* LISP_FLOAT_TYPE */ | |
|
1300
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
2348 INIT_INTERVALS; |
|
b13b79e28eb5
* alloc.c: #include "intervals.h".
Joseph Arceneaux <jla@gnu.org>
parents:
1295
diff
changeset
|
2349 |
|
10673
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
2350 #ifdef REL_ALLOC |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
2351 malloc_hysteresis = 32; |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
2352 #else |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
2353 malloc_hysteresis = 0; |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
2354 #endif |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
2355 |
|
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
2356 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
|
2357 |
| 300 | 2358 ignore_warnings = 0; |
| 2359 gcprolist = 0; | |
| 2360 staticidx = 0; | |
| 2361 consing_since_gc = 0; | |
|
11048
3f19a379eb99
(init_alloc_once): Increase gc_cons_threshold to 300000.
Richard M. Stallman <rms@gnu.org>
parents:
11018
diff
changeset
|
2362 gc_cons_threshold = 300000; |
| 300 | 2363 #ifdef VIRT_ADDR_VARIES |
| 2364 malloc_sbrk_unused = 1<<22; /* A large number */ | |
| 2365 malloc_sbrk_used = 100000; /* as reasonable as any number */ | |
| 2366 #endif /* VIRT_ADDR_VARIES */ | |
| 2367 } | |
| 2368 | |
| 2369 init_alloc () | |
| 2370 { | |
| 2371 gcprolist = 0; | |
| 2372 } | |
| 2373 | |
| 2374 void | |
| 2375 syms_of_alloc () | |
| 2376 { | |
| 2377 DEFVAR_INT ("gc-cons-threshold", &gc_cons_threshold, | |
| 2378 "*Number of bytes of consing between garbage collections.\n\ | |
| 2379 Garbage collection can happen automatically once this many bytes have been\n\ | |
| 2380 allocated since the last garbage collection. All data types count.\n\n\ | |
| 2381 Garbage collection happens automatically only when `eval' is called.\n\n\ | |
| 2382 By binding this temporarily to a large number, you can effectively\n\ | |
| 2383 prevent garbage collection during a part of the program."); | |
| 2384 | |
| 2385 DEFVAR_INT ("pure-bytes-used", &pureptr, | |
| 2386 "Number of bytes of sharable Lisp data allocated so far."); | |
| 2387 | |
| 2388 #if 0 | |
| 2389 DEFVAR_INT ("data-bytes-used", &malloc_sbrk_used, | |
| 2390 "Number of bytes of unshared memory allocated in this session."); | |
| 2391 | |
| 2392 DEFVAR_INT ("data-bytes-free", &malloc_sbrk_unused, | |
| 2393 "Number of bytes of unshared memory remaining available in this session."); | |
| 2394 #endif | |
| 2395 | |
| 2396 DEFVAR_LISP ("purify-flag", &Vpurify_flag, | |
| 2397 "Non-nil means loading Lisp code in order to dump an executable.\n\ | |
| 2398 This means that certain objects should be allocated in shared (pure) space."); | |
| 2399 | |
| 764 | 2400 DEFVAR_INT ("undo-limit", &undo_limit, |
| 300 | 2401 "Keep no more undo information once it exceeds this size.\n\ |
| 764 | 2402 This limit is applied when garbage collection happens.\n\ |
| 300 | 2403 The size is counted as the number of bytes occupied,\n\ |
| 2404 which includes both saved text and other data."); | |
| 764 | 2405 undo_limit = 20000; |
| 300 | 2406 |
| 764 | 2407 DEFVAR_INT ("undo-strong-limit", &undo_strong_limit, |
| 300 | 2408 "Don't keep more than this much size of undo information.\n\ |
| 2409 A command which pushes past this size is itself forgotten.\n\ | |
| 764 | 2410 This limit is applied when garbage collection happens.\n\ |
| 300 | 2411 The size is counted as the number of bytes occupied,\n\ |
| 2412 which includes both saved text and other data."); | |
| 764 | 2413 undo_strong_limit = 30000; |
| 300 | 2414 |
|
6116
64417bbbb128
(memory_full): Use new variable memory_signal_data with precomputed value
Karl Heuer <kwzh@gnu.org>
parents:
5874
diff
changeset
|
2415 /* 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
|
2416 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
|
2417 memory_signal_data |
|
10673
337c3a4d5fef
(emacs_blocked_malloc): Set __malloc_extra_blocks here.
Richard M. Stallman <rms@gnu.org>
parents:
10649
diff
changeset
|
2418 = 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
|
2419 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
|
2420 |
| 300 | 2421 defsubr (&Scons); |
| 2422 defsubr (&Slist); | |
| 2423 defsubr (&Svector); | |
| 2424 defsubr (&Smake_byte_code); | |
| 2425 defsubr (&Smake_list); | |
| 2426 defsubr (&Smake_vector); | |
| 2427 defsubr (&Smake_string); | |
| 2428 defsubr (&Smake_symbol); | |
| 2429 defsubr (&Smake_marker); | |
| 2430 defsubr (&Spurecopy); | |
| 2431 defsubr (&Sgarbage_collect); | |
|
1327
ef16e7c0d402
* alloc.c (Fmemory_limit): New function.
Jim Blandy <jimb@redhat.com>
parents:
1318
diff
changeset
|
2432 defsubr (&Smemory_limit); |
| 300 | 2433 } |
