From b1189dc4f19160c7a87b55a8ce29393cbd605e80 Mon Sep 17 00:00:00 2001
From: Phil Dawes <phil@phildawes.net>
Date: Mon, 17 Aug 2009 21:37:10 +0100
Subject: [PATCH] moved write_barrier functions to vm

---
 vm/code_block.hpp    |  2 +-
 vm/vm.hpp            | 15 +++++++++--
 vm/write_barrier.hpp | 63 +++++++++++++++++++++++++++++++++++++-------
 3 files changed, 68 insertions(+), 12 deletions(-)
 mode change 100644 => 100755 vm/write_barrier.hpp

diff --git a/vm/code_block.hpp b/vm/code_block.hpp
index d46cd9e885..3497ff33ba 100644
--- a/vm/code_block.hpp
+++ b/vm/code_block.hpp
@@ -86,7 +86,7 @@ void mark_object_code_block(object *scan);
 
 void relocate_code_block(code_block *relocating);
 
-inline static bool stack_traces_p()
+inline bool stack_traces_p()
 {
 	return userenv[STACK_TRACES_ENV] != F;
 }
diff --git a/vm/vm.hpp b/vm/vm.hpp
index bcbf2fe6bf..ffdf42aff9 100644
--- a/vm/vm.hpp
+++ b/vm/vm.hpp
@@ -155,6 +155,19 @@ struct factorvm {
 	inline void vmprim_end_scan();
 	template<typename T> void each_object(T &functor);
 	cell find_all_words();
+	
+	//write barrier
+	inline card *addr_to_card(cell a);
+	inline cell card_to_addr(card *c);
+	inline cell card_offset(card *c);
+	inline card_deck *addr_to_deck(cell a);
+	inline cell deck_to_addr(card_deck *c);
+	inline card *deck_to_card(card_deck *d);
+	inline card *addr_to_allot_marker(object *a);
+	inline void write_barrier(object *obj);
+	inline void allot_barrier(object *address);
+	// next method here:
+
 
 	//data_gc
 	void init_data_gc();
@@ -192,14 +205,12 @@ struct factorvm {
 	template <typename TYPE> TYPE *allot(cell size);
 	inline void check_data_pointer(object *pointer);
 	inline void check_tagged_pointer(cell tagged);
-	// next method here:
 
 	// local roots
 	std::vector<cell> gc_locals;
 	std::vector<cell> gc_bignums;
 
 	// generic arrays
-
 	template <typename TYPE> TYPE *reallot_array(TYPE *array_, cell capacity);
 
 	//debug
diff --git a/vm/write_barrier.hpp b/vm/write_barrier.hpp
old mode 100644
new mode 100755
index 0006581034..e874600b24
--- a/vm/write_barrier.hpp
+++ b/vm/write_barrier.hpp
@@ -22,65 +22,110 @@ static const cell card_bits = 8;
 static const cell card_size = (1<<card_bits);
 static const cell addr_card_mask = (card_size-1);
 
-inline static card *addr_to_card(cell a)
+inline card *factorvm::addr_to_card(cell a)
 {
 	return (card*)(((cell)(a) >> card_bits) + cards_offset);
 }
 
-inline static cell card_to_addr(card *c)
+inline card *addr_to_card(cell a)
+{
+	return vm->addr_to_card(a);
+}
+
+inline cell factorvm::card_to_addr(card *c)
 {
 	return ((cell)c - cards_offset) << card_bits;
 }
 
-inline static cell card_offset(card *c)
+inline cell card_to_addr(card *c)
+{
+	return vm->card_to_addr(c);
+}
+
+inline cell factorvm::card_offset(card *c)
 {
 	return *(c - (cell)data->cards + (cell)data->allot_markers);
 }
 
+inline cell card_offset(card *c)
+{
+	return vm->card_offset(c);
+}
+
 typedef u8 card_deck;
 
 static const cell deck_bits = (card_bits + 10);
 static const cell deck_size = (1<<deck_bits);
 static const cell addr_deck_mask = (deck_size-1);
 
-inline static card_deck *addr_to_deck(cell a)
+inline card_deck *factorvm::addr_to_deck(cell a)
 {
 	return (card_deck *)(((cell)a >> deck_bits) + decks_offset);
 }
 
-inline static cell deck_to_addr(card_deck *c)
+inline card_deck *addr_to_deck(cell a)
+{
+	return vm->addr_to_deck(a);
+}
+
+inline cell factorvm::deck_to_addr(card_deck *c)
 {
 	return ((cell)c - decks_offset) << deck_bits;
 }
 
-inline static card *deck_to_card(card_deck *d)
+inline cell deck_to_addr(card_deck *c)
+{
+	return vm->deck_to_addr(c);
+}
+
+inline card *factorvm::deck_to_card(card_deck *d)
 {
 	return (card *)((((cell)d - decks_offset) << (deck_bits - card_bits)) + cards_offset);
 }
 
+inline card *deck_to_card(card_deck *d)
+{
+	return vm->deck_to_card(d);
+}
+
 static const cell invalid_allot_marker = 0xff;
 
 extern cell allot_markers_offset;
 
-inline static card *addr_to_allot_marker(object *a)
+inline card *factorvm::addr_to_allot_marker(object *a)
 {
 	return (card *)(((cell)a >> card_bits) + allot_markers_offset);
 }
 
+inline card *addr_to_allot_marker(object *a)
+{
+	return vm->addr_to_allot_marker(a);
+}
+
 /* the write barrier must be called any time we are potentially storing a
 pointer from an older generation to a younger one */
-inline static void write_barrier(object *obj)
+inline void factorvm::write_barrier(object *obj)
 {
 	*addr_to_card((cell)obj) = card_mark_mask;
 	*addr_to_deck((cell)obj) = card_mark_mask;
 }
 
+inline void write_barrier(object *obj)
+{
+	return vm->write_barrier(obj);
+}
+
 /* we need to remember the first object allocated in the card */
-inline static void allot_barrier(object *address)
+inline void factorvm::allot_barrier(object *address)
 {
 	card *ptr = addr_to_allot_marker(address);
 	if(*ptr == invalid_allot_marker)
 		*ptr = ((cell)address & addr_card_mask);
 }
 
+inline void allot_barrier(object *address)
+{
+	return vm->allot_barrier(address);
+}
+
 }