From 50eb431225a786ca4a952c3e6a858f2826740797 Mon Sep 17 00:00:00 2001 From: Justin Ethier Date: Tue, 17 Jul 2018 13:08:24 -0400 Subject: [PATCH] Fully-disable fixed-size heaps for now --- gc.c | 7 +++++-- include/cyclone/types.h | 12 ++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/gc.c b/gc.c index d2085da4..a51b19ed 100644 --- a/gc.c +++ b/gc.c @@ -1374,8 +1374,11 @@ void *gc_alloc(gc_heap_root * hrt, size_t size, char *obj, gc_thread_data * thd, #if INTPTR_MAX == INT64_MAX } else if (size <= 96) { heap_type = HEAP_96; - try_alloc = &gc_try_alloc_fixed_size; - try_alloc_slow = &gc_try_alloc_slow_fixed_size; + try_alloc = &gc_try_alloc; + try_alloc_slow = &gc_try_alloc_slow; + // TODO: + //try_alloc = &gc_try_alloc_fixed_size; + //try_alloc_slow = &gc_try_alloc_slow_fixed_size; #endif } else if (size >= MAX_STACK_OBJ) { heap_type = HEAP_HUGE; diff --git a/include/cyclone/types.h b/include/cyclone/types.h index 903620b1..85d3609e 100644 --- a/include/cyclone/types.h +++ b/include/cyclone/types.h @@ -172,12 +172,12 @@ typedef enum { /** The first heap type that is not fixed-size */ // TODO: disable this for now -//#define LAST_FIXED_SIZE_HEAP_TYPE -1 -#if INTPTR_MAX == INT64_MAX -#define LAST_FIXED_SIZE_HEAP_TYPE HEAP_96 -#else -#define LAST_FIXED_SIZE_HEAP_TYPE HEAP_64 -#endif +#define LAST_FIXED_SIZE_HEAP_TYPE -1 +//#if INTPTR_MAX == INT64_MAX +//#define LAST_FIXED_SIZE_HEAP_TYPE HEAP_96 +//#else +//#define LAST_FIXED_SIZE_HEAP_TYPE HEAP_64 +//#endif /** The number of `gc_heap_type`'s */ #define NUM_HEAP_TYPES (HEAP_HUGE + 1)