aboutsummaryrefslogtreecommitdiffstats
path: root/src/alloc.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/alloc.c')
-rw-r--r--src/alloc.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/alloc.c b/src/alloc.c
index 16b004fc0e9..314438ba9f1 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -296,7 +296,6 @@ enum mem_type
296 MEM_TYPE_VECTORLIKE 296 MEM_TYPE_VECTORLIKE
297}; 297};
298 298
299static POINTER_TYPE *lisp_align_malloc (size_t, enum mem_type);
300static POINTER_TYPE *lisp_malloc (size_t, enum mem_type); 299static POINTER_TYPE *lisp_malloc (size_t, enum mem_type);
301 300
302 301
@@ -938,9 +937,10 @@ lisp_free (POINTER_TYPE *block)
938 MALLOC_UNBLOCK_INPUT; 937 MALLOC_UNBLOCK_INPUT;
939} 938}
940 939
941/* Allocation of aligned blocks of memory to store Lisp data. */ 940/***** Allocation of aligned blocks of memory to store Lisp data. *****/
942/* The entry point is lisp_align_malloc which returns blocks of at most */ 941
943/* BLOCK_BYTES and guarantees they are aligned on a BLOCK_ALIGN boundary. */ 942/* The entry point is lisp_align_malloc which returns blocks of at most
943 BLOCK_BYTES and guarantees they are aligned on a BLOCK_ALIGN boundary. */
944 944
945/* Use posix_memalloc if the system has it and we're using the system's 945/* Use posix_memalloc if the system has it and we're using the system's
946 malloc (because our gmalloc.c routines don't have posix_memalign although 946 malloc (because our gmalloc.c routines don't have posix_memalign although
@@ -1099,7 +1099,7 @@ lisp_align_malloc (size_t nbytes, enum mem_type type)
1099#endif 1099#endif
1100 1100
1101 /* Initialize the blocks and put them on the free list. 1101 /* Initialize the blocks and put them on the free list.
1102 Is `base' was not properly aligned, we can't use the last block. */ 1102 If `base' was not properly aligned, we can't use the last block. */
1103 for (i = 0; i < (aligned ? ABLOCKS_SIZE : ABLOCKS_SIZE - 1); i++) 1103 for (i = 0; i < (aligned ? ABLOCKS_SIZE : ABLOCKS_SIZE - 1); i++)
1104 { 1104 {
1105 abase->blocks[i].abase = abase; 1105 abase->blocks[i].abase = abase;
@@ -1146,8 +1146,8 @@ lisp_align_free (POINTER_TYPE *block)
1146 ablock->x.next_free = free_ablock; 1146 ablock->x.next_free = free_ablock;
1147 free_ablock = ablock; 1147 free_ablock = ablock;
1148 /* Update busy count. */ 1148 /* Update busy count. */
1149 ABLOCKS_BUSY (abase) = 1149 ABLOCKS_BUSY (abase)
1150 (struct ablocks *) (-2 + (intptr_t) ABLOCKS_BUSY (abase)); 1150 = (struct ablocks *) (-2 + (intptr_t) ABLOCKS_BUSY (abase));
1151 1151
1152 if (2 > (intptr_t) ABLOCKS_BUSY (abase)) 1152 if (2 > (intptr_t) ABLOCKS_BUSY (abase))
1153 { /* All the blocks are free. */ 1153 { /* All the blocks are free. */