summaryrefslogtreecommitdiff
path: root/malloc.c
diff options
context:
space:
mode:
authorIvan Maidanski <ivmai@mail.ru>2011-07-26 15:49:27 +0200
committerIvan Maidanski <ivmai@mail.ru>2011-07-26 15:49:27 +0200
commitcab07051b9609b90d82db8c4586988a804a25264 (patch)
tree98eb408f4e958f983450dad080f567702d67bd74 /malloc.c
parent1b159c5602737076356b862a8d2205bb13b34909 (diff)
gc6.3alpha5 tarball importgc6_3alpha5
Diffstat (limited to 'malloc.c')
-rw-r--r--malloc.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/malloc.c b/malloc.c
index edcbbc5..cb3f376 100644
--- a/malloc.c
+++ b/malloc.c
@@ -36,6 +36,7 @@ register struct obj_kind * kind;
/* Allocate a large block of size lw words. */
/* The block is not cleared. */
/* Flags is 0 or IGNORE_OFF_PAGE. */
+/* We hold the allocation lock. */
ptr_t GC_alloc_large(lw, k, flags)
word lw;
int k;
@@ -76,6 +77,7 @@ unsigned flags;
/* Allocate a large block of size lb bytes. Clear if appropriate. */
+/* We hold the allocation lock. */
ptr_t GC_alloc_large_and_clear(lw, k, flags)
word lw;
int k;
@@ -217,7 +219,7 @@ register int k;
GC_words_allocd += lw;
UNLOCK();
ENABLE_SIGNALS();
- if (init & !GC_debugging_started && 0 != result) {
+ if (init && !GC_debugging_started && 0 != result) {
BZERO(result, n_blocks * HBLKSIZE);
}
}