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