From 18a2ce1f8cd0208af1ccd0e2b942ddd84ac8b991 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Thu, 5 Nov 2009 19:32:26 -0600
Subject: [PATCH] vm: remove some dead code

---
 vm/code_heap.cpp           |  6 -----
 vm/free_list_allocator.hpp | 54 --------------------------------------
 vm/vm.hpp                  |  1 -
 3 files changed, 61 deletions(-)

diff --git a/vm/code_heap.cpp b/vm/code_heap.cpp
index 44a7a54dfa..98da158b16 100755
--- a/vm/code_heap.cpp
+++ b/vm/code_heap.cpp
@@ -135,12 +135,6 @@ struct code_heap_relocator {
 	}
 };
 
-void factor_vm::relocate_code_heap()
-{
-	code_heap_relocator relocator(this);
-	code->allocator->sweep(relocator);
-}
-
 void factor_vm::primitive_modify_code_heap()
 {
 	data_root<array> alist(dpop(),this);
diff --git a/vm/free_list_allocator.hpp b/vm/free_list_allocator.hpp
index a4801daa72..62e4e09758 100644
--- a/vm/free_list_allocator.hpp
+++ b/vm/free_list_allocator.hpp
@@ -23,7 +23,6 @@ template<typename Block> struct free_list_allocator {
 	cell largest_free_block();
 	cell free_block_count();
 	void sweep();
-	template<typename Iterator> void sweep(Iterator &iter);
 	template<typename Iterator, typename Sizer> void compact(Iterator &iter, Sizer &sizer);
 	template<typename Iterator, typename Sizer> void iterate(Iterator &iter, Sizer &sizer);
 	template<typename Iterator> void iterate(Iterator &iter);
@@ -152,59 +151,6 @@ void free_list_allocator<Block>::sweep()
 	}
 }
 
-template<typename Block>
-template<typename Iterator>
-void free_list_allocator<Block>::sweep(Iterator &iter)
-{
-	free_blocks.clear_free_list();
-
-	Block *prev = NULL;
-	Block *scan = this->first_block();
-	Block *end = this->last_block();
-
-	while(scan != end)
-	{
-		cell size = scan->size();
-
-		if(scan->free_p())
-		{
-			if(prev && prev->free_p())
-			{
-				free_heap_block *free_prev = (free_heap_block *)prev;
-				free_prev->make_free(free_prev->size() + size);
-			}
-			else
-				prev = scan;
-		}
-		else if(this->state.marked_p(scan))
-		{
-			if(prev && prev->free_p())
-				free_blocks.add_to_free_list((free_heap_block *)prev);
-			prev = scan;
-			iter(scan,size);
-		}
-		else
-		{
-			if(prev && prev->free_p())
-			{
-				free_heap_block *free_prev = (free_heap_block *)prev;
-				free_prev->make_free(free_prev->size() + size);
-			}
-			else
-			{
-				free_heap_block *free_block = (free_heap_block *)scan;
-				free_block->make_free(size);
-				prev = scan;
-			}
-		}
-
-		scan = (Block *)((cell)scan + size);
-	}
-
-	if(prev && prev->free_p())
-		free_blocks.add_to_free_list((free_heap_block *)prev);
-}
-
 template<typename Block, typename Iterator> struct heap_compactor {
 	mark_bits<Block> *state;
 	char *address;
diff --git a/vm/vm.hpp b/vm/vm.hpp
index 0a65873f6c..81dd30000e 100755
--- a/vm/vm.hpp
+++ b/vm/vm.hpp
@@ -530,7 +530,6 @@ struct factor_vm
 	void jit_compile_word(cell word_, cell def_, bool relocate);
 	void update_code_heap_words();
 	void update_code_heap_words_and_literals();
-	void relocate_code_heap();
 	void primitive_modify_code_heap();
 	code_heap_room code_room();
 	void primitive_code_room();