8f9ac37 · Idris-dev · git.iko.soy

git.iko.soy/Idris-dev

Generalized alloc_heap so it could be reused for garbage collection.

commit8f9ac37a02af2d45c2ca52c6a37076eafecd4166 authorCalvin Beck <hobbes@ualberta.ca> dateSat 28 Feb 2015, 14:41 (12 years ago) parent5475fe3

4 files changed+11−19

compare with master

unifiedsplit

rts/idris_gc.c+3−14 rts/idris_heap.c+6−3 rts/idris_heap.h+1−1 rts/idris_rts.c+1−1

rts/idris_gc.c+3−14

@@ -116,19 +116,8 @@ void idris_gc(VM* vm) {

116116 if (vm->heap.old != NULL)

117117 free(vm->heap.old);

118118

119− char* newheap = malloc(vm->heap.size);

120− char* oldheap = vm->heap.heap;

121−

122− vm->heap.heap = newheap;

123−#ifdef FORCE_ALIGNMENT

124− if (((i_int)(vm->heap.heap)&1) == 1) {

125− vm->heap.next = newheap + 1;

126− } else

127−#endif

128− {

129− vm->heap.next = newheap;

130− }

131− vm->heap.end = newheap + vm->heap.size;

119+ /* Allocate swap heap. */

120+ alloc_heap(&vm->heap, vm->heap.size, vm->heap.growth, vm->heap.heap);

132121

133122 VAL* root;

134123

@@ -143,6 +132,7 @@ void idris_gc(VM* vm) {

143132 msg->msg = copy(vm, msg->msg);

144133 }

145134#endif

135+

146136 vm->ret = copy(vm, vm->ret);

147137 vm->reg1 = copy(vm, vm->reg1);

148138

@@ -154,7 +144,6 @@ void idris_gc(VM* vm) {

154144 if ((vm->heap.next - vm->heap.heap) > vm->heap.size >> 1) {

155145 vm->heap.size += vm->heap.growth;

156146 }

157− vm->heap.old = oldheap;

158147

159148 STATS_LEAVE_GC(vm->stats, vm->heap.size, vm->heap.next - vm->heap.heap)

160149 HEAP_CHECK(vm)

rts/idris_heap.c+6−3

@@ -5,7 +5,9 @@

55#include <stddef.h>

66#include <stdio.h>

8−void alloc_heap(Heap * h, size_t heap_size)

9+/* Used for initializing the heap. */

10+void alloc_heap(Heap * h, size_t heap_size, size_t growth, char * old)

911{

1012 char * mem = malloc(heap_size);

1113 if (mem == NULL) {

@@ -27,9 +29,9 @@ void alloc_heap(Heap * h, size_t heap_size)

2729 h->end = h->heap + heap_size;

2830

2931 h->size = heap_size;

30− h->growth = heap_size;

32+ h->growth = growth;

3133

32− h->old = NULL;

34+ h->old = old;

3335}

3436

3537void free_heap(Heap * h) {

@@ -40,6 +42,7 @@ void free_heap(Heap * h) {

4042 }

4143}

4244

45+

4346// TODO: more testing

4447/******************** Heap testing ********************************************/

4548void heap_check_underflow(Heap * heap) {

rts/idris_heap.h+1−1

@@ -14,7 +14,7 @@ typedef struct {

1414} Heap;

1515

1616

17−void alloc_heap(Heap * heap, size_t heap_size);

17+void alloc_heap(Heap * heap, size_t heap_size, size_t growth, char * old);

1818void free_heap(Heap * heap);

1919

2020

rts/idris_rts.c+1−1

@@ -29,7 +29,7 @@ VM* init_vm(int stack_size, size_t heap_size,

2929 vm->valstack_base = valstack;

3030 vm->stack_max = valstack + stack_size;

3131

32− alloc_heap(&(vm->heap), heap_size);

32+ alloc_heap(&(vm->heap), heap_size, heap_size, NULL);

3333

3434 vm->ret = NULL;

3535 vm->reg1 = NULL;