steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename some fields to avoid conflicting with windows.h macros 'small' and 'large'

db4
Slava Pestov 2009-04-26 10:02:52 -05:00
parent cc44597ea7
commit e0f6825757
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
vm/code_gc.c
View File

@ -22,13 +22,13 @@ void add_to_free_list(F_HEAP *heap, F_FREE_BLOCK *block)
if(block->block.size < FREE_LIST_COUNT * BLOCK_SIZE_INCREMENT) if(block->block.size < FREE_LIST_COUNT * BLOCK_SIZE_INCREMENT)
{ {
int index = block->block.size / BLOCK_SIZE_INCREMENT; int index = block->block.size / BLOCK_SIZE_INCREMENT;
block->next_free = heap->free.small[index]; block->next_free = heap->free.small_blocks[index];
heap->free.small[index] = block; heap->free.small_blocks[index] = block;
} }
else else
{ {
block->next_free = heap->free.large; block->next_free = heap->free.large_blocks;
heap->free.large = block; heap->free.large_blocks = block;
} }
} }
@ -101,11 +101,11 @@ F_FREE_BLOCK *find_free_block(F_HEAP *heap, CELL size)
while(attempt < FREE_LIST_COUNT * BLOCK_SIZE_INCREMENT) while(attempt < FREE_LIST_COUNT * BLOCK_SIZE_INCREMENT)
{ {
int index = attempt / BLOCK_SIZE_INCREMENT; int index = attempt / BLOCK_SIZE_INCREMENT;
F_FREE_BLOCK *block = heap->free.small[index]; F_FREE_BLOCK *block = heap->free.small_blocks[index];
if(block) if(block)
{ {
assert_free_block(block); assert_free_block(block);
heap->free.small[index] = block->next_free; heap->free.small_blocks[index] = block->next_free;
return block; return block;
} }
@ -113,7 +113,7 @@ F_FREE_BLOCK *find_free_block(F_HEAP *heap, CELL size)
} }
F_FREE_BLOCK *prev = NULL; F_FREE_BLOCK *prev = NULL;
F_FREE_BLOCK *block = heap->free.large; F_FREE_BLOCK *block = heap->free.large_blocks;
while(block) while(block)
{ {
@ -123,7 +123,7 @@ F_FREE_BLOCK *find_free_block(F_HEAP *heap, CELL size)
if(prev) if(prev)
prev->next_free = block->next_free; prev->next_free = block->next_free;
else else
heap->free.large = block->next_free; heap->free.large_blocks = block->next_free;
return block; return block;
} }

4
vm/code_gc.h Normal file → Executable file
View File

@ -2,8 +2,8 @@
#define BLOCK_SIZE_INCREMENT 32 #define BLOCK_SIZE_INCREMENT 32
typedef struct { typedef struct {
F_FREE_BLOCK *small[FREE_LIST_COUNT]; F_FREE_BLOCK *small_blocks[FREE_LIST_COUNT];
F_FREE_BLOCK *large; F_FREE_BLOCK *large_blocks;
} F_HEAP_FREE_LIST; } F_HEAP_FREE_LIST;
typedef struct { typedef struct {