Fix conflict

[factor.git] / vm / vm.hpp

diff --git a/vm/vm.hpp b/vm/vm.hpp
index 4f82e595989096b757657c28349a013663ece088..67997e859021b1686232aa0b984a46f1d0e00f3b 100755 (executable)
--- a/vm/vm.hpp
+++ b/vm/vm.hpp
@@ -496,11 +496,7 @@ struct factor_vm
        void primitive_fclose();
 
        //code_block
-       relocation_type relocation_type_of(relocation_entry r);
-       relocation_class relocation_class_of(relocation_entry r);
-       cell relocation_offset_of(relocation_entry r);
        void flush_icache_for(code_block *block);
-       int number_of_parameters(relocation_type type);
        void *object_xt(cell obj);
        void *xt_pic(word *w, cell tagged_quot);
        void *word_xt_pic(word *w);
@@ -509,9 +505,6 @@ struct factor_vm
        void *get_rel_symbol(array *literals, cell index);
        cell compute_relocation(relocation_entry rel, cell index, code_block *compiled);
        template<typename Iterator> void iterate_relocations(code_block *compiled, Iterator &iter);
-       void store_address_2_2(cell *ptr, cell value);
-       void store_address_masked(cell *ptr, fixnum value, cell mask, fixnum shift);
-       void store_address_in_code_block(cell klass, cell offset, fixnum absolute_value);
        void update_literal_references(code_block *compiled);
        void relocate_code_block_step(relocation_entry rel, cell index, code_block *compiled);
        void update_word_references(code_block *compiled);