e5b50de · Idris-dev · git.iko.soy

git.iko.soy/Idris-dev

Merge pull request #1968 from Chobbes/heap_fixes

Generalized alloc_heap so it could be reused for garbage collection.

commite5b50de7e25238e59dc25882a257d32308547637 authorEdwin Brady <edwin.brady@gmail.com> dateThu 19 Mar 2015, 19:30 (12 years ago) parentab3b3db 8f9ac37

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

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

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

113113 free(vm->heap.old);

114114

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

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

117−

118− vm->heap.heap = newheap;

119−#ifdef FORCE_ALIGNMENT

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

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

122− } else

123−#endif

124− {

125− vm->heap.next = newheap;

126− }

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

115+ /* Allocate swap heap. */

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

128117

129118 VAL* root;

130119

@@ -139,6 +128,7 @@ void idris_gc(VM* vm) {

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

140129 }

141130#endif

131+

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

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

144134

@@ -150,7 +140,6 @@ void idris_gc(VM* vm) {

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

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

152142 }

153− vm->heap.old = oldheap;

154143

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

156145 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;